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

[xscreensaver] / hacks / blitspin.c

diff --git a/hacks/blitspin.c b/hacks/blitspin.c
index e8ee26537f3b84f687e30bd8a6ee271df32dce2e..1c5272537718321a6dc68c84d9206c324ef7ec12 100644 (file)
--- a/hacks/blitspin.c
+++ b/hacks/blitspin.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1992-1997 Jamie Zawinski <jwz@netscape.com>
+/* xscreensaver, Copyright (c) 1992-1997 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
@@ -42,7 +42,7 @@
 # endif /* VMS */
 #endif
 
-#include "default.xbm"
+#include "images/som.xbm"
 
 static Display *dpy;
 static Window window;
@@ -249,9 +249,9 @@ init (void)
 
   if (!strcmp (bitmap_name, "(default)"))
     {
-      width = logo_width;
-      height = logo_height;
-      bitmap = XCreatePixmapFromBitmapData (dpy, window, (char *) logo_bits,
+      width = som_width;
+      height = som_height;
+      bitmap = XCreatePixmapFromBitmapData (dpy, window, (char *) som_bits,
                                            width, height, fg, bg, depth);
       scale_up = True; /* definitely. */
     }
@@ -299,6 +299,7 @@ init (void)
 
   display (self);
   XSync(dpy, False);
+  screenhack_handle_events (dpy);
 }
 
 static void
@@ -326,15 +327,16 @@ display (Pixmap pixmap)
                  ((xgwa.width-size)>>1)-1, ((xgwa.height-size)>>1)-1,
                  size+2, size+2);
 */
-  XSync (dpy, True);
+  XSync (dpy, False);
+  screenhack_handle_events (dpy);
 }
 
 \f
 char *progclass = "BlitSpin";
 
 char *defaults [] = {
-  "BlitSpin.background:        black",         /* to placate SGI */
-  "BlitSpin.foreground:        white",
+  ".background:        black",
+  ".foreground:        white",
   "*delay:     500000",
   "*delay2:    500000",
   "*bitmap:    (default)",
@@ -360,6 +362,7 @@ screenhack (Display *d, Window w)
   while (1)
     {
       rotate ();
+      screenhack_handle_events (d);
       if (delay2) usleep (delay2);
     }
 }