X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Frorschach.c;h=430fa9dfb3373464428651dd90fd56ddef1da39e;hb=f65151994eba80ecabcdac6eef6fa0dde7e2d45b;hp=2eeb617035fa1926364a8863f133267cba3b6cad;hpb=186b0b9f1638444c650c9273df38085e0db71e4a;p=xscreensaver

diff --git a/hacks/rorschach.c b/hacks/rorschach.c
index 2eeb6170..430fa9df 100644
--- a/hacks/rorschach.c
+++ b/hacks/rorschach.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1992, 1996 Jamie Zawinski <jwz@netscape.com>
+/* xscreensaver, Copyright (c) 1992, 1996, 1998 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -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)
@@ -95,15 +92,17 @@ hurm (Display *dpy, Window window)
 	  j++;
 	}
       XDrawPoints (dpy, window, draw_gc, points, j, CoordModeOrigin);
-      XSync (dpy, True);
+      XSync (dpy, False);
+      screenhack_handle_events (dpy);
     }
   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);
-  XSync (dpy, True);
+  XSync (dpy, False);
+  screenhack_handle_events (dpy);
   sleep (1);
 }
 
@@ -111,15 +110,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 +127,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);