aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xquartz/quartzKeyboard.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-01-14 10:44:09 +0000
committermarha <marha@users.sourceforge.net>2010-01-14 10:44:09 +0000
commitb152ebf4b66368e1cbfda1ae81cef29bf9c00bb7 (patch)
treeca2990ba0e447003b16ef239d3bdb30fdd8dc792 /xorg-server/hw/xquartz/quartzKeyboard.c
parent13863345017a14a9dcce2ea5d3833eb74bb3760f (diff)
downloadvcxsrv-b152ebf4b66368e1cbfda1ae81cef29bf9c00bb7.tar.gz
vcxsrv-b152ebf4b66368e1cbfda1ae81cef29bf9c00bb7.tar.bz2
vcxsrv-b152ebf4b66368e1cbfda1ae81cef29bf9c00bb7.zip
Git update 14/1/2010
Diffstat (limited to 'xorg-server/hw/xquartz/quartzKeyboard.c')
-rw-r--r--xorg-server/hw/xquartz/quartzKeyboard.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/xorg-server/hw/xquartz/quartzKeyboard.c b/xorg-server/hw/xquartz/quartzKeyboard.c
index 62b2ebbdf..96b5fa5b6 100644
--- a/xorg-server/hw/xquartz/quartzKeyboard.c
+++ b/xorg-server/hw/xquartz/quartzKeyboard.c
@@ -260,6 +260,7 @@ static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
break;
case XK_Mode_switch:
+ ErrorF("DarwinBuildModifierMaps: XK_Mode_switch encountered, unable to determine side.\n");
info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
#ifdef NX_MODIFIERKEY_RALTERNATE
info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;
@@ -388,7 +389,6 @@ void DarwinKeyboardReloadHandler(void) {
pthread_mutex_lock(&keyInfo_mutex); {
/* Initialize our keySyms */
- DarwinBuildModifierMaps(&keyInfo);
keySyms.map = keyInfo.keyMap;
keySyms.mapWidth = GLYPHS_PER_KEY;
keySyms.minKeyCode = MIN_KEYCODE;
@@ -808,5 +808,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
}
}
+ DarwinBuildModifierMaps(info);
+
return TRUE;
}