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:
parent
56d1793c43
commit
19aac4274b
20
mi/mieq.c
20
mi/mieq.c
|
@ -314,16 +314,6 @@ mieqProcessInputEvents(void)
|
|||
master = NULL;
|
||||
|
||||
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];
|
||||
|
||||
/* GenericEvents always have nevents == 1 */
|
||||
|
@ -346,6 +336,16 @@ mieqProcessInputEvents(void)
|
|||
type = event->u.u.type;
|
||||
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 */
|
||||
handler = miEventQueue.handlers[type];
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user