|
|
@ -4748,7 +4748,7 @@ fini_xkb(struct input *input) |
|
|
|
xkb_map_unref(input->xkb.keymap); |
|
|
|
xkb_map_unref(input->xkb.keymap); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
#define MAX(a,b) ((a) > (b) ? a : b) |
|
|
|
#define MIN(a,b) ((a) < (b) ? a : b) |
|
|
|
|
|
|
|
|
|
|
|
static void |
|
|
|
static void |
|
|
|
display_add_input(struct display *d, uint32_t id) |
|
|
|
display_add_input(struct display *d, uint32_t id) |
|
|
@ -4758,7 +4758,7 @@ display_add_input(struct display *d, uint32_t id) |
|
|
|
input = xzalloc(sizeof *input); |
|
|
|
input = xzalloc(sizeof *input); |
|
|
|
input->display = d; |
|
|
|
input->display = d; |
|
|
|
input->seat = wl_registry_bind(d->registry, id, &wl_seat_interface, |
|
|
|
input->seat = wl_registry_bind(d->registry, id, &wl_seat_interface, |
|
|
|
MAX(d->seat_version, 3)); |
|
|
|
MIN(d->seat_version, 3)); |
|
|
|
input->touch_focus = NULL; |
|
|
|
input->touch_focus = NULL; |
|
|
|
input->pointer_focus = NULL; |
|
|
|
input->pointer_focus = NULL; |
|
|
|
input->keyboard_focus = NULL; |
|
|
|
input->keyboard_focus = NULL; |
|
|
|