We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] proper unicode input support for windows

SDL_windowsevents.c.patch (text/plain), 3.02 KB, created by Andreas Ertelt on 2013-08-16 17:47:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Ertelt

Created: 2013-08-16 17:47:44 UTC

Size: 3.02 KB

patch

obsolete

>@@ -256,6 +256,31 @@
>     }
> }
> 
>+static __inline__ BOOL
>+WIN_ConvertUTF32toUTF8(UINT32 codepoint, char * text) {
>+	if (codepoint <= 0x7F) {
>+		text[0] = (char) codepoint;
>+		text[1] = '\0';
>+	} else if (codepoint <= 0x7FF) {
>+		text[0] = 0xC0 | (char) ((codepoint >> 6) & 0x1F);
>+		text[1] = 0x80 | (char) (codepoint & 0x3F);
>+		text[2] = '\0';
>+	} else if (codepoint <= 0xFFFF) {
>+		text[0] = 0xE0 | (char) ((codepoint >> 12) & 0x0F);
>+		text[1] = 0x80 | (char) ((codepoint >> 6) & 0x3F);
>+		text[2] = 0x80 | (char) (codepoint & 0x3F);
>+		text[3] = '\0';
>+	} else if (codepoint <= 0x10FFFF) {
>+		text[0] = 0xF0 | (char) ((codepoint >> 18) & 0x0F);
>+		text[1] = 0x80 | (char) ((codepoint >> 12) & 0x3F);
>+		text[2] = 0x80 | (char) ((codepoint >> 6) & 0x3F);
>+		text[3] = 0x80 | (char) (codepoint & 0x3F);
>+		text[4] = '\0';
>+	} else
>+		return SDL_FALSE;
>+	return SDL_TRUE;
>+}
>+
> LRESULT CALLBACK
> WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
> {
>@@ -459,4 +484,20 @@
>         break;
> #endif /* WM_MOUSELEAVE */
> 
>+    case WM_KEYDOWN:
>+		{
>+			BYTE keyboardState[256];
>+            char text[5];
>+			UINT32 utf32 = 0;
>+
>+			GetKeyboardState(keyboardState);
>+			if (ToUnicode(wParam, (lParam >> 16) & 0xff, keyboardState, (LPWSTR)&utf32, 1, 0) > 0) {
>+				WORD repitition;
>+				for (repitition = lParam & 0xffff; repitition > 0; repitition--) {
>+					WIN_ConvertUTF32toUTF8(utf32, text);
>+					SDL_SendKeyboardText(text);
>+				}
>+			}
>+		}
>+		// no break
>     case WM_SYSKEYDOWN:
>@@ -462,5 +503,4 @@
>     case WM_SYSKEYDOWN:
>-    case WM_KEYDOWN:
>         {
>             SDL_Scancode code = WindowsScanCodeToSDLScanCode( lParam, wParam );
>             if ( code != SDL_SCANCODE_UNKNOWN ) {
>@@ -485,5 +525,13 @@
>         returnCode = 0;
>         break;
> 
>+	case WM_UNICHAR:
>+		{
>+			if (wParam == UNICODE_NOCHAR) {
>+				returnCode = 1;
>+				break;
>+			}
>+		}
>+		// no break
>     case WM_CHAR:
>         {
>@@ -488,4 +536,4 @@
>     case WM_CHAR:
>         {
>-            char text[4];
>+            char text[5];
> 
>@@ -491,18 +539,5 @@
> 
>-            /* Convert to UTF-8 and send it on... */
>-            if (wParam <= 0x7F) {
>-                text[0] = (char) wParam;
>-                text[1] = '\0';
>-            } else if (wParam <= 0x7FF) {
>-                text[0] = 0xC0 | (char) ((wParam >> 6) & 0x1F);
>-                text[1] = 0x80 | (char) (wParam & 0x3F);
>-                text[2] = '\0';
>-            } else {
>-                text[0] = 0xE0 | (char) ((wParam >> 12) & 0x0F);
>-                text[1] = 0x80 | (char) ((wParam >> 6) & 0x3F);
>-                text[2] = 0x80 | (char) (wParam & 0x3F);
>-                text[3] = '\0';
>-            }
>+			WIN_ConvertUTF32toUTF8(wParam, text);
>             SDL_SendKeyboardText(text);
>         }
>         returnCode = 0;
>@@ -772,7 +807,6 @@
>     const Uint8 *keystate;
>     MSG msg;
>     while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
>-        TranslateMessage(&msg);
>         DispatchMessage(&msg);
>     }
>

Actions: View | Diff

Attachments on bug 1876: 1291

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.