xorg-server: Changes to 'ubuntu'
debian/changelog | 8 +++
debian/patches/187_lastdeviceeventtime-no-reset.patch | 47 ++++++++++++++++++
2 files changed, 55 insertions(+)
New commits:
commit 80a6590ad4f81a7c5a2bb1bd6d8c67c92f651338
Author: Loïc Minier <lool@dooz.org>
Date: Mon Sep 28 10:05:11 2009 +0200
Cherrypick to avoid resetting IDLETIME on DPMS
Add 187_lastdeviceeventtime-no-reset.patch: Avoids resetting IDLETIME on
DPMS events. Cherrypick from upstream. (LP: #397839)
diff --git a/debian/changelog b/debian/changelog
index 312ca01..b2a16b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.6.3-1ubuntu7) UNRELEASED; urgency=low
+
+ * Add 187_lastdeviceeventtime-no-reset.patch: Avoids resetting IDLETIME on
+ DPMS events. Cherrypick from upstream.
+ (LP: #397839)
+
+ -- Loïc Minier <loic.minier@ubuntu.com> Mon, 28 Sep 2009 10:05:00 +0200
+
xorg-server (2:1.6.3-1ubuntu6) karmic; urgency=low
* Add 186_autoconfig_geode.patch: Add autoconfiguration support for
diff --git a/debian/patches/187_lastdeviceeventtime-no-reset.patch b/debian/patches/187_lastdeviceeventtime-no-reset.patch
new file mode 100644
index 0000000..d152ad7
--- /dev/null
+++ b/debian/patches/187_lastdeviceeventtime-no-reset.patch
@@ -0,0 +1,47 @@
+From c1d901d723c3bee523736eacc15b44a7dff484fe Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@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@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.3
+
Reply to: