mirror of
https://github.com/glfw/glfw.git
synced 2024-11-10 09:01:46 +00:00
X11: Cleanup
We can use C99 now and also we will need the event mask below.
(cherry picked from commit 8149a5fc00
)
This commit is contained in:
parent
cb49e1821b
commit
7f775302ae
@ -613,46 +613,40 @@ static GLFWbool createNativeWindow(_GLFWwindow* window,
|
|||||||
|
|
||||||
window->x11.transparent = _glfwIsVisualTransparentX11(visual);
|
window->x11.transparent = _glfwIsVisualTransparentX11(visual);
|
||||||
|
|
||||||
// Create the actual window
|
XSetWindowAttributes wa = { 0 };
|
||||||
|
wa.colormap = window->x11.colormap;
|
||||||
|
wa.event_mask = StructureNotifyMask | KeyPressMask | KeyReleaseMask |
|
||||||
|
PointerMotionMask | ButtonPressMask | ButtonReleaseMask |
|
||||||
|
ExposureMask | FocusChangeMask | VisibilityChangeMask |
|
||||||
|
EnterWindowMask | LeaveWindowMask | PropertyChangeMask;
|
||||||
|
|
||||||
|
_glfwGrabErrorHandlerX11();
|
||||||
|
|
||||||
|
window->x11.handle = XCreateWindow(_glfw.x11.display,
|
||||||
|
_glfw.x11.root,
|
||||||
|
0, 0, // Position
|
||||||
|
width, height,
|
||||||
|
0, // Border width
|
||||||
|
depth, // Color depth
|
||||||
|
InputOutput,
|
||||||
|
visual,
|
||||||
|
CWBorderPixel | CWColormap | CWEventMask,
|
||||||
|
&wa);
|
||||||
|
|
||||||
|
_glfwReleaseErrorHandlerX11();
|
||||||
|
|
||||||
|
if (!window->x11.handle)
|
||||||
{
|
{
|
||||||
XSetWindowAttributes wa;
|
_glfwInputErrorX11(GLFW_PLATFORM_ERROR,
|
||||||
const unsigned long wamask = CWBorderPixel | CWColormap | CWEventMask;
|
"X11: Failed to create window");
|
||||||
|
return GLFW_FALSE;
|
||||||
wa.colormap = window->x11.colormap;
|
|
||||||
wa.border_pixel = 0;
|
|
||||||
wa.event_mask = StructureNotifyMask | KeyPressMask | KeyReleaseMask |
|
|
||||||
PointerMotionMask | ButtonPressMask | ButtonReleaseMask |
|
|
||||||
ExposureMask | FocusChangeMask | VisibilityChangeMask |
|
|
||||||
EnterWindowMask | LeaveWindowMask | PropertyChangeMask;
|
|
||||||
|
|
||||||
_glfwGrabErrorHandlerX11();
|
|
||||||
|
|
||||||
window->x11.handle = XCreateWindow(_glfw.x11.display,
|
|
||||||
_glfw.x11.root,
|
|
||||||
0, 0,
|
|
||||||
width, height,
|
|
||||||
0, // Border width
|
|
||||||
depth, // Color depth
|
|
||||||
InputOutput,
|
|
||||||
visual,
|
|
||||||
wamask,
|
|
||||||
&wa);
|
|
||||||
|
|
||||||
_glfwReleaseErrorHandlerX11();
|
|
||||||
|
|
||||||
if (!window->x11.handle)
|
|
||||||
{
|
|
||||||
_glfwInputErrorX11(GLFW_PLATFORM_ERROR,
|
|
||||||
"X11: Failed to create window");
|
|
||||||
return GLFW_FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
XSaveContext(_glfw.x11.display,
|
|
||||||
window->x11.handle,
|
|
||||||
_glfw.x11.context,
|
|
||||||
(XPointer) window);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
XSaveContext(_glfw.x11.display,
|
||||||
|
window->x11.handle,
|
||||||
|
_glfw.x11.context,
|
||||||
|
(XPointer) window);
|
||||||
|
|
||||||
if (!wndconfig->decorated)
|
if (!wndconfig->decorated)
|
||||||
_glfwPlatformSetWindowDecorated(window, GLFW_FALSE);
|
_glfwPlatformSetWindowDecorated(window, GLFW_FALSE);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user