|
|
|
@ -489,9 +489,9 @@ static void inputMethodInstantiateCallback(Display* display, |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Check whether the specified atom is supported
|
|
|
|
|
// Return the atom ID only if it is listed in the specified array
|
|
|
|
|
//
|
|
|
|
|
static Atom getSupportedAtom(Atom* supportedAtoms, |
|
|
|
|
static Atom getAtomIfSupported(Atom* supportedAtoms, |
|
|
|
|
unsigned long atomCount, |
|
|
|
|
const char* atomName) |
|
|
|
|
{ |
|
|
|
@ -565,33 +565,33 @@ static void detectEWMH(void) |
|
|
|
|
// See which of the atoms we support that are supported by the WM
|
|
|
|
|
|
|
|
|
|
_glfw.x11.NET_WM_STATE = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_STATE"); |
|
|
|
|
getAtomIfSupported(supportedAtoms, atomCount, "_NET_WM_STATE"); |
|
|
|
|
_glfw.x11.NET_WM_STATE_ABOVE = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_STATE_ABOVE"); |
|
|
|
|
getAtomIfSupported(supportedAtoms, atomCount, "_NET_WM_STATE_ABOVE"); |
|
|
|
|
_glfw.x11.NET_WM_STATE_FULLSCREEN = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_STATE_FULLSCREEN"); |
|
|
|
|
getAtomIfSupported(supportedAtoms, atomCount, "_NET_WM_STATE_FULLSCREEN"); |
|
|
|
|
_glfw.x11.NET_WM_STATE_MAXIMIZED_VERT = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_STATE_MAXIMIZED_VERT"); |
|
|
|
|
getAtomIfSupported(supportedAtoms, atomCount, "_NET_WM_STATE_MAXIMIZED_VERT"); |
|
|
|
|
_glfw.x11.NET_WM_STATE_MAXIMIZED_HORZ = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_STATE_MAXIMIZED_HORZ"); |
|
|
|
|
getAtomIfSupported(supportedAtoms, atomCount, "_NET_WM_STATE_MAXIMIZED_HORZ"); |
|
|
|
|
_glfw.x11.NET_WM_STATE_DEMANDS_ATTENTION = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_STATE_DEMANDS_ATTENTION"); |
|
|
|
|
getAtomIfSupported(supportedAtoms, atomCount, "_NET_WM_STATE_DEMANDS_ATTENTION"); |
|
|
|
|
_glfw.x11.NET_WM_FULLSCREEN_MONITORS = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_FULLSCREEN_MONITORS"); |
|
|
|
|
getAtomIfSupported(supportedAtoms, atomCount, "_NET_WM_FULLSCREEN_MONITORS"); |
|
|
|
|
_glfw.x11.NET_WM_WINDOW_TYPE = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_WINDOW_TYPE"); |
|
|
|
|
getAtomIfSupported(supportedAtoms, atomCount, "_NET_WM_WINDOW_TYPE"); |
|
|
|
|
_glfw.x11.NET_WM_WINDOW_TYPE_NORMAL = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_WM_WINDOW_TYPE_NORMAL"); |
|
|
|
|
getAtomIfSupported(supportedAtoms, atomCount, "_NET_WM_WINDOW_TYPE_NORMAL"); |
|
|
|
|
_glfw.x11.NET_WORKAREA = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_WORKAREA"); |
|
|
|
|
getAtomIfSupported(supportedAtoms, atomCount, "_NET_WORKAREA"); |
|
|
|
|
_glfw.x11.NET_CURRENT_DESKTOP = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_CURRENT_DESKTOP"); |
|
|
|
|
getAtomIfSupported(supportedAtoms, atomCount, "_NET_CURRENT_DESKTOP"); |
|
|
|
|
_glfw.x11.NET_ACTIVE_WINDOW = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_ACTIVE_WINDOW"); |
|
|
|
|
getAtomIfSupported(supportedAtoms, atomCount, "_NET_ACTIVE_WINDOW"); |
|
|
|
|
_glfw.x11.NET_FRAME_EXTENTS = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_FRAME_EXTENTS"); |
|
|
|
|
getAtomIfSupported(supportedAtoms, atomCount, "_NET_FRAME_EXTENTS"); |
|
|
|
|
_glfw.x11.NET_REQUEST_FRAME_EXTENTS = |
|
|
|
|
getSupportedAtom(supportedAtoms, atomCount, "_NET_REQUEST_FRAME_EXTENTS"); |
|
|
|
|
getAtomIfSupported(supportedAtoms, atomCount, "_NET_REQUEST_FRAME_EXTENTS"); |
|
|
|
|
|
|
|
|
|
if (supportedAtoms) |
|
|
|
|
XFree(supportedAtoms); |
|
|
|
|