andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XQuartz: Make WarpPointer multithread safe in XQuartz.

Browse Source
This commit is contained in:
Jeremy Huddleston 2008-09-04 10:00:43 -07:00
parent 2e45344870
commit c1caeb52a4
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xquartz/darwinEvents.c
View File

@ -107,7 +107,7 @@ static pthread_t create_thread(void *func, void *arg) {
return tid;
}
static inline void darwinEvents_lock(void) {
void darwinEvents_lock(void) {
int err;
if((err = pthread_mutex_lock(&mieq_lock))) {
ErrorF("%s:%s:%d: Failed to lock mieq_lock: %d\n",
@ -119,7 +119,7 @@ static inline void darwinEvents_lock(void) {
}
}
static inline void darwinEvents_unlock(void) {
void darwinEvents_unlock(void) {
int err;
if((err = pthread_mutex_unlock(&mieq_lock))) {
ErrorF("%s:%s:%d: Failed to unlock mieq_lock: %d\n",

12
mi/mipointer.c
View File

@ -486,6 +486,12 @@ miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y)
*y = miPointer.y;
}
#ifdef XQUARTZ
#include <pthread.h>
void darwinEvents_lock(void);
void darwinEvents_unlock(void);
#endif
void
miPointerMove (ScreenPtr pScreen, int x, int y, unsigned long time)
{
@ -512,6 +518,12 @@ miPointerMove (ScreenPtr pScreen, int x, int y, unsigned long time)
nevents = GetPointerEvents(events, inputInfo.pointer, MotionNotify, 0,
POINTER_ABSOLUTE, 0, 2, valuators);
#ifdef XQUARTZ
darwinEvents_lock();
#endif
for (i = 0; i < nevents; i++)
mieqEnqueue(inputInfo.pointer, &events[i]);
#ifdef XQUARTZ
darwinEvents_unlock();
#endif
}