From 153463790abfa9fbe8f77694cf6a46f9b5e1f586 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 4 Oct 2013 02:20:43 -0400 Subject: [PATCH] wayland: Drop focus on click The native raise-on-click works with Wayland clients through the standard Grand Central Station event handling, with MetaWindow. --- src/wayland/meta-wayland.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c index d32a8687e..6351e4878 100644 --- a/src/wayland/meta-wayland.c +++ b/src/wayland/meta-wayland.c @@ -568,32 +568,12 @@ event_filter_cb (const ClutterEvent *event, MetaWaylandCompositor *compositor = user_data; MetaWaylandSeat *seat = compositor->seat; MetaWaylandPointer *pointer = &seat->pointer; - MetaWaylandSurface *surface; reset_idletimes (event); if (meta_wayland_seat_handle_event (compositor->seat, event)) return TRUE; - /* HACK: for now, the surfaces from Wayland clients aren't - integrated into Mutter's event handling and Mutter won't give them - focus on mouse clicks. As a hack to work around this we can just - give them input focus on mouse clicks so we can at least test the - keyboard support */ - if (event->type == CLUTTER_BUTTON_PRESS) - { - surface = pointer->current; - - if (surface && surface->window && - surface->window->client_type == META_WINDOW_CLIENT_TYPE_WAYLAND) - { - MetaDisplay *display = meta_get_display (); - guint32 timestamp = meta_display_get_current_time_roundtrip (display); - - meta_window_focus (surface->window, timestamp); - } - } - if (seat->cursor_tracker) { meta_cursor_tracker_update_position (seat->cursor_tracker,