mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clients: Fix cursors when compositor gives wl_seat before wl_compositor 

We have no guarantee that we can create a surface for the pointer at the
instant we receive a seat that will (probably eventually) need one.

Hold off until we receive an enter event before creating this - at that
point we know with certainty that wl_compositor is available, since we've
used it to create the surface that was entered.

Fixes #659

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
(cherry picked from commit 11ba13d717)
This commit is contained in:
Derek Foreman 2022-09-12 11:52:19 -05:00 committed by Marius Vlad
parent 8f8ff5f294
commit f88eed4ea8
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
clients/window.c
View File

@ -2778,6 +2778,15 @@ pointer_handle_enter(void *data, struct wl_pointer *pointer,
input->display->serial = serial;
input->pointer_enter_serial = serial;
input->pointer_focus = window;
/* Some compositors advertise wl_seat before wl_compositor. This
* makes it potentially impossible to create the pointer surface
* when we bind the seat, so we need to create our pointer surface
* now instead.
*/
if (!input->pointer_surface)
input->pointer_surface = wl_compositor_create_surface(input->display->compositor);
input->pointer_surface_has_role = false;
input->sx = sx;
@ -5940,7 +5949,6 @@ display_add_input(struct display *d, uint32_t id, int display_seat_version)
input);
}
input->pointer_surface = wl_compositor_create_surface(d->compositor);
input->pointer_surface_has_role = false;
toytimer_init(&input->cursor_timer, CLOCK_MONOTONIC, d,
@ -6010,7 +6018,8 @@ input_destroy(struct input *input)
fini_xkb(input);
wl_surface_destroy(input->pointer_surface);
if (input->pointer_surface)
wl_surface_destroy(input->pointer_surface);
wl_list_remove(&input->link);
wl_seat_destroy(input->seat);