diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-14 17:14:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-14 17:14:58 +0000 |
| commit | 8bbcd844049eb1296ccd25aca75bf3b08f28facb (patch) | |
| tree | a4b168a1b2c686548550719b094e982124696f3d /xorg-server/hw/xquartz/quartzKeyboard.c | |
| parent | 5eaf49ad7feec1f2043ecb1b90c04c534ce29f46 (diff) | |
| parent | b152ebf4b66368e1cbfda1ae81cef29bf9c00bb7 (diff) | |
| download | vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.tar.gz vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.tar.bz2 vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/quartzKeyboard.c')
| -rw-r--r-- | xorg-server/hw/xquartz/quartzKeyboard.c | 4 |
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; } |