Merge branch 'master' into msvc6

FWGS · Dec 9, 2015 · 782f4b1 · 782f4b1
2 parents fd65658 + 41730e4
commit 782f4b1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
@@ -49,6 +49,7 @@ convar_t	*cl_interp;
 convar_t	*cl_allow_fragment;
 convar_t	*cl_lw;
 convar_t	*cl_trace_events;
+convar_t	*cl_charset;
 convar_t	*hud_scale;
 
 //
@@ -1627,6 +1628,7 @@ void CL_InitLocal( void )
 	//Cvar_Get( "ex_maxerrordistance", "0", 0, "" );
 	cl_allow_fragment = Cvar_Get( "cl_allow_fragment", "0", CVAR_ARCHIVE, "allow downloading files directly from game server" ); 
 	cl_timeout = Cvar_Get( "cl_timeout", "60", 0, "connect timeout (in seconds)" );
+	cl_charset = Cvar_Get( "cl_charset", "cp1251", CVAR_ARCHIVE, "1-byte charset to use (iconv style)" );
 
 	rcon_client_password = Cvar_Get( "rcon_password", "", 0, "remote control client password" );
 	rcon_address = Cvar_Get( "rcon_address", "", 0, "remote control address" );

diff --git a/engine/client/client.h b/engine/client/client.h
@@ -490,6 +490,7 @@ extern convar_t	*cl_showfps;
 extern convar_t *cl_showpos;
 extern convar_t	*cl_envshot_size;
 extern convar_t	*cl_timeout;
+extern convar_t	*cl_charset;
 extern convar_t	*cl_nodelta;
 extern convar_t	*cl_interp;
 extern convar_t	*cl_crosshair;

diff --git a/engine/common/sdl/events.c b/engine/common/sdl/events.c
@@ -214,13 +214,31 @@ void SDLash_WheelEvent(SDL_MouseWheelEvent wheel)
 
 void SDLash_InputEvent(SDL_TextInputEvent input)
 {
-	int i;
+	int i, f, t;
+
+	// Try convert to selected charset
+	unsigned char buf[32];
+
+	const char *in = input.text;
+	char *out = buf;
+	SDL_iconv_t cd;
+	Q_memset( &buf, 0, sizeof( buf ) );
+	cd = SDL_iconv_open( cl_charset->string, "utf-8" );
+	if( cd != (SDL_iconv_t)-1 )
+	{
+		f = strlen( input.text );
+		t = 32;
+		t = SDL_iconv( cd, &in, &f, &out, &t );
+	}
+	if( ( t < 0 ) || ( cd == (SDL_iconv_t)-1 ) )
+	Q_strncpy( buf, input.text, 32 );
+
 	// Pass characters one by one to Con_CharEvent
-	for(i = 0; input.text[i]; ++i)
+	for(i = 0; buf[i]; ++i)
 	{
-		Con_CharEvent( (int)input.text[i] );
+		Con_CharEvent( (uint)buf[i] );
 		if( cls.key_dest == key_menu )
-			UI_CharEvent ( (int)input.text[i] );
+			UI_CharEvent ( (uint)buf[i] );
 	}
 }