43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
|
From 142cebe39f216b3e39353e173b29f47b4fc295fd Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||
|
|
Date: Thu, 10 Jul 2014 10:39:50 +1000
|
||
|
|
Subject: [PATCH] xfree86: don't force the screensaver off on DPMS unblank,
|
||
|
|
merely suggest it
|
||
|
|
|
||
|
|
Having dependencies between DPMS and the screensaver is subject to further
|
||
|
|
arguments, but in this particular case using SCREENSAVER_FORCER is
|
||
|
|
detrimental. SCREENSAVER_FORCER(ScreenSaverReset) resets the idle time for all
|
||
|
|
devices on DPMS unblank.
|
||
|
|
|
||
|
|
It prevents at least one use-case that GNOME tries to implement:
|
||
|
|
GNOME displays a notification before suspending. If the display is
|
||
|
|
currently blanked, GNOME lights it up to display the message. With the
|
||
|
|
original in place DPMS unblank also resets the screen saver, thus
|
||
|
|
restarting the timeout.
|
||
|
|
|
||
|
|
Switch this to a more suggestive SCREENSAVER_OFF(ScreenSaverReset). This keeps
|
||
|
|
the symmetry in blanking mode (DPMS and screensaver turn each other on/off as
|
||
|
|
expected) but does not reset the idle time on the devices.
|
||
|
|
|
||
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||
|
|
---
|
||
|
|
hw/xfree86/common/xf86DPMS.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
|
||
|
|
index 14d1f45..2b5a3ed 100644
|
||
|
|
--- a/hw/xfree86/common/xf86DPMS.c
|
||
|
|
+++ b/hw/xfree86/common/xf86DPMS.c
|
||
|
|
@@ -166,7 +166,7 @@ DPMSSet(ClientPtr client, int level)
|
||
|
|
return rc;
|
||
|
|
}
|
||
|
|
} else if (!xf86IsUnblank(screenIsSaved)) {
|
||
|
|
- rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverReset);
|
||
|
|
+ rc = dixSaveScreens(client, SCREEN_SAVER_OFF, ScreenSaverReset);
|
||
|
|
if (rc != Success)
|
||
|
|
return rc;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.9.3
|
||
|
|
|