RPJosh
/
wayvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keyboard: Always use layout index 0 

Layout switching isn't supported anyhow. Better not to confuse things.
pull/95/head
Andri Yngvason 2020-12-27 19:26:51 +00:00
parent c1a5de76ea
commit 0178c13627
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/keyboard.c
View File

@ -289,10 +289,9 @@ static struct table_entry* match_level(struct keyboard* self,
xkb_keysym_t symbol = entry->symbol; xkb_keysym_t symbol = entry->symbol;
while (true) { while (true) {
int layout, level; int level;
layout = xkb_state_key_get_layout(self->state, entry->code); level = xkb_state_key_get_level(self->state, entry->code, 0);
level = xkb_state_key_get_level(self->state, entry->code, layout);
if (entry->level == level) if (entry->level == level)
return entry; return entry;
@ -359,9 +358,8 @@ static void send_key_with_level(struct keyboard* self, xkb_keycode_t code,
struct kb_mods save; struct kb_mods save;
save_mods(self, &save); save_mods(self, &save);
int layout = xkb_state_key_get_layout(self->state, code);
xkb_mod_mask_t mods = 0; xkb_mod_mask_t mods = 0;
xkb_keymap_key_get_mods_for_level(self->keymap, code, layout, level, xkb_keymap_key_get_mods_for_level(self->keymap, code, 0, level,
&mods, 1); &mods, 1);
xkb_state_update_mask(self->state, mods, 0, 0, XKB_STATE_MODS_DEPRESSED, xkb_state_update_mask(self->state, mods, 0, 0, XKB_STATE_MODS_DEPRESSED,
XKB_STATE_MODS_LATCHED, XKB_STATE_MODS_LOCKED); XKB_STATE_MODS_LATCHED, XKB_STATE_MODS_LOCKED);