From 43f01d2e00c9c02bdae078916ea5fedd2f04ad93 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 19 Aug 2009 04:50:35 +0000 Subject: [PATCH] * Wed Aug 19 2009 Peter Hutterer 1.6.99-36.20090814 - xserver-1.6.99-eventtime.patch: don't reset the last event time when the screen saver activates. --- xorg-x11-server.spec | 10 ++++++++-- xserver-1.6.99-eventtime.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 xserver-1.6.99-eventtime.patch diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index e459548..3158e42 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.6.99 -Release: 35.%{gitdate}%{?dist} +Release: 36.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -82,8 +82,10 @@ Patch6029: xserver-1.6.1-proc-cmdline.patch Patch6030: xserver-1.6.99-right-of.patch Patch6031: xserver-1.6.99-dri2-crash-fixes.patch -# dpms/idlecounter race condition. upstream soon +# dpms/idlecounter race condition. upstream Patch6032: xserver-1.6.99-dpms.patch +# screen saver/idlecounter race condition. upstream +Patch6033: xserver-1.6.99-eventtime.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -510,6 +512,10 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Wed Aug 19 2009 Peter Hutterer 1.6.99-36.20090814 +- xserver-1.6.99-eventtime.patch: don't reset the last event time when the + screen saver activates. + * Mon Aug 17 2009 Peter Hutterer 1.6.99-35.20090814 - xserver-1.6.99-dpms.patch: don't reset last event time on DPMS changes. diff --git a/xserver-1.6.99-eventtime.patch b/xserver-1.6.99-eventtime.patch new file mode 100644 index 0000000..e44ed20 --- /dev/null +++ b/xserver-1.6.99-eventtime.patch @@ -0,0 +1,29 @@ +From 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Mon, 17 Aug 2009 09:15:32 +0100 +Subject: [PATCH] Do not reset lastDeviceEventTime when we do dixSaveScreens + +When we turn off DPMS with DPMSModeOff and do dixSaveScreens, don't reset the +event time else session clients using IDLETIME will be reset. + +Signed-off-by: Peter Hutterer +--- + dix/window.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/dix/window.c b/dix/window.c +index 32e26d9..1a645f6 100644 +--- a/dix/window.c ++++ b/dix/window.c +@@ -3128,8 +3128,6 @@ dixSaveScreens(ClientPtr client, int on, int mode) + + if (on == SCREEN_SAVER_FORCER) + { +- UpdateCurrentTimeIf(); +- lastDeviceEventTime = currentTime; + if (mode == ScreenSaverReset) + what = SCREEN_SAVER_OFF; + else +-- +1.6.3.rc1.2.g0164.dirty +