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

keyboard: Ignore shift level on modifiers

rpi-vc4-hack
Andri Yngvason 2020-05-26 22:19:48 +00:00
parent ff1223e4f9
commit ff882b7774
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/keyboard.c
View File

@ -302,6 +302,28 @@ static struct table_entry* match_level(struct keyboard* self,
return NULL; return NULL;
} }
static bool keyboard_symbol_is_mod(xkb_keysym_t symbol)
{
switch (symbol) {
case XKB_KEY_Shift_L:
case XKB_KEY_Shift_R:
case XKB_KEY_Control_L:
case XKB_KEY_Caps_Lock:
case XKB_KEY_Shift_Lock:
case XKB_KEY_Meta_L:
case XKB_KEY_Meta_R:
case XKB_KEY_Alt_L:
case XKB_KEY_Alt_R:
case XKB_KEY_Super_L:
case XKB_KEY_Super_R:
case XKB_KEY_Hyper_L:
case XKB_KEY_Hyper_R:
return true;
}
return false;
}
void keyboard_feed(struct keyboard* self, xkb_keysym_t symbol, bool is_pressed) void keyboard_feed(struct keyboard* self, xkb_keysym_t symbol, bool is_pressed)
{ {
struct table_entry* entry = keyboard_find_symbol(self, symbol); struct table_entry* entry = keyboard_find_symbol(self, symbol);
@ -312,9 +334,11 @@ void keyboard_feed(struct keyboard* self, xkb_keysym_t symbol, bool is_pressed)
return; return;
} }
struct table_entry* level_entry = match_level(self, entry); if (!keyboard_symbol_is_mod(symbol)) {
if (level_entry) struct table_entry* level_entry = match_level(self, entry);
entry = level_entry; if (level_entry)
entry = level_entry;
}
bool was_pressed = intset_is_set(&self->key_state, entry->code); bool was_pressed = intset_is_set(&self->key_state, entry->code);
if (was_pressed == is_pressed) if (was_pressed == is_pressed)