aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2020-06-05 11:42:36 +0200
committerSimon Ser <contact@emersion.fr>2021-02-08 13:30:21 +0100
commit8d76d3263d31554c287a72d5e280568ae4cc2122 (patch)
tree268d1d03a08d0dee0b88dc9f87d50cafa0cc6e1f
parent533a36f05a46472a29700df47100a4c5c59c5f29 (diff)
seat: use WL_SEAT_ERROR_CAPABILITY
Depends on [1]. [1]: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/79
-rw-r--r--meson.build2
-rw-r--r--types/seat/wlr_seat.c6
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;
}