summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2010-03-25 22:15:58 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2010-03-29 09:37:10 -0700
commit339207be6f184cc783076fc7e2cc12f92f57f2ba (patch)
tree80fc94b2775a89988a8ac37488d5c289303e71d2
parent579715f830fbbca9e1ecb17dc18176132f5969e7 (diff)
XQuartz: Workaround weird key data reported on some layouts
This should make 'Unicode Hex Input' work as an input layout. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Acked-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--hw/xquartz/quartzKeyboard.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index c9ef7cc81..a4a0b08bd 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -735,7 +735,10 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
if (err != noErr) continue;
}
- if (len > 0 && s[0] != 0x0010) {
+ /* Not sure why 0x0010 is there.
+ * 0x0000 - <rdar://problem/7793566> 'Unicode Hex Input' ...
+ */
+ if (len > 0 && s[0] != 0x0010 && s[0] != 0x0000) {
k[j] = ucs2keysym (s[0]);
if (dead_key_state != 0) k[j] = make_dead_key (k[j]);
}