From c9e99ebbbf6e70691102b843d142c3b4d89e27d0 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 18 Apr 2014 18:55:08 -0400 Subject: [PATCH] pointer: Move update up It seems that I forgot or messed this up in one of my reshufflings. --- src/wayland/meta-wayland-pointer.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c index e9f0c2448..a2e7b2c9e 100644 --- a/src/wayland/meta-wayland-pointer.c +++ b/src/wayland/meta-wayland-pointer.c @@ -352,6 +352,21 @@ count_buttons (const ClutterEvent *event) return count; } +void +meta_wayland_pointer_update (MetaWaylandPointer *pointer, + const ClutterEvent *event) +{ + pointer->button_count = count_buttons (event); + + if (pointer->cursor_tracker) + { + ClutterPoint pos; + + clutter_input_device_get_coords (pointer->device, NULL, &pos); + meta_cursor_tracker_update_position (pointer->cursor_tracker, pos.x, pos.y); + } +} + static MetaWaylandSurface * get_focus_surface (MetaWaylandPointer *pointer) { @@ -530,21 +545,6 @@ meta_wayland_pointer_handle_event (MetaWaylandPointer *pointer, return FALSE; } -void -meta_wayland_pointer_update (MetaWaylandPointer *pointer, - const ClutterEvent *event) -{ - pointer->button_count = count_buttons (event); - - if (pointer->cursor_tracker) - { - ClutterPoint pos; - - clutter_input_device_get_coords (pointer->device, NULL, &pos); - meta_cursor_tracker_update_position (pointer->cursor_tracker, pos.x, pos.y); - } -} - static void move_resources (struct wl_list *destination, struct wl_list *source) {