Don't reset the lastDeviceEventTime when doing DPMS actions

Backported from X.org's Xserver: commit c1d901d723c3bee523736eacc15b44a7dff484fe Author: Richard Hughes <richard@hughsie.com> Date: Fri Aug 14 11:44:35 2009 +0100 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> Backport-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

Don't reset the lastDeviceEventTime when doing DPMS actions
222153af · Mike Gabriel · 7401a669 · 222153af
Commit 222153af authored Jul 03, 2018 by Mike Gabriel
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 13 deletions

dpms.c nx-X11/programs/Xserver/Xext/dpms.c +4 -13

No files found.
--- a/nx-X11/programs/Xserver/Xext/dpms.c
+++ b/nx-X11/programs/Xserver/Xext/dpms.c
@@ -232,19 +232,10 @@ ProcDPMSForceLevel(client)
    if (!DPMSEnabled)
 	return BadMatch;
-    if (stuff->level == DPMSModeOn) {
+    if (stuff->level != DPMSModeOn &&
-      lastDeviceEventTime.milliseconds =
+        stuff->level != DPMSModeStandby &&
-          GetTimeInMillis();
+        stuff->level != DPMSModeSuspend &&
-    } else if (stuff->level == DPMSModeStandby) {
+        stuff->level != DPMSModeOff) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis() -  DPMSStandbyTime;
-    } else if (stuff->level == DPMSModeSuspend) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis() -  DPMSSuspendTime;
-    } else if (stuff->level == DPMSModeOff) {
-      lastDeviceEventTime.milliseconds =
-          GetTimeInMillis() -  DPMSOffTime;
-    } else {
 	client->errorValue = stuff->level;
 	return BadValue;
    }