xserver: Branch 'master' - 5 commits

[Jeremy Huddleston]

 Xi/exevents.c               |    5 ++++-
 hw/xquartz/darwin.c         |   12 +++++++-----
 hw/xquartz/quartzKeyboard.c |    2 --
 3 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit fbfbf93405222322571e15e78dea57c8f2755eae
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Sep 26 22:52:39 2009 -0700

    XQuartz: Add pressure/tilt property labels
    (cherry picked from commit 84ea67130ef6b4086042aad6036ce66f93ea3e56)

diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 8836782..30b8905 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -353,6 +353,9 @@ static int DarwinTabletProc(DeviceIntPtr pPointer, int what) {
 
             axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);
             axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);
+            axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE);
+            axes_labels[3] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_X);
+            axes_labels[4] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_Y);
 
             // Set button map.
             InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,
commit 65f14840898dd7e9d61d8c966f3ff11ae3e82d4f
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Sep 26 22:48:49 2009 -0700

    XQuartz: Fix a brain-o array indexing problem
    
    /bop Peter
    (cherry picked from commit 494a6b046a258ad83dc98eb92b7c3d8f1d2626bb)

diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 5ad5392..8836782 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -290,8 +290,8 @@ static int DarwinMouseProc(DeviceIntPtr pPointer, int what) {
 #define NAXES 2
 	// 7 buttons: left, right, middle, then four scroll wheel "buttons"
     CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3, 4, 5, 6, 7};
-    Atom btn_labels[NAXES] = {0};
-    Atom axes_labels[NBUTTONS] = {0};
+    Atom btn_labels[NBUTTONS] = {0};
+    Atom axes_labels[NAXES] = {0};
 
     switch (what) {
         case DEVICE_INIT:
@@ -340,8 +340,8 @@ static int DarwinTabletProc(DeviceIntPtr pPointer, int what) {
 #define NBUTTONS 3
 #define NAXES 5
     CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3};
-    Atom axes_labels[NAXES] = {0};
     Atom btn_labels[NBUTTONS] = {0};
+    Atom axes_labels[NAXES] = {0};
 
     switch (what) {
         case DEVICE_INIT:
commit 7159381881e5da33a49e8735811b93cbfe4f681e
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Sep 26 22:17:09 2009 -0700

    XQuartz: Nuke duplicate locks that make painful headaches
    (cherry picked from commit 1dd56322bd1722f2427fb2d833c5608248b60cf0)

diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 4abf4af..503383f 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -296,13 +296,11 @@ static void DarwinLoadKeyboardMapping(KeySymsRec *keySyms) {
 static void DarwinKeyboardSetDeviceKeyMap(KeySymsRec *keySyms, CARD8 *modmap) {
     DeviceIntPtr pDev;
 
-    pthread_mutex_lock(&keyInfo_mutex);
     for (pDev = inputInfo.devices; pDev; pDev = pDev->next)
         if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key)
             XkbApplyMappingChange(pDev, keySyms, keySyms->minKeyCode,
                                   keySyms->maxKeyCode - keySyms->minKeyCode + 1,
                                   modmap, serverClient);
-    pthread_mutex_unlock(&keyInfo_mutex);
 }
 
 /*
commit fba8c702ba6aa8fac27682e0838fd744e197d54f
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Sep 26 22:13:49 2009 -0700

    Xi: CopyKeyClass is not static for XQuartz
    (cherry picked from commit 85d6402354cdf143c6490f2725744c2f08b5605b)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 2673552..5e73bf3 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -192,7 +192,10 @@ XIGetDevice(xEvent* xE)
  * This code is basically the old SwitchCoreKeyboard.
  */
 
-static void
+#ifndef XQUARTZ
+static
+#endif
+void
 CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master)
 {
     KeyClassPtr mk = master->key;
commit dc1e1bebff8b9d1eb6196dfd4b2f52f1e4200efa
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Aug 7 00:02:21 2009 -0700

    XQuartz: Use internal xshm header for new xextproto
    (cherry picked from commit 1755239330c0bdac820d88a3e06ff391d65f29be)
    (cherry picked from commit 697be460d0e555e2c75eed6889293650e02d423c)

diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 7129ac6..5ad5392 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -67,8 +67,7 @@
 #include <IOKit/hidsystem/IOHIDLib.h>
 
 #ifdef MITSHM
-#define _XSHM_SERVER_
-#include <X11/extensions/XShm.h>
+#include "shmint.h"
 #endif
 
 #include "darwin.h"