rpms/xorg-x11-server/devel xserver-1.6.99-dpms.patch, NONE, 1.1 xorg-x11-server.spec, 1.471, 1.472

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15055

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.99-dpms.patch 
Log Message:
* Mon Aug 17 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-35.20090814
- xserver-1.6.99-dpms.patch: don't reset last event time on DPMS changes.


xserver-1.6.99-dpms.patch:
 dpms.c |   18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

--- NEW FILE xserver-1.6.99-dpms.patch ---
>From c1d901d723c3bee523736eacc15b44a7dff484fe Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard at hughsie.com>
Date: Fri, 14 Aug 2009 11:44:35 +0100
Subject: [PATCH] Don't reset the lastDeviceEventTime when doing DPMS actions

When we change the DPMS mode, don't play games with the last event time as
this breaks applications using IDLETIME to turn the backlight off after a
preset time.

This patch fixes gnome-power-manager and xfce-power-manager

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 Xext/dpms.c |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Xext/dpms.c b/Xext/dpms.c
index 21ba923..df63a8b 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -177,19 +177,10 @@ ProcDPMSForceLevel(ClientPtr client)
     if (!DPMSEnabled)
 	return BadMatch;
 
-    if (stuff->level == DPMSModeOn) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis();
-    } else if (stuff->level == DPMSModeStandby) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis() -  DPMSStandbyTime;
-    } else if (stuff->level == DPMSModeSuspend) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis() -  DPMSSuspendTime;
-    } else if (stuff->level == DPMSModeOff) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis() -  DPMSOffTime;
-    } else {
+    if (stuff->level != DPMSModeOn &&
+        stuff->level != DPMSModeStandby &&
+        stuff->level != DPMSModeSuspend &&
+        stuff->level != DPMSModeOff) {
 	client->errorValue = stuff->level;
 	return BadValue;
     }
-- 
1.6.3.rc1.2.g0164.dirty



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -p -r1.471 -r1.472
--- xorg-x11-server.spec	13 Aug 2009 23:01:32 -0000	1.471
+++ xorg-x11-server.spec	17 Aug 2009 03:29:47 -0000	1.472
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   34.%{gitdate}%{?dist}
+Release:   35.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -82,6 +82,9 @@ Patch6029: xserver-1.6.1-proc-cmdline.pa
 Patch6030: xserver-1.6.99-right-of.patch
 Patch6031: xserver-1.6.99-dri2-crash-fixes.patch
 
+# dpms/idlecounter race condition. upstream soon
+Patch6032: xserver-1.6.99-dpms.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -507,6 +510,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Aug 17 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-35.20090814
+- xserver-1.6.99-dpms.patch: don't reset last event time on DPMS changes.
+
 * Fri Aug 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99-34.20090814
 - Today's git snapshot.