X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fjigsaw.c;h=ca52f59d8870f0e77181e835274dbcfa1263cb62;hp=bdbe44684a79929531e4a8658e04342a276cd443;hb=40eacb5812ef7c0e3374fb139afbb4f5bc8bbfb5;hpb=2c902d6065f9856adf31e8540a94f1e42e68e905 diff --git a/hacks/jigsaw.c b/hacks/jigsaw.c index bdbe4468..ca52f59d 100644 --- a/hacks/jigsaw.c +++ b/hacks/jigsaw.c @@ -1,4 +1,5 @@ -/* xscreensaver, Copyright (c) 1997, 1998, 2001 Jamie Zawinski +/* xscreensaver, Copyright (c) 1997, 1998, 2001, 2003 + * Jamie Zawinski * * 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; }