projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ftp://ftp.sunet.se/pub/os/Linux/distributions/ultrapenguin/ultrapenguin-1.1/SRPMS...
[xscreensaver]
/
driver
/
windows.c
diff --git
a/driver/windows.c
b/driver/windows.c
index 7dabe9f11e12352c432df5d260d54f6799fe2cef..5dcc3d355b4fb7303934c5450b33ee793b8b2c4c 100644
(file)
--- a/
driver/windows.c
+++ b/
driver/windows.c
@@
-918,7
+918,7
@@
blank_screen (saver_info *si)
ssi->screensaver_window,
ssi->screensaver_window);
}
ssi->screensaver_window,
ssi->screensaver_window);
}
- store_activate_time (si,
True
);
+ store_activate_time (si,
si->screen_blanked_p
);
raise_window (si, False, False, False);
/* #### */
grab_keyboard_and_mouse (si->dpy, si->screens[0].screensaver_window,
raise_window (si, False, False, False);
/* #### */
grab_keyboard_and_mouse (si->dpy, si->screens[0].screensaver_window,
@@
-1035,6
+1035,8
@@
unblank_screen (saver_info *si)
kill_xsetroot_data (si->dpy, ssi->screensaver_window, p->verbose_p);
}
kill_xsetroot_data (si->dpy, ssi->screensaver_window, p->verbose_p);
}
+ store_activate_time(si, False); /* store unblank time */
+
ungrab_keyboard_and_mouse (si->dpy);
restore_real_vroot (si);
ungrab_keyboard_and_mouse (si->dpy);
restore_real_vroot (si);
@@
-1113,7
+1115,7
@@
select_visual (saver_screen_info *ssi, const char *visual_name)
raise_window (si, True, True, False);
store_vroot_property (si->dpy,
ssi->screensaver_window, ssi->screensaver_window);
raise_window (si, True, True, False);
store_vroot_property (si->dpy,
ssi->screensaver_window, ssi->screensaver_window);
- store_activate_time (si,
Fals
e);
+ store_activate_time (si,
Tru
e);
XDestroyWindow (si->dpy, old_w);
if (old_c &&
XDestroyWindow (si->dpy, old_w);
if (old_c &&