mirror of
https://github.com/glfw/glfw.git
synced 2024-11-10 00:51:47 +00:00
Prefer Wayland over X11
When GLFW_ANY_PLATFORM is used (which is the default), X11 would be selected on a Wayland system with XWayland and where XDG_SESSION_TYPE was not set. Closes #2035
This commit is contained in:
parent
dbf7cfc4dc
commit
65102e2005
@ -358,6 +358,7 @@ information on what to include when reporting a bug.
|
|||||||
- [Wayland] Disabled alpha channel for opaque windows on systems lacking
|
- [Wayland] Disabled alpha channel for opaque windows on systems lacking
|
||||||
`EGL_EXT_present_opaque` (#1895)
|
`EGL_EXT_present_opaque` (#1895)
|
||||||
- [Wayland] Removed support for `wl_shell` (#1443)
|
- [Wayland] Removed support for `wl_shell` (#1443)
|
||||||
|
- [Wayland] Prefer Wayland over X11 if both are available (#2035)
|
||||||
- [Wayland] Bugfix: The `GLFW_HAND_CURSOR` shape used the wrong image (#1432)
|
- [Wayland] Bugfix: The `GLFW_HAND_CURSOR` shape used the wrong image (#1432)
|
||||||
- [Wayland] Bugfix: Repeated keys could be reported with `NULL` window (#1704)
|
- [Wayland] Bugfix: Repeated keys could be reported with `NULL` window (#1704)
|
||||||
- [Wayland] Bugfix: Retrieving partial framebuffer size would segfault
|
- [Wayland] Bugfix: Retrieving partial framebuffer size would segfault
|
||||||
|
@ -50,12 +50,12 @@ static const struct
|
|||||||
#if defined(_GLFW_COCOA)
|
#if defined(_GLFW_COCOA)
|
||||||
{ GLFW_PLATFORM_COCOA, _glfwConnectCocoa },
|
{ GLFW_PLATFORM_COCOA, _glfwConnectCocoa },
|
||||||
#endif
|
#endif
|
||||||
#if defined(_GLFW_X11)
|
|
||||||
{ GLFW_PLATFORM_X11, _glfwConnectX11 },
|
|
||||||
#endif
|
|
||||||
#if defined(_GLFW_WAYLAND)
|
#if defined(_GLFW_WAYLAND)
|
||||||
{ GLFW_PLATFORM_WAYLAND, _glfwConnectWayland },
|
{ GLFW_PLATFORM_WAYLAND, _glfwConnectWayland },
|
||||||
#endif
|
#endif
|
||||||
|
#if defined(_GLFW_X11)
|
||||||
|
{ GLFW_PLATFORM_X11, _glfwConnectX11 },
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
GLFWbool _glfwSelectPlatform(int desiredID, _GLFWplatform* platform)
|
GLFWbool _glfwSelectPlatform(int desiredID, _GLFWplatform* platform)
|
||||||
|
Loading…
Reference in New Issue
Block a user