gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-10-07 22:57:25 -04:00
Code Issues Projects Releases Wiki Activity

Wayland: Use HiDPI cursors on decorations

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2018-09-11 14:20:02 +02:00 committed by linkmauve
parent 321062833a
commit e0b83bbe8d
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/wl_init.c
View File

@ -122,15 +122,24 @@ static void pointerHandleLeave(void* data,
_glfwInputCursorEnter(window, GLFW_FALSE); _glfwInputCursorEnter(window, GLFW_FALSE);
} }
static void setCursor(const char* name) static void setCursor(_GLFWwindow* window, const char* name)
{ {
struct wl_buffer* buffer; struct wl_buffer* buffer;
struct wl_cursor* cursor; struct wl_cursor* cursor;
struct wl_cursor_image* image; struct wl_cursor_image* image;
struct wl_surface* surface = _glfw.wl.cursorSurface; struct wl_surface* surface = _glfw.wl.cursorSurface;
struct wl_cursor_theme* theme = _glfw.wl.cursorTheme;
int scale = 1;
cursor = wl_cursor_theme_get_cursor(_glfw.wl.cursorTheme, if (window->wl.scale > 1 && _glfw.wl.cursorThemeHiDPI)
name); {
// We only support up to scale=2 for now, since libwayland-cursor
// requires us to load a different theme for each size.
scale = 2;
theme = _glfw.wl.cursorThemeHiDPI;
}
cursor = wl_cursor_theme_get_cursor(theme, name);
if (!cursor) if (!cursor)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
@ -148,8 +157,9 @@ static void setCursor(const char* name)
return; return;
wl_pointer_set_cursor(_glfw.wl.pointer, _glfw.wl.pointerSerial, wl_pointer_set_cursor(_glfw.wl.pointer, _glfw.wl.pointerSerial,
surface, surface,
image->hotspot_x, image->hotspot_x / scale,
image->hotspot_y); image->hotspot_y / scale);
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,
image->width, image->height); image->width, image->height);
@ -212,7 +222,7 @@ static void pointerHandleMotion(void* data,
default: default:
assert(0); assert(0);
} }
setCursor(cursorName); setCursor(window, cursorName);
} }
static void pointerHandleButton(void* data, static void pointerHandleButton(void* data,

1
src/wl_window.c
View File

@ -721,6 +721,7 @@ setCursorImage(_GLFWcursorWayland* cursorWayland)
surface, surface,
cursorWayland->xhot, cursorWayland->xhot,
cursorWayland->yhot); cursorWayland->yhot);
wl_surface_set_buffer_scale(surface, 1);
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);