XQuartz: Add locking to make mieq thread safe on OSX

3 files changed, 68 insertions, 1 deletions

diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index 37f0bfb45..1863eff1a 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -118,3 +118,4 @@ void darwinEvents_lock(void) {
 
-static inline void darwinEvents_unlock(void) {
+void darwinEvents_unlock(void);
+void darwinEvents_unlock(void) {
     int err;
diff --git a/mi/mieq.c b/mi/mieq.c
index db48f55e5..2905c7782 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -38,2 +38,7 @@ in this Software without prior written authorization from The Open Group.
 
+#ifdef XQUARTZ
+#include  <pthread.h>
+static pthread_mutex_t miEventQueueMutex = PTHREAD_MUTEX_INITIALIZER;
+#endif
+
 # define NEED_EVENTS
@@ -141,2 +146,5 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
 
+#ifdef XQUARTZ
+    pthread_mutex_lock(&miEventQueueMutex);
+#endif
 
@@ -159,2 +167,6 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
         if (laste->nevents > 6) {
+#ifdef XQUARTZ
+            pthread_mutex_unlock(&miEventQueueMutex);
+#endif
+            
             ErrorF("[mi] mieqEnqueue: more than six valuator events; dropping.\n");
@@ -170,2 +182,5 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
              (v->deviceid & DEVICE_BITS))) {
+#ifdef XQUARTZ
+            pthread_mutex_unlock(&miEventQueueMutex);
+#endif
             ErrorF("[mi] mieqEnequeue: out-of-order valuator event; dropping.\n");
@@ -175,2 +190,5 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
         memcpy((laste->events[laste->nevents++].event), e, sizeof(xEvent));
+#ifdef XQUARTZ
+        pthread_mutex_unlock(&miEventQueueMutex);
+#endif
         return;
@@ -194,2 +212,5 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
 	    }
+#ifdef XQUARTZ
+	    pthread_mutex_unlock(&miEventQueueMutex);
+#endif
 	    return;
@@ -211,2 +232,5 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
             ErrorF("[mi] Running out of memory. Tossing event.\n");
+#ifdef XQUARTZ
+            pthread_mutex_unlock(&miEventQueueMutex);
+#endif
             return;
@@ -231,2 +255,5 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
     miEventQueue.tail = (oldtail + 1) % QUEUE_SIZE;
+#ifdef XQUARTZ
+    pthread_mutex_unlock(&miEventQueueMutex);
+#endif
 }
@@ -236,2 +263,5 @@ mieqSwitchScreen(DeviceIntPtr pDev, ScreenPtr pScreen, Bool fromDIX)
 {
+#ifdef XQUARTZ
+    pthread_mutex_lock(&miEventQueueMutex);
+#endif
     EnqueueScreen(pDev) = pScreen;
@@ -239,2 +269,5 @@ mieqSwitchScreen(DeviceIntPtr pDev, ScreenPtr pScreen, Bool fromDIX)
 	DequeueScreen(pDev) = pScreen;
+#ifdef XQUARTZ
+    pthread_mutex_unlock(&miEventQueueMutex);
+#endif
 }
@@ -244,2 +277,5 @@ mieqSetHandler(int event, mieqHandler handler)
 {
+#ifdef XQUARTZ
+    pthread_mutex_lock(&miEventQueueMutex);
+#endif
     if (handler && miEventQueue.handlers[event])
@@ -249,2 +285,5 @@ mieqSetHandler(int event, mieqHandler handler)
     miEventQueue.handlers[event] = handler;
+#ifdef XQUARTZ
+    pthread_mutex_unlock(&miEventQueueMutex);
+#endif
 }
@@ -315,2 +354,6 @@ mieqProcessInputEvents(void)
 
+#ifdef XQUARTZ
+    pthread_mutex_lock(&miEventQueueMutex);
+#endif
+    
     while (miEventQueue.head != miEventQueue.tail) {
@@ -338,2 +381,6 @@ mieqProcessInputEvents(void)
 
+#ifdef XQUARTZ
+        pthread_mutex_unlock(&miEventQueueMutex);
+#endif
+        
         type    = event->u.u.type;
@@ -387,3 +434,10 @@ mieqProcessInputEvents(void)
             miPointerUpdateSprite(dev);
+
+#ifdef XQUARTZ
+        pthread_mutex_lock(&miEventQueueMutex);
+#endif
     }
+#ifdef XQUARTZ
+    pthread_mutex_unlock(&miEventQueueMutex);
+#endif
 }
diff --git a/mi/mipointer.c b/mi/mipointer.c
index b998cd4a2..9b2a1b2ba 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -549,2 +549,8 @@ miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y)
 
+#ifdef XQUARTZ
+#include <pthread.h>
+void darwinEvents_lock(void);
+void darwinEvents_unlock(void);
+#endif
+
 void
@@ -575,4 +581,10 @@ miPointerMove (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
     OsBlockSignals();
+#ifdef XQUARTZ
+    darwinEvents_lock();
+#endif
     for (i = 0; i < nevents; i++)
         mieqEnqueue(pDev, events[i].event);
+#ifdef XQUARTZ
+    darwinEvents_unlock();
+#endif
     OsReleaseSignals();