diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-07-09 09:07:06 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-07-09 09:07:06 +0000 |
| commit | 9b5c044b29f31c0cd8a4ffa21d497cd5ccb28404 (patch) | |
| tree | ab748ad05d321b9a4ebbea026e36a9841f8875b4 | |
| parent | vt: handle ESC correctly in OSC string state (diff) | |
terminal: rename and redefine cursor keys mode and keypad keys mode
| -rw-r--r-- | csi.c | 4 | ||||
| -rw-r--r-- | input.c | 4 | ||||
| -rw-r--r-- | main.c | 4 | ||||
| -rw-r--r-- | terminal.h | 8 |
4 files changed, 10 insertions, 10 deletions
@@ -588,7 +588,7 @@ csi_dispatch(struct terminal *term, uint8_t final) for (size_t i = 0; i < term->vt.params.idx; i++) { switch (term->vt.params.v[i].value) { case 1: - term->decckm = DECCKM_SS3; + term->cursor_keys_mode = CURSOR_KEYS_APPLICATION; break; case 5: @@ -667,7 +667,7 @@ csi_dispatch(struct terminal *term, uint8_t final) for (size_t i = 0; i < term->vt.params.idx; i++) { switch (term->vt.params.v[i].value) { case 1: - term->decckm = DECCKM_CSI; + term->cursor_keys_mode = CURSOR_KEYS_NORMAL; break; case 5: @@ -207,9 +207,9 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, sym, mods, consumed, significant, effective_mods); if (sym < sizeof(key_map) / sizeof(key_map[0]) && - key_map[sym][term->decckm].normal != NULL) + key_map[sym][term->cursor_keys_mode - 1].normal != NULL) { - const struct keymap *key = &key_map[sym][term->decckm]; + const struct keymap *key = &key_map[sym][term->cursor_keys_mode - 1]; const char *esc = NULL; if (effective_mods == 0) @@ -294,8 +294,8 @@ main(int argc, char *const *argv) struct terminal term = { .quit = false, .ptmx = posix_openpt(O_RDWR | O_NOCTTY), - .decckm = DECCKM_CSI, - .keypad_mode = KEYPAD_NUMERICAL, /* TODO: verify */ + .cursor_keys_mode = CURSOR_KEYS_NORMAL, + .keypad_keys_mode = KEYPAD_NUMERICAL, .auto_margin = true, .vt = { .state = 1, /* STATE_GROUND */ @@ -171,8 +171,8 @@ struct kbd { bool ctrl; }; -enum decckm { DECCKM_CSI, DECCKM_SS3 }; -enum keypad_mode { KEYPAD_NUMERICAL, KEYPAD_APPLICATION }; +enum cursor_keys { CURSOR_KEYS_DONTCARE, CURSOR_KEYS_NORMAL, CURSOR_KEYS_APPLICATION}; +enum keypad_keys { KEYPAD_DONTCARE, KEYPAD_NUMERICAL, KEYPAD_APPLICATION }; enum charset { CHARSET_ASCII, CHARSET_GRAPHIC }; /* *What* to report */ @@ -197,8 +197,8 @@ struct terminal { int ptmx; bool quit; - enum decckm decckm; - enum keypad_mode keypad_mode; + enum cursor_keys cursor_keys_mode; + enum keypad_keys keypad_keys_mode; bool reverse; bool hide_cursor; bool auto_margin; |
