Skip to content
Permalink
Browse files

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

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.
  • Loading branch information
slouken committed Sep 11, 2004
1 parent 2a9474f commit 1752cce0d1f99ee6f62f3ca19a382dfd23cbac6a
Showing with 14 additions and 8 deletions.
  1. +14 −8 src/video/x11/SDL_x11wm.c
@@ -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);
}

0 comments on commit 1752cce

Please sign in to comment.