diff options
| author | Zach DeCook <zachdecook@librem.one> | 2022-01-20 20:23:31 -0500 |
|---|---|---|
| committer | Zach DeCook <zachdecook@librem.one> | 2022-01-20 20:23:31 -0500 |
| commit | 10398d3f9a18575f328d3784beacbc1e937886b8 (patch) | |
| tree | 5ef0d4727c1832fc128449531783380cb2838277 /keyboard.c | |
| parent | c8bd7a2d3973780d430007da9c0229bd7d1aa693 (diff) | |
| download | suggpicker-10398d3f9a18575f328d3784beacbc1e937886b8.tar.gz | |
switch_layout: remove
Diffstat (limited to 'keyboard.c')
| -rw-r--r-- | keyboard.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/keyboard.c b/keyboard.c index 7f0dc8b..2a0c982 100644 --- a/keyboard.c +++ b/keyboard.c @@ -12,19 +12,6 @@ fprintf(stderr, __VA_ARGS__); \ exit(1) -void -kbd_switch_layout(struct kbd *kb, struct layout *l) { - kb->prevlayout = kb->layout; - kb->layout = l; - if (kb->debug) - fprintf(stderr, "Switching to layout %s)\n", kb->layout->name); - if ((!kb->prevlayout) || - (strcmp(kb->prevlayout->keymap_name, kb->layout->keymap_name) != 0)) { - fprintf(stderr, "Switching to keymap %s\n", kb->layout->keymap_name); - } - kbd_draw_layout(kb); -} - uint8_t kbd_get_rows(struct layout *l) { uint8_t rows = 0; @@ -123,19 +110,8 @@ kbd_get_key(struct kbd *kb, uint32_t x, uint32_t y) { void kbd_unpress_key(struct kbd *kb, uint32_t time) { - bool unlatch_shift = false; - if (kb->last_press) { - - if (kb->compose >= 2) { - kb->compose = 0; - kbd_switch_layout(kb, kb->prevlayout); - } else if (unlatch_shift) { - kbd_draw_layout(kb); - } else { - kbd_draw_key(kb, kb->last_press, Unpress); - } - + kbd_draw_key(kb, kb->last_press, Unpress); kb->last_press = NULL; } } |