From 111fa1a42c1550dcd3cc7a252f66c7f035456e93 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 11 Jul 2014 08:23:26 +1000 Subject: [PATCH] Don't force the screensaver off on DPMS unblank --- ...rce-the-screensaver-off-on-DPMS-unbl.patch | 42 +++++++++++++++++++ xorg-x11-server.spec | 9 +++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 0001-xfree86-don-t-force-the-screensaver-off-on-DPMS-unbl.patch diff --git a/0001-xfree86-don-t-force-the-screensaver-off-on-DPMS-unbl.patch b/0001-xfree86-don-t-force-the-screensaver-off-on-DPMS-unbl.patch new file mode 100644 index 0000000..6666554 --- /dev/null +++ b/0001-xfree86-don-t-force-the-screensaver-off-on-DPMS-unbl.patch @@ -0,0 +1,42 @@ +From 142cebe39f216b3e39353e173b29f47b4fc295fd Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +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 +--- + 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 + diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 7e65c8c..36007a4 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -42,7 +42,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.15.99.904 -Release: 1%{?gitdate:.%{gitdate}}%{dist} +Release: 2%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -105,6 +105,10 @@ Patch10000: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch # submitted http://lists.x.org/archives/xorg-devel/2014-July/042936.html Patch10200: 0001-xwayland-Snap-damage-reports-to-the-bounding-box.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=731241 +# submitted: http://patchwork.freedesktop.org/patch/29412/ +Patch10201: 0001-xfree86-don-t-force-the-screensaver-off-on-DPMS-unbl.patch + %global moduledir %{_libdir}/xorg/modules %global drimoduledir %{_libdir}/dri %global sdkdir %{_includedir}/xorg @@ -619,6 +623,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %changelog +* Fri Jul 11 2014 Peter Hutterer 1.15.99.904-2 +- Don't force the screensaver off on DPMS unblank + * Tue Jul 8 2014 Hans de Goede - 1.15.99.904-1 - Update to 1.15.99.904