diff -urN xlife-6.7.4/cell.c xlife-6.7.5/cell.c --- xlife-6.7.4/cell.c 2013-04-07 07:29:34.000000000 +0400 +++ xlife-6.7.5/cell.c 2013-08-01 15:56:59.000000000 +0400 @@ -22,7 +22,7 @@ /* * A lot of modifications were added at 2011-13 by Vladimir Lidovski vol.litwr@gmail.com - * $Id: cell.c 177 2013-03-23 17:29:52Z micro $ + * $Id: cell.c 216 2013-07-28 18:06:27Z micro $ * (C) This version of XLife may be used under the same conditions as mentioned above */ diff -urN xlife-6.7.4/clipboard.c xlife-6.7.5/clipboard.c --- xlife-6.7.4/clipboard.c 2013-03-26 13:19:17.000000000 +0400 +++ xlife-6.7.5/clipboard.c 2013-08-01 15:56:59.000000000 +0400 @@ -1,6 +1,6 @@ /* * XLife Copyright 2011-13 Vladimir Lidovski vol.litwr@gmail.com - * $Id: clipboard.c 181 2013-03-26 09:19:17Z micro $ + * $Id: clipboard.c 216 2013-07-28 18:06:27Z micro $ * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff -urN xlife-6.7.4/clipboard.h xlife-6.7.5/clipboard.h --- xlife-6.7.4/clipboard.h 2012-04-02 21:28:29.000000000 +0400 +++ xlife-6.7.5/clipboard.h 2013-08-01 15:56:59.000000000 +0400 @@ -1,6 +1,6 @@ /* * XLife Copyright 2011, 2012 Vladimir Lidovski vol.litwr@gmail.com - * $Id: clipboard.h 51 2012-04-02 17:28:29Z micro $ + * $Id: clipboard.h 216 2013-07-28 18:06:27Z micro $ * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff -urN xlife-6.7.4/collect.c xlife-6.7.5/collect.c --- xlife-6.7.4/collect.c 2013-03-11 14:32:57.000000000 +0400 +++ xlife-6.7.5/collect.c 2013-08-01 15:56:59.000000000 +0400 @@ -28,7 +28,7 @@ /* Several modifications were added at 2011 by Vladimir Lidovski vol.litwr@gmail.com (C) This version of XLife may be used under the same conditions as mentioned above -$Id: collect.c 145 2013-03-11 10:32:57Z micro $ +$Id: collect.c 216 2013-07-28 18:06:27Z micro $ */ /* collect.c: Collects separate included files into one file diff -urN xlife-6.7.4/colors.c xlife-6.7.5/colors.c --- xlife-6.7.4/colors.c 2013-08-04 15:10:25.000000000 +0400 +++ xlife-6.7.5/colors.c 2013-10-22 12:51:32.000000000 +0400 @@ -1,6 +1,6 @@ /* * XLife Copyright 2011-13 Vladimir Lidovski vol.litwr@gmail.com - * $Id: colors.c 241 2013-08-04 10:00:07Z micro $ + * $Id: colors.c 255 2013-10-22 09:12:33Z teacher $ * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -294,7 +294,9 @@ "Green", "#CCCCCC", /* + 9 */ "#000082", - "#620000"}; + "#620000", + "Blue", + "#000000"}; /* reserve */ struct AdjustColorPair historycolors[] = {{0, "Black"}, {1, "Green"}, {2, "#000080"}, {3, "#d8ffd8"}, {4, "Red"}, {5, "Yellow"}, {6, "#616161"}}; diff -urN xlife-6.7.4/colors.h xlife-6.7.5/colors.h --- xlife-6.7.4/colors.h 2013-03-21 21:19:56.000000000 +0400 +++ xlife-6.7.5/colors.h 2013-10-22 12:51:32.000000000 +0400 @@ -1,6 +1,6 @@ /* * XLife Copyright 2011-13 Vladimir Lidovski vol.litwr@gmail.com - * $Id: colors.h 168 2013-03-21 17:19:56Z micro $ + * $Id: colors.h 255 2013-10-22 09:12:33Z teacher $ * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -32,6 +32,7 @@ #define WHITE_EVER (MAXSTATES + 7) #define GREEN_EVER (MAXSTATES + 8) #define LOADW_BG (MAXSTATES + 9) +#define BLUE_EVER (MAXSTATES + 12) struct AdjustColorPair { int cn; diff -urN xlife-6.7.4/common.h xlife-6.7.5/common.h --- xlife-6.7.4/common.h 2012-04-02 21:28:29.000000000 +0400 +++ xlife-6.7.5/common.h 2013-08-01 15:56:59.000000000 +0400 @@ -23,7 +23,7 @@ /* * A lot of modifications were added at 2011, 2012 by Vladimir Lidovski vol.litwr@gmail.com * (C) This version of XLife may be used under the same conditions as mentioned above - * $Id: common.h 51 2012-04-02 17:28:29Z micro $ + * $Id: common.h 216 2013-07-28 18:06:27Z micro $ */ /* someday, on a 64-bit machine, this might be unsigned int rather than long */ diff -urN xlife-6.7.4/data.c xlife-6.7.5/data.c --- xlife-6.7.4/data.c 2013-03-21 21:19:56.000000000 +0400 +++ xlife-6.7.5/data.c 2013-08-01 15:56:59.000000000 +0400 @@ -23,7 +23,7 @@ /* A lot of modifications were added at 2001, 2011-13 by Vladimir Lidovski vol.litwr@gmail.com (C) This version of XLife may be used under the same conditions as mentioned above -$Id: data.c 168 2013-03-21 17:19:56Z micro $ +$Id: data.c 216 2013-07-28 18:06:27Z micro $ */ #include "defs.h" diff -urN xlife-6.7.4/defs.h xlife-6.7.5/defs.h --- xlife-6.7.4/defs.h 2013-08-04 15:10:25.000000000 +0400 +++ xlife-6.7.5/defs.h 2013-10-22 12:51:32.000000000 +0400 @@ -23,7 +23,7 @@ /* A lot of modifications were added at 2001, 2011-13 by Vladimir Lidovski vol.litwr@gmail.com (C) This version of XLife may be used under the same conditions as mentioned above -$Id: defs.h 241 2013-08-04 10:00:07Z micro $ +$Id: defs.h 255 2013-10-22 09:12:33Z teacher $ */ #ifdef __GNUCC__ @@ -364,7 +364,7 @@ extern char saveformat, scriptformat; #define MAXCHANGE 8192 -#define EXTRACOLORS 12 +#define EXTRACOLORS 14 #define MAXCOLORS (MAXSTATES + EXTRACOLORS) extern cellcount_t chgpoints[MAXCOLORS], chgrects[MAXCOLORS]; extern XPoint points[MAXCOLORS][MAXCHANGE]; diff -urN xlife-6.7.4/isave.c xlife-6.7.5/isave.c --- xlife-6.7.4/isave.c 2013-03-11 14:32:57.000000000 +0400 +++ xlife-6.7.5/isave.c 2013-08-01 15:56:59.000000000 +0400 @@ -5,7 +5,7 @@ /* Several modifications were added at 2011 by Vladimir Lidovski -$Id: isave.c 145 2013-03-11 10:32:57Z micro $ +$Id: isave.c 216 2013-07-28 18:06:27Z micro $ */ /* it saves pattern in I-format. diff -urN xlife-6.7.4/key.c xlife-6.7.5/key.c --- xlife-6.7.4/key.c 2013-03-11 14:32:57.000000000 +0400 +++ xlife-6.7.5/key.c 2013-08-01 15:56:59.000000000 +0400 @@ -23,7 +23,7 @@ /* * A lot of modifications were added at 2011-13 by Vladimir Lidovski vol.litwr@gmail.com * (C) This version of XLife may be used under the same conditions as mentioned above - * $Id: key.c 145 2013-03-11 10:32:57Z micro $ + * $Id: key.c 216 2013-07-28 18:06:27Z micro $ */ #include diff -urN xlife-6.7.4/main.c xlife-6.7.5/main.c --- xlife-6.7.4/main.c 2013-09-29 22:21:44.000000000 +0400 +++ xlife-6.7.5/main.c 2013-10-22 22:56:19.000000000 +0400 @@ -25,7 +25,7 @@ /* * A lot of modifications were added at 2001, 2011-13 by Vladimir Lidovski vol.litwr@gmail.com * (C) This version of XLife may be used under the same conditions as mentioned above - * $Id: main.c 253 2013-09-29 18:39:43Z teacher $ + * $Id: main.c 256 2013-10-22 19:17:22Z teacher $ */ #include @@ -1123,8 +1123,8 @@ XClassHint class_hints; XSetWindowAttributes winat; XColor white, black; - char *geomstring = NULL; - char *initpat = NULL; + char *geomstring = 0; + char *initpat = 0; XTextProperty iconName; unsigned long cwhite, cblack; char *icon_name = "Xlife"; @@ -1159,7 +1159,7 @@ } else goto le; - else + else if (initpat == 0) initpat = argv[i]; } else @@ -1320,7 +1320,7 @@ * Only accept one pattern since it is highly unlikely that overlaying * n patterns is what you want to do */ - if (saveformat == 'C') { + if (saveformat == 'C') { collect(initpat, 0); return 0; } @@ -1332,7 +1332,20 @@ fatal("Can't automatically convert this pattern with topology information -- Use XLife for the conversion\n"); while (qgens-- > 0) generate(&active); +#ifdef MICROSOFT +/* MINGW can't use stdout :-( */ + { + FILE *f = fopen(argv[argc - 1], "r"); + if (f || argc < 4) +errwin: fatalw("Wrong name for the output file. Use syntax: lifeconv OPTIONS INFILE OUTFILE"); + f = fopen(argv[argc - 1], "w"); + if (!f) goto errwin; + saveall(f, saveformat); + fclose(f); + } +#else saveall(stdout, saveformat); +#endif return 0; } xpos -= SCALE(width >> 1); diff -urN xlife-6.7.4/patchlevel.h xlife-6.7.5/patchlevel.h --- xlife-6.7.4/patchlevel.h 2013-09-29 20:55:50.000000000 +0400 +++ xlife-6.7.5/patchlevel.h 2013-10-22 12:51:32.000000000 +0400 @@ -23,9 +23,9 @@ /* * Several modifications were added at 2011-13 by Vladimir Lidovski vol.litwr@gmail.com * (C) This version of XLife may be used under the same conditions as mentioned above - * $Id: patchlevel.h 251 2013-09-29 17:13:49Z teacher $ + * $Id: patchlevel.h 255 2013-10-22 09:12:33Z teacher $ */ static int majorversion = 6; static int minorversion = 7; -static int patchlevel = 4; +static int patchlevel = 5; diff -urN xlife-6.7.4/table2r xlife-6.7.5/table2r --- xlife-6.7.4/table2r 2013-05-27 21:39:50.000000000 +0400 +++ xlife-6.7.5/table2r 2013-08-01 15:56:59.000000000 +0400 @@ -1,7 +1,7 @@ #!GAWKPATH -f # A converter from TABLE to XLIFE r-format # by Vladimir Lidovski, v2.10, 2011, 2013, (C) Copyright GNU GPL v2 -# $Id: table2r 196 2013-05-27 17:39:50Z micro $ +# $Id: table2r 216 2013-07-28 18:06:27Z micro $ BEGIN { if (ARGC != 2) {