diff options
| author | emersion <contact@emersion.fr> | 2017-10-12 14:28:37 +0200 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2017-10-12 14:28:37 +0200 |
| commit | 29abf93bb6a52101a53ece0b23e3b24c593a737e (patch) | |
| tree | 40d3fa4fa81dca872b525fb5f0fe3175b987dbdd | |
| parent | 19860c03f7567bd85ffd735ce2ccc90c454dd5b1 (diff) | |
Check pointer focused surface instead of view at cursor
| -rw-r--r-- | include/rootston/input.h | 2 | ||||
| -rw-r--r-- | rootston/cursor.c | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/include/rootston/input.h b/include/rootston/input.h index fbabbdb6..516104a7 100644 --- a/include/rootston/input.h +++ b/include/rootston/input.h @@ -79,7 +79,7 @@ struct roots_input { struct wlr_xcursor_theme *theme; struct wlr_xcursor *xcursor; struct wlr_seat *wl_seat; - struct roots_view *client_cursor_view; + struct wl_client *cursor_client; enum roots_cursor_mode mode; struct roots_view *active_view, *last_active_view; diff --git a/rootston/cursor.c b/rootston/cursor.c index eeb657ad..4c3a9947 100644 --- a/rootston/cursor.c +++ b/rootston/cursor.c @@ -80,10 +80,16 @@ void cursor_update_position(struct roots_input *input, uint32_t time) { case ROOTS_CURSOR_PASSTHROUGH: view = view_at(desktop, input->cursor->x, input->cursor->y, &surface, &sx, &sy); - if (view != input->client_cursor_view) { + bool set_compositor_cursor = !view && input->cursor_client; + if (view) { + struct wl_client *view_client = + wl_resource_get_client(view->wlr_surface->resource); + set_compositor_cursor = view_client != input->cursor_client; + } + if (set_compositor_cursor) { wlr_log(L_DEBUG, "Switching to compositor cursor"); cursor_set_xcursor_image(input, input->xcursor->images[0]); - input->client_cursor_view = NULL; + input->cursor_client = NULL; } if (view) { wlr_seat_pointer_notify_enter(input->wl_seat, surface, sx, sy); @@ -298,10 +304,8 @@ static void handle_request_set_cursor(struct wl_listener *listener, request_set_cursor); struct wlr_seat_pointer_request_set_cursor_event *event = data; - struct wlr_surface *focused_surface = NULL; - double sx, sy; - struct roots_view *focused_view = view_at(input->server->desktop, - input->cursor->x, input->cursor->y, &focused_surface, &sx, &sy); + struct wlr_surface *focused_surface = + event->seat_handle->wlr_seat->pointer_state.focused_surface; bool ok = focused_surface != NULL; if (focused_surface != NULL) { struct wl_client *focused_client = @@ -309,7 +313,7 @@ static void handle_request_set_cursor(struct wl_listener *listener, ok = event->client == focused_client; } if (!ok) { - wlr_log(L_DEBUG, "Denying request to set cursor outside view"); + wlr_log(L_DEBUG, "Denying request to set cursor from unfocused client"); return; } @@ -321,7 +325,7 @@ static void handle_request_set_cursor(struct wl_listener *listener, event->hotspot_x, event->hotspot_y); } - input->client_cursor_view = focused_view; + input->cursor_client = event->client; } void cursor_initialize(struct roots_input *input) { |