http://www.mirrorservice.org/sites/master.us.finkmirrors.net/distfiles/md5/fa43fdd68d...

[xscreensaver] / hacks / jigsaw.c

diff --git a/hacks/jigsaw.c b/hacks/jigsaw.c
index bdbe44684a79929531e4a8658e04342a276cd443..ca52f59d8870f0e77181e835274dbcfa1263cb62 100644 (file)
--- a/hacks/jigsaw.c
+++ b/hacks/jigsaw.c
@@ -1,4 +1,5 @@
-/* xscreensaver, Copyright (c) 1997, 1998, 2001 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1997, 1998, 2001, 2003
+ *  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
@@ -143,20 +144,14 @@ read_screen (Display *dpy, Window window, int *widthP, int *heightP)
 {
   Pixmap p;
   XWindowAttributes xgwa;
-  XGCValues gcv;
-  GC gc;
   XGetWindowAttributes (dpy, window, &xgwa);
   *widthP = xgwa.width;
   *heightP = xgwa.height;
 
-  XClearWindow(dpy, window);
-  grab_screen_image(xgwa.screen, window);
   p = XCreatePixmap(dpy, window, *widthP, *heightP, xgwa.depth);
-  gcv.function = GXcopy;
-  gc = XCreateGC (dpy, window, GCFunction, &gcv);
-  XCopyArea (dpy, window, p, gc, 0, 0, *widthP, *heightP, 0, 0);
-
-  XFreeGC (dpy, gc);
+  XClearWindow(dpy, window);
+  load_random_image (xgwa.screen, window, p);
+  XClearWindow(dpy, window);
 
   return p;
 }