X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fmoire.c;h=0584dd9581906f3281781ab5df9843bac311e13f;hb=8eb2873d7054e705c4e83f22d18c40946a9e2529;hp=f01fa28fe4e7e3bf9a73da888e83aded87684334;hpb=ce3185de9d9705e259f2b60dd4b5509007fa17d4;p=xscreensaver

diff --git a/hacks/moire.c b/hacks/moire.c
index f01fa28f..0584dd95 100644
--- a/hacks/moire.c
+++ b/hacks/moire.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1997, 1998 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1997, 1998, 2001 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
@@ -191,7 +191,12 @@ moire (Display *dpy, Window window, int offset, XColor *colors, int ncolors)
 	image->data = 0;
       }
 
-  XDestroyImage (image);
+# ifdef HAVE_XSHM_EXTENSION
+  if (use_shm)
+    destroy_xshm_image (dpy, image, &shm_info);
+  else
+# endif /*  HAVE_XSHM_EXTENSION */
+    XDestroyImage (image);
 }
 
 
@@ -211,7 +216,8 @@ char *defaults [] = {
 };
 
 XrmOptionDescRec options [] = {
-  { "-random",		".random",	XrmoptionSepArg, 0 },
+  { "-random",		".random",	XrmoptionNoArg, "True" },
+  { "-no-random",	".random",	XrmoptionNoArg, "False" },
   { "-delay",		".delay",	XrmoptionSepArg, 0 },
   { "-ncolors",		".ncolors",	XrmoptionSepArg, 0 },
   { "-offset",		".offset",	XrmoptionSepArg, 0 },
@@ -230,7 +236,8 @@ screenhack (Display *dpy, Window window)
     {
       init_moire (dpy, window);
       moire (dpy, window, offset, colors, ncolors);
-      XSync (dpy, True);
+      XSync (dpy, False);
+      screenhack_handle_events (dpy);
       if (delay)
 	sleep(delay);
     }