summaryrefslogtreecommitdiff
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-09-28 01:25:57 (GMT)
committer Jeremy Huddleston <jeremyhu@freedesktop.org>2009-09-28 01:25:57 (GMT)
commitceaa5c779ceed3de5ea53727649613be3133b24e (patch) (side-by-side diff)
tree8d44e47f81581c1a395f44cf8e7c32509f6103ae
parenta3dbde2de87ee4f577748a8c447501a3ea462559 (diff)
downloadxserver-ceaa5c779ceed3de5ea53727649613be3133b24e.zip
xserver-ceaa5c779ceed3de5ea53727649613be3133b24e.tar.gz
XQuartz: Force a keymap resync on the first keypress to workaround XKB mucking with our keymap.
We need to find a better way to work with XKB on this.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--hw/xquartz/X11Application.m11
1 files changed, 11 insertions, 0 deletions
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 9fb1926..3cf7a77 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -1180,6 +1180,17 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe
break;
case NSKeyDown: case NSKeyUp:
+ {
+ /* XKB clobbers our keymap at startup, so we need to force it on the first keypress.
+ * TODO: Make this less of a kludge.
+ */
+ static int force_resync_keymap = YES;
+ if(force_resync_keymap) {
+ DarwinSendDDXEvent(kXquartzReloadKeymap, 0);
+ force_resync_keymap = NO;
+ }
+ }
+
if(darwinSyncKeymap) {
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
TISInputSourceRef key_layout = TISCopyCurrentKeyboardLayoutInputSource();