projects / screensavers / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Cleaned up CLI flags for cell size in WolframAutomata source code and README.
[screensavers] / hacks / WolframAutomata / WolframAutomata.c
diff --git a/hacks/WolframAutomata/WolframAutomata.c b/hacks/WolframAutomata/WolframAutomata.c
index 5e0b725..36f1c05 100644 (file)
--- a/hacks/WolframAutomata/WolframAutomata.c
+++ b/hacks/WolframAutomata/WolframAutomata.c
@@ -46,9 +46,9 @@ struct state {
     uint8_t rule_number;
 
     /* At the end of the simulation, the user is given time to admire the     */
     uint8_t rule_number;
 
     /* At the end of the simulation, the user is given time to admire the     */
-    /* output. Delay is available to user as CLI option.                      */
+    /* output. Delay is available to user as CLI option '-admiration-delay'.  */
     Bool admiration_in_progress;
     Bool admiration_in_progress;
-    size_t admiration_delay; /* ...in microseconds.                           */
+    size_t admiration_delay; /* ...in seconds.                                */
 
     /* The following values correspond directly to independent CLI options.   */
     Bool    rule_random;
 
     /* The following values correspond directly to independent CLI options.   */
     Bool    rule_random;
@@ -276,41 +276,45 @@ WolframAutomata_init(Display * dpy, Window win)
     state->dpy_height = xgwa.height;
     state->ypos = 0;
 
     state->dpy_height = xgwa.height;
     state->ypos = 0;
 
-    state->admiration_delay = 5000000;
+    state->admiration_delay = get_integer_resource(state->dpy, "admiration-delay", "Integer");
     state->admiration_in_progress = False;
 
     state->admiration_in_progress = False;
 
-    if (get_boolean_resource(state->dpy, "random-colors", "Boolean")) {
-        XColor fg, bg;
-        size_t rand_i = random() % sizeof(color_list)/sizeof(color_list[0]);
-        fg.red   = color_list[rand_i].fg_red;
-        fg.green = color_list[rand_i].fg_green;
-        fg.blue  = color_list[rand_i].fg_blue;
-        bg.red   = color_list[rand_i].bg_red;
-        bg.green = color_list[rand_i].bg_green;
-        bg.blue  = color_list[rand_i].bg_blue;
-        /* TODO: Since I 'alloc', presumably I must also 'free' these colors  */
-        /* at some point. Where/how? I don't want to eventually crash my      */
-        /* X server after months of use.                                      */
-        XAllocColor(state->dpy, xgwa.colormap, &fg);
-        XAllocColor(state->dpy, xgwa.colormap, &bg);
-        state->fg = gcv.foreground = fg.pixel;
-        state->bg = gcv.background = bg.pixel;
-    } else {
-        state->fg = gcv.foreground = get_pixel_resource(state->dpy, xgwa.colormap, "foreground", "Foreground");
-        state->bg = gcv.background = get_pixel_resource(state->dpy, xgwa.colormap, "background", "Background");
+    /* Set foreground and background colors for active/inactive cells. Either */
+    /* the user provided an index into the pre-defined color_list[] or a      */
+    /* random entry from that same array should be selected.                  */
+    size_t color_index = get_integer_resource(state->dpy, "color-index", "Integer");
+    if (color_index == -1) {
+        color_index = random() % sizeof(color_list)/sizeof(color_list[0]);
+    } else if (color_index >= sizeof(color_list)/sizeof(color_list[0])) {
+        fprintf(stderr, "WARNING: Color index out of range.\n");
+        color_index = 0;
     }
     }
+    XColor fg, bg;
+    fg.red   = color_list[color_index].fg_red;
+    fg.green = color_list[color_index].fg_green;
+    fg.blue  = color_list[color_index].fg_blue;
+    bg.red   = color_list[color_index].bg_red;
+    bg.green = color_list[color_index].bg_green;
+    bg.blue  = color_list[color_index].bg_blue;
+    /* TODO: Since I 'alloc', presumably I must also 'free' these colors  */
+    /* at some point. Where/how? I don't want to eventually crash my      */
+    /* X server after months of use.                                      */
+    XAllocColor(state->dpy, xgwa.colormap, &fg);
+    XAllocColor(state->dpy, xgwa.colormap, &bg);
+    state->fg = gcv.foreground = fg.pixel;
+    state->bg = gcv.background = bg.pixel;
 
     state->gc = XCreateGC(state->dpy, state->win, GCForeground, &gcv);
 
     /* Set the size of each simulated cell to NxN pixels for cell_size=N.     */
 
     state->gc = XCreateGC(state->dpy, state->win, GCForeground, &gcv);
 
     /* Set the size of each simulated cell to NxN pixels for cell_size=N.     */
-    if (get_boolean_resource(state->dpy, "random-pixel-size", "Boolean")) {
+    if (get_boolean_resource(state->dpy, "random-cell-size", "Boolean")) {
         /* Although we are choosing the pixel size 'randomly', a truly random */
         /* selection would bias toward large numbers since there are more of  */
         /* them. To avoid this, we select a random number for a bit shift,    */
         /* resulting in a pixel size of 1, 2, 4, 8, 16 or 32, equally likely. */
         state->cell_size = 1 << (random() % 6);
     } else {
         /* Although we are choosing the pixel size 'randomly', a truly random */
         /* selection would bias toward large numbers since there are more of  */
         /* them. To avoid this, we select a random number for a bit shift,    */
         /* resulting in a pixel size of 1, 2, 4, 8, 16 or 32, equally likely. */
         state->cell_size = 1 << (random() % 6);
     } else {
-        state->cell_size = get_integer_resource(state->dpy, "pixel-size", "Integer");
+        state->cell_size = get_integer_resource(state->dpy, "cell-size", "Integer");
     }
     if (state->cell_size < 1) state->cell_size = 1;
     if (state->cell_size > state->dpy_width) state->cell_size = state->dpy_width;
     }
     if (state->cell_size < 1) state->cell_size = 1;
     if (state->cell_size > state->dpy_width) state->cell_size = state->dpy_width;
@@ -478,7 +482,7 @@ WolframAutomata_draw(Display * dpy, Window win, void * closure)
             closure = WolframAutomata_init(dpy, win);
         } else {
             state->admiration_in_progress = True;
             closure = WolframAutomata_init(dpy, win);
         } else {
             state->admiration_in_progress = True;
-            return state->admiration_delay;
+            return 1000000 * state->admiration_delay;
         }
     }
 
         }
     }
 
@@ -499,12 +503,13 @@ WolframAutomata_draw(Display * dpy, Window win, void * closure)
 
 static const char * WolframAutomata_defaults[] = {
     "*delay-usec:         25000",
 
 static const char * WolframAutomata_defaults[] = {
     "*delay-usec:         25000",
+    "*admiration-delay:   5",
     "*num-generations:    5000",
     "*num-generations:    5000",
-    "*pixel-size:         2",
+    "*cell-size:          2",
+    "*color-index:        -1",
     "*population-density: 50",
     "*population-single:  False",
     "*population-density: 50",
     "*population-single:  False",
-    "*random-cellsize:    False",
-    "*random-color:       False",
+    "*random-cell-size:   False",
     "*random-delay:       False",
     "*random-length:      False",
     "*random-rule:        False",
     "*random-delay:       False",
     "*random-length:      False",
     "*random-rule:        False",
@@ -514,12 +519,13 @@ static const char * WolframAutomata_defaults[] = {
 
 static XrmOptionDescRec WolframAutomata_options[] = {
     { "-delay-usec",         ".delay-usec",             XrmoptionSepArg, 0      },
 
 static XrmOptionDescRec WolframAutomata_options[] = {
     { "-delay-usec",         ".delay-usec",             XrmoptionSepArg, 0      },
+    { "-admiration-delay",   ".admiration-delay",       XrmoptionSepArg, 0      },
     { "-num-generations",    ".num-generations",        XrmoptionSepArg, 0      },
     { "-num-generations",    ".num-generations",        XrmoptionSepArg, 0      },
-    { "-pixel-size",         ".pixel-size",             XrmoptionSepArg, 0      },
+    { "-cell-size",          ".cell-size",              XrmoptionSepArg, 0      },
+    { "-color-index",        ".color-index",            XrmoptionSepArg, 0      },
     { "-population-density", ".population-density",     XrmoptionSepArg, 0      },
     { "-population-single",  ".population-single",      XrmoptionNoArg,  "True" },
     { "-population-density", ".population-density",     XrmoptionSepArg, 0      },
     { "-population-single",  ".population-single",      XrmoptionNoArg,  "True" },
-    { "-random-cellsize",    ".random-pixel-size",      XrmoptionNoArg,  "True" },
-    { "-random-color",       ".random-colors",          XrmoptionNoArg,  "True" },
+    { "-random-cell-size",   ".random-cell-size",       XrmoptionNoArg,  "True" },
     { "-random-delay",       ".random-delay",           XrmoptionNoArg,  "True" },
     { "-random-length",      ".random-num-generations", XrmoptionNoArg,  "True" },
     { "-random-rule",        ".rule-random",            XrmoptionNoArg,  "True" },
     { "-random-delay",       ".random-delay",           XrmoptionNoArg,  "True" },
     { "-random-length",      ".random-num-generations", XrmoptionNoArg,  "True" },
     { "-random-rule",        ".rule-random",            XrmoptionNoArg,  "True" },
Collection of hacks (screensavers) for use with XScreensaver framework.