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

Update keyboard modifiers in example compositor

This commit is contained in:
nyorain 2017-08-17 14:34:31 +02:00
parent 2db04c369e
commit edbaa7d6ac
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/compositor/main.c
View File

@ -110,6 +110,16 @@ static void handle_keyboard_key(struct keyboard_state *keyboard, uint32_t keycod
} }
if (seat_handle && seat_handle->keyboard) { if (seat_handle && seat_handle->keyboard) {
uint32_t depressed = xkb_state_serialize_mods(keyboard->xkb_state,
XKB_STATE_MODS_DEPRESSED);
uint32_t latched = xkb_state_serialize_mods(keyboard->xkb_state,
XKB_STATE_MODS_LATCHED);
uint32_t locked = xkb_state_serialize_mods(keyboard->xkb_state,
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, depressed,
latched, locked, group);
wl_keyboard_send_key(seat_handle->keyboard, ++sample->serial, 0, keycode, key_state); wl_keyboard_send_key(seat_handle->keyboard, ++sample->serial, 0, keycode, key_state);
} }
} }

6
examples/shared.c
View File

@ -32,6 +32,9 @@ static void keyboard_key_notify(struct wl_listener *listener, void *data) {
enum wlr_key_state key_state = event->state; enum wlr_key_state key_state = event->state;
const xkb_keysym_t *syms; const xkb_keysym_t *syms;
int nsyms = xkb_state_key_get_syms(kbstate->xkb_state, keycode, &syms); int nsyms = xkb_state_key_get_syms(kbstate->xkb_state, keycode, &syms);
xkb_state_update_key(kbstate->xkb_state, keycode,
event->state == WLR_KEY_PRESSED ? XKB_KEY_DOWN : XKB_KEY_UP);
keyboard_led_update(kbstate);
for (int i = 0; i < nsyms; ++i) { for (int i = 0; i < nsyms; ++i) {
xkb_keysym_t sym = syms[i]; xkb_keysym_t sym = syms[i];
char name[64]; char name[64];
@ -57,9 +60,6 @@ static void keyboard_key_notify(struct wl_listener *listener, void *data) {
} }
} }
} }
xkb_state_update_key(kbstate->xkb_state, keycode,
event->state == WLR_KEY_PRESSED ? XKB_KEY_DOWN : XKB_KEY_UP);
keyboard_led_update(kbstate);
} }
static void keyboard_add(struct wlr_input_device *device, struct compositor_state *state) { static void keyboard_add(struct wlr_input_device *device, struct compositor_state *state) {