diff options
| author | Fredrik Höglund <fredrik@kde.org> | 2017-02-09 21:28:12 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-17 09:40:37 +0100 |
| commit | 6307e6fc72f3cd748c9dc0e601a87171131309ea (patch) | |
| tree | f566350ac7d3f6c3823f5f87468f9d3813363803 /nx-X11/programs | |
| parent | 9b934a44772ded19812ed4665265cc43fb751169 (diff) | |
| download | nx-libs-6307e6fc72f3cd748c9dc0e601a87171131309ea.tar.gz nx-libs-6307e6fc72f3cd748c9dc0e601a87171131309ea.tar.bz2 nx-libs-6307e6fc72f3cd748c9dc0e601a87171131309ea.zip | |
Move the code for resetting the DPMS mode in response to input events, from WaitForSomething to mieqProcessInputEvents.
Backported from X.org:
commit 3b5b7ef5c2ab1d196806f6359e0972fd78d204dd
Author: Fredrik Höglund <fredrik@kde.org>
Date: Wed Jan 3 21:05:35 2007 +0100
Move the code for resetting the DPMS mode in response to input events,
from WaitForSomething to mieqProcessInputEvents.
mieqProcessInputEvents already handles resetting the screen saver.
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs')
| -rw-r--r-- | nx-X11/programs/Xserver/mi/mieq.c | 14 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/WaitFor.c | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/mi/mieq.c b/nx-X11/programs/Xserver/mi/mieq.c index b5d9baa31..fefb222c4 100644 --- a/nx-X11/programs/Xserver/mi/mieq.c +++ b/nx-X11/programs/Xserver/mi/mieq.c @@ -43,6 +43,12 @@ in this Software without prior written authorization from The Open Group. # include "mi.h" # include "scrnintstr.h" +#ifdef DPMSExtension +# include "dpmsproc.h" +# define DPMS_SERVER +# include <nx-X11/extensions/dpms.h> +#endif + #define QUEUE_SIZE 256 typedef struct _Event { @@ -151,6 +157,14 @@ void mieqProcessInputEvents () if (screenIsSaved == SCREEN_SAVER_ON) SaveScreens (SCREEN_SAVER_OFF, ScreenSaverReset); +#ifdef DPMSExtension + else if (DPMSPowerLevel != DPMSModeOn) + SetScreenSaverTimer(); + + if (DPMSPowerLevel != DPMSModeOn) + DPMSSet(DPMSModeOn); +#endif + e = &miEventQueue.events[miEventQueue.head]; /* * Assumption - screen switching can only occur on motion events diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c index 19a1b9809..d94ada1d5 100644 --- a/nx-X11/programs/Xserver/os/WaitFor.c +++ b/nx-X11/programs/Xserver/os/WaitFor.c @@ -509,10 +509,6 @@ WaitForSomething(int *pClientsReady) if (XFD_ANYSET(&tmp_set)) HandleNotifyFds(); -#ifdef DPMSExtension - if (XFD_ANYSET (&devicesReadable) && (DPMSPowerLevel != DPMSModeOn)) - DPMSSet(DPMSModeOn); -#endif if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable)) break; #ifdef WIN32 |