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

wlr_seat: special-case first serial set use

This commit is contained in:
Manuel Stoeckl 2019-06-29 20:40:45 -04:00 committed by Drew DeVault
parent 1ef0c03a46
commit c2fb8a84a2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
types/seat/wlr_seat.c
View File

@ -142,9 +142,6 @@ static void seat_handle_bind(struct wl_client *client, void *_wlr_seat,
wl_signal_init(&seat_client->events.destroy); wl_signal_init(&seat_client->events.destroy);
wl_list_insert(&wlr_seat->clients, &seat_client->link); wl_list_insert(&wlr_seat->clients, &seat_client->link);
// ensure first entry will have index zero
seat_client->serials.end = WLR_SERIAL_RINGSET_SIZE - 1;
} }
wl_resource_set_implementation(wl_resource, &seat_impl, wl_resource_set_implementation(wl_resource, &seat_impl,
@ -378,7 +375,12 @@ uint32_t wlr_seat_client_next_serial(struct wlr_seat_client *client) {
uint32_t serial = wl_display_next_serial(wl_client_get_display(client->client)); uint32_t serial = wl_display_next_serial(wl_client_get_display(client->client));
struct wlr_serial_ringset *set = &client->serials; struct wlr_serial_ringset *set = &client->serials;
if (set->count == 0 || set->data[set->end].max_incl + 1 != serial) { if (set->count == 0) {
set->data[0].min_incl = serial;
set->data[0].max_incl = serial;
set->count = 1;
set->end = 0;
} else if (set->data[set->end].max_incl + 1 != serial) {
if (set->count < WLR_SERIAL_RINGSET_SIZE) { if (set->count < WLR_SERIAL_RINGSET_SIZE) {
set->count++; set->count++;
} }