From http://www.jwz.org/xscreensaver/xscreensaver-5.16.tar.gz

[xscreensaver] / driver / screens.c

diff --git a/driver/screens.c b/driver/screens.c
index 689e26982c2be7d9b1ddb922019f22e0b5dc15cf..52320d65c359f110cde58a38be32e23d79ac25be 100644 (file)
--- a/driver/screens.c
+++ b/driver/screens.c
@@ -436,7 +436,7 @@ randr_scan_monitors (Display *dpy, char **errP)
               XRROutputInfo *rroi = XRRGetOutputInfo (dpy, res, 
                                                       res->outputs[k]);
               RRCrtc crtc = (rroi->crtc  ? rroi->crtc :
-                             rroi->crtcs ? rroi->crtcs[0] : 0);
+                             rroi->ncrtc ? rroi->crtcs[0] : 0);
               XRRCrtcInfo *crtci = (crtc ? XRRGetCrtcInfo(dpy, res, crtc) : 0);
 
               monitors[j] = m;
@@ -1049,8 +1049,8 @@ update_screen_layout (saver_info *si)
       if (ssi->screen != old_screen)
         initialize_screen_root_widget (ssi);
 
-      ssi->poll_mouse_last_root_x = -1;
-      ssi->poll_mouse_last_root_y = -1;
+      ssi->last_poll_mouse.root_x = -1;
+      ssi->last_poll_mouse.root_y = -1;
 
       ssi->x      = m->x;
       ssi->y      = m->y;