From 211bdab51f5879c3cc9e8cadb9a221324ad7c03a Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Tue, 3 May 2016 11:38:45 +0200 Subject: [PATCH] Fix NET_WM_STATE clobbering at creation --- src/x11_window.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/x11_window.c b/src/x11_window.c index f3730c25..dfa7af30 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -464,32 +464,32 @@ static GLFWbool createWindow(_GLFWwindow* window, sizeof(hints) / sizeof(long)); } - if (wndconfig->floating) + if (_glfw.x11.NET_WM_STATE && !window->monitor) { - if (_glfw.x11.NET_WM_STATE && _glfw.x11.NET_WM_STATE_ABOVE) + Atom states[3]; + int count = 0; + + if (wndconfig->floating) { - Atom value = _glfw.x11.NET_WM_STATE_ABOVE; - XChangeProperty(_glfw.x11.display, window->x11.handle, - _glfw.x11.NET_WM_STATE, XA_ATOM, 32, - PropModeReplace, (unsigned char*) &value, 1); + if (_glfw.x11.NET_WM_STATE_ABOVE) + states[count++] = _glfw.x11.NET_WM_STATE_ABOVE; } - } - if (wndconfig->maximized && !window->monitor) - { - if (_glfw.x11.NET_WM_STATE && - _glfw.x11.NET_WM_STATE_MAXIMIZED_VERT && - _glfw.x11.NET_WM_STATE_MAXIMIZED_HORZ) + if (wndconfig->maximized) { - const Atom states[2] = + if (_glfw.x11.NET_WM_STATE_MAXIMIZED_VERT && + _glfw.x11.NET_WM_STATE_MAXIMIZED_HORZ) { - _glfw.x11.NET_WM_STATE_MAXIMIZED_VERT, - _glfw.x11.NET_WM_STATE_MAXIMIZED_HORZ - }; + states[count++] = _glfw.x11.NET_WM_STATE_MAXIMIZED_VERT; + states[count++] = _glfw.x11.NET_WM_STATE_MAXIMIZED_HORZ; + } + } + if (count) + { XChangeProperty(_glfw.x11.display, window->x11.handle, _glfw.x11.NET_WM_STATE, XA_ATOM, 32, - PropModeReplace, (unsigned char*) &states, 2); + PropModeReplace, (unsigned char*) &states, count); } }