|
|
|
|
@ -30,7 +30,6 @@ |
|
|
|
|
|
|
|
|
|
#include "internal.h" |
|
|
|
|
|
|
|
|
|
#include <limits.h> |
|
|
|
|
#include <string.h> |
|
|
|
|
#include <stdio.h> |
|
|
|
|
#include <stdlib.h> |
|
|
|
|
@ -65,154 +64,6 @@ static Bool isMapNotify(Display* d, XEvent* e, char* arg) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//========================================================================
|
|
|
|
|
// Retrieve a single window property of the specified type
|
|
|
|
|
// Inspired by fghGetWindowProperty from freeglut
|
|
|
|
|
//========================================================================
|
|
|
|
|
|
|
|
|
|
static unsigned long getWindowProperty(Window window, |
|
|
|
|
Atom property, |
|
|
|
|
Atom type, |
|
|
|
|
unsigned char** value) |
|
|
|
|
{ |
|
|
|
|
Atom actualType; |
|
|
|
|
int actualFormat; |
|
|
|
|
unsigned long itemCount, bytesAfter; |
|
|
|
|
|
|
|
|
|
XGetWindowProperty(_glfwLibrary.X11.display, |
|
|
|
|
window, |
|
|
|
|
property, |
|
|
|
|
0, |
|
|
|
|
LONG_MAX, |
|
|
|
|
False, |
|
|
|
|
type, |
|
|
|
|
&actualType, |
|
|
|
|
&actualFormat, |
|
|
|
|
&itemCount, |
|
|
|
|
&bytesAfter, |
|
|
|
|
value); |
|
|
|
|
|
|
|
|
|
if (actualType != type) |
|
|
|
|
return 0; |
|
|
|
|
|
|
|
|
|
return itemCount; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//========================================================================
|
|
|
|
|
// Check whether the specified atom is supported
|
|
|
|
|
//========================================================================
|
|
|
|
|
|
|
|
|
|
static Atom getSupportedAtom(Atom* supportedAtoms, |
|
|
|
|
unsigned long atomCount, |
|
|
|
|
const char* atomName) |
|
|
|
|
{ |
|
|
|
|
Atom atom = XInternAtom(_glfwLibrary.X11.display, atomName, True); |
|
|
|
|
if (atom != None) |
|
|
|
|
{ |
|
|
|
|
unsigned long i; |
|
|
|
|
|
|
|
|
|
for (i = 0; i < atomCount; i++) |
|
|
|
|
{ |
|
|
|
|
if (supportedAtoms[i] == atom) |
|
|
|
|
return atom; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return None; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//========================================================================
|
|
|
|
|
// Check whether the running window manager is EWMH-compliant
|
|
|
|
|
//========================================================================
|
|
|
|
|
|
|
|
|
|
static GLboolean hasEWMH(_GLFWwindow* window) |
|
|
|
|
{ |
|
|
|
|
Window* windowFromRoot = NULL; |
|
|
|
|
Window* windowFromChild = NULL; |
|
|
|
|
|
|
|
|
|
// Hey kids; let's see if the window manager supports EWMH!
|
|
|
|
|
|
|
|
|
|
// First we need a couple of atoms, which should already be there
|
|
|
|
|
Atom supportingWmCheck = |
|
|
|
|
XInternAtom(_glfwLibrary.X11.display, "_NET_SUPPORTING_WM_CHECK", True); |
|
|
|
|
Atom wmSupported = |
|
|
|
|
XInternAtom(_glfwLibrary.X11.display, "_NET_SUPPORTED", True); |
|
|
|
|
if (supportingWmCheck == None || wmSupported == None) |
|
|
|
|
return GL_FALSE; |
|
|
|
|
|
|
|
|
|
// Then we look for the _NET_SUPPORTING_WM_CHECK property of the root window
|
|
|
|
|
if (getWindowProperty(_glfwLibrary.X11.root, |
|
|
|
|
supportingWmCheck, |
|
|
|
|
XA_WINDOW, |
|
|
|
|
(unsigned char**) &windowFromRoot) != 1) |
|
|
|
|
{ |
|
|
|
|
XFree(windowFromRoot); |
|
|
|
|
return GL_FALSE; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// It should be the ID of a child window (of the root)
|
|
|
|
|
// Then we look for the same property on the child window
|
|
|
|
|
if (getWindowProperty(*windowFromRoot, |
|
|
|
|
supportingWmCheck, |
|
|
|
|
XA_WINDOW, |
|
|
|
|
(unsigned char**) &windowFromChild) != 1) |
|
|
|
|
{ |
|
|
|
|
XFree(windowFromRoot); |
|
|
|
|
XFree(windowFromChild); |
|
|
|
|
return GL_FALSE; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// It should be the ID of that same child window
|
|
|
|
|
if (*windowFromRoot != *windowFromChild) |
|
|
|
|
{ |
|
|
|
|
XFree(windowFromRoot); |
|
|
|
|
XFree(windowFromChild); |
|
|
|
|
return GL_FALSE; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
XFree(windowFromRoot); |
|
|
|
|
XFree(windowFromChild); |
|
|
|
|
|
|
|
|
|
// We are now fairly sure that an EWMH-compliant window manager is running
|
|
|
|
|
|
|
|
|
|
Atom* supportedAtoms; |
|
|
|
|
unsigned long atomCount; |
|
|
|
|
|
|
|
|
|
// Now we need to check the _NET_SUPPORTED property of the root window
|
|
|
|
|
// It should be a list of supported WM protocol and state atoms
|
|
|
|
|
atomCount = getWindowProperty(_glfwLibrary.X11.root, |
|
|
|
|
wmSupported, |
|
|
|
|
XA_ATOM, |
|
|
|
|
(unsigned char**) &supportedAtoms); |
|
|
|
|
|
|
|
|
|
// See which of the atoms we support that are supported by the WM
|
|
|
|
|
|
|
|
|
|
window->X11.wmState = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_STATE"); |
|
|
|
|
|
|
|
|
|
window->X11.wmStateFullscreen = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_STATE_FULLSCREEN"); |
|
|
|
|
|
|
|
|
|
window->X11.wmName = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_NAME"); |
|
|
|
|
|
|
|
|
|
window->X11.wmIconName = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_ICON_NAME"); |
|
|
|
|
|
|
|
|
|
window->X11.wmPing = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_PING"); |
|
|
|
|
|
|
|
|
|
window->X11.wmActiveWindow = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_ACTIVE_WINDOW"); |
|
|
|
|
|
|
|
|
|
XFree(supportedAtoms); |
|
|
|
|
|
|
|
|
|
return GL_TRUE; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//========================================================================
|
|
|
|
|
// Translates an X Window key to internal coding
|
|
|
|
|
//========================================================================
|
|
|
|
|
@ -721,10 +572,7 @@ static GLboolean createWindow(_GLFWwindow* window, |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Check whether an EWMH-compliant window manager is running
|
|
|
|
|
window->X11.hasEWMH = hasEWMH(window); |
|
|
|
|
|
|
|
|
|
if (window->mode == GLFW_FULLSCREEN && !window->X11.hasEWMH) |
|
|
|
|
if (window->mode == GLFW_FULLSCREEN && !_glfwLibrary.X11.hasEWMH) |
|
|
|
|
{ |
|
|
|
|
// This is the butcher's way of removing window decorations
|
|
|
|
|
// Setting the override-redirect attribute on a window makes the window
|
|
|
|
|
@ -745,7 +593,7 @@ static GLboolean createWindow(_GLFWwindow* window, |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Find or create the protocol atom for window close notifications
|
|
|
|
|
window->X11.wmDeleteWindow = XInternAtom(_glfwLibrary.X11.display, |
|
|
|
|
_glfwLibrary.X11.wmDeleteWindow = XInternAtom(_glfwLibrary.X11.display, |
|
|
|
|
"WM_DELETE_WINDOW", |
|
|
|
|
False); |
|
|
|
|
|
|
|
|
|
@ -756,14 +604,14 @@ static GLboolean createWindow(_GLFWwindow* window, |
|
|
|
|
|
|
|
|
|
// The WM_DELETE_WINDOW ICCCM protocol
|
|
|
|
|
// Basic window close notification protocol
|
|
|
|
|
if (window->X11.wmDeleteWindow != None) |
|
|
|
|
protocols[count++] = window->X11.wmDeleteWindow; |
|
|
|
|
if (_glfwLibrary.X11.wmDeleteWindow != None) |
|
|
|
|
protocols[count++] = _glfwLibrary.X11.wmDeleteWindow; |
|
|
|
|
|
|
|
|
|
// The _NET_WM_PING EWMH protocol
|
|
|
|
|
// Tells the WM to ping our window and flag us as unresponsive if we
|
|
|
|
|
// don't reply within a few seconds
|
|
|
|
|
if (window->X11.wmPing != None) |
|
|
|
|
protocols[count++] = window->X11.wmPing; |
|
|
|
|
if (_glfwLibrary.X11.wmPing != None) |
|
|
|
|
protocols[count++] = _glfwLibrary.X11.wmPing; |
|
|
|
|
|
|
|
|
|
if (count > 0) |
|
|
|
|
{ |
|
|
|
|
@ -908,15 +756,14 @@ static void enterFullscreenMode(_GLFWwindow* window) |
|
|
|
|
_glfwLibrary.X11.saver.changed = GL_TRUE; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
_glfwSetVideoMode(_glfwLibrary.X11.screen, |
|
|
|
|
&window->width, &window->height, |
|
|
|
|
_glfwSetVideoMode(&window->width, &window->height, |
|
|
|
|
&window->refreshRate); |
|
|
|
|
|
|
|
|
|
if (window->X11.hasEWMH && |
|
|
|
|
window->X11.wmState != None && |
|
|
|
|
window->X11.wmStateFullscreen != None) |
|
|
|
|
if (_glfwLibrary.X11.hasEWMH && |
|
|
|
|
_glfwLibrary.X11.wmState != None && |
|
|
|
|
_glfwLibrary.X11.wmStateFullscreen != None) |
|
|
|
|
{ |
|
|
|
|
if (window->X11.wmActiveWindow != None) |
|
|
|
|
if (_glfwLibrary.X11.wmActiveWindow != None) |
|
|
|
|
{ |
|
|
|
|
// Ask the window manager to raise and focus the GLFW window
|
|
|
|
|
// Only focused windows with the _NET_WM_STATE_FULLSCREEN state end
|
|
|
|
|
@ -928,7 +775,7 @@ static void enterFullscreenMode(_GLFWwindow* window) |
|
|
|
|
event.type = ClientMessage; |
|
|
|
|
event.xclient.window = window->X11.handle; |
|
|
|
|
event.xclient.format = 32; // Data is 32-bit longs
|
|
|
|
|
event.xclient.message_type = window->X11.wmActiveWindow; |
|
|
|
|
event.xclient.message_type = _glfwLibrary.X11.wmActiveWindow; |
|
|
|
|
event.xclient.data.l[0] = 1; // Sender is a normal application
|
|
|
|
|
event.xclient.data.l[1] = 0; // We don't really know the timestamp
|
|
|
|
|
|
|
|
|
|
@ -949,9 +796,9 @@ static void enterFullscreenMode(_GLFWwindow* window) |
|
|
|
|
event.type = ClientMessage; |
|
|
|
|
event.xclient.window = window->X11.handle; |
|
|
|
|
event.xclient.format = 32; // Data is 32-bit longs
|
|
|
|
|
event.xclient.message_type = window->X11.wmState; |
|
|
|
|
event.xclient.message_type = _glfwLibrary.X11.wmState; |
|
|
|
|
event.xclient.data.l[0] = _NET_WM_STATE_ADD; |
|
|
|
|
event.xclient.data.l[1] = window->X11.wmStateFullscreen; |
|
|
|
|
event.xclient.data.l[1] = _glfwLibrary.X11.wmStateFullscreen; |
|
|
|
|
event.xclient.data.l[2] = 0; // No secondary property
|
|
|
|
|
event.xclient.data.l[3] = 1; // Sender is a normal application
|
|
|
|
|
|
|
|
|
|
@ -989,7 +836,7 @@ static void enterFullscreenMode(_GLFWwindow* window) |
|
|
|
|
|
|
|
|
|
static void leaveFullscreenMode(_GLFWwindow* window) |
|
|
|
|
{ |
|
|
|
|
_glfwRestoreVideoMode(_glfwLibrary.X11.screen); |
|
|
|
|
_glfwRestoreVideoMode(); |
|
|
|
|
|
|
|
|
|
// Did we change the screen saver setting?
|
|
|
|
|
if (_glfwLibrary.X11.saver.changed) |
|
|
|
|
@ -1004,9 +851,9 @@ static void leaveFullscreenMode(_GLFWwindow* window) |
|
|
|
|
_glfwLibrary.X11.saver.changed = GL_FALSE; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (window->X11.hasEWMH && |
|
|
|
|
window->X11.wmState != None && |
|
|
|
|
window->X11.wmStateFullscreen != None) |
|
|
|
|
if (_glfwLibrary.X11.hasEWMH && |
|
|
|
|
_glfwLibrary.X11.wmState != None && |
|
|
|
|
_glfwLibrary.X11.wmStateFullscreen != None) |
|
|
|
|
{ |
|
|
|
|
// Ask the window manager to make the GLFW window a normal window
|
|
|
|
|
// Normal windows usually have frames and other decorations
|
|
|
|
|
@ -1017,9 +864,9 @@ static void leaveFullscreenMode(_GLFWwindow* window) |
|
|
|
|
event.type = ClientMessage; |
|
|
|
|
event.xclient.window = window->X11.handle; |
|
|
|
|
event.xclient.format = 32; // Data is 32-bit longs
|
|
|
|
|
event.xclient.message_type = window->X11.wmState; |
|
|
|
|
event.xclient.message_type = _glfwLibrary.X11.wmState; |
|
|
|
|
event.xclient.data.l[0] = _NET_WM_STATE_REMOVE; |
|
|
|
|
event.xclient.data.l[1] = window->X11.wmStateFullscreen; |
|
|
|
|
event.xclient.data.l[1] = _glfwLibrary.X11.wmStateFullscreen; |
|
|
|
|
event.xclient.data.l[2] = 0; // No secondary property
|
|
|
|
|
event.xclient.data.l[3] = 1; // Sender is a normal application
|
|
|
|
|
|
|
|
|
|
@ -1292,15 +1139,15 @@ static void processSingleEvent(void) |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if ((Atom) event.xclient.data.l[0] == window->X11.wmDeleteWindow) |
|
|
|
|
if ((Atom) event.xclient.data.l[0] == _glfwLibrary.X11.wmDeleteWindow) |
|
|
|
|
{ |
|
|
|
|
// The window manager was asked to close the window, for example by
|
|
|
|
|
// the user pressing a 'close' window decoration button
|
|
|
|
|
|
|
|
|
|
window->closeRequested = GL_TRUE; |
|
|
|
|
} |
|
|
|
|
else if (window->X11.wmPing != None && |
|
|
|
|
(Atom) event.xclient.data.l[0] == window->X11.wmPing) |
|
|
|
|
else if (_glfwLibrary.X11.wmPing != None && |
|
|
|
|
(Atom) event.xclient.data.l[0] == _glfwLibrary.X11.wmPing) |
|
|
|
|
{ |
|
|
|
|
// The window manager is pinging us to make sure we are still
|
|
|
|
|
// responding to events
|
|
|
|
|
@ -1480,11 +1327,18 @@ int _glfwPlatformOpenWindow(_GLFWwindow* window, |
|
|
|
|
|
|
|
|
|
fbconfigs = getFBConfigs(window, &fbcount); |
|
|
|
|
if (!fbconfigs) |
|
|
|
|
{ |
|
|
|
|
_glfwSetError(GLFW_PLATFORM_ERROR, |
|
|
|
|
"X11/GLX: No usable GLXFBConfigs found"); |
|
|
|
|
return GL_FALSE; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
result = _glfwChooseFBConfig(fbconfig, fbconfigs, fbcount); |
|
|
|
|
if (!result) |
|
|
|
|
{ |
|
|
|
|
_glfwSetError(GLFW_PLATFORM_ERROR, |
|
|
|
|
"X11/GLX: No GLXFBConfig matched the criteria"); |
|
|
|
|
|
|
|
|
|
free(fbconfigs); |
|
|
|
|
return GL_FALSE; |
|
|
|
|
} |
|
|
|
|
@ -1603,18 +1457,18 @@ void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title) |
|
|
|
|
NULL, NULL, NULL); |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
if (window->X11.wmName != None) |
|
|
|
|
if (_glfwLibrary.X11.wmName != None) |
|
|
|
|
{ |
|
|
|
|
XChangeProperty(_glfwLibrary.X11.display, window->X11.handle, |
|
|
|
|
window->X11.wmName, type, 8, |
|
|
|
|
_glfwLibrary.X11.wmName, type, 8, |
|
|
|
|
PropModeReplace, |
|
|
|
|
(unsigned char*) title, strlen(title)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (window->X11.wmIconName != None) |
|
|
|
|
if (_glfwLibrary.X11.wmIconName != None) |
|
|
|
|
{ |
|
|
|
|
XChangeProperty(_glfwLibrary.X11.display, window->X11.handle, |
|
|
|
|
window->X11.wmIconName, type, 8, |
|
|
|
|
_glfwLibrary.X11.wmIconName, type, 8, |
|
|
|
|
PropModeReplace, |
|
|
|
|
(unsigned char*) title, strlen(title)); |
|
|
|
|
} |
|
|
|
|
@ -1635,8 +1489,7 @@ void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height) |
|
|
|
|
if (window->mode == GLFW_FULLSCREEN) |
|
|
|
|
{ |
|
|
|
|
// Get the closest matching video mode for the specified window size
|
|
|
|
|
mode = _glfwGetClosestVideoMode(_glfwLibrary.X11.screen, |
|
|
|
|
&width, &height, &rate); |
|
|
|
|
mode = _glfwGetClosestVideoMode(&width, &height, &rate); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (!window->resizable) |
|
|
|
|
@ -1663,7 +1516,7 @@ void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height) |
|
|
|
|
if (window->mode == GLFW_FULLSCREEN) |
|
|
|
|
{ |
|
|
|
|
// Change video mode, keeping current refresh rate
|
|
|
|
|
_glfwSetVideoModeMODE(_glfwLibrary.X11.screen, mode, window->refreshRate); |
|
|
|
|
_glfwSetVideoModeMODE(mode, window->refreshRate); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Set window size (if not already changed)
|
|
|
|
|
|
Camilla Berglund
ago%!(EXTRA string=14 years)