Mercurial > sdl-ios-xcode

comparison src/video/windib/SDL_dibevents.c @ 4170:092c0bc69155 SDL-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed bug #618 Description From Tim Angus 2008-08-30 12:23:56 (-) [reply] As we all know SDL 1.2 doesn't handle dead keys well since one key press potentially equals two (or more) characters. For example, on many layouts, keying <backquote>,<space> results in <no character>,<backquote><space>. Since the unicode member of the SDL_keysym struct only has room for one character, only one can be returned. On Linux, the first character is returned. On Windows however, unless the exact number of characters generated by the keypress is 1, nothing is returned. The following patch addresses this inconsistency. Updated patch which includes a further fix to the handling of the numpad when numlock is on. This further fix is courtesy Amanieu d'Antras.
author Sam Lantinga <slouken@libsdl.org>
date Mon, 13 Apr 2009 08:42:09 +0000
parents a6f635e5eaa6
children d7294b7c732d
comparison
equal deleted inserted replaced
4169:27c0db0fbfad 4170:092c0bc69155
550 #else 550 #else
551 BYTE keystate[256]; 551 BYTE keystate[256];
552 Uint16 wchars[2]; 552 Uint16 wchars[2];
553 553
554 GetKeyboardState(keystate); 554 GetKeyboardState(keystate);
555 if (SDL_ToUnicode((UINT)vkey, scancode, keystate, wchars, sizeof(wchars)/sizeof(wchars[0]), 0) == 1) 555 /* Numlock isn't taken into account in ToUnicode,
556 * so we handle it as a special case here */
557 if ((keystate[VK_NUMLOCK] & 1) && vkey >= VK_NUMPAD0 && vkey <= VK_NUMPAD9)
558 {
559 keysym->unicode = vkey - VK_NUMPAD0 + '0';
560 }
561 else if (SDL_ToUnicode((UINT)vkey, scancode, keystate, wchars, sizeof(wchars)/sizeof(wchars[0]), 0) > 0)
556 { 562 {
557 keysym->unicode = wchars[0]; 563 keysym->unicode = wchars[0];
558 } 564 }
559 #endif /* NO_GETKEYBOARDSTATE */ 565 #endif /* NO_GETKEYBOARDSTATE */
560 } 566 }