Regrouped CLI options by function in WolframAutomata.c

[screensavers] / hacks / WolframAutomata / WolframAutomata.c

diff --git a/hacks/WolframAutomata/WolframAutomata.c b/hacks/WolframAutomata/WolframAutomata.c
index 4b5c1ec..fff8a8a 100644 (file)
--- a/hacks/WolframAutomata/WolframAutomata.c
+++ b/hacks/WolframAutomata/WolframAutomata.c
@@ -1,8 +1,10 @@
-/* (c) 2021 Aaron Taylor <ataylor at subgeniuskitty dot com>   */
-/* See LICENSE.txt file for copyright and license details.     */
+/* (c) 2021 Aaron Taylor <ataylor at subgeniuskitty dot com>                  */
+/* See LICENSE.txt file for copyright and license details.                    */

 
 #include "screenhack.h"
 
 
 #include "screenhack.h"
 

+/* Keep this source code C89 compliant per XScreensaver's instructions.       */
+

 /* -------------------------------------------------------------------------- */
 /* Data Structures                                                            */
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
 /* Data Structures                                                            */
 /* -------------------------------------------------------------------------- */


@@ -519,38 +521,52 @@ WolframAutomata_draw(Display * dpy, Window win, void * closure)
 }
 
 static const char * WolframAutomata_defaults[] = {
 }
 
 static const char * WolframAutomata_defaults[] = {

-    "*delay:              25000",

     "*admiration-delay:   5",
     "*admiration-delay:   5",

-    "*length:             5000",
-    "*cell-size:          2",
+

     "*color-index:        -1",
     "*color-index:        -1",

-    "*seed-density:       -1",
-    "*seed-left:          False",
-    "*seed-center:        False",
-    "*seed-right:         False",
+
+    "*cell-size:          2",

     "*random-cell-size:   False",
     "*random-cell-size:   False",

+
+    "*delay:              25000",

     "*random-delay:       False",
     "*random-delay:       False",

+
+    "*length:             5000",

     "*random-length:      False",
     "*random-length:      False",

-    "*random-rule:        False",
+

     "*rule:               -1",
     "*rule:               -1",

+    "*random-rule:        False",
+
+    "*seed-density:       -1",
+    "*seed-left:          False",
+    "*seed-center:        False",
+    "*seed-right:         False",
+

     0
 };
 
 static XrmOptionDescRec WolframAutomata_options[] = {
     0
 };
 
 static XrmOptionDescRec WolframAutomata_options[] = {

-    { "-delay",              ".delay",                  XrmoptionSepArg, 0      },

     { "-admiration-delay",   ".admiration-delay",       XrmoptionSepArg, 0      },
     { "-admiration-delay",   ".admiration-delay",       XrmoptionSepArg, 0      },

-    { "-length",             ".length",                 XrmoptionSepArg, 0      },
-    { "-cell-size",          ".cell-size",              XrmoptionSepArg, 0      },
+

     { "-color-index",        ".color-index",            XrmoptionSepArg, 0      },
     { "-color-index",        ".color-index",            XrmoptionSepArg, 0      },

-    { "-seed-density",       ".seed-density",           XrmoptionSepArg, 0      },
-    { "-seed-left",          ".seed-left",              XrmoptionNoArg,  "True" },
-    { "-seed-center",        ".seed-center",            XrmoptionNoArg,  "True" },
-    { "-seed-right",         ".seed-right",             XrmoptionNoArg,  "True" },
+
+    { "-cell-size",          ".cell-size",              XrmoptionSepArg, 0      },

     { "-random-cell-size",   ".random-cell-size",       XrmoptionNoArg,  "True" },
     { "-random-cell-size",   ".random-cell-size",       XrmoptionNoArg,  "True" },

+
+    { "-delay",              ".delay",                  XrmoptionSepArg, 0      },

     { "-random-delay",       ".random-delay",           XrmoptionNoArg,  "True" },
     { "-random-delay",       ".random-delay",           XrmoptionNoArg,  "True" },

+
+    { "-length",             ".length",                 XrmoptionSepArg, 0      },

     { "-random-length",      ".random-length",          XrmoptionNoArg,  "True" },
     { "-random-length",      ".random-length",          XrmoptionNoArg,  "True" },

-    { "-random-rule",        ".random-rule",            XrmoptionNoArg,  "True" },
+

     { "-rule",               ".rule",                   XrmoptionSepArg, 0      },
     { "-rule",               ".rule",                   XrmoptionSepArg, 0      },

+    { "-random-rule",        ".random-rule",            XrmoptionNoArg,  "True" },
+
+    { "-seed-density",       ".seed-density",           XrmoptionSepArg, 0      },
+    { "-seed-left",          ".seed-left",              XrmoptionNoArg,  "True" },
+    { "-seed-center",        ".seed-center",            XrmoptionNoArg,  "True" },
+    { "-seed-right",         ".seed-right",             XrmoptionNoArg,  "True" },
+

     { 0, 0, 0, 0 }
 };
 
     { 0, 0, 0, 0 }
 };