|
|
|
@ -573,18 +573,25 @@ int _glfwPlatformInit(void) |
|
|
|
|
_glfwInitTimer(); |
|
|
|
|
_glfwInitJoysticks(); |
|
|
|
|
|
|
|
|
|
if (_glfw.wl.pointer && _glfw.wl.shm){ |
|
|
|
|
if (_glfw.wl.pointer && _glfw.wl.shm) |
|
|
|
|
{ |
|
|
|
|
_glfw.wl.cursorTheme = wl_cursor_theme_load(NULL, 32, _glfw.wl.shm); |
|
|
|
|
if (!_glfw.wl.cursorTheme) { |
|
|
|
|
_glfwInputError(GLFW_PLATFORM_ERROR, "Wayland: Unable to load default cursor theme\n"); |
|
|
|
|
if (!_glfw.wl.cursorTheme) |
|
|
|
|
{ |
|
|
|
|
_glfwInputError(GLFW_PLATFORM_ERROR, |
|
|
|
|
"Wayland: Unable to load default cursor theme\n"); |
|
|
|
|
return GL_FALSE; |
|
|
|
|
} |
|
|
|
|
_glfw.wl.defaultCursor = wl_cursor_theme_get_cursor(_glfw.wl.cursorTheme, "left_ptr"); |
|
|
|
|
if (!_glfw.wl.defaultCursor) { |
|
|
|
|
_glfwInputError(GLFW_PLATFORM_ERROR, "Wayland: Unable to load default left pointer\n"); |
|
|
|
|
_glfw.wl.defaultCursor = |
|
|
|
|
wl_cursor_theme_get_cursor(_glfw.wl.cursorTheme, "left_ptr"); |
|
|
|
|
if (!_glfw.wl.defaultCursor) |
|
|
|
|
{ |
|
|
|
|
_glfwInputError(GLFW_PLATFORM_ERROR, |
|
|
|
|
"Wayland: Unable to load default left pointer\n"); |
|
|
|
|
return GL_FALSE; |
|
|
|
|
} |
|
|
|
|
_glfw.wl.cursorSurface = wl_compositor_create_surface(_glfw.wl.compositor); |
|
|
|
|
_glfw.wl.cursorSurface = |
|
|
|
|
wl_compositor_create_surface(_glfw.wl.compositor); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return GL_TRUE; |
|
|
|
|