Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove superfluous X11 library struct member.

Browse Source
This commit is contained in:
Camilla Berglund 2015-06-15 14:27:25 +02:00
parent 1ee4c4ba62
commit bdcffa90eb
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/x11_init.c
View File

@ -459,8 +459,6 @@ static void detectEWMH(void)
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_BYPASS_COMPOSITOR"); getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_BYPASS_COMPOSITOR");
XFree(supportedAtoms); XFree(supportedAtoms);
_glfw.x11.hasEWMH = GL_TRUE;
} }
// Initialize X11 display and look for supported X11 extensions // Initialize X11 display and look for supported X11 extensions

2
src/x11_platform.h
View File

@ -115,8 +115,6 @@ typedef struct _GLFWlibraryX11
XContext context; XContext context;
// XIM input method // XIM input method
XIM im; XIM im;
// True if window manager supports EWMH
GLboolean hasEWMH;
// Most recent error code received by X error handler // Most recent error code received by X error handler
int errorCode; int errorCode;
// Clipboard string (while the selection is owned) // Clipboard string (while the selection is owned)

15
src/x11_window.c
View File

@ -317,15 +317,17 @@ static GLboolean createWindow(_GLFWwindow* window,
(XPointer) window); (XPointer) window);
} }
if (window->monitor && !_glfw.x11.hasEWMH) if (window->monitor)
{
if (!_glfw.x11.NET_WM_STATE || !_glfw.x11.NET_WM_STATE_FULLSCREEN)
{ {
// This is the butcher's way of removing window decorations // This is the butcher's way of removing window decorations
// Setting the override-redirect attribute on a window makes the window // Setting the override-redirect attribute on a window makes the
// manager ignore the window completely (ICCCM, section 4) // window manager ignore the window completely (ICCCM, section 4)
// The good thing is that this makes undecorated full screen windows // The good thing is that this makes undecorated full screen windows
// easy to do; the bad thing is that we have to do everything manually // easy to do; the bad thing is that we have to do everything
// and some things (like iconify/restore) won't work at all, as those // manually and some things (like iconify/restore) won't work at
// are tasks usually performed by the window manager // all, as those are tasks usually performed by the window manager
XSetWindowAttributes attributes; XSetWindowAttributes attributes;
attributes.override_redirect = True; attributes.override_redirect = True;
@ -336,6 +338,7 @@ static GLboolean createWindow(_GLFWwindow* window,
window->x11.overrideRedirect = GL_TRUE; window->x11.overrideRedirect = GL_TRUE;
} }
}
// Declare the WM protocols supported by GLFW // Declare the WM protocols supported by GLFW
{ {