diff options
Diffstat (limited to 'xorg-server/hw/xquartz/quartzKeyboard.c')
| -rw-r--r-- | xorg-server/hw/xquartz/quartzKeyboard.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/xorg-server/hw/xquartz/quartzKeyboard.c b/xorg-server/hw/xquartz/quartzKeyboard.c index 3b4eac31c..7e36a9aa3 100644 --- a/xorg-server/hw/xquartz/quartzKeyboard.c +++ b/xorg-server/hw/xquartz/quartzKeyboard.c @@ -301,9 +301,6 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) { // for a kIOHIDParamConnectType connection. assert(darwinParamConnect = NXOpenEventStatus()); - /* We need to really have rules... or something... */ - //XkbSetRulesDflts("base", "pc105", "us", NULL, NULL); - InitKeyboardDeviceStruct(pDev, NULL, DarwinKeyboardBell, DarwinChangeKeyboardControl); DarwinKeyboardReloadHandler(); @@ -775,12 +772,9 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) { #endif } - // There seems to be an issue with this in 1.5+, shift-space is not - // producing space, it's sending NoSymbol... ? - //if (k[3] == k[2]) k[3] = NoSymbol; - //if (k[1] == k[0]) k[1] = NoSymbol; - //if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol; - //if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol) k[3] = NoSymbol; + if (k[3] == k[2]) k[3] = NoSymbol; + if (k[1] == k[0]) k[1] = NoSymbol; + if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol; } /* Fix up some things that are normally missing.. */ @@ -791,7 +785,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) { if (k[0] == NoSymbol && k[1] == NoSymbol && k[2] == NoSymbol && k[3] == NoSymbol) - k[0] = k[1] = k[2] = k[3] = known_keys[i].keysym; + k[0] = known_keys[i].keysym; } } @@ -804,7 +798,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) { k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY; if (k[0] == known_numeric_keys[i].normal) - k[0] = k[1] = k[2] = k[3] = known_numeric_keys[i].keypad; + k[0] = known_numeric_keys[i].keypad; } } |