diff options
| author | Craig Barnes <craigbarnes@protonmail.com> | 2022-02-09 20:50:20 +0000 |
|---|---|---|
| committer | Craig Barnes <craigbarnes@protonmail.com> | 2022-02-09 20:50:20 +0000 |
| commit | e32707ffc04a5c4acee62680f080c927d96e1836 (patch) | |
| tree | 3295b5498c0490eb24ead59995a46a5f9a64b742 | |
| parent | Merge branch 'refactor-key-bindings' (diff) | |
csi/input: remove private mode 27127
This effectively reverts commit 31c73f0cf01e1d0bdcd1435136b010c1c1ab442c.
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | csi.c | 7 | ||||
| -rw-r--r-- | input.c | 8 | ||||
| -rw-r--r-- | terminal.c | 1 | ||||
| -rw-r--r-- | terminal.h | 2 |
5 files changed, 6 insertions, 17 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 74499326..ac9247e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,11 @@ ### Deprecated ### Removed + +* DECSET mode 27127 (which was first added in release 1.6.0). + The kitty keyboard protocol (added in release 1.10.3) can + be used to similar effect. + ### Fixed * Build: missing `wayland_client` dependency in `test-config` @@ -564,10 +564,6 @@ decset_decrst(struct terminal *term, unsigned param, bool enable) term->sixel.cursor_right_of_graphics = enable; break; - case 27127: - term->modify_escape_key = enable; - break; - case 737769: if (enable) term_ime_enable(term); @@ -629,7 +625,6 @@ decrqm(const struct terminal *term, unsigned param, bool *enabled) case 2004: *enabled = term->bracketed_paste; return true; case 2026: *enabled = term->render.app_sync_updates.enabled; return true; case 8452: *enabled = term->sixel.cursor_right_of_graphics; return true; - case 27127: *enabled = term->modify_escape_key; return true; case 737769: *enabled = term_ime_is_enabled(term); return true; } @@ -673,7 +668,6 @@ xtsave(struct terminal *term, unsigned param) case 2004: term->xtsave.bracketed_paste = term->bracketed_paste; break; case 2026: term->xtsave.app_sync_updates = term->render.app_sync_updates.enabled; break; case 8452: term->xtsave.sixel_cursor_right_of_graphics = term->sixel.cursor_right_of_graphics; break; - case 27127: term->xtsave.modify_escape_key = term->modify_escape_key; break; case 737769: term->xtsave.ime = term_ime_is_enabled(term); break; } } @@ -716,7 +710,6 @@ xtrestore(struct terminal *term, unsigned param) case 2004: enable = term->xtsave.bracketed_paste; break; case 2026: enable = term->xtsave.app_sync_updates; break; case 8452: enable = term->xtsave.sixel_cursor_right_of_graphics; break; - case 27127: enable = term->xtsave.modify_escape_key; break; case 737769: enable = term->xtsave.ime; break; default: return; @@ -1044,13 +1044,7 @@ legacy_kbd_protocol(struct seat *seat, struct terminal *term, const size_t count = ctx->utf8.count; const uint8_t *const utf8 = ctx->utf8.buf; - const struct key_data *keymap; - if (sym == XKB_KEY_Escape && keymap_mods == MOD_NONE && term->modify_escape_key) { - static const struct key_data esc = {.seq = "\033[27;1;27~"}; - keymap = &esc; - } else - keymap = keymap_lookup(term, sym, keymap_mods); - + const struct key_data *keymap = keymap_lookup(term, sym, keymap_mods); if (keymap != NULL) { term_to_slave(term, keymap->seq, strlen(keymap->seq)); return true; @@ -1808,7 +1808,6 @@ term_reset(struct terminal *term, bool hard) term->insert_mode = false; term->bracketed_paste = false; term->focus_events = false; - term->modify_escape_key = false; term->num_lock_modifier = true; term->bell_action_enabled = true; term->mouse_tracking = MOUSE_NONE; @@ -327,7 +327,6 @@ struct terminal { bool bracketed_paste; bool focus_events; bool alt_scrolling; - bool modify_escape_key; bool modify_other_keys_2; /* True when modifyOtherKeys=2 (i.e. “CSI >4;2m”) */ enum cursor_origin origin; enum cursor_keys cursor_keys_mode; @@ -415,7 +414,6 @@ struct terminal { bool num_lock_modifier:1; bool bell_action_enabled:1; bool alt_screen:1; - bool modify_escape_key:1; bool ime:1; bool app_sync_updates:1; |
