From 8d76d3263d31554c287a72d5e280568ae4cc2122 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 5 Jun 2020 11:42:36 +0200 Subject: [PATCH] seat: use WL_SEAT_ERROR_CAPABILITY Depends on [1]. [1]: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/79 --- meson.build | 2 +- types/seat/wlr_seat.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index cba68568..e0951a8d 100644 --- a/meson.build +++ b/meson.build @@ -89,7 +89,7 @@ conf_data.set10('WLR_HAS_XCB_ERRORS', false) conf_data.set10('WLR_HAS_XCB_ICCCM', false) conf_data.set10('WLR_HAS_XDG_FOREIGN', false) -wayland_server = dependency('wayland-server', version: '>=1.18') +wayland_server = dependency('wayland-server', version: '>=1.19') wayland_client = dependency('wayland-client') wayland_protos = dependency('wayland-protocols', version: '>=1.17') egl = dependency('egl') diff --git a/types/seat/wlr_seat.c b/types/seat/wlr_seat.c index 53d1db22..f9314744 100644 --- a/types/seat/wlr_seat.c +++ b/types/seat/wlr_seat.c @@ -20,7 +20,7 @@ static void seat_handle_get_pointer(struct wl_client *client, struct wlr_seat_client *seat_client = wlr_seat_client_from_resource(seat_resource); if (!(seat_client->seat->accumulated_capabilities & WL_SEAT_CAPABILITY_POINTER)) { - wl_resource_post_error(seat_resource, 0, + wl_resource_post_error(seat_resource, WL_SEAT_ERROR_MISSING_CAPABILITY, "wl_seat.get_pointer called when no pointer capability has existed"); return; } @@ -34,7 +34,7 @@ static void seat_handle_get_keyboard(struct wl_client *client, struct wlr_seat_client *seat_client = wlr_seat_client_from_resource(seat_resource); if (!(seat_client->seat->accumulated_capabilities & WL_SEAT_CAPABILITY_KEYBOARD)) { - wl_resource_post_error(seat_resource, 0, + wl_resource_post_error(seat_resource, WL_SEAT_ERROR_MISSING_CAPABILITY, "wl_seat.get_keyboard called when no keyboard capability has existed"); return; } @@ -48,7 +48,7 @@ static void seat_handle_get_touch(struct wl_client *client, struct wlr_seat_client *seat_client = wlr_seat_client_from_resource(seat_resource); if (!(seat_client->seat->accumulated_capabilities & WL_SEAT_CAPABILITY_TOUCH)) { - wl_resource_post_error(seat_resource, 0, + wl_resource_post_error(seat_resource, WL_SEAT_ERROR_MISSING_CAPABILITY, "wl_seat.get_touch called when no touch capability has existed"); return; }