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

[xscreensaver] / hacks / noseguy.c

diff --git a/hacks/noseguy.c b/hacks/noseguy.c
index a84ee6b65daf40b65b1154e9230dcca1e8056e5c..9ea9f4e54204247a6b4c8ce8475b46c0283e802c 100644 (file)
--- a/hacks/noseguy.c
+++ b/hacks/noseguy.c
@@ -1,5 +1,5 @@
-/* xscreensaver, Copyright (c) 1992, 1996, 1997
- *  Jamie Zawinski <jwz@netscape.com>
+/* xscreensaver, Copyright (c) 1992, 1996, 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
@@ -58,23 +58,23 @@ static void (*next_fn) (void);
 #ifdef HAVE_XPM
 # include <X11/xpm.h>
 
-# include "noses/nose-f1.xpm"
-# include "noses/nose-f2.xpm"
-# include "noses/nose-f3.xpm"
-# include "noses/nose-f4.xpm"
-# include "noses/nose-l1.xpm"
-# include "noses/nose-l2.xpm"
-# include "noses/nose-r1.xpm"
-# include "noses/nose-r2.xpm"
+# include "images/noseguy/nose-f1.xpm"
+# include "images/noseguy/nose-f2.xpm"
+# include "images/noseguy/nose-f3.xpm"
+# include "images/noseguy/nose-f4.xpm"
+# include "images/noseguy/nose-l1.xpm"
+# include "images/noseguy/nose-l2.xpm"
+# include "images/noseguy/nose-r1.xpm"
+# include "images/noseguy/nose-r2.xpm"
 #else
-# include "noses/nose-f1.xbm"
-# include "noses/nose-f2.xbm"
-# include "noses/nose-f3.xbm"
-# include "noses/nose-f4.xbm"
-# include "noses/nose-l1.xbm"
-# include "noses/nose-l2.xbm"
-# include "noses/nose-r1.xbm"
-# include "noses/nose-r2.xbm"
+# include "images/noseguy/nose-f1.xbm"
+# include "images/noseguy/nose-f2.xbm"
+# include "images/noseguy/nose-f3.xbm"
+# include "images/noseguy/nose-f4.xbm"
+# include "images/noseguy/nose-l1.xbm"
+# include "images/noseguy/nose-l2.xbm"
+# include "images/noseguy/nose-r1.xbm"
+# include "images/noseguy/nose-r2.xbm"
 #endif
 
 static void
@@ -610,8 +610,8 @@ get_words (void)
 char *progclass = "Noseguy";
 
 char *defaults [] = {
-  "Noseguy.background: black",         /* to placate SGI */
-  "Noseguy.foreground: gray80",
+  ".background:                black",
+  ".foreground:                gray80",
 #ifndef VMS
   "*mode:              program",
 #else
@@ -713,7 +713,8 @@ screenhack (Display *d, Window w)
   while (1)
     {
       next_fn();
-      XSync (dpy, True);
+      XSync (dpy, False);
+      screenhack_handle_events (dpy);
       usleep (interval * 1000);
     }
 }