http://ftp.x.org/contrib/applications/xscreensaver-2.23.tar.gz

[xscreensaver] / hacks / rorschach.c

diff --git a/hacks/rorschach.c b/hacks/rorschach.c
index 2eeb617035fa1926364a8863f133267cba3b6cad..4b623628449a5a21de27de7961be7a77fcc722ff 100644 (file)
--- a/hacks/rorschach.c
+++ b/hacks/rorschach.c
@@ -19,10 +19,7 @@ static GC draw_gc, erase_gc;
 static unsigned int default_fg_pixel;
 static int iterations, offset;
 static Bool xsym, ysym;
-static int erase_speed, sleep_time, erase_mode;
-
-void erase_window (Display *dpy, Window win, GC gc, int width, int height,
-                  int mode, int delay);
+static int sleep_time;
 
 static void
 init_rorschach (Display *dpy, Window window)
@@ -99,7 +96,7 @@ hurm (Display *dpy, Window window)
     }
   sleep ( sleep_time );
 
-  erase_window(dpy, window, erase_gc, xlim, ylim, erase_mode, erase_speed);
+  erase_full_window(dpy, window);
 
   XClearWindow (dpy, window);
   if (got_color) XFreeColors (dpy, cmap, &color.pixel, 1, 0);
@@ -111,15 +108,13 @@ hurm (Display *dpy, Window window)
 char *progclass = "Rorschach";
 
 char *defaults [] = {
-  "Rorschach.background:       black",         /* to placate SGI */
-  "Rorschach.foreground:       white",
+  ".background:        black",
+  ".foreground:        white",
   "*xsymmetry: true",
   "*ysymmetry: false",
   "*iterations:        4000",
   "*offset:    4",
-  "Rorschach.eraseSpeed: 400",
-  "Rorschach.delay: 5",
-  "Rorschach.eraseMode: -1",
+  "*delay:     5",
   0
 };
 
@@ -130,16 +125,13 @@ XrmOptionDescRec options [] = {
   { "-ysymmetry",      ".ysymmetry",   XrmoptionNoArg, "true" },
   { "-erase-speed",    ".eraseSpeed",          XrmoptionSepArg, 0 },
   { "-delay",           ".delay",               XrmoptionSepArg, 0 },
-  { "-erase-mode",      ".eraseMode",           XrmoptionSepArg, 0 },
   { 0, 0, 0, 0 }
 };
 
 void
 screenhack (Display *dpy, Window window)
 {
-  erase_speed = get_integer_resource("eraseSpeed", "Integer");
   sleep_time = get_integer_resource("delay", "Integer");
-  erase_mode = get_integer_resource("eraseMode", "Integer");
   init_rorschach (dpy, window);
   while (1)
     hurm (dpy, window);