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

vt: fix SS2/SS3 escape sequences to act correctly as single shifts

Browse source 
These sequences are supposed to affect the next printable ASCII
character and then reset to the previous character set, but before
this commit they were behaving like locking shifts.
This commit is contained in:
Craig Barnes 2021-06-08 21:09:40 +01:00
parent e72e8b1b8e
commit a2c9c56f19
4 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -162,6 +162,8 @@
* Restore `SIGHUP` in spawned processes.
* Text reflow performance (https://codeberg.org/dnkl/foot/issues/504).
* IL+DL (`CSI Ps L` + `CSI Ps M`) now moves the cursor to column 0.
* SS2 and SS3 (single shift) escape sequences behaving like locking
shifts.
### Security

16
terminal.c
View file

@ -2839,6 +2839,14 @@ ascii_printer_fast(struct terminal *term, wchar_t wc)
xassert(!term->grid->cursor.lcf);
}
static void
ascii_printer_single_shift(struct terminal *term, wchar_t wc)
{
ascii_printer_generic(term, wc);
term->charsets.selected = term->charsets.saved;
term_update_ascii_printer(term);
}
void
term_update_ascii_printer(struct terminal *term)
{
@ -2860,6 +2868,14 @@ term_update_ascii_printer(struct terminal *term)
term->ascii_printer = new_printer;
}
void
term_set_single_shift_ascii_printer(struct terminal *term, int selected)
{
term->charsets.saved = term->charsets.selected;
term->charsets.selected = selected;
term->ascii_printer = &ascii_printer_single_shift;
}
enum term_surface
term_surface_kind(const struct terminal *term, const struct wl_surface *surface)
{

2
terminal.h
View file

@ -192,6 +192,7 @@ enum charset { CHARSET_ASCII, CHARSET_GRAPHIC };
struct charsets {
int selected;
int saved;
enum charset set[4]; /* G0-G3 */
};
@ -605,6 +606,7 @@ bool term_shutdown(struct terminal *term);
int term_destroy(struct terminal *term);
void term_update_ascii_printer(struct terminal *term);
void term_set_single_shift_ascii_printer(struct terminal *term, int selected);
void term_reset(struct terminal *term, bool hard);
bool term_to_slave(struct terminal *term, const void *data, size_t len);

6
vt.c
View file

@ -426,14 +426,12 @@ action_esc_dispatch(struct terminal *term, uint8_t final)
case 'N':
/* SS2 - Single Shift 2 */
term->charsets.selected = 2; /* G2 */
term_update_ascii_printer(term);
term_set_single_shift_ascii_printer(term, 2); /* G2 */
break;
case 'O':
/* SS3 - Single Shift 3 */
term->charsets.selected = 3; /* G3 */
term_update_ascii_printer(term);
term_set_single_shift_ascii_printer(term, 3); /* G3 */
break;
case '\\':