Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-08-23 09:15:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Date: Thu, 02 Sep 2004 01:06:23 +0200

Browse Source 
From: Ivo Danihelka
Subject: [SDL] [PATCH] Fixed XLocaleNotSupported in utf8 code

there exist X server configurations which does not support locales.
They even does not support conversion from utf-8 textList to utf-8
textProperty.

This patch fixes such situations. It is my bug because I submitted the
previous support for utf-8.
This commit is contained in:
Sam Lantinga
2004-09-11 18:00:41 +00:00
parent 4e112a5f20
commit 8cabfbd595
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/video/x11/SDL_x11wm.c
View File

@@ -255,22 +255,28 @@ void X11_SetCaption(_THIS, const char *title, const char *icon)
SDL_Lock_EventThread();
if ( title != NULL ) {
int error = XLocaleNotSupported;
#ifdef X_HAVE_UTF8_STRING
Xutf8TextListToTextProperty(SDL_Display, (char **)&title, 1,
XUTF8StringStyle, &titleprop);
#else
XStringListToTextProperty((char **)&title, 1, &titleprop);
error = Xutf8TextListToTextProperty(SDL_Display,
(char **)&title, 1, XUTF8StringStyle,
&titleprop);
#endif
if ( error != Success ) {
XStringListToTextProperty((char **)&title, 1,
&titleprop);
}
XSetWMName(SDL_Display, WMwindow, &titleprop);
XFree(titleprop.value);
}
if ( icon != NULL ) {
int error = XLocaleNotSupported;
#ifdef X_HAVE_UTF8_STRING
Xutf8TextListToTextProperty(SDL_Display, (char **)&icon, 1,
XUTF8StringStyle, &iconprop);
#else
XStringListToTextProperty((char **)&icon, 1, &iconprop);
error = Xutf8TextListToTextProperty(SDL_Display,
(char **)&icon, 1, XUTF8StringStyle, &iconprop);
#endif
if ( error != Success ) {
XStringListToTextProperty((char **)&icon, 1, &iconprop);
}
XSetWMIconName(SDL_Display, WMwindow, &iconprop);
XFree(iconprop.value);
}