isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 09:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Update tool cursor scale when crossing monitors

Browse Source 
This makes tool cursors properly scaled on hidpi.

https://bugzilla.gnome.org/show_bug.cgi?id=778474
This commit is contained in:
Carlos Garnacho 2017-02-11 00:53:42 +01:00
parent 6e2722298e
commit 1d24f612cc
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/wayland/meta-wayland-tablet-tool.c
View File

@ -37,6 +37,7 @@
#include "meta-wayland-tablet-seat.h" #include "meta-wayland-tablet-seat.h"
#include "meta-wayland-tablet-tool.h" #include "meta-wayland-tablet-tool.h"
#include "backends/meta-input-settings-private.h" #include "backends/meta-input-settings-private.h"
#include "backends/meta-logical-monitor.h"
#ifdef HAVE_NATIVE_BACKEND #ifdef HAVE_NATIVE_BACKEND
#include "backends/native/meta-backend-native.h" #include "backends/native/meta-backend-native.h"
@ -380,6 +381,25 @@ tablet_tool_handle_cursor_surface_destroy (struct wl_listener *listener,
meta_wayland_tablet_tool_set_cursor_surface (tool, NULL); meta_wayland_tablet_tool_set_cursor_surface (tool, NULL);
} }
static void
tool_cursor_prepare_at (MetaCursorSprite *cursor_sprite,
int x,
int y,
MetaWaylandTabletTool *tool)
{
MetaBackend *backend = meta_get_backend ();
MetaMonitorManager *monitor_manager =
meta_backend_get_monitor_manager (backend);
MetaLogicalMonitor *logical_monitor;
logical_monitor =
meta_monitor_manager_get_logical_monitor_at (monitor_manager, x, y);
/* Reload the cursor texture if the scale has changed. */
if (logical_monitor)
meta_cursor_sprite_set_theme_scale (cursor_sprite, logical_monitor->scale);
}
MetaWaylandTabletTool * MetaWaylandTabletTool *
meta_wayland_tablet_tool_new (MetaWaylandTabletSeat *seat, meta_wayland_tablet_tool_new (MetaWaylandTabletSeat *seat,
ClutterInputDevice *device, ClutterInputDevice *device,
@ -398,6 +418,9 @@ meta_wayland_tablet_tool_new (MetaWaylandTabletSeat *seat,
tool->cursor_surface_destroy_listener.notify = tablet_tool_handle_cursor_surface_destroy; tool->cursor_surface_destroy_listener.notify = tablet_tool_handle_cursor_surface_destroy;
tool->default_sprite = meta_cursor_sprite_from_theme (META_CURSOR_CROSSHAIR); tool->default_sprite = meta_cursor_sprite_from_theme (META_CURSOR_CROSSHAIR);
tool->prepare_at_signal_id =
g_signal_connect (tool->default_sprite, "prepare-at",
G_CALLBACK (tool_cursor_prepare_at), tool);
return tool; return tool;
} }
@ -418,6 +441,7 @@ meta_wayland_tablet_tool_free (MetaWaylandTabletTool *tool)
wl_list_init (wl_resource_get_link (resource)); wl_list_init (wl_resource_get_link (resource));
} }
g_signal_handler_disconnect (tool->default_sprite, tool->prepare_at_signal_id);
g_object_unref (tool->default_sprite); g_object_unref (tool->default_sprite);
g_slice_free (MetaWaylandTabletTool, tool); g_slice_free (MetaWaylandTabletTool, tool);

1
src/wayland/meta-wayland-tablet-tool.h
View File

@ -44,6 +44,7 @@ struct _MetaWaylandTabletTool
struct wl_listener cursor_surface_destroy_listener; struct wl_listener cursor_surface_destroy_listener;
MetaCursorRenderer *cursor_renderer; MetaCursorRenderer *cursor_renderer;
MetaCursorSprite *default_sprite; MetaCursorSprite *default_sprite;
guint prepare_at_signal_id;
MetaWaylandSurface *current; MetaWaylandSurface *current;
guint32 pressed_buttons; guint32 pressed_buttons;