From d7cd6edaa5a8097725c37327ab3a87cc73ba095d Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 16 Jul 2020 23:50:26 +0200 Subject: [PATCH] GLFW: X11: Include X Shape extension headers From upstream: https://github.com/glfw/glfw/commit/68e4261d73295cc280ee3d060d421e0ace5d8d11. --- glfw/x11_platform.h | 3 +++ glfw/x11_window.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/glfw/x11_platform.h b/glfw/x11_platform.h index ac24a624b..5f3f540f3 100644 --- a/glfw/x11_platform.h +++ b/glfw/x11_platform.h @@ -51,6 +51,9 @@ // The XInput extension provides raw mouse motion input #include +// The Shape extension provides custom window shapes +#include + // The libxkb library is used for improved keyboard support #include "xkb_glfw.h" #include "backend_utils.h" diff --git a/glfw/x11_window.c b/glfw/x11_window.c index 3413ca151..c51163184 100644 --- a/glfw/x11_window.c +++ b/glfw/x11_window.c @@ -2598,13 +2598,13 @@ void _glfwPlatformSetWindowMousePassthrough(_GLFWwindow* window, bool enabled) { Region region = XCreateRegion(); XShapeCombineRegion(_glfw.x11.display, window->x11.handle, - 2/*ShapeInput*/, 0, 0, region, 0/*ShapeSet*/); + ShapeInput, 0, 0, region, ShapeSet); XDestroyRegion(region); } else { XShapeCombineMask(_glfw.x11.display, window->x11.handle, - 2/*ShapeInput*/, 0, 0, None, 0/*ShapeSet*/); + ShapeInput, 0, 0, None, ShapeSet); } window->mousePassthrough = enabled;