mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-05 04:06:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'remove-decset-27127'

Browse source
This commit is contained in:
Craig Barnes 2022-02-09 20:59:36 +00:00
commit 3c232bec28
5 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -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`

7
csi.c
View file

@ -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;

8
input.c
View file

@ -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;

1
terminal.c
View file

@ -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;

2
terminal.h
View file

@ -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;