summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-08-26 23:09:20 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-08-26 23:10:18 -0700
commit2db1afbf2e56d8743c701d81a5797001ce9e5c52 (patch)
tree66d98535476ea47b8a0fc1dfd6918318bdc26e8f
parent319405fa4a530804c19fb7d0fcece5c912e41c9d (diff)
XQuartz: Always use TIS for the keyboard layout seed since KB* aren't thread safe.
(cherry picked from commit c8244177b0dbcb28d2f5509e6f2a3e8057889790)
-rw-r--r--hw/xquartz/quartzKeyboard.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index aebc941ff..d26fbd3b8 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -1103,7 +1103,8 @@ Bool LegalModifier(unsigned int key, DeviceIntPtr pDev)
/* TODO: Not thread safe */
unsigned int QuartzSystemKeymapSeed(void) {
static unsigned int seed = 0;
-#if defined(__x86_64__) || defined(__ppc64__)
+//#if defined(__x86_64__) || defined(__ppc64__)
+#if 1
static TISInputSourceRef last_key_layout = NULL;
TISInputSourceRef key_layout;