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

Merge pull request #155 from emersion/next-serial 

Use wl_display_next_serial
This commit is contained in:
Drew DeVault 2017-09-22 13:31:55 -04:00 committed by GitHub
parent dc26f6a8f8 c38d7949ef
commit 06ae9e7c9f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/compositor.c
View File

@ -350,8 +350,8 @@ static void handle_keyboard_key(struct keyboard_state *keyboard,
if (res != sample->focus && seat_handle && seat_handle->keyboard) { if (res != sample->focus && seat_handle && seat_handle->keyboard) {
struct wl_array keys; struct wl_array keys;
wl_array_init(&keys); wl_array_init(&keys);
wl_keyboard_send_enter(seat_handle->keyboard, ++sample->serial, res, uint32_t serial = wl_display_next_serial(state->display);
&keys); wl_keyboard_send_enter(seat_handle->keyboard, serial, res, &keys);
sample->focus = res; sample->focus = res;
} }
@ -364,10 +364,12 @@ static void handle_keyboard_key(struct keyboard_state *keyboard,
XKB_STATE_MODS_LOCKED); XKB_STATE_MODS_LOCKED);
uint32_t group = xkb_state_serialize_layout(keyboard->xkb_state, uint32_t group = xkb_state_serialize_layout(keyboard->xkb_state,
XKB_STATE_LAYOUT_EFFECTIVE); XKB_STATE_LAYOUT_EFFECTIVE);
wl_keyboard_send_modifiers(seat_handle->keyboard, ++sample->serial, uint32_t modifiers_serial = wl_display_next_serial(state->display);
uint32_t key_serial = wl_display_next_serial(state->display);
wl_keyboard_send_modifiers(seat_handle->keyboard, modifiers_serial,
depressed, latched, locked, group); depressed, latched, locked, group);
wl_keyboard_send_key(seat_handle->keyboard, ++sample->serial, 0, wl_keyboard_send_key(seat_handle->keyboard, key_serial, 0, keycode,
keycode, key_state); key_state);
} }
if (sym == XKB_KEY_Super_L || sym == XKB_KEY_Super_R) { if (sym == XKB_KEY_Super_L || sym == XKB_KEY_Super_R) {