frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mi: Push screen-saver/DPMS handling to after the EQ pop operation. 

This way we on't need to hold the mutex during the dixSaveScreens() call.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
This commit is contained in:
Jeremy Huddleston 2008-11-19 10:55:29 -08:00
parent 56d1793c43
commit 19aac4274b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mi/mieq.c
View File

@ -314,16 +314,6 @@ mieqProcessInputEvents(void)
master = NULL; master = NULL;
while (miEventQueue.head != miEventQueue.tail) { while (miEventQueue.head != miEventQueue.tail) {
if (screenIsSaved == SCREEN_SAVER_ON)
dixSaveScreens (serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
#ifdef DPMSExtension
else if (DPMSPowerLevel != DPMSModeOn)
SetScreenSaverTimer();
if (DPMSPowerLevel != DPMSModeOn)
DPMSSet(serverClient, DPMSModeOn);
#endif
e = &miEventQueue.events[miEventQueue.head]; e = &miEventQueue.events[miEventQueue.head];
/* GenericEvents always have nevents == 1 */ /* GenericEvents always have nevents == 1 */
@ -346,6 +336,16 @@ mieqProcessInputEvents(void)
type = event->u.u.type; type = event->u.u.type;
master = (!dev->isMaster && dev->u.master) ? dev->u.master : NULL; master = (!dev->isMaster && dev->u.master) ? dev->u.master : NULL;
if (screenIsSaved == SCREEN_SAVER_ON)
dixSaveScreens (serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
#ifdef DPMSExtension
else if (DPMSPowerLevel != DPMSModeOn)
SetScreenSaverTimer();
if (DPMSPowerLevel != DPMSModeOn)
DPMSSet(serverClient, DPMSModeOn);
#endif
/* Custom event handler */ /* Custom event handler */
handler = miEventQueue.handlers[type]; handler = miEventQueue.handlers[type];