http://packetstormsecurity.org/UNIX/admin/xscreensaver-4.01.tar.gz

[xscreensaver] / hacks / zoom.c

diff --git a/hacks/zoom.c b/hacks/zoom.c
index f6cb4b9c5b41e2c2daf6540b946cef6bc11cf0af..5e7672a2b03366f53a9e5fb3118d7198ed8c031f 100644 (file)
--- a/hacks/zoom.c
+++ b/hacks/zoom.c
@@ -100,6 +100,11 @@ static void init_hack(Display *dpy, Window window)
   window_gc = XCreateGC(dpy, window, gcflags, &gcv);
 
   grab_screen_image(xgwa.screen, window);
+
+  /* We might have needed this to grab the image, but if we leave this set
+     to GCSubwindowMode, then we'll *draw* right over subwindows too. */
+  XSetSubwindowMode (dpy, window_gc, ClipByChildren);
+
   if (lenses) {
     orig_map = NULL;
     pm = XCreatePixmap(dpy, window, sizex, sizey, xgwa.depth);
@@ -181,7 +186,7 @@ XrmOptionDescRec options[] = {
   { "-pixwidth", ".pixwidth", XrmoptionSepArg, 0 },
   { "-pixheight", ".pixheight", XrmoptionSepArg, 0 },
   { "-pixspacex", ".pixspacex", XrmoptionSepArg, 0 },
-  { "-pixspacey", ".pixspacex", XrmoptionSepArg, 0 },
+  { "-pixspacey", ".pixspacey", XrmoptionSepArg, 0 },
   { "-lensoffsetx", ".lensoffsetx", XrmoptionSepArg, 0 },
   { "-lensoffsety", ".lensoffsety", XrmoptionSepArg, 0 },
   { 0, 0, 0, 0 }