diff --git a/eek/eek-keyboard.c b/eek/eek-keyboard.c index 7d09a369..8423fa78 100644 --- a/eek/eek-keyboard.c +++ b/eek/eek-keyboard.c @@ -222,7 +222,7 @@ void eek_keyboard_press_key(LevelKeyboard *keyboard, EekKey *key, guint32 timest guint keycode = eek_key_get_keycode (key); - emit_key_activated(keyboard->manager, keyboard, keycode, 0, TRUE, timestamp); + emit_key_activated(keyboard->manager, keyboard, keycode, TRUE, timestamp); } void eek_keyboard_release_key(LevelKeyboard *keyboard, @@ -247,7 +247,7 @@ void eek_keyboard_release_key(LevelKeyboard *keyboard, guint keycode = eek_key_get_keycode (key); - emit_key_activated(keyboard->manager, keyboard, keycode, 0, FALSE, timestamp); + emit_key_activated(keyboard->manager, keyboard, keycode, FALSE, timestamp); } static void diff --git a/eekboard/key-emitter.c b/eekboard/key-emitter.c index 05652b0b..0fe1b2b6 100644 --- a/eekboard/key-emitter.c +++ b/eekboard/key-emitter.c @@ -87,27 +87,21 @@ static void send_fake_key (SeatEmitter *emitter, LevelKeyboard *keyboard, guint keycode, - guint keyboard_modifiers, gboolean pressed, uint32_t timestamp) { - uint32_t proto_modifiers = 0; guint level = keyboard->level; uint32_t group = (level / 2); - if (keyboard_modifiers & EEK_SHIFT_MASK) - proto_modifiers |= 1<virtual_keyboard, proto_modifiers, 0, 0, group); + zwp_virtual_keyboard_v1_modifiers(emitter->virtual_keyboard, 0, 0, 0, group); send_virtual_keyboard_key (emitter->virtual_keyboard, keycode - 8, (unsigned)pressed, timestamp); - zwp_virtual_keyboard_v1_modifiers(emitter->virtual_keyboard, proto_modifiers, 0, 0, group); + zwp_virtual_keyboard_v1_modifiers(emitter->virtual_keyboard, 0, 0, 0, group); } void emit_key_activated (EekboardContextService *manager, LevelKeyboard *keyboard, guint keycode, - EekModifierType modifiers, gboolean pressed, uint32_t timestamp) { @@ -142,5 +136,5 @@ emit_key_activated (EekboardContextService *manager, emitter.virtual_keyboard = manager->virtual_keyboard; emitter.keymap = keyboard->keymap; update_modifier_info (&emitter); - send_fake_key (&emitter, keyboard, keycode, modifiers, pressed, timestamp); + send_fake_key (&emitter, keyboard, keycode, pressed, timestamp); } diff --git a/eekboard/key-emitter.h b/eekboard/key-emitter.h index 20e05c20..337e925c 100644 --- a/eekboard/key-emitter.h +++ b/eekboard/key-emitter.h @@ -41,6 +41,5 @@ enum mod_indices { void emit_key_activated (EekboardContextService *manager, LevelKeyboard *keyboard, guint keycode, - guint modifiers, gboolean pressed, uint32_t timestamp); #endif // KEYEMITTER_H