Fix broken keyboard handling

This commit is contained in:
Drew DeVault 2017-09-25 16:44:26 -04:00
parent e6a6634bc5
commit 1ddda91b1b
2 changed files with 1 additions and 3 deletions

View file

@ -26,7 +26,7 @@ void wlr_keyboard_update_state(struct wlr_keyboard *keyboard,
xkb_state_update_key(keyboard->xkb_state, keycode, xkb_state_update_key(keyboard->xkb_state, keycode,
event->state == WLR_KEY_PRESSED ? XKB_KEY_DOWN : XKB_KEY_UP); event->state == WLR_KEY_PRESSED ? XKB_KEY_DOWN : XKB_KEY_UP);
keyboard_led_update(keyboard); keyboard_led_update(keyboard);
wl_signal_emit(&keyboard->events.key, &event); wl_signal_emit(&keyboard->events.key, event);
} }
void wlr_keyboard_init(struct wlr_keyboard *kb, void wlr_keyboard_init(struct wlr_keyboard *kb,

View file

@ -390,8 +390,6 @@ static void keyboard_key_notify(struct wl_listener *listener, void *data) {
if (handle->seat_keyboard != seat_kb) { if (handle->seat_keyboard != seat_kb) {
// 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
wlr_log(L_DEBUG, "Sending key map %d %zd",
seat_kb->keyboard->keymap_fd, seat_kb->keyboard->keymap_size);
wl_keyboard_send_keymap(handle->keyboard, wl_keyboard_send_keymap(handle->keyboard,
WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
seat_kb->keyboard->keymap_fd, seat_kb->keyboard->keymap_fd,