diff options
author | Colin Harrison <colin.harrison@virgin.net> | 2010-02-26 14:41:00 +0000 |
---|---|---|
committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-03-16 13:55:51 +0000 |
commit | b8cf4153f84404b2a1b62a247d5d36d24bf481da (patch) | |
tree | 51177b5bb37b42077e332ed821d7fb9c27e1c6df /hw/xwin/winkeybd.c | |
parent | 9b18f7ac0ba9aadb8c86bc2717cbdff75e951b69 (diff) | |
download | xserver-b8cf4153f84404b2a1b62a247d5d36d24bf481da.tar.gz |
Xming: Dead code removal
Remove some dead code, mostly code made obsolete by mandatory XKB
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Diffstat (limited to 'hw/xwin/winkeybd.c')
-rw-r--r-- | hw/xwin/winkeybd.c | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c index a423b499a..ad9e66a0b 100644 --- a/hw/xwin/winkeybd.c +++ b/hw/xwin/winkeybd.c @@ -49,9 +49,6 @@ static Bool g_winKeyState[NUM_KEYCODES]; */ static void -winGetKeyMappings (KeySymsPtr pKeySyms, CARD8 *pModMap); - -static void winKeybdBell (int iPercent, DeviceIntPtr pDeviceInt, pointer pCtrl, int iClass); @@ -119,89 +116,6 @@ winTranslateKey (WPARAM wParam, LPARAM lParam, int *piScanCode) } -/* - * We call this function from winKeybdProc when we are - * initializing the keyboard. - */ - -static void -winGetKeyMappings (KeySymsPtr pKeySyms, CARD8 *pModMap) -{ - int i; - KeySym *pMap = map; - KeySym *pKeySym; - - /* - * Initialize all key states to up... which may not be true - * but it is close enough. - */ - ZeroMemory (g_winKeyState, sizeof (g_winKeyState[0]) * NUM_KEYCODES); - - /* MAP_LENGTH is defined in Xserver/include/input.h to be 256 */ - for (i = 0; i < MAP_LENGTH; i++) - pModMap[i] = NoSymbol; /* make sure it is restored */ - - /* Loop through all valid entries in the key symbol table */ - for (pKeySym = pMap, i = MIN_KEYCODE; - i < (MIN_KEYCODE + NUM_KEYCODES); - i++, pKeySym += GLYPHS_PER_KEY) - { - switch (*pKeySym) - { - case XK_Shift_L: - case XK_Shift_R: - pModMap[i] = ShiftMask; - break; - - case XK_Control_L: - case XK_Control_R: - pModMap[i] = ControlMask; - break; - - case XK_Caps_Lock: - pModMap[i] = LockMask; - break; - - case XK_Alt_L: - case XK_Alt_R: - pModMap[i] = AltMask; - break; - - case XK_Num_Lock: - pModMap[i] = NumLockMask; - break; - - case XK_Scroll_Lock: - pModMap[i] = ScrollLockMask; - break; - -#if 0 - case XK_Super_L: - case XK_Super_R: - pModMap[i] = Mod4Mask; - break; -#else - /* Hirigana/Katakana toggle */ - case XK_Kana_Lock: - case XK_Kana_Shift: - pModMap[i] = KanaMask; - break; -#endif - - /* alternate toggle for multinational support */ - case XK_Mode_switch: - pModMap[i] = AltLangMask; - break; - } - } - - pKeySyms->map = (KeySym *) pMap; - pKeySyms->mapWidth = GLYPHS_PER_KEY; - pKeySyms->minKeyCode = MIN_KEYCODE; - pKeySyms->maxKeyCode = MAX_KEYCODE; -} - - /* Ring the keyboard bell (system speaker on PCs) */ static void winKeybdBell (int iPercent, DeviceIntPtr pDeviceInt, |