[X2Go-Commits] [nx-libs] 01/01: Add missing DPMS code to WaitForSomething().

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x-rpm-debug
in repository nx-libs.

commit b0332c73fd9834f661c6aa3784df373c6994d1c7
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Mar 6 03:44:12 2018 +0100

    Add missing DPMS code to WaitForSomething().
---
 nx-X11/programs/Xserver/os/WaitFor.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c
index 9133adf..a6ba227 100644
--- a/nx-X11/programs/Xserver/os/WaitFor.c
+++ b/nx-X11/programs/Xserver/os/WaitFor.c
@@ -188,6 +188,7 @@ WaitForSomething(int *pClientsReady)
     int curclient;
     int selecterr;
     int nready;
+    fd_set devicesReadable;
     CARD32 now = 0;
     Bool    someReady = FALSE;
     Bool    someNotifyWriteReady = FALSE;
@@ -494,13 +495,17 @@ WaitForSomething(int *pClientsReady)
 		}
 	    }
 
+	    XFD_ANDSET(&devicesReadable, &LastSelectMask, &EnabledDevices);
 	    XFD_ANDSET(&clientsReadable, &LastSelectMask, &AllClients); 
 
 	    XFD_ANDSET(&tmp_set, &LastSelectMask, &NotifyReadFds);
 	    if (XFD_ANYSET(&tmp_set) || someNotifyWriteReady)
 	         HandleNotifyFds();
-
-	    if (XFD_ANYSET (&clientsReadable))
+#ifdef DPMSExtension
+	    if (XFD_ANYSET (&devicesReadable) && (DPMSPowerLevel != DPMSModeOn))
+		DPMSSet(DPMSModeOn);
+#endif
+	    if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable))
 		break;
 #ifdef WIN32
 	    /* Windows keyboard and mouse events are added to the input queue

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git