From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 4 Oct 2014 20:16:54 +0000 (+0000)
Subject: Implement proper support for utf8 characters in SDL2
X-Git-Tag: xonotic-v0.8.0~39
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=38f2877e6eb474b156496b8cc7417ffd3e8d7c05;p=xonotic%2Fdarkplaces.git

Implement proper support for utf8 characters in SDL2

From: terencehill <piuntn@gmail.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12097 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=0275b3fc9bbf9bea9dd5b7740ba34295a7514424
---

diff --git a/vid_sdl.c b/vid_sdl.c
index 934295d8..ba5a6fd7 100644
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "image.h"
 #include "dpsoftrast.h"
+#include "utf8lib.h"
 
 #ifndef __IPHONEOS__
 #ifdef MACOSX
@@ -1213,8 +1214,7 @@ void Sys_SendKeyEvents( void )
 	static qboolean sound_active = true;
 	int keycode;
 	int i;
-	int j;
-	int unicode;
+	Uchar unicode;
 	SDL_Event event;
 
 	VID_EnableJoystick(true);
@@ -1353,30 +1353,11 @@ void Sys_SendKeyEvents( void )
 #ifdef DEBUGSDLEVENTS
 				Con_DPrintf("SDL_Event: SDL_TEXTINPUT - text: %s\n", event.text.text);
 #endif
-				// we have some characters to parse
-				{
-					unicode = 0;
-					for (i = 0;event.text.text[i];)
-					{
-						unicode = event.text.text[i++];
-						if (unicode & 0x80)
-						{
-							// UTF-8 character
-							// strip high bits (we could count these to validate character length but we don't)
-							for (j = 0x80;unicode & j;j >>= 1)
-								unicode ^= j;
-							for (;(event.text.text[i] & 0xC0) == 0x80;i++)
-								unicode = (unicode << 6) | (event.text.text[i] & 0x3F);
-							// low characters are invalid and could be bad, so replace them
-							if (unicode < 0x80)
-								unicode = '?'; // we could use 0xFFFD instead, the unicode substitute character
-						}
-						//Con_DPrintf("SDL_TEXTINPUT: K_TEXT %i \n", unicode);
-
-						Key_Event(K_TEXT, unicode, true);
-						Key_Event(K_TEXT, unicode, false);
-					}
-				}
+				// convert utf8 string to char
+				// NOTE: this code is supposed to run even if utf8enable is 0
+				unicode = u8_getchar_utf8_enabled(event.text.text + (int)u8_bytelen(event.text.text, 0), NULL);
+				Key_Event(K_TEXT, unicode, true);
+				Key_Event(K_TEXT, unicode, false);
 				break;
 			case SDL_MOUSEMOTION:
 				break;