Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-29 13:32:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

add _NET_WM_NAME to the hasEWMGH check

Browse Source
This commit is contained in:
Hanmac 2012-02-01 00:10:17 +01:00
parent 8e2f4cfb31
commit 1be6f17c66
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/x11_platform.h
View File

@ -141,6 +141,7 @@ typedef struct _GLFWwindowX11
Colormap colormap; // Window colormap Colormap colormap; // Window colormap
Window handle; // Window handle Window handle; // Window handle
Atom wmDeleteWindow; // WM_DELETE_WINDOW atom Atom wmDeleteWindow; // WM_DELETE_WINDOW atom
Atom wmName; // _NET_WM_NAME atom
Atom wmPing; // _NET_WM_PING atom Atom wmPing; // _NET_WM_PING atom
Atom wmState; // _NET_WM_STATE atom Atom wmState; // _NET_WM_STATE atom
Atom wmStateFullscreen; // _NET_WM_STATE_FULLSCREEN atom Atom wmStateFullscreen; // _NET_WM_STATE_FULLSCREEN atom

8
src/x11_window.c
View File

@ -195,6 +195,9 @@ static GLboolean hasEWMH(_GLFWwindow* window)
window->X11.wmStateFullscreen = window->X11.wmStateFullscreen =
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_STATE_FULLSCREEN"); getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_STATE_FULLSCREEN");
window->X11.wmName =
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_NAME");
window->X11.wmPing = window->X11.wmPing =
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_PING"); getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_PING");
@ -1513,12 +1516,15 @@ void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title)
XStoreName(_glfwLibrary.X11.display, window->X11.handle, title); XStoreName(_glfwLibrary.X11.display, window->X11.handle, title);
XSetIconName(_glfwLibrary.X11.display, window->X11.handle, title); XSetIconName(_glfwLibrary.X11.display, window->X11.handle, title);
if(window->X11.wmName != None)
{
XChangeProperty(_glfwLibrary.X11.display, window->X11.handle, XChangeProperty(_glfwLibrary.X11.display, window->X11.handle,
XInternAtom(_glfwLibrary.X11.display, "_NET_WM_NAME", False), window->X11.wmName,
XInternAtom(_glfwLibrary.X11.display, "UTF8_STRING", False), XInternAtom(_glfwLibrary.X11.display, "UTF8_STRING", False),
8, PropModeReplace, (unsigned char *) title, 8, PropModeReplace, (unsigned char *) title,
strlen(title)); strlen(title));
} }
}
//======================================================================== //========================================================================