diff options
| -rw-r--r-- | keyboard.c | 26 | ||||
| -rw-r--r-- | keyboard.h | 2 |
2 files changed, 1 insertions, 27 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; } } diff --git a/keyboard.h b/keyboard.h index 2e05e72..5c8aa95 100644 --- a/keyboard.h +++ b/keyboard.h @@ -126,8 +126,6 @@ void kbd_draw_layout(struct kbd *kb); void kbd_resize(struct kbd *kb, struct layout *layouts, uint8_t layoutcount); uint8_t kbd_get_rows(struct layout *l); double kbd_get_row_length(struct key *k); -void kbd_switch_layout(struct kbd *kb, struct layout *l); - #ifndef LAYOUT #error "make sure to define LAYOUT" |