diff options
| author | Craig Barnes <craigbarnes@protonmail.com> | 2021-06-09 09:18:52 +0000 |
|---|---|---|
| committer | Craig Barnes <craigbarnes@protonmail.com> | 2021-06-09 09:18:52 +0000 |
| commit | 2a75da41436be42a1b1d0ce32994ef26480139ae (patch) | |
| tree | 306f28991890caf11bfc3e4e4f98d9713804ec90 /terminal.c | |
| parent | Merge branch 'overlapping-sixels' (diff) | |
| parent | terminal: add 'charset_designator' enum to make code more self-documenting (diff) | |
Merge branch 'charset-shift-fixes'
Diffstat (limited to 'terminal.c')
| -rw-r--r-- | terminal.c | 26 |
1 files changed, 21 insertions, 5 deletions
@@ -1606,11 +1606,11 @@ term_reset(struct terminal *term, bool hard) term->bell_action_enabled = true; term->mouse_tracking = MOUSE_NONE; term->mouse_reporting = MOUSE_NORMAL; - term->charsets.selected = 0; - term->charsets.set[0] = CHARSET_ASCII; - term->charsets.set[1] = CHARSET_ASCII; - term->charsets.set[2] = CHARSET_ASCII; - term->charsets.set[3] = CHARSET_ASCII; + term->charsets.selected = G0; + term->charsets.set[G0] = CHARSET_ASCII; + term->charsets.set[G1] = CHARSET_ASCII; + term->charsets.set[G2] = CHARSET_ASCII; + term->charsets.set[G3] = CHARSET_ASCII; term->saved_charsets = term->charsets; tll_free_and_free(term->window_title_stack, free); term_set_window_title(term, term->conf->title); @@ -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_single_shift(struct terminal *term, enum charset_designator idx) +{ + term->charsets.saved = term->charsets.selected; + term->charsets.selected = idx; + term->ascii_printer = &ascii_printer_single_shift; +} + enum term_surface term_surface_kind(const struct terminal *term, const struct wl_surface *surface) { |
