xserver: Branch 'xorg-server-1.4-apple'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Mon Nov 17 22:36:57 PST 2008
mi/mieq.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 17eebd7c108aab6e3303edaf18d8fecc91c09ab2
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Mon Nov 17 22:36:14 2008 -0800
mi: Don't hold the event mutex during SaveScreens()
diff --git a/mi/mieq.c b/mi/mieq.c
index 60c2a75..6559158 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -237,6 +237,14 @@ mieqProcessInputEvents(void)
pthread_mutex_lock(&miEventQueueMutex);
#endif
while (miEventQueue.head != miEventQueue.tail) {
+ memcpy(&e, &miEventQueue.events[miEventQueue.head], sizeof(EventRec));
+ handler = miEventQueue.handlers[e.event[0].u.u.type];
+ miEventQueue.head = (miEventQueue.head + 1) % QUEUE_SIZE;
+
+#ifdef XQUARTZ
+ pthread_mutex_unlock(&miEventQueueMutex);
+#endif
+
if (screenIsSaved == SCREEN_SAVER_ON)
SaveScreens (SCREEN_SAVER_OFF, ScreenSaverReset);
#ifdef DPMSExtension
@@ -247,14 +255,6 @@ mieqProcessInputEvents(void)
DPMSSet(DPMSModeOn);
#endif
- memcpy(&e, &miEventQueue.events[miEventQueue.head], sizeof(EventRec));
- handler = miEventQueue.handlers[e.event[0].u.u.type];
- miEventQueue.head = (miEventQueue.head + 1) % QUEUE_SIZE;
-
-#ifdef XQUARTZ
- pthread_mutex_unlock(&miEventQueueMutex);
-#endif
-
if (handler) {
/* If someone's registered a custom event handler, let them
* steal it. */
More information about the xorg-commit
mailing list