projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.27.tar.gz
[xscreensaver]
/
driver
/
dpms.c
diff --git
a/driver/dpms.c
b/driver/dpms.c
index d88737eefd98340fe9412a6ce4f03f4c2179aec8..4be93319050dd48b04e2b94c17e4b8c9d0a69997 100644
(file)
--- a/
driver/dpms.c
+++ b/
driver/dpms.c
@@
-97,7
+97,7
@@
ignore_all_errors_ehandler (Display *dpy, XErrorEvent *error)
void
void
-sync_server_dpms_settings (Display *dpy, Bool enabled_p,
+sync_server_dpms_settings (Display *dpy, Bool enabled_p,
Bool dpms_quickoff_p,
int standby_secs, int suspend_secs, int off_secs,
Bool verbose_p)
{
int standby_secs, int suspend_secs, int off_secs,
Bool verbose_p)
{
@@
-107,6
+107,12
@@
sync_server_dpms_settings (Display *dpy, Bool enabled_p,
CARD16 o_standby = 0, o_suspend = 0, o_off = 0;
Bool bogus_p = False;
CARD16 o_standby = 0, o_suspend = 0, o_off = 0;
Bool bogus_p = False;
+ if (dpms_quickoff_p && !off_secs)
+ {
+ /* To do this, we might need to temporarily re-enable DPMS first. */
+ off_secs = 0xFFFF;
+ }
+
if (standby_secs == 0 && suspend_secs == 0 && off_secs == 0)
/* all zero implies "DPMS disabled" */
enabled_p = False;
if (standby_secs == 0 && suspend_secs == 0 && off_secs == 0)
/* all zero implies "DPMS disabled" */
enabled_p = False;