# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1239612129 0
# Node ID 092c0bc691558ce3922901714ecfe2f27eefd1e6
# Parent  27c0db0fbfad1dd812a299c09a025f0ac5504db7
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.

diff -r 27c0db0fbfad -r 092c0bc69155 src/video/windib/SDL_dibevents.c
--- a/src/video/windib/SDL_dibevents.c	Mon Apr 13 08:38:04 2009 +0000
+++ b/src/video/windib/SDL_dibevents.c	Mon Apr 13 08:42:09 2009 +0000
@@ -552,7 +552,13 @@
 		Uint16	wchars[2];
 
 		GetKeyboardState(keystate);
-		if (SDL_ToUnicode((UINT)vkey, scancode, keystate, wchars, sizeof(wchars)/sizeof(wchars[0]), 0) == 1)
+		/* Numlock isn't taken into account in ToUnicode,
+		 * so we handle it as a special case here */
+		if ((keystate[VK_NUMLOCK] & 1) && vkey >= VK_NUMPAD0 && vkey <= VK_NUMPAD9)
+		{
+			keysym->unicode = vkey - VK_NUMPAD0 + '0';
+		}
+		else if (SDL_ToUnicode((UINT)vkey, scancode, keystate, wchars, sizeof(wchars)/sizeof(wchars[0]), 0) > 0)
 		{
 			keysym->unicode = wchars[0];
 		}
diff -r 27c0db0fbfad -r 092c0bc69155 src/video/windx5/SDL_dx5events.c
--- a/src/video/windx5/SDL_dx5events.c	Mon Apr 13 08:38:04 2009 +0000
+++ b/src/video/windx5/SDL_dx5events.c	Mon Apr 13 08:42:09 2009 +0000
@@ -912,7 +912,13 @@
 		keysym->unicode = vkey;
 #else
 		GetKeyboardState(keystate);
-		if (SDL_ToUnicode(vkey, scancode, keystate, wchars, sizeof(wchars)/sizeof(wchars[0]), 0) == 1)
+		/* Numlock isn't taken into account in ToUnicode,
+		 * so we handle it as a special case here */
+		if ((keystate[VK_NUMLOCK] & 1) && vkey >= VK_NUMPAD0 && vkey <= VK_NUMPAD9)
+		{
+			keysym->unicode = vkey - VK_NUMPAD0 + '0';
+		}
+		else if (SDL_ToUnicode(vkey, scancode, keystate, wchars, sizeof(wchars)/sizeof(wchars[0]), 0) > 0)
 		{
 			keysym->unicode = wchars[0];
 		}