1diff -urN xlife-6.7.4/cell.c xlife-6.7.5/cell.c 2--- xlife-6.7.4/cell.c 2013-04-07 07:29:34.000000000 +0400 3+++ xlife-6.7.5/cell.c 2013-08-01 15:56:59.000000000 +0400 4@@ -22,7 +22,7 @@ 5 6 /* 7 * A lot of modifications were added at 2011-13 by Vladimir Lidovski vol.litwr@gmail.com 8- * $Id: cell.c 177 2013-03-23 17:29:52Z micro $ 9+ * $Id: cell.c 216 2013-07-28 18:06:27Z micro $ 10 * (C) This version of XLife may be used under the same conditions as mentioned above 11 */ 12 13diff -urN xlife-6.7.4/clipboard.c xlife-6.7.5/clipboard.c 14--- xlife-6.7.4/clipboard.c 2013-03-26 13:19:17.000000000 +0400 15+++ xlife-6.7.5/clipboard.c 2013-08-01 15:56:59.000000000 +0400 16@@ -1,6 +1,6 @@ 17 /* 18 * XLife Copyright 2011-13 Vladimir Lidovski vol.litwr@gmail.com 19- * $Id: clipboard.c 181 2013-03-26 09:19:17Z micro $ 20+ * $Id: clipboard.c 216 2013-07-28 18:06:27Z micro $ 21 * 22 * Permission to use, copy, modify, distribute, and sell this software and its 23 * documentation for any purpose is hereby granted without fee, provided that 24diff -urN xlife-6.7.4/clipboard.h xlife-6.7.5/clipboard.h 25--- xlife-6.7.4/clipboard.h 2012-04-02 21:28:29.000000000 +0400 26+++ xlife-6.7.5/clipboard.h 2013-08-01 15:56:59.000000000 +0400 27@@ -1,6 +1,6 @@ 28 /* 29 * XLife Copyright 2011, 2012 Vladimir Lidovski vol.litwr@gmail.com 30- * $Id: clipboard.h 51 2012-04-02 17:28:29Z micro $ 31+ * $Id: clipboard.h 216 2013-07-28 18:06:27Z micro $ 32 * 33 * Permission to use, copy, modify, distribute, and sell this software and its 34 * documentation for any purpose is hereby granted without fee, provided that 35diff -urN xlife-6.7.4/collect.c xlife-6.7.5/collect.c 36--- xlife-6.7.4/collect.c 2013-03-11 14:32:57.000000000 +0400 37+++ xlife-6.7.5/collect.c 2013-08-01 15:56:59.000000000 +0400 38@@ -28,7 +28,7 @@ 39 /* 40 Several modifications were added at 2011 by Vladimir Lidovski vol.litwr@gmail.com 41 (C) This version of XLife may be used under the same conditions as mentioned above 42-$Id: collect.c 145 2013-03-11 10:32:57Z micro $ 43+$Id: collect.c 216 2013-07-28 18:06:27Z micro $ 44 */ 45 46 /* collect.c: Collects separate included files into one file 47diff -urN xlife-6.7.4/colors.c xlife-6.7.5/colors.c 48--- xlife-6.7.4/colors.c 2013-08-04 15:10:25.000000000 +0400 49+++ xlife-6.7.5/colors.c 2013-10-22 12:51:32.000000000 +0400 50@@ -1,6 +1,6 @@ 51 /* 52 * XLife Copyright 2011-13 Vladimir Lidovski vol.litwr@gmail.com 53- * $Id: colors.c 241 2013-08-04 10:00:07Z micro $ 54+ * $Id: colors.c 255 2013-10-22 09:12:33Z teacher $ 55 * 56 * Permission to use, copy, modify, distribute, and sell this software and its 57 * documentation for any purpose is hereby granted without fee, provided that 58@@ -294,7 +294,9 @@ 59 "Green", 60 "#CCCCCC", /* + 9 */ 61 "#000082", 62- "#620000"}; 63+ "#620000", 64+ "Blue", 65+ "#000000"}; /* reserve */ 66 67 struct AdjustColorPair historycolors[] = {{0, "Black"}, {1, "Green"}, {2, "#000080"}, 68 {3, "#d8ffd8"}, {4, "Red"}, {5, "Yellow"}, {6, "#616161"}}; 69diff -urN xlife-6.7.4/colors.h xlife-6.7.5/colors.h 70--- xlife-6.7.4/colors.h 2013-03-21 21:19:56.000000000 +0400 71+++ xlife-6.7.5/colors.h 2013-10-22 12:51:32.000000000 +0400 72@@ -1,6 +1,6 @@ 73 /* 74 * XLife Copyright 2011-13 Vladimir Lidovski vol.litwr@gmail.com 75- * $Id: colors.h 168 2013-03-21 17:19:56Z micro $ 76+ * $Id: colors.h 255 2013-10-22 09:12:33Z teacher $ 77 * 78 * Permission to use, copy, modify, distribute, and sell this software and its 79 * documentation for any purpose is hereby granted without fee, provided that 80@@ -32,6 +32,7 @@ 81 #define WHITE_EVER (MAXSTATES + 7) 82 #define GREEN_EVER (MAXSTATES + 8) 83 #define LOADW_BG (MAXSTATES + 9) 84+#define BLUE_EVER (MAXSTATES + 12) 85 86 struct AdjustColorPair { 87 int cn; 88diff -urN xlife-6.7.4/common.h xlife-6.7.5/common.h 89--- xlife-6.7.4/common.h 2012-04-02 21:28:29.000000000 +0400 90+++ xlife-6.7.5/common.h 2013-08-01 15:56:59.000000000 +0400 91@@ -23,7 +23,7 @@ 92 /* 93 * A lot of modifications were added at 2011, 2012 by Vladimir Lidovski vol.litwr@gmail.com 94 * (C) This version of XLife may be used under the same conditions as mentioned above 95- * $Id: common.h 51 2012-04-02 17:28:29Z micro $ 96+ * $Id: common.h 216 2013-07-28 18:06:27Z micro $ 97 */ 98 99 /* someday, on a 64-bit machine, this might be unsigned int rather than long */ 100diff -urN xlife-6.7.4/data.c xlife-6.7.5/data.c 101--- xlife-6.7.4/data.c 2013-03-21 21:19:56.000000000 +0400 102+++ xlife-6.7.5/data.c 2013-08-01 15:56:59.000000000 +0400 103@@ -23,7 +23,7 @@ 104 /* 105 A lot of modifications were added at 2001, 2011-13 by Vladimir Lidovski vol.litwr@gmail.com 106 (C) This version of XLife may be used under the same conditions as mentioned above 107-$Id: data.c 168 2013-03-21 17:19:56Z micro $ 108+$Id: data.c 216 2013-07-28 18:06:27Z micro $ 109 */ 110 111 #include "defs.h" 112diff -urN xlife-6.7.4/defs.h xlife-6.7.5/defs.h 113--- xlife-6.7.4/defs.h 2013-08-04 15:10:25.000000000 +0400 114+++ xlife-6.7.5/defs.h 2013-10-22 12:51:32.000000000 +0400 115@@ -23,7 +23,7 @@ 116 /* 117 A lot of modifications were added at 2001, 2011-13 by Vladimir Lidovski vol.litwr@gmail.com 118 (C) This version of XLife may be used under the same conditions as mentioned above 119-$Id: defs.h 241 2013-08-04 10:00:07Z micro $ 120+$Id: defs.h 255 2013-10-22 09:12:33Z teacher $ 121 */ 122 123 #ifdef __GNUCC__ 124@@ -364,7 +364,7 @@ 125 extern char saveformat, scriptformat; 126 127 #define MAXCHANGE 8192 128-#define EXTRACOLORS 12 129+#define EXTRACOLORS 14 130 #define MAXCOLORS (MAXSTATES + EXTRACOLORS) 131 extern cellcount_t chgpoints[MAXCOLORS], chgrects[MAXCOLORS]; 132 extern XPoint points[MAXCOLORS][MAXCHANGE]; 133diff -urN xlife-6.7.4/isave.c xlife-6.7.5/isave.c 134--- xlife-6.7.4/isave.c 2013-03-11 14:32:57.000000000 +0400 135+++ xlife-6.7.5/isave.c 2013-08-01 15:56:59.000000000 +0400 136@@ -5,7 +5,7 @@ 137 138 /* 139 Several modifications were added at 2011 by Vladimir Lidovski <vol.litwr@gmail.com> 140-$Id: isave.c 145 2013-03-11 10:32:57Z micro $ 141+$Id: isave.c 216 2013-07-28 18:06:27Z micro $ 142 */ 143 144 /* it saves pattern in I-format. 145diff -urN xlife-6.7.4/key.c xlife-6.7.5/key.c 146--- xlife-6.7.4/key.c 2013-03-11 14:32:57.000000000 +0400 147+++ xlife-6.7.5/key.c 2013-08-01 15:56:59.000000000 +0400 148@@ -23,7 +23,7 @@ 149 /* 150 * A lot of modifications were added at 2011-13 by Vladimir Lidovski vol.litwr@gmail.com 151 * (C) This version of XLife may be used under the same conditions as mentioned above 152- * $Id: key.c 145 2013-03-11 10:32:57Z micro $ 153+ * $Id: key.c 216 2013-07-28 18:06:27Z micro $ 154 */ 155 156 #include <stdlib.h> 157diff -urN xlife-6.7.4/main.c xlife-6.7.5/main.c 158--- xlife-6.7.4/main.c 2013-09-29 22:21:44.000000000 +0400 159+++ xlife-6.7.5/main.c 2013-10-22 22:56:19.000000000 +0400 160@@ -25,7 +25,7 @@ 161 /* 162 * A lot of modifications were added at 2001, 2011-13 by Vladimir Lidovski vol.litwr@gmail.com 163 * (C) This version of XLife may be used under the same conditions as mentioned above 164- * $Id: main.c 253 2013-09-29 18:39:43Z teacher $ 165+ * $Id: main.c 256 2013-10-22 19:17:22Z teacher $ 166 */ 167 168 #include <X11/Xlib.h> 169@@ -1123,8 +1123,8 @@ 170 XClassHint class_hints; 171 XSetWindowAttributes winat; 172 XColor white, black; 173- char *geomstring = NULL; 174- char *initpat = NULL; 175+ char *geomstring = 0; 176+ char *initpat = 0; 177 XTextProperty iconName; 178 unsigned long cwhite, cblack; 179 char *icon_name = "Xlife"; 180@@ -1159,7 +1159,7 @@ 181 } 182 else 183 goto le; 184- else 185+ else if (initpat == 0) 186 initpat = argv[i]; 187 } 188 else 189@@ -1320,7 +1320,7 @@ 190 * Only accept one pattern since it is highly unlikely that overlaying 191 * n patterns is what you want to do 192 */ 193- if (saveformat == 'C') { 194+ if (saveformat == 'C') { 195 collect(initpat, 0); 196 return 0; 197 } 198@@ -1332,7 +1332,20 @@ 199 fatal("Can't automatically convert this pattern with topology information -- Use XLife for the conversion\n"); 200 while (qgens-- > 0) 201 generate(&active); 202+#ifdef MICROSOFT 203+/* MINGW can't use stdout :-( */ 204+ { 205+ FILE *f = fopen(argv[argc - 1], "r"); 206+ if (f || argc < 4) 207+errwin: fatalw("Wrong name for the output file. Use syntax: lifeconv OPTIONS INFILE OUTFILE"); 208+ f = fopen(argv[argc - 1], "w"); 209+ if (!f) goto errwin; 210+ saveall(f, saveformat); 211+ fclose(f); 212+ } 213+#else 214 saveall(stdout, saveformat); 215+#endif 216 return 0; 217 } 218 xpos -= SCALE(width >> 1); 219diff -urN xlife-6.7.4/patchlevel.h xlife-6.7.5/patchlevel.h 220--- xlife-6.7.4/patchlevel.h 2013-09-29 20:55:50.000000000 +0400 221+++ xlife-6.7.5/patchlevel.h 2013-10-22 12:51:32.000000000 +0400 222@@ -23,9 +23,9 @@ 223 /* 224 * Several modifications were added at 2011-13 by Vladimir Lidovski vol.litwr@gmail.com 225 * (C) This version of XLife may be used under the same conditions as mentioned above 226- * $Id: patchlevel.h 251 2013-09-29 17:13:49Z teacher $ 227+ * $Id: patchlevel.h 255 2013-10-22 09:12:33Z teacher $ 228 */ 229 230 static int majorversion = 6; 231 static int minorversion = 7; 232-static int patchlevel = 4; 233+static int patchlevel = 5; 234diff -urN xlife-6.7.4/table2r xlife-6.7.5/table2r 235--- xlife-6.7.4/table2r 2013-05-27 21:39:50.000000000 +0400 236+++ xlife-6.7.5/table2r 2013-08-01 15:56:59.000000000 +0400 237@@ -1,7 +1,7 @@ 238 #!GAWKPATH -f 239 # A converter from TABLE to XLIFE r-format 240 # by Vladimir Lidovski, v2.10, 2011, 2013, (C) Copyright GNU GPL v2 241-# $Id: table2r 196 2013-05-27 17:39:50Z micro $ 242+# $Id: table2r 216 2013-07-28 18:06:27Z micro $ 243 244 BEGIN { 245 if (ARGC != 2) { 246