mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Rename left-over caps_mask to capability

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-05-17 09:09:21 -04:00
parent b93b6cfa47
commit 870461997a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test-client.c
+5 -5
View File
@@ -151,26 +151,26 @@ static const struct wl_keyboard_listener keyboard_listener = {
static void static void
seat_handle_capabilities(void *data, struct wl_seat *seat, seat_handle_capabilities(void *data, struct wl_seat *seat,
enum wl_seat_caps_mask caps) enum wl_seat_capability caps)
{ {
struct input *input = data; struct input *input = data;
if ((caps & WL_SEAT_CAPS_MASK_POINTER) && !input->pointer) { if ((caps & WL_SEAT_CAPABILITY_POINTER) && !input->pointer) {
input->pointer = wl_seat_get_pointer(seat); input->pointer = wl_seat_get_pointer(seat);
wl_pointer_set_user_data(input->pointer, input); wl_pointer_set_user_data(input->pointer, input);
wl_pointer_add_listener(input->pointer, &pointer_listener, wl_pointer_add_listener(input->pointer, &pointer_listener,
input); input);
} else if (!(caps & WL_SEAT_CAPS_MASK_POINTER) && input->pointer) { } else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && input->pointer) {
wl_pointer_destroy(input->pointer); wl_pointer_destroy(input->pointer);
input->pointer = NULL; input->pointer = NULL;
} }
if ((caps & WL_SEAT_CAPS_MASK_KEYBOARD) && !input->keyboard) { if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && !input->keyboard) {
input->keyboard = wl_seat_get_keyboard(seat); input->keyboard = wl_seat_get_keyboard(seat);
wl_keyboard_set_user_data(input->keyboard, input); wl_keyboard_set_user_data(input->keyboard, input);
wl_keyboard_add_listener(input->keyboard, &keyboard_listener, wl_keyboard_add_listener(input->keyboard, &keyboard_listener,
input); input);
} else if (!(caps & WL_SEAT_CAPS_MASK_KEYBOARD) && input->keyboard) { } else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && input->keyboard) {
wl_keyboard_destroy(input->keyboard); wl_keyboard_destroy(input->keyboard);
input->keyboard = NULL; input->keyboard = NULL;
} }