AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 22:10:08 +00:00
Code Issues Projects Releases Wiki Activity

wayland: Tweak cursor sizing code

Browse Source 
We want to take advantage of a viewporter also for named cursors.
This commit is contained in:
Matthias Clasen 2024-05-10 22:59:22 -04:00
parent 4e5976427b
commit c61d8bc188
1 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
gdk/wayland/gdkcursor-wayland.c
View File

@ -165,25 +165,29 @@ _gdk_wayland_cursor_get_buffer (GdkWaylandDisplay *display,
double *scale) double *scale)
{ {
GdkTexture *texture; GdkTexture *texture;
int desired_scale_factor;
desired_scale_factor = (int) ceil (desired_scale);
if (gdk_cursor_get_name (cursor)) if (gdk_cursor_get_name (cursor))
{ {
struct wl_cursor *c; struct wl_cursor *c;
int scale_factor;
if (g_str_equal (gdk_cursor_get_name (cursor), "none")) if (g_str_equal (gdk_cursor_get_name (cursor), "none"))
goto none; {
*hotspot_x = *hotspot_y = 0;
*width = *height = 0;
*scale = 1;
return NULL;
}
scale_factor = (int) ceil (desired_scale);
c = gdk_wayland_cursor_load_for_name (display, c = gdk_wayland_cursor_load_for_name (display,
_gdk_wayland_display_get_cursor_theme (display), display->cursor_theme,
desired_scale_factor, scale_factor,
gdk_cursor_get_name (cursor)); gdk_cursor_get_name (cursor));
if (c && c->image_count > 0) if (c && c->image_count > 0)
{ {
struct wl_cursor_image *image; struct wl_cursor_image *image;
int cursor_scale;
if (image_index >= c->image_count) if (image_index >= c->image_count)
{ {
@ -195,23 +199,23 @@ _gdk_wayland_cursor_get_buffer (GdkWaylandDisplay *display,
image = c->images[image_index]; image = c->images[image_index];
cursor_scale = desired_scale_factor; *width = display->cursor_theme_size;
if ((image->width % cursor_scale != 0) || *height = display->cursor_theme_size;
(image->height % cursor_scale != 0)) *scale = image->width / (double) *width;
*hotspot_x = image->hotspot_x / scale_factor;
*hotspot_y = image->hotspot_y / scale_factor;
if (*scale != scale_factor && !use_viewporter)
{ {
g_warning (G_STRLOC " cursor image size (%dx%d) not an integer " g_warning (G_STRLOC " cursor image size (%d) not an integer "
"multiple of scale (%d)", image->width, image->height, "multiple of theme size (%d)", image->width, *width);
cursor_scale); *width = image->width;
cursor_scale = 1; *height = image->height;
*hotspot_x = image->hotspot_x;
*hotspot_y = image->hotspot_y;
*scale = 1;
} }
*hotspot_x = image->hotspot_x / cursor_scale;
*hotspot_y = image->hotspot_y / cursor_scale;
*width = image->width / cursor_scale;
*height = image->height / cursor_scale;
*scale = cursor_scale;
return wl_cursor_image_get_buffer (image); return wl_cursor_image_get_buffer (image);
} }
} }
@ -257,7 +261,7 @@ from_texture:
else else
{ {
if (!use_viewporter) if (!use_viewporter)
*scale = desired_scale_factor; *scale = ceil (desired_scale);
else else
*scale = desired_scale; *scale = desired_scale;
@ -294,28 +298,23 @@ from_texture:
} }
if (gdk_cursor_get_fallback (cursor)) if (gdk_cursor_get_fallback (cursor))
return _gdk_wayland_cursor_get_buffer (display, {
gdk_cursor_get_fallback (cursor), return _gdk_wayland_cursor_get_buffer (display,
desired_scale, gdk_cursor_get_fallback (cursor),
use_viewporter, desired_scale,
image_index, use_viewporter,
hotspot_x, hotspot_y, image_index,
width, height, hotspot_x, hotspot_y,
scale); width, height,
scale);
}
else else
{ {
texture = gdk_texture_new_from_resource ("/org/gtk/libgdk/cursor/default"); texture = gdk_texture_new_from_resource ("/org/gtk/libgdk/cursor/default");
goto from_texture; goto from_texture;
} }
none: g_assert_not_reached ();
*hotspot_x = 0;
*hotspot_y = 0;
*width = 0;
*height = 0;
*scale = 1;
return NULL;
} }
guint guint