blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #492 from emersion/seat-client-multiple-resources 

Support multiple resources per seat client
This commit is contained in:
Drew DeVault 2017-12-16 11:53:14 -05:00 committed by GitHub
parent 95fddf2fa8 50d91bd260
commit 3363ea869a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 238 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/wlr/types/wlr_seat.h
View File

@ -16,10 +16,11 @@ struct wlr_seat_client {
struct wl_client *client; struct wl_client *client;
struct wlr_seat *seat; struct wlr_seat *seat;
struct wl_resource *pointer; // lists of wl_resource
struct wl_resource *keyboard; struct wl_list pointers;
struct wl_resource *touch; struct wl_list keyboards;
struct wl_resource *data_device; struct wl_list touches;
struct wl_list data_devices;
struct { struct {
struct wl_signal destroy; struct wl_signal destroy;

146
types/wlr_data_device.c
View File

@ -231,28 +231,35 @@ static void handle_offer_source_destroyed(struct wl_listener *listener,
static struct wlr_data_offer *wlr_data_source_send_offer( static struct wlr_data_offer *wlr_data_source_send_offer(
struct wlr_data_source *source, struct wlr_data_source *source,
struct wl_resource *target) { struct wlr_seat_client *target) {
if (wl_list_empty(&target->data_devices)) {
return NULL;
}
struct wlr_data_offer *offer = calloc(1, sizeof(struct wlr_data_offer)); struct wlr_data_offer *offer = calloc(1, sizeof(struct wlr_data_offer));
if (offer == NULL) { if (offer == NULL) {
return NULL; return NULL;
} }
offer->resource = uint32_t version = wl_resource_get_version(
wl_resource_create(wl_resource_get_client(target), wl_resource_from_link(target->data_devices.next));
&wl_data_offer_interface, offer->resource = wl_resource_create(target->client,
wl_resource_get_version(target), 0); &wl_data_offer_interface, version, 0);
if (offer->resource == NULL) { if (offer->resource == NULL) {
free(offer); free(offer);
return NULL; return NULL;
} }
wl_resource_set_implementation(offer->resource, &data_offer_impl, offer, wl_resource_set_implementation(offer->resource, &data_offer_impl, offer,
data_offer_resource_destroy); data_offer_resource_destroy);
offer->source_destroy.notify = handle_offer_source_destroyed; offer->source_destroy.notify = handle_offer_source_destroyed;
wl_signal_add(&source->events.destroy, &offer->source_destroy); wl_signal_add(&source->events.destroy, &offer->source_destroy);
wl_data_device_send_data_offer(target, offer->resource); struct wl_resource *target_resource;
wl_resource_for_each(target_resource, &target->data_devices) {
wl_data_device_send_data_offer(target_resource, offer->resource);
}
char **p; char **p;
wl_array_for_each(p, &source->mime_types) { wl_array_for_each(p, &source->mime_types) {
wl_data_offer_send_offer(offer->resource, *p); wl_data_offer_send_offer(offer->resource, *p);
@ -265,20 +272,27 @@ static struct wlr_data_offer *wlr_data_source_send_offer(
return offer; return offer;
} }
void wlr_seat_client_send_selection(struct wlr_seat_client *seat_client) { void wlr_seat_client_send_selection(struct wlr_seat_client *seat_client) {
if (!seat_client->data_device) { if (wl_list_empty(&seat_client->data_devices)) {
return; return;
} }
if (seat_client->seat->selection_source) { if (seat_client->seat->selection_source) {
struct wlr_data_offer *offer = struct wlr_data_offer *offer = wlr_data_source_send_offer(
wlr_data_source_send_offer(seat_client->seat->selection_source, seat_client->seat->selection_source, seat_client);
seat_client->data_device); if (offer == NULL) {
wl_data_device_send_selection(seat_client->data_device, return;
offer->resource); }
struct wl_resource *resource;
wl_resource_for_each(resource, &seat_client->data_devices) {
wl_data_device_send_selection(resource, offer->resource);
}
} else { } else {
wl_data_device_send_selection(seat_client->data_device, NULL); struct wl_resource *resource;
wl_resource_for_each(resource, &seat_client->data_devices) {
wl_data_device_send_selection(resource, NULL);
}
} }
} }
@ -286,12 +300,13 @@ static void seat_client_selection_data_source_destroy(
struct wl_listener *listener, void *data) { struct wl_listener *listener, void *data) {
struct wlr_seat *seat = struct wlr_seat *seat =
wl_container_of(listener, seat, selection_data_source_destroy); wl_container_of(listener, seat, selection_data_source_destroy);
struct wlr_seat_client *seat_client = seat->keyboard_state.focused_client;
if (seat->keyboard_state.focused_client && if (seat_client && seat->keyboard_state.focused_surface) {
seat->keyboard_state.focused_surface && struct wl_resource *resource;
seat->keyboard_state.focused_client->data_device) { wl_resource_for_each(resource, &seat_client->data_devices) {
wl_data_device_send_selection( wl_data_device_send_selection(resource, NULL);
seat->keyboard_state.focused_client->data_device, NULL); }
} }
seat->selection_source = NULL; seat->selection_source = NULL;
@ -367,9 +382,14 @@ static void wlr_drag_set_focus(struct wlr_drag *drag,
return; return;
} }
if (drag->focus_client && drag->focus_client->data_device) { if (drag->focus_client) {
wl_list_remove(&drag->seat_client_destroy.link); wl_list_remove(&drag->seat_client_destroy.link);
wl_data_device_send_leave(drag->focus_client->data_device);
struct wl_resource *resource;
wl_resource_for_each(resource, &drag->focus_client->data_devices) {
wl_data_device_send_leave(resource);
}
drag->focus_client = NULL; drag->focus_client = NULL;
drag->focus = NULL; drag->focus = NULL;
} }
@ -395,15 +415,15 @@ static void wlr_drag_set_focus(struct wlr_drag *drag,
wlr_seat_client_for_wl_client(drag->seat_client->seat, wlr_seat_client_for_wl_client(drag->seat_client->seat,
wl_resource_get_client(surface->resource)); wl_resource_get_client(surface->resource));
if (!focus_client || !focus_client->data_device) { if (!focus_client || wl_list_empty(&focus_client->data_devices)) {
return; return;
} }
struct wl_resource *offer_resource = NULL; struct wl_resource *offer_resource = NULL;
if (drag->source) { if (drag->source) {
drag->source->accepted = false; drag->source->accepted = false;
struct wlr_data_offer *offer = struct wlr_data_offer *offer = wlr_data_source_send_offer(drag->source,
wlr_data_source_send_offer(drag->source, focus_client->data_device); focus_client);
if (offer == NULL) { if (offer == NULL) {
return; return;
} }
@ -421,10 +441,11 @@ static void wlr_drag_set_focus(struct wlr_drag *drag,
uint32_t serial = uint32_t serial =
wl_display_next_serial(drag->seat_client->seat->display); wl_display_next_serial(drag->seat_client->seat->display);
struct wl_resource *resource;
wl_data_device_send_enter(focus_client->data_device, serial, wl_resource_for_each(resource, &focus_client->data_devices) {
surface->resource, wl_fixed_from_double(sx), wl_data_device_send_enter(resource, serial, surface->resource,
wl_fixed_from_double(sy), offer_resource); wl_fixed_from_double(sx), wl_fixed_from_double(sy), offer_resource);
}
drag->focus = surface; drag->focus = surface;
drag->focus_client = focus_client; drag->focus_client = focus_client;
@ -467,9 +488,12 @@ static void pointer_drag_enter(struct wlr_seat_pointer_grab *grab,
static void pointer_drag_motion(struct wlr_seat_pointer_grab *grab, static void pointer_drag_motion(struct wlr_seat_pointer_grab *grab,
uint32_t time, double sx, double sy) { uint32_t time, double sx, double sy) {
struct wlr_drag *drag = grab->data; struct wlr_drag *drag = grab->data;
if (drag->focus && drag->focus_client && drag->focus_client->data_device) { if (drag->focus != NULL&& drag->focus_client != NULL) {
wl_data_device_send_motion(drag->focus_client->data_device, time, struct wl_resource *resource;
wl_fixed_from_double(sx), wl_fixed_from_double(sy)); wl_resource_for_each(resource, &drag->focus_client->data_devices) {
wl_data_device_send_motion(resource, time, wl_fixed_from_double(sx),
wl_fixed_from_double(sy));
}
} }
} }
@ -480,14 +504,16 @@ static uint32_t pointer_drag_button(struct wlr_seat_pointer_grab *grab,
if (drag->source && if (drag->source &&
grab->seat->pointer_state.grab_button == button && grab->seat->pointer_state.grab_button == button &&
state == WL_POINTER_BUTTON_STATE_RELEASED) { state == WL_POINTER_BUTTON_STATE_RELEASED) {
if (drag->focus_client && drag->focus_client->data_device && if (drag->focus_client && drag->source->current_dnd_action &&
drag->source->current_dnd_action &&
drag->source->accepted) { drag->source->accepted) {
wl_data_device_send_drop(drag->focus_client->data_device); struct wl_resource *resource;
wl_resource_for_each(resource, &drag->focus_client->data_devices) {
wl_data_device_send_drop(resource);
}
if (wl_resource_get_version(drag->source->resource) >= if (wl_resource_get_version(drag->source->resource) >=
WL_DATA_SOURCE_DND_DROP_PERFORMED_SINCE_VERSION) { WL_DATA_SOURCE_DND_DROP_PERFORMED_SINCE_VERSION) {
wl_data_source_send_dnd_drop_performed( wl_data_source_send_dnd_drop_performed(
drag->source->resource); drag->source->resource);
} }
drag->source->offer->in_ask = drag->source->offer->in_ask =
@ -538,8 +564,11 @@ static void touch_drag_up(struct wlr_seat_touch_grab *grab, uint32_t time,
return; return;
} }
if (drag->focus_client && drag->focus_client->data_device) { if (drag->focus_client) {
wl_data_device_send_drop(drag->focus_client->data_device); struct wl_resource *resource;
wl_resource_for_each(resource, &drag->focus_client->data_devices) {
wl_data_device_send_drop(resource);
}
} }
wlr_drag_end(drag); wlr_drag_end(drag);
@ -548,9 +577,13 @@ static void touch_drag_up(struct wlr_seat_touch_grab *grab, uint32_t time,
static void touch_drag_motion(struct wlr_seat_touch_grab *grab, uint32_t time, static void touch_drag_motion(struct wlr_seat_touch_grab *grab, uint32_t time,
struct wlr_touch_point *point) { struct wlr_touch_point *point) {
struct wlr_drag *drag = grab->data; struct wlr_drag *drag = grab->data;
if (drag->focus && drag->focus_client && drag->focus_client->data_device) { if (drag->focus && drag->focus_client) {
wl_data_device_send_motion(drag->focus_client->data_device, time, struct wl_resource *resource;
wl_fixed_from_double(point->sx), wl_fixed_from_double(point->sy)); wl_resource_for_each(resource, &drag->focus_client->data_devices) {
wl_data_device_send_motion(resource, time,
wl_fixed_from_double(point->sx),
wl_fixed_from_double(point->sy));
}
} }
} }
@ -687,19 +720,18 @@ static bool seat_client_start_drag(struct wlr_seat_client *client,
drag->seat = client->seat; drag->seat = client->seat;
drag->is_pointer_grab = client->pointer != NULL && drag->is_pointer_grab = !wl_list_empty(&client->pointers) &&
client->seat->pointer_state.button_count == 1 && client->seat->pointer_state.button_count == 1 &&
client->seat->pointer_state.grab_serial == serial && client->seat->pointer_state.grab_serial == serial &&
client->seat->pointer_state.focused_surface && client->seat->pointer_state.focused_surface &&
client->seat->pointer_state.focused_surface == origin; client->seat->pointer_state.focused_surface == origin;
bool is_touch_grab = client->touch && bool is_touch_grab = !wl_list_empty(&client->touches) &&
wlr_seat_touch_num_points(client->seat) == 1 && wlr_seat_touch_num_points(client->seat) == 1 &&
client->seat->touch_state.grab_serial == serial; client->seat->touch_state.grab_serial == serial;
// set in the iteration // set in the iteration
struct wlr_touch_point *point = NULL; struct wlr_touch_point *point = NULL;
if (is_touch_grab) { if (is_touch_grab) {
wl_list_for_each(point, &client->seat->touch_state.touch_points, link) { wl_list_for_each(point, &client->seat->touch_state.touch_points, link) {
is_touch_grab = point->surface && point->surface == origin; is_touch_grab = point->surface && point->surface == origin;
@ -717,7 +749,6 @@ static bool seat_client_start_drag(struct wlr_seat_client *client,
struct wlr_drag_icon *icon = struct wlr_drag_icon *icon =
wlr_drag_icon_create(icon_surface, client, drag->is_pointer_grab, wlr_drag_icon_create(icon_surface, client, drag->is_pointer_grab,
touch_id); touch_id);
if (!icon) { if (!icon) {
free(drag); free(drag);
return false; return false;
@ -800,31 +831,26 @@ static const struct wl_data_device_interface data_device_impl = {
.release = data_device_release, .release = data_device_release,
}; };
static void data_device_destroy(struct wl_resource *resource) {
wl_list_remove(wl_resource_get_link(resource));
}
void data_device_manager_get_data_device(struct wl_client *client, void data_device_manager_get_data_device(struct wl_client *client,
struct wl_resource *manager_resource, uint32_t id, struct wl_resource *manager_resource, uint32_t id,
struct wl_resource *seat_resource) { struct wl_resource *seat_resource) {
struct wlr_seat_client *seat_client = struct wlr_seat_client *seat_client =
wl_resource_get_user_data(seat_resource); wl_resource_get_user_data(seat_resource);
struct wl_resource *resource = struct wl_resource *resource = wl_resource_create(client,
wl_resource_create(client, &wl_data_device_interface, wl_resource_get_version(manager_resource),
&wl_data_device_interface, id);
wl_resource_get_version(manager_resource), id);
if (resource == NULL) { if (resource == NULL) {
wl_resource_post_no_memory(manager_resource); wl_resource_post_no_memory(manager_resource);
return; return;
} }
wl_resource_set_implementation(resource, &data_device_impl, seat_client,
if (seat_client->data_device != NULL) { &data_device_destroy);
// XXX this is probably a protocol violation, but it simplfies our code wl_list_insert(&seat_client->data_devices, wl_resource_get_link(resource));
// and it's stupid to create several data devices for the same seat.
wl_resource_destroy(seat_client->data_device);
}
seat_client->data_device = resource;
wl_resource_set_implementation(resource, &data_device_impl,
seat_client, NULL);
} }
static void data_source_resource_destroy(struct wl_resource *resource) { static void data_source_resource_destroy(struct wl_resource *resource) {

280
types/wlr_seat.c
View File

@ -55,14 +55,11 @@ static void wl_pointer_set_cursor(struct wl_client *client,
static const struct wl_pointer_interface wl_pointer_impl = { static const struct wl_pointer_interface wl_pointer_impl = {
.set_cursor = wl_pointer_set_cursor, .set_cursor = wl_pointer_set_cursor,
.release = resource_destroy .release = resource_destroy,
}; };
static void wl_pointer_destroy(struct wl_resource *resource) { static void wl_pointer_destroy(struct wl_resource *resource) {
struct wlr_seat_client *client = wl_resource_get_user_data(resource); wl_list_remove(wl_resource_get_link(resource));
if (client->pointer) {
client->pointer = NULL;
}
} }
static void wl_seat_get_pointer(struct wl_client *client, static void wl_seat_get_pointer(struct wl_client *client,
@ -72,55 +69,55 @@ static void wl_seat_get_pointer(struct wl_client *client,
if (!(seat_client->seat->capabilities & WL_SEAT_CAPABILITY_POINTER)) { if (!(seat_client->seat->capabilities & WL_SEAT_CAPABILITY_POINTER)) {
return; return;
} }
if (seat_client->pointer) {
// TODO: this is probably a protocol violation but it simplifies our struct wl_resource *resource = wl_resource_create(client,
// code and it'd be stupid for clients to create several pointers for &wl_pointer_interface, wl_resource_get_version(seat_resource), id);
// the same seat if (resource == NULL) {
wl_resource_destroy(seat_client->pointer);
}
seat_client->pointer = wl_resource_create(client, &wl_pointer_interface,
wl_resource_get_version(seat_resource), id);
if (seat_client->pointer == NULL) {
wl_resource_post_no_memory(seat_resource); wl_resource_post_no_memory(seat_resource);
return; return;
} }
wl_resource_set_implementation(seat_client->pointer, &wl_pointer_impl, wl_resource_set_implementation(resource, &wl_pointer_impl, seat_client,
seat_client, &wl_pointer_destroy); &wl_pointer_destroy);
wl_list_insert(&seat_client->pointers, wl_resource_get_link(resource));
} }
static const struct wl_keyboard_interface wl_keyboard_impl = { static const struct wl_keyboard_interface wl_keyboard_impl = {
.release = resource_destroy .release = resource_destroy,
}; };
static void wl_keyboard_destroy(struct wl_resource *resource) { static void wl_keyboard_destroy(struct wl_resource *resource) {
struct wlr_seat_client *client = wl_resource_get_user_data(resource); wl_list_remove(wl_resource_get_link(resource));
if (client->keyboard) {
client->keyboard = NULL;
}
} }
static void seat_client_send_keymap(struct wlr_seat_client *client, static void seat_client_send_keymap(struct wlr_seat_client *client,
struct wlr_keyboard *keyboard) { struct wlr_keyboard *keyboard) {
if (!keyboard || !client->keyboard) { if (!keyboard) {
return; return;
} }
// TODO: We should probably lift all of the keys set by the other // TODO: We should probably lift all of the keys set by the other
// keyboard // keyboard
wl_keyboard_send_keymap(client->keyboard, struct wl_resource *resource;
WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, keyboard->keymap_fd, wl_resource_for_each(resource, &client->keyboards) {
keyboard->keymap_size); wl_keyboard_send_keymap(resource,
WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, keyboard->keymap_fd,
keyboard->keymap_size);
}
} }
static void seat_client_send_repeat_info(struct wlr_seat_client *client, static void seat_client_send_repeat_info(struct wlr_seat_client *client,
struct wlr_keyboard *keyboard) { struct wlr_keyboard *keyboard) {
if (!keyboard || !client->keyboard) { if (!keyboard) {
return; return;
} }
if (wl_resource_get_version(client->keyboard) >= struct wl_resource *resource;
WL_KEYBOARD_REPEAT_INFO_SINCE_VERSION) { wl_resource_for_each(resource, &client->keyboards) {
wl_keyboard_send_repeat_info(client->keyboard, if (wl_resource_get_version(resource) >=
keyboard->repeat_info.rate, keyboard->repeat_info.delay); WL_KEYBOARD_REPEAT_INFO_SINCE_VERSION) {
wl_keyboard_send_repeat_info(resource,
keyboard->repeat_info.rate, keyboard->repeat_info.delay);
}
} }
} }
@ -131,20 +128,16 @@ static void wl_seat_get_keyboard(struct wl_client *client,
if (!(seat_client->seat->capabilities & WL_SEAT_CAPABILITY_KEYBOARD)) { if (!(seat_client->seat->capabilities & WL_SEAT_CAPABILITY_KEYBOARD)) {
return; return;
} }
if (seat_client->keyboard) {
// TODO: this is probably a protocol violation but it simplifies our struct wl_resource *resource = wl_resource_create(client,
// code and it'd be stupid for clients to create several keyboards for &wl_keyboard_interface, wl_resource_get_version(seat_resource), id);
// the same seat if (resource == NULL) {
wl_resource_destroy(seat_client->keyboard);
}
seat_client->keyboard = wl_resource_create(client, &wl_keyboard_interface,
wl_resource_get_version(seat_resource), id);
if (seat_client->keyboard == NULL) {
wl_resource_post_no_memory(seat_resource); wl_resource_post_no_memory(seat_resource);
return; return;
} }
wl_resource_set_implementation(seat_client->keyboard, &wl_keyboard_impl, wl_resource_set_implementation(resource, &wl_keyboard_impl, seat_client,
seat_client, &wl_keyboard_destroy); &wl_keyboard_destroy);
wl_list_insert(&seat_client->keyboards, wl_resource_get_link(resource));
struct wlr_keyboard *keyboard = seat_client->seat->keyboard_state.keyboard; struct wlr_keyboard *keyboard = seat_client->seat->keyboard_state.keyboard;
seat_client_send_keymap(seat_client, keyboard); seat_client_send_keymap(seat_client, keyboard);
@ -155,14 +148,11 @@ static void wl_seat_get_keyboard(struct wl_client *client,
} }
static const struct wl_touch_interface wl_touch_impl = { static const struct wl_touch_interface wl_touch_impl = {
.release = resource_destroy .release = resource_destroy,
}; };
static void wl_touch_destroy(struct wl_resource *resource) { static void wl_touch_destroy(struct wl_resource *resource) {
struct wlr_seat_client *client = wl_resource_get_user_data(resource); wl_list_remove(wl_resource_get_link(resource));
if (client->touch) {
client->touch = NULL;
}
} }
static void wl_seat_get_touch(struct wl_client *client, static void wl_seat_get_touch(struct wl_client *client,
@ -172,24 +162,20 @@ static void wl_seat_get_touch(struct wl_client *client,
if (!(seat_client->seat->capabilities & WL_SEAT_CAPABILITY_TOUCH)) { if (!(seat_client->seat->capabilities & WL_SEAT_CAPABILITY_TOUCH)) {
return; return;
} }
if (seat_client->touch) {
// TODO: this is probably a protocol violation but it simplifies our struct wl_resource *resource = wl_resource_create(client,
// code and it'd be stupid for clients to create several pointers for &wl_touch_interface, wl_resource_get_version(seat_resource), id);
// the same seat if (resource == NULL) {
wl_resource_destroy(seat_client->touch);
}
seat_client->touch = wl_resource_create(client, &wl_touch_interface,
wl_resource_get_version(seat_resource), id);
if (seat_client->touch == NULL) {
wl_resource_post_no_memory(seat_resource); wl_resource_post_no_memory(seat_resource);
return; return;
} }
wl_resource_set_implementation(seat_client->touch, &wl_touch_impl, wl_resource_set_implementation(resource, &wl_touch_impl, seat_client,
seat_client, &wl_touch_destroy); &wl_touch_destroy);
wl_list_insert(&seat_client->touches, wl_resource_get_link(resource));
} }
static void wlr_seat_client_resource_destroy(struct wl_resource *resource) { static void wlr_seat_client_resource_destroy(struct wl_resource *seat_resource) {
struct wlr_seat_client *client = wl_resource_get_user_data(resource); struct wlr_seat_client *client = wl_resource_get_user_data(seat_resource);
wl_signal_emit(&client->events.destroy, client); wl_signal_emit(&client->events.destroy, client);
if (client == client->seat->pointer_state.focused_client) { if (client == client->seat->pointer_state.focused_client) {
@ -199,18 +185,20 @@ static void wlr_seat_client_resource_destroy(struct wl_resource *resource) {
client->seat->keyboard_state.focused_client = NULL; client->seat->keyboard_state.focused_client = NULL;
} }
if (client->pointer) { struct wl_resource *resource, *tmp;
wl_resource_destroy(client->pointer); wl_resource_for_each_safe(resource, tmp, &client->pointers) {
wl_resource_destroy(resource);
} }
if (client->keyboard) { wl_resource_for_each_safe(resource, tmp, &client->keyboards) {
wl_resource_destroy(client->keyboard); wl_resource_destroy(resource);
} }
if (client->touch) { wl_resource_for_each_safe(resource, tmp, &client->touches) {
wl_resource_destroy(client->touch); wl_resource_destroy(resource);
} }
if (client->data_device) { wl_resource_for_each_safe(resource, tmp, &client->data_devices) {
wl_resource_destroy(client->data_device); wl_resource_destroy(resource);
} }
wl_list_remove(&client->link); wl_list_remove(&client->link);
free(client); free(client);
} }
@ -219,7 +207,7 @@ struct wl_seat_interface wl_seat_impl = {
.get_pointer = wl_seat_get_pointer, .get_pointer = wl_seat_get_pointer,
.get_keyboard = wl_seat_get_keyboard, .get_keyboard = wl_seat_get_keyboard,
.get_touch = wl_seat_get_touch, .get_touch = wl_seat_get_touch,
.release = resource_destroy .release = resource_destroy,
}; };
static void wl_seat_bind(struct wl_client *client, void *_wlr_seat, static void wl_seat_bind(struct wl_client *client, void *_wlr_seat,
@ -242,6 +230,10 @@ static void wl_seat_bind(struct wl_client *client, void *_wlr_seat,
} }
seat_client->client = client; seat_client->client = client;
seat_client->seat = wlr_seat; seat_client->seat = wlr_seat;
wl_list_init(&seat_client->pointers);
wl_list_init(&seat_client->keyboards);
wl_list_init(&seat_client->touches);
wl_list_init(&seat_client->data_devices);
wl_resource_set_implementation(seat_client->wl_resource, &wl_seat_impl, wl_resource_set_implementation(seat_client->wl_resource, &wl_seat_impl,
seat_client, wlr_seat_client_resource_destroy); seat_client, wlr_seat_client_resource_destroy);
wl_list_insert(&wlr_seat->clients, &seat_client->link); wl_list_insert(&wlr_seat->clients, &seat_client->link);
@ -253,7 +245,7 @@ static void wl_seat_bind(struct wl_client *client, void *_wlr_seat,
} }
static void default_pointer_enter(struct wlr_seat_pointer_grab *grab, static void default_pointer_enter(struct wlr_seat_pointer_grab *grab,
struct wlr_surface *surface, double sx, double sy) { struct wlr_surface *surface, double sx, double sy) {
wlr_seat_pointer_enter(grab->seat, surface, sx, sy); wlr_seat_pointer_enter(grab->seat, surface, sx, sy);
} }
@ -514,11 +506,6 @@ static void pointer_resource_destroy_notify(struct wl_listener *listener,
wlr_seat_pointer_clear_focus(state->seat); wlr_seat_pointer_clear_focus(state->seat);
} }
static bool wlr_seat_pointer_has_focus_resource(struct wlr_seat *wlr_seat) {
return wlr_seat->pointer_state.focused_client &&
wlr_seat->pointer_state.focused_client->pointer;
}
void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat, void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
struct wlr_surface *surface, double sx, double sy) { struct wlr_surface *surface, double sx, double sy) {
assert(wlr_seat); assert(wlr_seat);
@ -529,7 +516,6 @@ void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
} }
struct wlr_seat_client *client = NULL; struct wlr_seat_client *client = NULL;
if (surface) { if (surface) {
struct wl_client *wl_client = wl_resource_get_client(surface->resource); struct wl_client *wl_client = wl_resource_get_client(surface->resource);
client = wlr_seat_client_for_wl_client(wlr_seat, wl_client); client = wlr_seat_client_for_wl_client(wlr_seat, wl_client);
@ -541,19 +527,24 @@ void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
wlr_seat->pointer_state.focused_surface; wlr_seat->pointer_state.focused_surface;
// leave the previously entered surface // leave the previously entered surface
if (focused_client && focused_client->pointer && focused_surface) { if (focused_client != NULL && focused_surface != NULL) {
uint32_t serial = wl_display_next_serial(wlr_seat->display); uint32_t serial = wl_display_next_serial(wlr_seat->display);
wl_pointer_send_leave(focused_client->pointer, serial, struct wl_resource *resource;
focused_surface->resource); wl_resource_for_each(resource, &focused_client->pointers) {
pointer_send_frame(focused_client->pointer); wl_pointer_send_leave(resource, serial, focused_surface->resource);
pointer_send_frame(resource);
}
} }
// enter the current surface // enter the current surface
if (client && client->pointer) { if (client != NULL && surface != NULL) {
uint32_t serial = wl_display_next_serial(wlr_seat->display); uint32_t serial = wl_display_next_serial(wlr_seat->display);
wl_pointer_send_enter(client->pointer, serial, surface->resource, struct wl_resource *resource;
wl_fixed_from_double(sx), wl_fixed_from_double(sy)); wl_resource_for_each(resource, &client->pointers) {
pointer_send_frame(client->pointer); wl_pointer_send_enter(resource, serial, surface->resource,
wl_fixed_from_double(sx), wl_fixed_from_double(sy));
pointer_send_frame(resource);
}
} }
// reinitialize the focus destroy events // reinitialize the focus destroy events
@ -561,7 +552,7 @@ void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
wl_list_init(&wlr_seat->pointer_state.surface_destroy.link); wl_list_init(&wlr_seat->pointer_state.surface_destroy.link);
wl_list_remove(&wlr_seat->pointer_state.resource_destroy.link); wl_list_remove(&wlr_seat->pointer_state.resource_destroy.link);
wl_list_init(&wlr_seat->pointer_state.resource_destroy.link); wl_list_init(&wlr_seat->pointer_state.resource_destroy.link);
if (surface) { if (surface != NULL) {
wl_signal_add(&surface->events.destroy, wl_signal_add(&surface->events.destroy,
&wlr_seat->pointer_state.surface_destroy); &wlr_seat->pointer_state.surface_destroy);
wl_resource_add_destroy_listener(surface->resource, wl_resource_add_destroy_listener(surface->resource,
@ -584,46 +575,53 @@ void wlr_seat_pointer_clear_focus(struct wlr_seat *wlr_seat) {
void wlr_seat_pointer_send_motion(struct wlr_seat *wlr_seat, uint32_t time, void wlr_seat_pointer_send_motion(struct wlr_seat *wlr_seat, uint32_t time,
double sx, double sy) { double sx, double sy) {
if (!wlr_seat_pointer_has_focus_resource(wlr_seat)) { struct wlr_seat_client *client = wlr_seat->pointer_state.focused_client;
if (client == NULL) {
return; return;
} }
wl_pointer_send_motion(wlr_seat->pointer_state.focused_client->pointer, struct wl_resource *resource;
time, wl_fixed_from_double(sx), wl_fixed_from_double(sy)); wl_resource_for_each(resource, &client->pointers) {
pointer_send_frame(wlr_seat->pointer_state.focused_client->pointer); wl_pointer_send_motion(resource, time, wl_fixed_from_double(sx),
wl_fixed_from_double(sy));
pointer_send_frame(resource);
}
} }
uint32_t wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time, uint32_t wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time,
uint32_t button, uint32_t state) { uint32_t button, uint32_t state) {
if (!wlr_seat_pointer_has_focus_resource(wlr_seat)) { struct wlr_seat_client *client = wlr_seat->pointer_state.focused_client;
if (client == NULL) {
return 0; return 0;
} }
uint32_t serial = wl_display_next_serial(wlr_seat->display); uint32_t serial = wl_display_next_serial(wlr_seat->display);
wl_pointer_send_button(wlr_seat->pointer_state.focused_client->pointer, struct wl_resource *resource;
serial, time, button, state); wl_resource_for_each(resource, &client->pointers) {
pointer_send_frame(wlr_seat->pointer_state.focused_client->pointer); wl_pointer_send_button(resource, serial, time, button, state);
pointer_send_frame(resource);
}
return serial; return serial;
} }
void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time, void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time,
enum wlr_axis_orientation orientation, double value) { enum wlr_axis_orientation orientation, double value) {
if (!wlr_seat_pointer_has_focus_resource(wlr_seat)) { struct wlr_seat_client *client = wlr_seat->pointer_state.focused_client;
if (client == NULL) {
return; return;
} }
struct wl_resource *pointer = struct wl_resource *resource;
wlr_seat->pointer_state.focused_client->pointer; wl_resource_for_each(resource, &client->pointers) {
if (value) {
if (value) { wl_pointer_send_axis(resource, time, orientation,
wl_pointer_send_axis(pointer, time, orientation, wl_fixed_from_double(value));
wl_fixed_from_double(value)); } else if (wl_resource_get_version(resource) >=
} else if (wl_resource_get_version(pointer) >= WL_POINTER_AXIS_STOP_SINCE_VERSION) {
WL_POINTER_AXIS_STOP_SINCE_VERSION) { wl_pointer_send_axis_stop(resource, time, orientation);
wl_pointer_send_axis_stop(pointer, time, orientation); }
pointer_send_frame(resource);
} }
pointer_send_frame(pointer);
} }
void wlr_seat_pointer_start_grab(struct wlr_seat *wlr_seat, void wlr_seat_pointer_start_grab(struct wlr_seat *wlr_seat,
@ -697,13 +695,15 @@ bool wlr_seat_pointer_has_grab(struct wlr_seat *seat) {
void wlr_seat_keyboard_send_key(struct wlr_seat *wlr_seat, uint32_t time, void wlr_seat_keyboard_send_key(struct wlr_seat *wlr_seat, uint32_t time,
uint32_t key, uint32_t state) { uint32_t key, uint32_t state) {
struct wlr_seat_client *client = wlr_seat->keyboard_state.focused_client; struct wlr_seat_client *client = wlr_seat->keyboard_state.focused_client;
if (!client || !client->keyboard) { if (!client) {
return; return;
} }
uint32_t serial = wl_display_next_serial(wlr_seat->display); uint32_t serial = wl_display_next_serial(wlr_seat->display);
wl_keyboard_send_key(client->keyboard, serial, struct wl_resource *resource;
time, key, state); wl_resource_for_each(resource, &client->keyboards) {
wl_keyboard_send_key(resource, serial, time, key, state);
}
} }
static void handle_keyboard_keymap(struct wl_listener *listener, void *data) { static void handle_keyboard_keymap(struct wl_listener *listener, void *data) {
@ -811,19 +811,22 @@ static void keyboard_resource_destroy_notify(struct wl_listener *listener,
void wlr_seat_keyboard_send_modifiers(struct wlr_seat *seat) { void wlr_seat_keyboard_send_modifiers(struct wlr_seat *seat) {
struct wlr_seat_client *client = seat->keyboard_state.focused_client; struct wlr_seat_client *client = seat->keyboard_state.focused_client;
if (!client || !client->keyboard) { if (client == NULL) {
return; return;
} }
struct wlr_keyboard *keyboard = seat->keyboard_state.keyboard; struct wlr_keyboard *keyboard = seat->keyboard_state.keyboard;
if (!keyboard) { if (keyboard == NULL) {
return; return;
} }
uint32_t serial = wl_display_next_serial(seat->display); uint32_t serial = wl_display_next_serial(seat->display);
wl_keyboard_send_modifiers(client->keyboard, serial, struct wl_resource *resource;
keyboard->modifiers.depressed, keyboard->modifiers.latched, wl_resource_for_each(resource, &client->keyboards) {
keyboard->modifiers.locked, keyboard->modifiers.group); wl_keyboard_send_modifiers(resource, serial,
keyboard->modifiers.depressed, keyboard->modifiers.latched,
keyboard->modifiers.locked, keyboard->modifiers.group);
}
} }
void wlr_seat_keyboard_enter(struct wlr_seat *seat, void wlr_seat_keyboard_enter(struct wlr_seat *seat,
@ -846,29 +849,31 @@ void wlr_seat_keyboard_enter(struct wlr_seat *seat,
seat->keyboard_state.focused_surface; seat->keyboard_state.focused_surface;
// leave the previously entered surface // leave the previously entered surface
if (focused_client && focused_client->keyboard && focused_surface) { if (focused_client != NULL && focused_surface != NULL) {
uint32_t serial = wl_display_next_serial(seat->display); uint32_t serial = wl_display_next_serial(seat->display);
wl_keyboard_send_leave(focused_client->keyboard, serial, struct wl_resource *resource;
focused_surface->resource); wl_resource_for_each(resource, &focused_client->keyboards) {
wl_keyboard_send_leave(resource, serial, focused_surface->resource);
}
} }
// enter the current surface // enter the current surface
if (client && client->keyboard && seat->keyboard_state.keyboard) { if (client != NULL && seat->keyboard_state.keyboard != NULL) {
struct wlr_keyboard *keyboard = seat->keyboard_state.keyboard; struct wlr_keyboard *keyboard = seat->keyboard_state.keyboard;
struct wl_array keys; struct wl_array keys;
wl_array_init(&keys); wl_array_init(&keys);
size_t n = 0;
for (size_t i = 0; i < WLR_KEYBOARD_KEYS_CAP; ++i) { for (size_t i = 0; i < WLR_KEYBOARD_KEYS_CAP; ++i) {
if (keyboard->keycodes[i] != 0) { if (keyboard->keycodes[i] != 0) {
wl_array_add(&keys, sizeof(uint32_t)); uint32_t *p = wl_array_add(&keys, sizeof(uint32_t));
((uint32_t *)keys.data)[n] = keyboard->keycodes[i]; *p = keyboard->keycodes[i];
n++;
} }
} }
uint32_t serial = wl_display_next_serial(seat->display); uint32_t serial = wl_display_next_serial(seat->display);
wl_keyboard_send_enter(client->keyboard, serial, struct wl_resource *resource;
surface->resource, &keys); wl_resource_for_each(resource, &client->keyboards) {
wl_keyboard_send_enter(resource, serial, surface->resource, &keys);
}
wl_array_release(&keys); wl_array_release(&keys);
wlr_seat_client_send_selection(client); wlr_seat_client_send_selection(client);
@ -893,7 +898,7 @@ void wlr_seat_keyboard_enter(struct wlr_seat *seat,
seat->keyboard_state.focused_client = client; seat->keyboard_state.focused_client = client;
seat->keyboard_state.focused_surface = surface; seat->keyboard_state.focused_surface = surface;
if (client && client->keyboard && seat->keyboard_state.keyboard) { if (client != NULL && seat->keyboard_state.keyboard != NULL) {
// tell new client about any modifier change last, // tell new client about any modifier change last,
// as it targets seat->keyboard_state.focused_client // as it targets seat->keyboard_state.focused_client
wlr_seat_keyboard_send_modifiers(seat); wlr_seat_keyboard_send_modifiers(seat);
@ -986,7 +991,7 @@ static struct wlr_touch_point *touch_point_create(
struct wl_client *wl_client = wl_resource_get_client(surface->resource); struct wl_client *wl_client = wl_resource_get_client(surface->resource);
struct wlr_seat_client *client = wlr_seat_client_for_wl_client(seat, wl_client); struct wlr_seat_client *client = wlr_seat_client_for_wl_client(seat, wl_client);
if (!client || !client->touch) { if (client == NULL || wl_list_empty(&client->touches)) {
// touch points are not valid without a connected client with touch // touch points are not valid without a connected client with touch
return NULL; return NULL;
} }
@ -1101,7 +1106,7 @@ static void touch_point_set_focus(struct wlr_touch_point *point,
wlr_seat_client_for_wl_client(point->client->seat, wlr_seat_client_for_wl_client(point->client->seat,
wl_resource_get_client(surface->resource)); wl_resource_get_client(surface->resource));
if (client && client->touch) { if (client && !wl_list_empty(&client->touches)) {
wl_signal_add(&surface->events.destroy, &point->focus_surface_destroy); wl_signal_add(&surface->events.destroy, &point->focus_surface_destroy);
point->focus_surface_destroy.notify = handle_point_focus_destroy; point->focus_surface_destroy.notify = handle_point_focus_destroy;
point->focus_surface = surface; point->focus_surface = surface;
@ -1151,9 +1156,12 @@ uint32_t wlr_seat_touch_send_down(struct wlr_seat *seat,
} }
uint32_t serial = wl_display_next_serial(seat->display); uint32_t serial = wl_display_next_serial(seat->display);
wl_touch_send_down(point->client->touch, serial, time, surface->resource, struct wl_resource *resource;
touch_id, wl_fixed_from_double(sx), wl_fixed_from_double(sy)); wl_resource_for_each(resource, &point->client->touches) {
wl_touch_send_frame(point->client->touch); wl_touch_send_down(resource, serial, time, surface->resource,
touch_id, wl_fixed_from_double(sx), wl_fixed_from_double(sy));
wl_touch_send_frame(resource);
}
return serial; return serial;
} }
@ -1166,8 +1174,11 @@ void wlr_seat_touch_send_up(struct wlr_seat *seat, uint32_t time, int32_t touch_
} }
uint32_t serial = wl_display_next_serial(seat->display); uint32_t serial = wl_display_next_serial(seat->display);
wl_touch_send_up(point->client->touch, serial, time, touch_id); struct wl_resource *resource;
wl_touch_send_frame(point->client->touch); wl_resource_for_each(resource, &point->client->touches) {
wl_touch_send_up(resource, serial, time, touch_id);
wl_touch_send_frame(resource);
}
} }
void wlr_seat_touch_send_motion(struct wlr_seat *seat, uint32_t time, int32_t touch_id, void wlr_seat_touch_send_motion(struct wlr_seat *seat, uint32_t time, int32_t touch_id,
@ -1178,9 +1189,12 @@ void wlr_seat_touch_send_motion(struct wlr_seat *seat, uint32_t time, int32_t to
return; return;
} }
wl_touch_send_motion(point->client->touch, time, touch_id, struct wl_resource *resource;
wl_fixed_from_double(sx), wl_fixed_from_double(sy)); wl_resource_for_each(resource, &point->client->touches) {
wl_touch_send_frame(point->client->touch); wl_touch_send_motion(resource, time, touch_id, wl_fixed_from_double(sx),
wl_fixed_from_double(sy));
wl_touch_send_frame(resource);
}
} }
int wlr_seat_touch_num_points(struct wlr_seat *seat) { int wlr_seat_touch_num_points(struct wlr_seat *seat) {