diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-09-22 13:31:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-22 13:31:55 -0400 |
| commit | 06ae9e7c9f8811dcda3df8ec72ab75e54ee54b87 (patch) | |
| tree | 73ee35630d9426c97c5df5c7ab243e9b9023a2e4 /examples | |
| parent | dc26f6a8f8f84fd1e2787a33b9e073432afb4ad0 (diff) | |
| parent | c38d7949ef662e3d5208bca888facd61f050f31e (diff) | |
Merge pull request #155 from emersion/next-serial
Use wl_display_next_serial
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/compositor.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/examples/compositor.c b/examples/compositor.c index 721ae6bf..53b385b7 100644 --- a/examples/compositor.c +++ b/examples/compositor.c @@ -350,8 +350,8 @@ static void handle_keyboard_key(struct keyboard_state *keyboard, if (res != sample->focus && seat_handle && seat_handle->keyboard) { struct wl_array keys; wl_array_init(&keys); - wl_keyboard_send_enter(seat_handle->keyboard, ++sample->serial, res, - &keys); + uint32_t serial = wl_display_next_serial(state->display); + wl_keyboard_send_enter(seat_handle->keyboard, serial, res, &keys); sample->focus = res; } @@ -364,10 +364,12 @@ static void handle_keyboard_key(struct keyboard_state *keyboard, XKB_STATE_MODS_LOCKED); uint32_t group = xkb_state_serialize_layout(keyboard->xkb_state, 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); - wl_keyboard_send_key(seat_handle->keyboard, ++sample->serial, 0, - keycode, key_state); + wl_keyboard_send_key(seat_handle->keyboard, key_serial, 0, keycode, + key_state); } if (sym == XKB_KEY_Super_L || sym == XKB_KEY_Super_R) { |