Move the code for resetting the DPMS mode in response to input events,
from WaitForSomething to mieqProcessInputEvents. mieqProcessInputEvents already handles resetting the screen saver.
This commit is contained in:
parent
953a9ef949
commit
3b5b7ef5c2
13
mi/mieq.c
13
mi/mieq.c
|
@ -52,6 +52,12 @@ in this Software without prior written authorization from The Open Group.
|
||||||
# include "extinit.h"
|
# include "extinit.h"
|
||||||
# include "exglobals.h"
|
# include "exglobals.h"
|
||||||
|
|
||||||
|
#ifdef DPMSExtension
|
||||||
|
# include "dpmsproc.h"
|
||||||
|
# define DPMS_SERVER
|
||||||
|
# include <X11/extensions/dpms.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#define QUEUE_SIZE 256
|
#define QUEUE_SIZE 256
|
||||||
|
|
||||||
typedef struct _Event {
|
typedef struct _Event {
|
||||||
|
@ -183,6 +189,13 @@ mieqProcessInputEvents()
|
||||||
while (miEventQueue.head != miEventQueue.tail) {
|
while (miEventQueue.head != miEventQueue.tail) {
|
||||||
if (screenIsSaved == SCREEN_SAVER_ON)
|
if (screenIsSaved == SCREEN_SAVER_ON)
|
||||||
SaveScreens (SCREEN_SAVER_OFF, ScreenSaverReset);
|
SaveScreens (SCREEN_SAVER_OFF, ScreenSaverReset);
|
||||||
|
#ifdef DPMSExtension
|
||||||
|
else if (DPMSPowerLevel != DPMSModeOn)
|
||||||
|
SetScreenSaverTimer();
|
||||||
|
|
||||||
|
if (DPMSPowerLevel != DPMSModeOn)
|
||||||
|
DPMSSet(DPMSModeOn);
|
||||||
|
#endif
|
||||||
|
|
||||||
e = &miEventQueue.events[miEventQueue.head];
|
e = &miEventQueue.events[miEventQueue.head];
|
||||||
/* Assumption - screen switching can only occur on motion events. */
|
/* Assumption - screen switching can only occur on motion events. */
|
||||||
|
|
|
@ -337,10 +337,7 @@ WaitForSomething(int *pClientsReady)
|
||||||
if (XFD_ANYSET(&tmp_set))
|
if (XFD_ANYSET(&tmp_set))
|
||||||
QueueWorkProc(EstablishNewConnections, NULL,
|
QueueWorkProc(EstablishNewConnections, NULL,
|
||||||
(pointer)&LastSelectMask);
|
(pointer)&LastSelectMask);
|
||||||
#ifdef DPMSExtension
|
|
||||||
if (XFD_ANYSET (&devicesReadable) && (DPMSPowerLevel != DPMSModeOn))
|
|
||||||
DPMSSet(DPMSModeOn);
|
|
||||||
#endif
|
|
||||||
if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable))
|
if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable))
|
||||||
break;
|
break;
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
|
|
Loading…
Reference in New Issue
Block a user