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

[xscreensaver] / hacks / moire2.c

diff --git a/hacks/moire2.c b/hacks/moire2.c
index 463478c674a6429287cf4e92dd2c131e646ec5e7..96bfd9ac0e4a1c87b8801f8144c9c5f87d9085c1 100644 (file)
--- a/hacks/moire2.c
+++ b/hacks/moire2.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1997 Jamie Zawinski <jwz@netscape.com>
+/* xscreensaver, Copyright (c) 1997, 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
@@ -13,7 +13,7 @@
 #include <X11/Xutil.h>
 #include <stdio.h>
 
-static int ncolors, color_shift;
+static int ncolors;
 static XColor *colors = 0;
 static int fg_pixel, bg_pixel;
 static Pixmap p0 = 0, p1 = 0, p2 = 0, p3 = 0;
@@ -207,8 +207,8 @@ moire2 (Display *dpy, Window window)
 char *progclass = "Moire2";
 
 char *defaults [] = {
-  "Moire2.background:  black",         /* to placate SGI */
-  "Moire2.foreground:  white",
+  ".background:                black",
+  ".foreground:                white",
   "*delay:             50000",
   "*thickness:         0",
   "*colors:            150",
@@ -270,6 +270,7 @@ screenhack (Display *dpy, Window window)
          for (i = 0; i < color_shift; i++)
            {
              moire2 (dpy, window);
+              screenhack_handle_events (dpy);
              if (delay)
                usleep(delay);
            }