xserver: Branch 'xorg-server-1.4-apple' - 3 commits

[Jeremy Huddleston]

 configure.ac                |    2 +-
 hw/xquartz/quartzKeyboard.c |   20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 3521e7b9a1812fc1f4eae2c17e73601d6c2a34d5
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Wed Jul 9 10:03:08 2008 -0700

    1.4.2-apple4

diff --git a/configure.ac b/configure.ac
index 37a2e31..b0fe55d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.2-apple3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.2-apple4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
commit 5538e43b9ae7d06d2f48842b065810ce74286eb6
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Wed Jul 9 10:02:41 2008 -0700

    XQuartz: Use CFEqual to compare keyboards

diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 40d8cbb..5e7a13c 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -1087,16 +1087,26 @@ Bool LegalModifier(unsigned int key, DeviceIntPtr pDev)
     return 1;
 }
 
+/* TODO: Not thread safe */
 unsigned int QuartzSystemKeymapSeed(void) {
-    static unsigned int seed;
-    static TISInputSourceRef last_key_layout;
+    static unsigned int seed = 0;
+    static TISInputSourceRef last_key_layout = NULL;
     TISInputSourceRef key_layout;
 
     key_layout = TISCopyCurrentKeyboardLayoutInputSource();
 
-    if (key_layout != last_key_layout) seed++;
-    last_key_layout = key_layout;
-    
+    if(last_key_layout) {
+        if (CFEqual(key_layout, last_key_layout)) {
+            CFRelease(key_layout);
+        } else {
+            seed++;
+            CFRelease(last_key_layout);
+            last_key_layout = key_layout;
+        }
+    } else {
+        last_key_layout = key_layout;
+    }
+
     return seed;
 }
 
commit b3a208dc995864f1d3fe11464a2fb0611e49762a
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Jul 8 22:05:02 2008 -0700

    1.4.2-apple3

diff --git a/configure.ac b/configure.ac
index e7a4c5b..37a2e31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.2-apple2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.2-apple3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE