From 19aac4274bbac55ce944acfaf3274a4403fe392e Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Wed, 19 Nov 2008 10:55:29 -0800 Subject: [PATCH] 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 Signed-off-by: Tiago Vignatti Signed-off-by: Peter Hutterer --- mi/mieq.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mi/mieq.c b/mi/mieq.c index 7437966e2..82f0c6668 100644 --- a/mi/mieq.c +++ b/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];