From ff5867e4d33d195d5780560a1329b01fb51851d6 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 18 Feb 2014 23:18:13 -0500 Subject: [PATCH] pointer: Make the code here a bit clearer --- src/wayland/meta-wayland-pointer.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c index b0030dd9e..7f6a4afb7 100644 --- a/src/wayland/meta-wayland-pointer.c +++ b/src/wayland/meta-wayland-pointer.c @@ -369,8 +369,6 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer, { struct wl_client *client = wl_resource_get_client (pointer->focus_resource); struct wl_display *display = wl_client_get_display (client); - wl_fixed_t sx, sy; - uint32_t serial = wl_display_next_serial (display); if (kbd) @@ -387,13 +385,18 @@ meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer, } } - meta_wayland_pointer_get_relative_coordinates (pointer, pointer->focus_surface, &sx, &sy); meta_window_handle_enter (pointer->focus_surface->window, /* XXX -- can we reliably get a timestamp for setting focus? */ clutter_get_current_event_time (), wl_fixed_to_int (pointer->x), wl_fixed_to_int (pointer->y)); - wl_pointer_send_enter (pointer->focus_resource, serial, pointer->focus_surface->resource, sx, sy); + + { + wl_fixed_t sx, sy; + + meta_wayland_pointer_get_relative_coordinates (pointer, pointer->focus_surface, &sx, &sy); + wl_pointer_send_enter (pointer->focus_resource, serial, pointer->focus_surface->resource, sx, sy); + } wl_resource_add_destroy_listener (pointer->focus_resource, &pointer->focus_resource_listener); pointer->focus_serial = serial;