aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--csi.c4
-rw-r--r--input.c4
-rw-r--r--main.c4
-rw-r--r--terminal.h8
4 files changed, 10 insertions, 10 deletions
diff --git a/csi.c b/csi.c
index a57b1a7f..1680ef0c 100644
--- a/csi.c
+++ b/csi.c
@@ -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:
diff --git a/input.c b/input.c
index d8fbd4cd..11dd398d 100644
--- a/input.c
+++ b/input.c
@@ -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)
diff --git a/main.c b/main.c
index 4dd6afbc..e454e103 100644
--- a/main.c
+++ b/main.c
@@ -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 */
diff --git a/terminal.h b/terminal.h
index 5dd0db09..6f42398a 100644
--- a/terminal.h
+++ b/terminal.h
@@ -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;