mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-21 01:13:38 +00:00
Merge branch 'master'
This commit is contained in:
commit
15a81b6325
61 changed files with 5127 additions and 1002 deletions
13
mi/mieq.c
13
mi/mieq.c
|
|
@ -59,6 +59,12 @@ in this Software without prior written authorization from The Open Group.
|
|||
# include "extinit.h"
|
||||
# include "exglobals.h"
|
||||
|
||||
#ifdef DPMSExtension
|
||||
# include "dpmsproc.h"
|
||||
# define DPMS_SERVER
|
||||
# include <X11/extensions/dpms.h>
|
||||
#endif
|
||||
|
||||
#define QUEUE_SIZE 256
|
||||
|
||||
typedef struct _Event {
|
||||
|
|
@ -193,6 +199,13 @@ mieqProcessInputEvents()
|
|||
while (miEventQueue.head != miEventQueue.tail) {
|
||||
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. */
|
||||
|
|
|
|||
Loading…
Reference in a new issue