Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wayland: Use HiDPI cursors for standard cursors

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2018-09-11 14:24:43 +02:00 committed by linkmauve
parent e0b83bbe8d
commit 15cad02235
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/wl_platform.h
View File

@ -335,6 +335,7 @@ typedef struct _GLFWmonitorWayland
typedef struct _GLFWcursorWayland typedef struct _GLFWcursorWayland
{ {
struct wl_cursor* cursor; struct wl_cursor* cursor;
struct wl_cursor* cursorHiDPI;
struct wl_buffer* buffer; struct wl_buffer* buffer;
int width, height; int width, height;
int xhot, yhot; int xhot, yhot;

40
src/wl_window.c
View File

@ -691,18 +691,26 @@ static GLFWbool createXdgSurface(_GLFWwindow* window)
} }
static void static void
setCursorImage(_GLFWcursorWayland* cursorWayland) setCursorImage(_GLFWwindow* window, _GLFWcursorWayland* cursorWayland)
{ {
struct itimerspec timer = {}; struct itimerspec timer = {};
struct wl_cursor* wlCursor = cursorWayland->cursor;
struct wl_cursor_image* image; struct wl_cursor_image* image;
struct wl_buffer* buffer; struct wl_buffer* buffer;
struct wl_surface* surface = _glfw.wl.cursorSurface; struct wl_surface* surface = _glfw.wl.cursorSurface;
int scale = 1;
if (!cursorWayland->cursor) if (!wlCursor)
buffer = cursorWayland->buffer; buffer = cursorWayland->buffer;
else else
{ {
image = cursorWayland->cursor->images[cursorWayland->currentImage]; if (window->wl.scale > 1 && cursorWayland->cursorHiDPI)
{
wlCursor = cursorWayland->cursorHiDPI;
scale = 2;
}
image = wlCursor->images[cursorWayland->currentImage];
buffer = wl_cursor_image_get_buffer(image); buffer = wl_cursor_image_get_buffer(image);
if (!buffer) if (!buffer)
return; return;
@ -719,9 +727,9 @@ setCursorImage(_GLFWcursorWayland* cursorWayland)
wl_pointer_set_cursor(_glfw.wl.pointer, _glfw.wl.pointerSerial, wl_pointer_set_cursor(_glfw.wl.pointer, _glfw.wl.pointerSerial,
surface, surface,
cursorWayland->xhot, cursorWayland->xhot / scale,
cursorWayland->yhot); cursorWayland->yhot / scale);
wl_surface_set_buffer_scale(surface, 1); wl_surface_set_buffer_scale(surface, scale);
wl_surface_attach(surface, buffer, 0, 0); wl_surface_attach(surface, buffer, 0, 0);
wl_surface_damage(surface, 0, 0, wl_surface_damage(surface, 0, 0,
cursorWayland->width, cursorWayland->height); cursorWayland->width, cursorWayland->height);
@ -741,7 +749,7 @@ incrementCursorImage(_GLFWwindow* window)
{ {
cursor->wl.currentImage += 1; cursor->wl.currentImage += 1;
cursor->wl.currentImage %= cursor->wl.cursor->image_count; cursor->wl.currentImage %= cursor->wl.cursor->image_count;
setCursorImage(&cursor->wl); setCursorImage(window, &cursor->wl);
} }
} }
@ -1324,6 +1332,14 @@ int _glfwPlatformCreateStandardCursor(_GLFWcursor* cursor, int shape)
cursor->wl.cursor = standardCursor; cursor->wl.cursor = standardCursor;
cursor->wl.currentImage = 0; cursor->wl.currentImage = 0;
if (_glfw.wl.cursorThemeHiDPI)
{
standardCursor = wl_cursor_theme_get_cursor(_glfw.wl.cursorThemeHiDPI,
translateCursorShape(shape));
cursor->wl.cursorHiDPI = standardCursor;
}
return GLFW_TRUE; return GLFW_TRUE;
} }
@ -1437,6 +1453,7 @@ static GLFWbool isPointerLocked(_GLFWwindow* window)
void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor) void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor)
{ {
struct wl_cursor* defaultCursor; struct wl_cursor* defaultCursor;
struct wl_cursor* defaultCursorHiDPI = NULL;
if (!_glfw.wl.pointer) if (!_glfw.wl.pointer)
return; return;
@ -1455,7 +1472,7 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor)
if (window->cursorMode == GLFW_CURSOR_NORMAL) if (window->cursorMode == GLFW_CURSOR_NORMAL)
{ {
if (cursor) if (cursor)
setCursorImage(&cursor->wl); setCursorImage(window, &cursor->wl);
else else
{ {
defaultCursor = wl_cursor_theme_get_cursor(_glfw.wl.cursorTheme, defaultCursor = wl_cursor_theme_get_cursor(_glfw.wl.cursorTheme,
@ -1466,14 +1483,19 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor)
"Wayland: Standard cursor not found"); "Wayland: Standard cursor not found");
return; return;
} }
if (_glfw.wl.cursorThemeHiDPI)
defaultCursorHiDPI =
wl_cursor_theme_get_cursor(_glfw.wl.cursorThemeHiDPI,
"left_ptr");
_GLFWcursorWayland cursorWayland = { _GLFWcursorWayland cursorWayland = {
defaultCursor, defaultCursor,
defaultCursorHiDPI,
NULL, NULL,
0, 0, 0, 0,
0, 0, 0, 0,
0 0
}; };
setCursorImage(&cursorWayland); setCursorImage(window, &cursorWayland);
} }
} }
else if (window->cursorMode == GLFW_CURSOR_DISABLED) else if (window->cursorMode == GLFW_CURSOR_DISABLED)