blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check pointer focused surface instead of view at cursor

This commit is contained in:
emersion 2017-10-12 14:28:37 +02:00
parent 19860c03f7
commit 29abf93bb6
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/rootston/input.h
View File

@ -79,7 +79,7 @@ struct roots_input {
struct wlr_xcursor_theme *theme; struct wlr_xcursor_theme *theme;
struct wlr_xcursor *xcursor; struct wlr_xcursor *xcursor;
struct wlr_seat *wl_seat; struct wlr_seat *wl_seat;
struct roots_view *client_cursor_view; struct wl_client *cursor_client;
enum roots_cursor_mode mode; enum roots_cursor_mode mode;
struct roots_view *active_view, *last_active_view; struct roots_view *active_view, *last_active_view;

20
rootston/cursor.c
View File

@ -80,10 +80,16 @@ void cursor_update_position(struct roots_input *input, uint32_t time) {
case ROOTS_CURSOR_PASSTHROUGH: case ROOTS_CURSOR_PASSTHROUGH:
view = view_at(desktop, input->cursor->x, input->cursor->y, &surface, view = view_at(desktop, input->cursor->x, input->cursor->y, &surface,
&sx, &sy); &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"); wlr_log(L_DEBUG, "Switching to compositor cursor");
cursor_set_xcursor_image(input, input->xcursor->images[0]); cursor_set_xcursor_image(input, input->xcursor->images[0]);
input->client_cursor_view = NULL; input->cursor_client = NULL;
} }
if (view) { if (view) {
wlr_seat_pointer_notify_enter(input->wl_seat, surface, sx, sy); 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); request_set_cursor);
struct wlr_seat_pointer_request_set_cursor_event *event = data; struct wlr_seat_pointer_request_set_cursor_event *event = data;
struct wlr_surface *focused_surface = NULL; struct wlr_surface *focused_surface =
double sx, sy; event->seat_handle->wlr_seat->pointer_state.focused_surface;
struct roots_view *focused_view = view_at(input->server->desktop,
input->cursor->x, input->cursor->y, &focused_surface, &sx, &sy);
bool ok = focused_surface != NULL; bool ok = focused_surface != NULL;
if (focused_surface != NULL) { if (focused_surface != NULL) {
struct wl_client *focused_client = struct wl_client *focused_client =
@ -309,7 +313,7 @@ static void handle_request_set_cursor(struct wl_listener *listener,
ok = event->client == focused_client; ok = event->client == focused_client;
} }
if (!ok) { 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; return;
} }
@ -321,7 +325,7 @@ static void handle_request_set_cursor(struct wl_listener *listener,
event->hotspot_x, event->hotspot_y); event->hotspot_x, event->hotspot_y);
} }
input->client_cursor_view = focused_view; input->cursor_client = event->client;
} }
void cursor_initialize(struct roots_input *input) { void cursor_initialize(struct roots_input *input) {