[mutter/wip/tablet-protocol: 127/133] core: Update tablet cursors
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/tablet-protocol: 127/133] core: Update tablet cursors
- Date: Tue, 31 Mar 2015 11:58:03 +0000 (UTC)
commit 0bf722c4ace69b10b17790cb86fa1b2aeedef4f3
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri Jan 9 17:31:02 2015 +0100
core: Update tablet cursors
On wayland, tablets have their standalone pointer, which must be updated
on events from the corresponding device.
src/core/events.c | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/src/core/events.c b/src/core/events.c
index 43efe1d..fc13c2d 100644
--- a/src/core/events.c
+++ b/src/core/events.c
@@ -190,8 +190,19 @@ meta_display_handle_event (MetaDisplay *display,
if (meta_is_wayland_compositor () && event->type == CLUTTER_MOTION)
{
- MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (NULL);
- meta_cursor_tracker_update_position (tracker, event->motion.x, event->motion.y);
+ MetaWaylandCompositor *compositor;
+
+ compositor = meta_wayland_compositor_get_default ();
+
+ if (meta_wayland_tablet_manager_consumes_event (compositor->tablet_manager, event))
+ {
+ meta_wayland_tablet_manager_update_cursor_position (compositor->tablet_manager, event);
+ }
+ else
+ {
+ MetaCursorTracker *tracker = meta_cursor_tracker_get_for_screen (NULL);
+ meta_cursor_tracker_update_position (tracker, event->motion.x, event->motion.y);
+ }
}
handle_idletime_for_event (event);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]