X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fwindows.c;h=a61788ba3510df0ebd07680a5b0c8afda8fe4180;hp=4945202a1f228690bb8b4abe2e6b0f6ffe0659bb;hb=278c59e14c53fd412b734e699bd4f314f766f804;hpb=551b3de3f619c04c2dd1971ee9b3f02e270c28c9 diff --git a/driver/windows.c b/driver/windows.c index 4945202a..a61788ba 100644 --- a/driver/windows.c +++ b/driver/windows.c @@ -41,6 +41,9 @@ # include #endif /* HAVE_MIT_SAVER_EXTENSION */ +#ifdef HAVE_XF86VMODE +# include +#endif /* HAVE_XF86VMODE */ #ifdef HAVE_XHPDISABLERESET # include @@ -136,7 +139,7 @@ grab_mouse (saver_info *si, Window w, Cursor cursor) { saver_preferences *p = &si->prefs; int status = XGrabPointer (si->dpy, w, True, ALL_POINTER_EVENTS, - GrabModeAsync, GrabModeAsync, None, + GrabModeAsync, GrabModeAsync, w, cursor, CurrentTime); if (status == GrabSuccess) si->mouse_grab_window = w; @@ -210,6 +213,50 @@ ungrab_keyboard_and_mouse (saver_info *si) } +int +move_mouse_grab (saver_info *si, Window to, Cursor cursor) +{ + Window old = si->mouse_grab_window; + + if (old == 0) + return grab_mouse (si, to, cursor); + else + { + saver_preferences *p = &si->prefs; + int status; + + XSync (si->dpy, False); + XGrabServer (si->dpy); /* ############ DANGER! */ + XSync (si->dpy, False); + + if (p->verbose_p) + fprintf(stderr, "%s: grabbing server...\n", blurb()); + + ungrab_mouse (si); + status = grab_mouse (si, to, cursor); + + if (status != GrabSuccess) /* Augh! */ + { + sleep (1); /* Note dramatic evil of sleeping + with server grabbed. */ + XSync (si->dpy, False); + status = grab_mouse (si, to, cursor); + } + + if (status != GrabSuccess) /* Augh! Try to get the old one back... */ + grab_mouse (si, to, cursor); + + XUngrabServer (si->dpy); + XSync (si->dpy, False); /* ###### (danger over) */ + + if (p->verbose_p) + fprintf(stderr, "%s: ungrabbing server.\n", blurb()); + + return status; + } +} + + /* Prints an error message to stderr and returns True if there is another xscreensaver running already. Silently returns False otherwise. */ Bool @@ -757,6 +804,106 @@ store_saver_id (saver_screen_info *ssi) } +/* Returns the area of the screen which the xscreensaver window should cover. + Normally this is the whole screen, but if the X server's root window is + actually larger than the monitor's displayable area, then we want to + operate in the currently-visible portion of the desktop instead. + */ +void +get_screen_viewport (saver_screen_info *ssi, + int *x_ret, int *y_ret, + int *w_ret, int *h_ret, + Bool verbose_p) +{ + int w = WidthOfScreen (ssi->screen); + int h = HeightOfScreen (ssi->screen); + +#ifdef HAVE_XF86VMODE + saver_info *si = ssi->global; + int screen_no = screen_number (ssi->screen); + int event, error; + int dot; + XF86VidModeModeLine ml; + int x, y; + + if (XF86VidModeQueryExtension (si->dpy, &event, &error) && + XF86VidModeGetModeLine (si->dpy, screen_no, &dot, &ml) && + XF86VidModeGetViewPort (si->dpy, screen_no, &x, &y)) + { + char msg[512]; + *x_ret = x; + *y_ret = y; + *w_ret = ml.hdisplay; + *h_ret = ml.vdisplay; + + if (*x_ret == 0 && *y_ret == 0 && *w_ret == w && *h_ret == h) + /* There is no viewport -- the screen does not scroll. */ + return; + + sprintf (msg, "%s: vp is %dx%d+%d+%d", + blurb(), *w_ret, *h_ret, *x_ret, *y_ret); + + + /* Apparently, though the server stores the X position in increments of + 1 pixel, it will only make changes to the *display* in some other + increment. With XF86_SVGA on a Thinkpad, the display only updates + in multiples of 8 pixels when in 8-bit mode, and in multiples of 4 + pixels in 16-bit mode. I don't know what it does in 24- and 32-bit + mode, because I don't have enough video memory to find out. + + I consider it a bug that XF86VidModeGetViewPort() is telling me the + server's *target* scroll position rather than the server's *actual* + scroll position. David Dawes agrees, and says they may fix this in + XFree86 4.0, but it's notrivial. + + He also confirms that this behavior is server-dependent, so the + actual scroll position cannot be reliably determined by the client. + So... that means the only solution is to provide a ``sandbox'' + around the blackout window -- we make the window be up to N pixels + larger than the viewport on both the left and right sides. That + means some part of the outer edges of each hack might not be + visible, but screw it. + + I'm going to guess that 16 pixels is enough, and that the Y dimension + doesn't have this problem. + + The drawback of doing this, of course, is that some of the screenhacks + will still look pretty stupid -- for example, "slidescreen" will cut + off the left and right edges of the grid, etc. + */ +# define FUDGE 16 + if (x > 0 && x < w - ml.hdisplay) /* not at left edge or right edge */ + { + /* Round X position down to next lower multiple of FUDGE. + Increase width by 2*FUDGE in case some server rounds up. + */ + *x_ret = ((x - 1) / FUDGE) * FUDGE; + *w_ret += (FUDGE * 2); + } +# undef FUDGE + + if (*x_ret != x || + *y_ret != y || + *w_ret != ml.hdisplay || + *h_ret != ml.vdisplay) + sprintf (msg + strlen(msg), "; fudged to %dx%d+%d+%d", + *w_ret, *h_ret, *x_ret, *y_ret); + + if (verbose_p) + fprintf (stderr, "%s.\n", msg); + + return; + } + +#endif /* HAVE_XF86VMODE */ + + *x_ret = 0; + *y_ret = 0; + *w_ret = w; + *h_ret = h; +} + + static void initialize_screensaver_window_1 (saver_screen_info *ssi) { @@ -772,10 +919,12 @@ initialize_screensaver_window_1 (saver_screen_info *ssi) XColor black; XSetWindowAttributes attrs; unsigned long attrmask; - int width = WidthOfScreen (ssi->screen); - int height = HeightOfScreen (ssi->screen); + int x, y, width, height; static Bool printed_visual_info = False; /* only print the message once. */ + get_screen_viewport (si->default_screen, &x, &y, &width, &height, + (p->verbose_p && !si->screen_blanked_p)); + black.red = black.green = black.blue = 0; if (ssi->cmap == DefaultColormapOfScreen (ssi->screen)) @@ -905,8 +1054,8 @@ initialize_screensaver_window_1 (saver_screen_info *ssi) { XWindowChanges changes; unsigned int changesmask = CWX|CWY|CWWidth|CWHeight|CWBorderWidth; - changes.x = 0; - changes.y = 0; + changes.x = x; + changes.y = y; changes.width = width; changes.height = height; changes.border_width = 0; @@ -919,9 +1068,11 @@ initialize_screensaver_window_1 (saver_screen_info *ssi) else { ssi->screensaver_window = - XCreateWindow (si->dpy, RootWindowOfScreen (ssi->screen), 0, 0, - width, height, 0, ssi->current_depth, InputOutput, + XCreateWindow (si->dpy, RootWindowOfScreen (ssi->screen), + x, y, width, height, + 0, ssi->current_depth, InputOutput, ssi->current_visual, attrmask, &attrs); + reset_stderr (ssi); store_activate_time(si, True); if (p->verbose_p) @@ -972,10 +1123,15 @@ raise_window (saver_info *si, if (si->demoing_p) inhibit_fade = True; - initialize_screensaver_window (si); + if (si->emergency_lock_p) + inhibit_fade = True; + + if (!dont_clear) + initialize_screensaver_window (si); + reset_watchdog_timer (si, True); - if (p->fade_p && p->fading_possible_p && !inhibit_fade) + if (p->fade_p && si->fading_possible_p && !inhibit_fade) { Window *current_windows = (Window *) calloc(sizeof(Window), si->nscreens); @@ -1098,6 +1254,17 @@ blank_screen (saver_info *si) store_vroot_property (si->dpy, ssi->screensaver_window, ssi->screensaver_window); + +#ifdef HAVE_XF86VMODE + { + int ev, er; + if (!XF86VidModeQueryExtension (si->dpy, &ev, &er) || + !XF86VidModeGetViewPort (si->dpy, i, + &ssi->blank_vp_x, + &ssi->blank_vp_y)) + ssi->blank_vp_x = ssi->blank_vp_y = -1; + } +#endif /* HAVE_XF86VMODE */ } store_activate_time (si, si->screen_blanked_p); raise_window (si, False, False, False); @@ -1116,6 +1283,7 @@ blank_screen (saver_info *si) #endif si->screen_blanked_p = True; + si->last_wall_clock_time = 0; return True; } @@ -1124,7 +1292,7 @@ void unblank_screen (saver_info *si) { saver_preferences *p = &si->prefs; - Bool unfade_p = (p->fading_possible_p && p->unfade_p); + Bool unfade_p = (si->fading_possible_p && p->unfade_p); int i; monitor_power_on (si); @@ -1248,6 +1416,7 @@ unblank_screen (saver_info *si) XUnmapWindow (si->dpy, si->screens[i].screensaver_window); si->screen_blanked_p = False; + si->last_wall_clock_time = 0; } @@ -1278,7 +1447,7 @@ select_visual (saver_screen_info *ssi, const char *visual_name) saver_preferences *p = &si->prefs; Bool install_cmap_p = p->install_cmap_p; Bool was_installed_p = (ssi->cmap != DefaultColormapOfScreen(ssi->screen)); - Visual *new_v; + Visual *new_v = 0; Bool got_it; if (visual_name && *visual_name) @@ -1293,7 +1462,18 @@ select_visual (saver_screen_info *ssi, const char *visual_name) visual_name = "default"; install_cmap_p = False; } - new_v = get_visual (ssi->screen, visual_name, True, False); +#ifdef DAEMON_USE_GL + else if (!strcmp(visual_name, "gl") || + !strcmp(visual_name, "GL")) + { + new_v = get_gl_visual (ssi->screen); + if (!new_v && p->verbose_p) + fprintf (stderr, "%s: no GL visuals.\n", progname); + } +#endif /* DAEMON_USE_GL */ + + if (!new_v) + new_v = get_visual (ssi->screen, visual_name, True, False); } else {