mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-09-20 05:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Camilla Berglund 2015-10-24 23:40:02 +02:00
parent e8f3de0f2e
commit efdbfd3883
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/wl_window.c
View File

@ -491,18 +491,19 @@ int _glfwPlatformCreateCursor(_GLFWcursor* cursor,
int _glfwPlatformCreateStandardCursor(_GLFWcursor* cursor, int shape) int _glfwPlatformCreateStandardCursor(_GLFWcursor* cursor, int shape)
{ {
struct wl_cursor* standard_cursor; struct wl_cursor* standardCursor;
standard_cursor = wl_cursor_theme_get_cursor(_glfw.wl.cursorTheme, standardCursor = wl_cursor_theme_get_cursor(_glfw.wl.cursorTheme,
translateCursorShape(shape)); translateCursorShape(shape));
if (!standard_cursor) { if (!standardCursor)
{
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"Wayland: Standard cursor \"%s\" not found", "Wayland: Standard cursor \"%s\" not found",
translateCursorShape(shape)); translateCursorShape(shape));
return GLFW_FALSE; return GLFW_FALSE;
} }
cursor->wl.image = standard_cursor->images[0];
cursor->wl.image = standardCursor->images[0];
return GLFW_TRUE; return GLFW_TRUE;
} }
@ -534,7 +535,9 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor)
if (window->cursorMode == GLFW_CURSOR_NORMAL) if (window->cursorMode == GLFW_CURSOR_NORMAL)
{ {
if (cursor == NULL) if (cursor)
image = cursor->wl.image;
else
{ {
defaultCursor = wl_cursor_theme_get_cursor(_glfw.wl.cursorTheme, defaultCursor = wl_cursor_theme_get_cursor(_glfw.wl.cursorTheme,
"left_ptr"); "left_ptr");
@ -546,10 +549,6 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor)
} }
image = defaultCursor->images[0]; image = defaultCursor->images[0];
} }
else
{
image = cursor->wl.image;
}
if (image) if (image)
{ {