aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-03-14 18:19:10 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-03-16 07:45:18 +0000
commit60b3ccc64115fb7e4b303eb1b93ba16d10fff1b5 (patch)
tree1c9559769b3006e573b6774d6adbe791138b9c85 /terminal.c
parentMerge branch 'term-print-assume-col-can-be-incremented' (diff)
term: runtime switch between a ‘fast’ and a ‘generic’ ASCII print function
term_print() is called whenever the client application “prints” something to the grid. It is called for both ASCII and UTF-8 characters, and needs to handle sixels, insert mode and ASCII vs. graphical charsets. Since it’s on the hot path, this becomes unnecessarily slow. This patch adds a “fast” version of term_print(), tailored for the common case: ASCII characters in non-insert mode, without any sixels and non-graphical charsets. A new function, term_update_ascii_printer(), has been added, and must be called whenever: * The currently selected charset *index* changes * The currently selected charset changes (from ASCII to graphical, or vice verse) * Sixels are added to the grid * Sixels are removed from the grid * Insert mode is enabled/disabled
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c64
1 files changed, 64 insertions, 0 deletions
diff --git a/terminal.c b/terminal.c
index 85f267e1..0fe53ac1 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1187,6 +1187,8 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper,
#endif
};
+ term_update_ascii_printer(term);
+
for (size_t i = 0; i < 4; i++) {
size_t j = 0;
tll_foreach(conf->fonts[i], it) {
@@ -1702,6 +1704,8 @@ term_reset(struct terminal *term, bool hard)
term_ime_enable(term);
#endif
+ term_update_ascii_printer(term);
+
if (!hard)
return;
@@ -2335,6 +2339,7 @@ term_restore_cursor(struct terminal *term, const struct cursor *cursor)
term->vt.attrs = term->vt.saved_attrs;
term->charsets = term->saved_charsets;
+ term_update_ascii_printer(term);
}
void
@@ -2813,6 +2818,21 @@ term_print(struct terminal *term, wchar_t wc, int width)
{
xassert(width > 0);
+ if (unlikely(term->charsets.set[term->charsets.selected] == CHARSET_GRAPHIC) &&
+ wc >= 0x60 && wc <= 0x7e)
+ {
+ /* 0x60 - 0x7e */
+ static const wchar_t vt100_0[] = {
+ L'◆', L'▒', L'␉', L'␌', L'␍', L'␊', L'°', L'±', /* ` - g */
+ L'␤', L'␋', L'┘', L'┐', L'┌', L'└', L'┼', L'⎺', /* h - o */
+ L'⎻', L'─', L'⎼', L'⎽', L'├', L'┤', L'┴', L'┬', /* p - w */
+ L'│', L'≤', L'≥', L'π', L'≠', L'£', L'·', /* x - ~ */
+ };
+
+ xassert(width == 1);
+ wc = vt100_0[wc - 0x60];
+ }
+
print_linewrap(term);
print_insert(term, width);
@@ -2855,6 +2875,50 @@ term_print(struct terminal *term, wchar_t wc, int width)
xassert(!term->grid->cursor.lcf);
}
+static void
+ascii_printer_generic(struct terminal *term, wchar_t wc)
+{
+ term_print(term, wc, 1);
+}
+
+static void
+ascii_printer_fast(struct terminal *term, wchar_t wc)
+{
+ xassert(term->charsets.set[term->charsets.selected] == CHARSET_ASCII);
+ xassert(!term->insert_mode);
+ xassert(tll_length(term->grid->sixel_images) == 0);
+
+ print_linewrap(term);
+
+ /* *Must* get current cell *after* linewrap+insert */
+ struct row *row = term->grid->cur_row;
+ struct cell *cell = &row->cells[term->grid->cursor.point.col];
+
+ cell->wc = term->vt.last_printed = wc;
+ cell->attrs = term->vt.attrs;
+
+ row->dirty = true;
+ cell->attrs.clean = 0;
+
+ /* Advance cursor */
+ if (unlikely(++term->grid->cursor.point.col >= term->cols)) {
+ term->grid->cursor.lcf = true;
+ term->grid->cursor.point.col--;
+ } else
+ xassert(!term->grid->cursor.lcf);
+}
+
+void
+term_update_ascii_printer(struct terminal *term)
+{
+ term->ascii_printer =
+ unlikely(tll_length(term->grid->sixel_images) > 0 ||
+ term->charsets.set[term->charsets.selected] == CHARSET_GRAPHIC ||
+ term->insert_mode)
+ ? &ascii_printer_generic
+ : &ascii_printer_fast;
+}
+
enum term_surface
term_surface_kind(const struct terminal *term, const struct wl_surface *surface)
{