backend/wayland: manage cursor for current pointer

This commit is contained in:
Mykola Orliuk 2020-10-03 15:06:05 +02:00 committed by Simon Ser
parent b98522b38f
commit df417b7e95
2 changed files with 4 additions and 2 deletions

View file

@ -419,8 +419,9 @@ static void output_destroy(struct wlr_output *wlr_output) {
}
void update_wl_output_cursor(struct wlr_wl_output *output) {
if (output->backend->pointer && output->enter_serial) {
wl_pointer_set_cursor(output->backend->pointer, output->enter_serial,
struct wlr_wl_pointer *pointer = output->backend->current_pointer;
if (pointer && pointer->output == output && output->enter_serial) {
wl_pointer_set_cursor(pointer->wl_pointer, output->enter_serial,
output->cursor.surface, output->cursor.hotspot_x,
output->cursor.hotspot_y);
}

View file

@ -48,6 +48,7 @@ static void pointer_handle_enter(void *data, struct wl_pointer *wl_pointer,
struct wlr_wl_output *output = wl_surface_get_user_data(surface);
assert(output);
struct wlr_wl_pointer *pointer = output_get_pointer(output);
assert(!backend->current_pointer || backend->current_pointer == pointer);
output->enter_serial = serial;
backend->current_pointer = pointer;