[Patch 01/02] mieq threading prep: Push screen-saver/DPMS handling to after the EQ pop operation.

[Jeremy Huddleston]

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

Signed-off-by: Jeremy Huddleston <[EMAIL PROTECTED]>
Signed-off-by: Peter Hutterer <[EMAIL PROTECTED]>
---
 mi/mieq.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mi/mieq.c b/mi/mieq.c
index 7437966..82f0c66 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)

-#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;


+        if (screenIsSaved == SCREEN_SAVER_ON)

+#ifdef DPMSExtension
+        else if (DPMSPowerLevel != DPMSModeOn)
+            SetScreenSaverTimer();
+
+        if (DPMSPowerLevel != DPMSModeOn)
+            DPMSSet(serverClient, DPMSModeOn);
+#endif
+
         /* Custom event handler */
         handler = miEventQueue.handlers[type];

--
1.6.0.3

- dixSaveScreens (serverClient, SCREEN_SAVER_OFF, ScreenSaverReset); master = (!dev->isMaster && dev->u.master) ? dev- >u.master : NULL; + dixSaveScreens (serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);

smime.p7s
Description: S/MIME cryptographic signature

_______________________________________________
xorg mailing list
xorg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg