X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fmaze.c;h=ba80e835e399d43893942063531318d25123831e;hb=3f438031d610c7e15fd33876a879b97e290e05fb;hp=578e768319c1323f7215bb2402ec674e811f321e;hpb=4cecfc89e5e889c7232693897c06168fb378bd5c;p=xscreensaver

diff --git a/hacks/maze.c b/hacks/maze.c
index 578e7683..ba80e835 100644
--- a/hacks/maze.c
+++ b/hacks/maze.c
@@ -1377,7 +1377,9 @@ find_dead_regions(void)
 	  if((x < logo_x || x > logo_x + logo_width / grid_width) ||
 	     (y < logo_y || y > logo_y + logo_height / grid_height))
 	  {
-	    if (!maze[x][y] & WALL_ANY)
+            /* if we are completely surrounded by walls, just draw the
+               inside part */
+            if ((maze[x][y] & WALL_ANY) == WALL_ANY)
 	      XFillRectangle(dpy, win, ugc,
 			     border_x + bw + grid_width * x,
 			     border_y + bw + grid_height * y,
@@ -1659,8 +1661,7 @@ screenhack(Display *display, Window window)
       XWindowAttributes xgwa;
       XGetWindowAttributes (dpy, window, &xgwa);
       XSelectInput (dpy, win,
-                    xgwa.your_event_mask | ExposureMask |
-                    ButtonPressMask |StructureNotifyMask);
+                    xgwa.your_event_mask | ExposureMask | ButtonPressMask);
     }
   
   gc  = XCreateGC(dpy, win, 0, 0);
@@ -1706,7 +1707,8 @@ screenhack(Display *display, Window window)
   {
     unsigned long *pixels; /* ignored - unfreed */
     int npixels;
-    logo_map = xscreensaver_logo (dpy, win, xgwa.colormap, bg,
+    logo_map = xscreensaver_logo (xgwa.screen, xgwa.visual, win,
+                                  xgwa.colormap, bg,
                                   &pixels, &npixels, 0,
                                   logo_width > 150);
   }