From a656e486f4a62c18913a2acdc9febd34edd1ed18 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Sat, 27 Apr 2019 20:02:19 +0300 Subject: [PATCH] seat: fallback to v6 if libwayland 1.17 isn't available See https://github.com/swaywm/wlroots/pull/1675#issuecomment-487300445 --- types/seat/wlr_seat.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/types/seat/wlr_seat.c b/types/seat/wlr_seat.c index 5fd02645f..879a75131 100644 --- a/types/seat/wlr_seat.c +++ b/types/seat/wlr_seat.c @@ -254,8 +254,13 @@ struct wlr_seat *wlr_seat_create(struct wl_display *display, const char *name) { seat->touch_state.seat = seat; wl_list_init(&seat->touch_state.touch_points); + // TODO: always use SEAT_VERSION (requires libwayland 1.17) + uint32_t version = SEAT_VERSION; + if (wl_seat_interface.version < SEAT_VERSION) { + version = wl_seat_interface.version; + } seat->global = wl_global_create(display, &wl_seat_interface, - SEAT_VERSION, seat, seat_handle_bind); + version, seat, seat_handle_bind); if (seat->global == NULL) { free(touch_grab); free(pointer_grab);