Replaced XStoreName and XSetIconName with X*SetWMProperties.

This commit is contained in:
Camilla Berglund 2012-02-02 17:01:11 +01:00
parent 4cffa3b185
commit 797e936311

View File

@ -1512,9 +1512,21 @@ void _glfwPlatformCloseWindow(_GLFWwindow* window)
void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title) void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title)
{ {
// Set window & icon title #if defined(X_HAVE_UTF8_STRING)
XStoreName(_glfwLibrary.X11.display, window->X11.handle, title); Xutf8SetWMProperties(_glfwLibrary.X11.display,
XSetIconName(_glfwLibrary.X11.display, window->X11.handle, title); window->X11.handle,
title, title,
NULL, 0,
NULL, NULL, NULL);
#else
// This may be a slightly better fallback than using XStoreName and
// XSetIconName, which always store their arguments using STRING
XmbSetWMProperties(_glfwLibrary.X11.display,
window->X11.handle,
title, title,
NULL, 0,
NULL, NULL, NULL);
#endif
if (window->X11.wmName != None) if (window->X11.wmName != None)
{ {