ftp://ftp.jp.xemacs.org/pub/NetBSD/packages/distfiles/xscreensaver-4.15.tar.gz

[xscreensaver] / hacks / maze.c

diff --git a/hacks/maze.c b/hacks/maze.c
index 578e768319c1323f7215bb2402ec674e811f321e..9371b276cbd40c99c2d1b765b6be527fbd109d7f 100644 (file)
--- a/hacks/maze.c
+++ b/hacks/maze.c
@@ -1377,7 +1377,7 @@ 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 (!(maze[x][y] & WALL_ANY))
              XFillRectangle(dpy, win, ugc,
                             border_x + bw + grid_width * x,
                             border_y + bw + grid_height * y,
@@ -1659,8 +1659,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 +1705,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);
   }