From d70956da08c987af639fd8e03e669ca59c4c542b Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 1 Jul 2019 12:23:38 +0200 Subject: wip: use a sliding window instead of memmove() to scroll Instead of memmoving a large amount of data on every scroll, use a sliding window. That is, each time we scroll, we offset origin. --- main.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 19 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index f4f9eaa7..a1e7f5ee 100644 --- a/main.c +++ b/main.c @@ -79,24 +79,42 @@ attrs_to_font(struct context *c, const struct attributes *attrs) static void grid_render_update(struct context *c, struct buffer *buf, const struct damage *dmg) { - LOG_DBG("damage: UPDATE: %d -> %d", - dmg->range.start, dmg->range.start + dmg->range.length); + LOG_DBG("damage: UPDATE: %d -> %d (offset = %d)", + (dmg->range.start - c->term.grid->offset) % c->term.grid->size, + (dmg->range.start - c->term.grid->offset) % c->term.grid->size + dmg->range.length, + c->term.grid->offset); + + int start = dmg->range.start; + int length = dmg->range.length; + + if (start < c->term.grid->offset) { + int end = start + length; + if (end >= c->term.grid->offset) { + start = c->term.grid->offset; + length = end - start; + } else + return; + } const int cols = c->term.cols; - for (int linear_cursor = dmg->range.start, - row = dmg->range.start / cols, - col = dmg->range.start % cols; - linear_cursor < dmg->range.start + dmg->range.length; + for (int linear_cursor = start, + row = ((start - c->term.grid->offset) % c->term.grid->size) / cols, + col = ((start - c->term.grid->offset) % c->term.grid->size) % cols; + linear_cursor < start + length; linear_cursor++, //col = (col + 1) % cols, col = col + 1 >= c->term.cols ? 0 : col + 1, row += col == 0 ? 1 : 0) { + //LOG_DBG("UPDATE: %d (%dx%d)", linear_cursor, row, col); - const struct cell *cell = &c->term.grid->cells[linear_cursor]; - bool has_cursor = c->term.cursor.linear == linear_cursor; + //assert(linear_cursor < c->term.grid->size); + const struct cell *cell = &c->term.grid->cells[linear_cursor % c->term.grid->size]; + + bool has_cursor = c->term.cursor.linear == linear_cursor - c->term.grid->offset; + //bool has_cursor = false; int x = col * c->term.cell_width; int y = row * c->term.cell_height; @@ -160,15 +178,19 @@ grid_render_update(struct context *c, struct buffer *buf, const struct damage *d wl_surface_damage_buffer( c->wl.surface, - 0, (dmg->range.start / cols) * c->term.cell_height, + 0, ((dmg->range.start - c->term.grid->offset) / cols) * c->term.cell_height, buf->width, (dmg->range.length + cols - 1) / cols * c->term.cell_height); } static void grid_render_erase(struct context *c, struct buffer *buf, const struct damage *dmg) { - LOG_DBG("damage: ERASE: %d -> %d", - dmg->range.start, dmg->range.start + dmg->range.length); + LOG_DBG("damage: ERASE: %d -> %d (offset = %d)", + (dmg->range.start - c->term.grid->offset) % c->term.grid->size, + (dmg->range.start - c->term.grid->offset) % c->term.grid->size + dmg->range.length, + c->term.grid->offset); + + assert(dmg->range.start >= c->term.grid->offset); cairo_set_source_rgba( buf->cairo, default_background.r, default_background.g, @@ -176,7 +198,7 @@ grid_render_erase(struct context *c, struct buffer *buf, const struct damage *dm const int cols = c->term.cols; - int start = dmg->range.start; + int start = (dmg->range.start - c->term.grid->offset) % c->term.grid->size; int left = dmg->range.length; int row = start / cols; @@ -238,17 +260,21 @@ grid_render_erase(struct context *c, struct buffer *buf, const struct damage *dm cairo_fill(buf->cairo); wl_surface_damage_buffer(c->wl.surface, x, y, width, height); } - +#if 0 /* Redraw cursor, if it's inside the erased range */ - if (c->term.cursor.linear >= dmg->range.start && - c->term.cursor.linear < dmg->range.start + dmg->range.length) + if (c->term.grid->offset + c->term.cursor.linear >= dmg->range.start && + c->term.grid->offset + c->term.cursor.linear < dmg->range.start + dmg->range.length) { grid_render_update( c, buf, &(struct damage){ .type = DAMAGE_UPDATE, - .range = {.start = c->term.cursor.linear, .length = 1}}); + .range = { + .start = (c->term.grid->offset + c->term.cursor.linear) % c->term.grid->size, + .length = 1} + }); } + #endif } static void @@ -284,7 +310,7 @@ grid_render_scroll(struct context *c, struct buffer *buf, struct damage erase = { .type = DAMAGE_ERASE, .range = { - .start = max(dmg->scroll.region.end - dmg->scroll.lines, + .start = c->term.grid->offset + max(dmg->scroll.region.end - dmg->scroll.lines, dmg->scroll.region.start) * cols, .length = min(dmg->scroll.region.end - dmg->scroll.region.start, dmg->scroll.lines) * cols, @@ -383,6 +409,8 @@ grid_render(struct context *c) tll_remove(c->term.grid->damage, it); } + c->term.grid->offset %= c->term.grid->size; + //cairo_surface_flush(buf->cairo_surface); wl_surface_attach(c->wl.surface, buf->wl_buf, 0, 0); @@ -450,8 +478,8 @@ resize(struct context *c, int width, int height) /* Update environment variables */ char cols_s[12], rows_s[12]; - sprintf(cols_s, "%u", c->term.cols); - sprintf(rows_s, "%u", c->term.rows); + sprintf(cols_s, "%d", c->term.cols); + sprintf(rows_s, "%d", c->term.rows); setenv("COLUMNS", cols_s, 1); setenv("LINES", rows_s, 1); -- cgit v1.3 From c853f01027fa4affcdb1620489d093aeccd75693 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 1 Jul 2019 19:19:32 +0200 Subject: render: re-enable drawing cursor on erase --- main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index a1e7f5ee..7e0216b8 100644 --- a/main.c +++ b/main.c @@ -260,21 +260,20 @@ grid_render_erase(struct context *c, struct buffer *buf, const struct damage *dm cairo_fill(buf->cairo); wl_surface_damage_buffer(c->wl.surface, x, y, width, height); } -#if 0 + /* Redraw cursor, if it's inside the erased range */ - if (c->term.grid->offset + c->term.cursor.linear >= dmg->range.start && - c->term.grid->offset + c->term.cursor.linear < dmg->range.start + dmg->range.length) + if (c->term.cursor.linear >= dmg->range.start - c->term.grid->offset && + c->term.cursor.linear < dmg->range.start - c->term.grid->offset + dmg->range.length) { grid_render_update( c, buf, &(struct damage){ .type = DAMAGE_UPDATE, .range = { - .start = (c->term.grid->offset + c->term.cursor.linear) % c->term.grid->size, + .start = c->term.grid->offset + c->term.cursor.linear, .length = 1} }); } - #endif } static void -- cgit v1.3 From 63e46b7b0bb22a7546d3040c078895471f72a7f2 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 1 Jul 2019 19:19:48 +0200 Subject: render: use actual grid size when re-allocating grid buffer --- main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 7e0216b8..f81771ab 100644 --- a/main.c +++ b/main.c @@ -453,10 +453,10 @@ resize(struct context *c, int width, int height) c->term.normal.cells = realloc( c->term.normal.cells, - c->term.cols * c->term.rows * sizeof(c->term.normal.cells[0])); + c->term.normal.size * sizeof(c->term.normal.cells[0])); c->term.alt.cells = realloc( c->term.alt.cells, - c->term.cols * c->term.rows * sizeof(c->term.alt.cells[0])); + c->term.alt.size * sizeof(c->term.alt.cells[0])); for (size_t i = normal_old_size; i < c->term.normal.size; i++) { c->term.normal.cells[i] = (struct cell){ -- cgit v1.3 From dfc9554e89fa741884b2140f0f1c9c2b74da0220 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 1 Jul 2019 21:13:24 +0200 Subject: render: always render cursor --- main.c | 44 +++++++++++++++++++++++++++----------------- terminal.c | 2 -- 2 files changed, 27 insertions(+), 19 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index f81771ab..5c2876e6 100644 --- a/main.c +++ b/main.c @@ -260,20 +260,6 @@ grid_render_erase(struct context *c, struct buffer *buf, const struct damage *dm cairo_fill(buf->cairo); wl_surface_damage_buffer(c->wl.surface, x, y, width, height); } - - /* Redraw cursor, if it's inside the erased range */ - if (c->term.cursor.linear >= dmg->range.start - c->term.grid->offset && - c->term.cursor.linear < dmg->range.start - c->term.grid->offset + dmg->range.length) - { - grid_render_update( - c, buf, - &(struct damage){ - .type = DAMAGE_UPDATE, - .range = { - .start = c->term.grid->offset + c->term.cursor.linear, - .length = 1} - }); - } } static void @@ -362,18 +348,19 @@ grid_render_scroll_reverse(struct context *c, struct buffer *buf, static void grid_render(struct context *c) { + struct buffer *buf = shm_get_buffer(c->wl.shm, c->width, c->height); + cairo_set_operator(buf->cairo, CAIRO_OPERATOR_SOURCE); + if (tll_length(c->term.grid->damage) == 0 && tll_length(c->term.grid->scroll_damage) == 0) { - return; + goto render_cursor; } assert(c->width > 0); assert(c->height > 0); - struct buffer *buf = shm_get_buffer(c->wl.shm, c->width, c->height); - cairo_set_operator(buf->cairo, CAIRO_OPERATOR_SOURCE); tll_foreach(c->term.grid->scroll_damage, it) { switch (it->item.type) { @@ -408,6 +395,29 @@ grid_render(struct context *c) tll_remove(c->term.grid->damage, it); } +render_cursor: + ; + + /* TODO: break out to function */ + /* Re-render last cursor cell and current cursor cell */ + static struct cursor last_cursor = {.linear = 0, .col = 0, .row = 0}; + + if (last_cursor.linear != c->term.cursor.linear) { + struct damage prev_cursor = { + .type = DAMAGE_UPDATE, + .range = {.start = c->term.grid->offset + last_cursor.linear, + .length = 1}, + }; + grid_render_update(c, buf, &prev_cursor); + } + + struct damage cursor = { + .type = DAMAGE_UPDATE, + .range = {.start = c->term.grid->offset + c->term.cursor.linear, .length = 1}, + }; + grid_render_update(c, buf, &cursor); + last_cursor = c->term.cursor; + c->term.grid->offset %= c->term.grid->size; //cairo_surface_flush(buf->cairo_surface); diff --git a/terminal.c b/terminal.c index c6129953..952476f3 100644 --- a/terminal.c +++ b/terminal.c @@ -156,8 +156,6 @@ term_cursor_to(struct terminal *term, int row, int col) int new_linear = row * term->cols + col; assert(new_linear < term->rows * term->cols); - term_damage_update(term, term->cursor.linear, 1); - term_damage_update(term, new_linear, 1); term->print_needs_wrap = false; term->cursor.linear = new_linear; -- cgit v1.3 From e6d9eb7c9e20afd8ee135ddc5e94e291e12721e5 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 1 Jul 2019 21:15:06 +0200 Subject: main: log resize event as INFO --- main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 5c2876e6..b389d2da 100644 --- a/main.c +++ b/main.c @@ -482,8 +482,8 @@ resize(struct context *c, int width, int height) }; } - LOG_DBG("resize: %dx%d, grid: cols=%d, rows=%d", - c->width, c->height, c->term.cols, c->term.rows); + LOG_INFO("resize: %dx%d, grid: cols=%d, rows=%d", + c->width, c->height, c->term.cols, c->term.rows); /* Update environment variables */ char cols_s[12], rows_s[12]; -- cgit v1.3 From 3d8e140a287875503c0c210744395fd7a40f400e Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 2 Jul 2019 12:22:05 +0200 Subject: render: cache glyph masks Cache rendered glyph masks for each font combo. When rendering text, use these when possible (standard ASCII). For now, use the cached glyph as a mask. This allows colors to just work. It would be faster to cache a completely pre-rendered image, but then we would need one image for each background/foreground combo. --- main.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 102 insertions(+), 38 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index b389d2da..1a3458f6 100644 --- a/main.c +++ b/main.c @@ -45,10 +45,16 @@ struct wayland { struct xdg_toplevel *xdg_toplevel; }; +struct glyph_cache { + cairo_scaled_font_t *font; + cairo_surface_t *surf[256]; + cairo_pattern_t *cache[256]; +}; + struct context { bool quit; - cairo_scaled_font_t *fonts[8]; + struct glyph_cache fonts[4]; cairo_font_extents_t fextents; int width; @@ -61,7 +67,6 @@ struct context { bool frame_is_scheduled; }; - static void frame_callback( void *data, struct wl_callback *wl_callback, uint32_t callback_data); @@ -69,11 +74,11 @@ static const struct wl_callback_listener frame_listener = { .done = &frame_callback, }; -static cairo_scaled_font_t * +static struct glyph_cache * attrs_to_font(struct context *c, const struct attributes *attrs) { int idx = attrs->italic << 1 | attrs->bold; - return c->fonts[idx]; + return &c->fonts[idx]; } static void @@ -138,15 +143,9 @@ grid_render_update(struct context *c, struct buffer *buf, const struct damage *d background = swap; } - //LOG_DBG("cell %dx%d dirty: c=0x%02x (%c)", - // row, col, cell->c[0], cell->c[0]); - - cairo_scaled_font_t *font = attrs_to_font(c, &cell->attrs); - cairo_set_scaled_font(buf->cairo, font); + /* Background */ cairo_set_source_rgba( buf->cairo, background.r, background.g, background.b, background.a); - - /* Background */ cairo_rectangle(buf->cairo, x, y, width, height); cairo_fill(buf->cairo); @@ -156,24 +155,45 @@ grid_render_update(struct context *c, struct buffer *buf, const struct damage *d if (cell->attrs.conceal) continue; - cairo_glyph_t *glyphs = NULL; - int num_glyphs = 0; - - cairo_status_t status = cairo_scaled_font_text_to_glyphs( - font, x, y + c->fextents.ascent, - cell->c, strlen(cell->c), &glyphs, &num_glyphs, - NULL, NULL, NULL); - - if (status != CAIRO_STATUS_SUCCESS) { - if (glyphs != NULL) - cairo_glyph_free(glyphs); - continue; - } + struct glyph_cache *cache = attrs_to_font(c, &cell->attrs); cairo_set_source_rgba( buf->cairo, foreground.r, foreground.g, foreground.b, foreground.a); - cairo_show_glyphs(buf->cairo, glyphs, num_glyphs); - cairo_glyph_free(glyphs); + + if (strlen(cell->c) == 1 && cache->cache[(int)cell->c[0]] != NULL) { + cairo_matrix_t matrix; + cairo_matrix_init_translate(&matrix, -x, -y); + + cairo_pattern_t *pat = cache->cache[(int)cell->c[0]]; + cairo_pattern_set_matrix(pat, &matrix); + +#if 1 + cairo_pattern_set_matrix(pat, &matrix); + cairo_mask(buf->cairo, pat); +#else /* TODO: blit image instead - but doesn't (yet) handle colors */ + cairo_set_source(buf->cairo, pat); + cairo_rectangle(buf->cairo, x, y, width, height); + cairo_fill(buf->cairo); +#endif + } else { + cairo_glyph_t *glyphs = NULL; + int num_glyphs = 0; + + cairo_status_t status = cairo_scaled_font_text_to_glyphs( + cache->font, x, y + c->fextents.ascent, + cell->c, strlen(cell->c), &glyphs, &num_glyphs, + NULL, NULL, NULL); + + if (status != CAIRO_STATUS_SUCCESS) { + if (glyphs != NULL) + cairo_glyph_free(glyphs); + continue; + } + + cairo_set_scaled_font(buf->cairo, cache->font); + cairo_show_glyphs(buf->cairo, glyphs, num_glyphs); + cairo_glyph_free(glyphs); + } } wl_surface_damage_buffer( @@ -453,8 +473,6 @@ resize(struct context *c, int width, int height) const size_t normal_old_size = c->term.normal.size; const size_t alt_old_size = c->term.alt.size; - c->term.cell_width = (int)ceil(c->fextents.max_x_advance); - c->term.cell_height = (int)ceil(c->fextents.height); c->term.cols = c->width / c->term.cell_width; c->term.rows = c->height / c->term.cell_height; @@ -802,30 +820,70 @@ main(int argc, const char *const *argv) thrd_create(&keyboard_repeater_id, &keyboard_repeater, &c.term); const char *font_name = "Dina:pixelsize=12"; - c.fonts[0] = font_from_name(font_name); - if (c.fonts[0] == NULL) + c.fonts[0].font = font_from_name(font_name); + if (c.fonts[0].font == NULL) goto out; { char fname[1024]; snprintf(fname, sizeof(fname), "%s:style=bold", font_name); - c.fonts[1] = font_from_name(fname); + c.fonts[1].font = font_from_name(fname); snprintf(fname, sizeof(fname), "%s:style=italic", font_name); - c.fonts[2] = font_from_name(fname); + c.fonts[2].font = font_from_name(fname); snprintf(fname, sizeof(fname), "%s:style=bold italic", font_name); - c.fonts[3] = font_from_name(fname); - - /* TODO; underline */ + c.fonts[3].font = font_from_name(fname); } - cairo_scaled_font_extents(c.fonts[0], &c.fextents); + cairo_scaled_font_extents(c.fonts[0].font, &c.fextents); + c.term.cell_width = (int)ceil(c.fextents.max_x_advance); + c.term.cell_height = (int)ceil(c.fextents.height); LOG_DBG("font: height: %.2f, x-advance: %.2f", c.fextents.height, c.fextents.max_x_advance); assert(c.fextents.max_y_advance == 0); + for (size_t i; i < sizeof(c.fonts) / sizeof(c.fonts[0]); i++) { + cairo_scaled_font_t *font = c.fonts[i].font; + + for (size_t j = 0; j < 256; j++) { + const char text[2] = {(char)j, '\0'}; + + cairo_glyph_t *glyphs = NULL; + int num_glyphs = 0; + + cairo_status_t status = cairo_scaled_font_text_to_glyphs( + font, 0, 0 + c.fextents.ascent, + text, 1, &glyphs, &num_glyphs, NULL, NULL, NULL); + + if (status != CAIRO_STATUS_SUCCESS || num_glyphs != 1) { + if (glyphs != NULL) + cairo_glyph_free(glyphs); + continue; + } + + cairo_surface_t *surf = cairo_image_surface_create( + CAIRO_FORMAT_ARGB32, c.term.cell_width, c.term.cell_height); + cairo_t *ca = cairo_create(surf); + + cairo_set_scaled_font(ca, font); + cairo_set_source_rgba(ca, 1.0, 1.0, 1.0, 1.0); + cairo_show_glyphs(ca, glyphs, num_glyphs); + + cairo_glyph_free(glyphs); + cairo_destroy(ca); + + assert(surf != NULL); + assert(cairo_surface_status(surf) == CAIRO_STATUS_SUCCESS); + c.fonts[i].surf[j] = surf; + + cairo_pattern_t *pat = cairo_pattern_create_for_surface(surf); + assert(cairo_pattern_status(pat) == CAIRO_STATUS_SUCCESS); + c.fonts[i].cache[j] = pat; + } + } + if (c.term.ptmx == -1) { LOG_ERRNO("failed to open pseudo terminal"); goto out; @@ -988,8 +1046,14 @@ out: free(c.term.alt.cells); for (size_t i = 0; i < sizeof(c.fonts) / sizeof(c.fonts[0]); i++) { - if (c.fonts[i] != NULL) - cairo_scaled_font_destroy(c.fonts[i]); + struct glyph_cache *fcache = &c.fonts[i]; + if (fcache->font != NULL) + cairo_scaled_font_destroy(fcache->font); + + for (size_t i = 0; i < sizeof(fcache->cache) / sizeof(fcache->cache[0]); i++) { + if (fcache->cache[i] != NULL) + cairo_pattern_destroy(fcache->cache[i]); + } } if (c.term.ptmx != -1) -- cgit v1.3 From 9392cfbbf37b0034da4d382b25d5387ab445dc7c Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 2 Jul 2019 12:50:18 +0200 Subject: render: draw pre-rendered glyph OVER background This allows us to render the background dynamically. Note that pre-rendered glyphs still have wrong foreground color. --- main.c | 1 + 1 file changed, 1 insertion(+) (limited to 'main.c') diff --git a/main.c b/main.c index 1a3458f6..81cd4656 100644 --- a/main.c +++ b/main.c @@ -171,6 +171,7 @@ grid_render_update(struct context *c, struct buffer *buf, const struct damage *d cairo_pattern_set_matrix(pat, &matrix); cairo_mask(buf->cairo, pat); #else /* TODO: blit image instead - but doesn't (yet) handle colors */ + cairo_set_operator(buf->cairo, CAIRO_OPERATOR_OVER); cairo_set_source(buf->cairo, pat); cairo_rectangle(buf->cairo, x, y, width, height); cairo_fill(buf->cairo); -- cgit v1.3 From 607df23a92ca904a14b8858d5128703b144d4be1 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 2 Jul 2019 12:51:43 +0200 Subject: render: fix cursor not always being rendered In case the only difference between this and the last frame was cursor movement, the cursor was not rendered. --- main.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 81cd4656..feaa7f25 100644 --- a/main.c +++ b/main.c @@ -369,18 +369,27 @@ grid_render_scroll_reverse(struct context *c, struct buffer *buf, static void grid_render(struct context *c) { - struct buffer *buf = shm_get_buffer(c->wl.shm, c->width, c->height); - cairo_set_operator(buf->cairo, CAIRO_OPERATOR_SOURCE); + static struct cursor last_cursor = {.linear = 0, .col = 0, .row = 0}; if (tll_length(c->term.grid->damage) == 0 && - tll_length(c->term.grid->scroll_damage) == 0) + tll_length(c->term.grid->scroll_damage) == 0 && + last_cursor.linear == c->term.cursor.linear) { - goto render_cursor; + return; } assert(c->width > 0); assert(c->height > 0); + struct buffer *buf = shm_get_buffer(c->wl.shm, c->width, c->height); + cairo_set_operator(buf->cairo, CAIRO_OPERATOR_SOURCE); + + static struct buffer *last_buf = NULL; + if (last_buf != buf) { + if (last_buf != NULL) + LOG_WARN("new buffer"); + last_buf = buf; + } tll_foreach(c->term.grid->scroll_damage, it) { @@ -416,12 +425,8 @@ grid_render(struct context *c) tll_remove(c->term.grid->damage, it); } -render_cursor: - ; - /* TODO: break out to function */ /* Re-render last cursor cell and current cursor cell */ - static struct cursor last_cursor = {.linear = 0, .col = 0, .row = 0}; if (last_cursor.linear != c->term.cursor.linear) { struct damage prev_cursor = { -- cgit v1.3 From d04029d7035005b9747b8b4b3a48c61885c99052 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 2 Jul 2019 19:44:02 +0200 Subject: render: revert glyph caching Instead, try to group as long sequences of glyphs as possible, as fewer calls to cairo_show_glyphs() is *much* faster. --- main.c | 177 +++++++++++++++++++++++++++-------------------------------------- 1 file changed, 74 insertions(+), 103 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index feaa7f25..1e835a5b 100644 --- a/main.c +++ b/main.c @@ -45,16 +45,10 @@ struct wayland { struct xdg_toplevel *xdg_toplevel; }; -struct glyph_cache { - cairo_scaled_font_t *font; - cairo_surface_t *surf[256]; - cairo_pattern_t *cache[256]; -}; - struct context { bool quit; - struct glyph_cache fonts[4]; + cairo_scaled_font_t *fonts[4]; cairo_font_extents_t fextents; int width; @@ -74,13 +68,22 @@ static const struct wl_callback_listener frame_listener = { .done = &frame_callback, }; -static struct glyph_cache * +static cairo_scaled_font_t * attrs_to_font(struct context *c, const struct attributes *attrs) { int idx = attrs->italic << 1 | attrs->bold; - return &c->fonts[idx]; + return c->fonts[idx]; } +struct glyph_sequence { + cairo_glyph_t glyphs[10000]; + cairo_glyph_t *g; + int count; + + struct attributes attrs; + struct rgba foreground; +}; + static void grid_render_update(struct context *c, struct buffer *buf, const struct damage *dmg) { @@ -103,23 +106,25 @@ grid_render_update(struct context *c, struct buffer *buf, const struct damage *d const int cols = c->term.cols; + struct glyph_sequence gseq = {.g = gseq.glyphs}; + for (int linear_cursor = start, row = ((start - c->term.grid->offset) % c->term.grid->size) / cols, col = ((start - c->term.grid->offset) % c->term.grid->size) % cols; linear_cursor < start + length; linear_cursor++, - //col = (col + 1) % cols, col = col + 1 >= c->term.cols ? 0 : col + 1, row += col == 0 ? 1 : 0) { //LOG_DBG("UPDATE: %d (%dx%d)", linear_cursor, row, col); - //assert(linear_cursor < c->term.grid->size); - const struct cell *cell = &c->term.grid->cells[linear_cursor % c->term.grid->size]; + const struct cell *cell + = &c->term.grid->cells[linear_cursor % c->term.grid->size]; - bool has_cursor = c->term.cursor.linear == linear_cursor - c->term.grid->offset; - //bool has_cursor = false; + /* Cursor here? */ + bool has_cursor + = c->term.cursor.linear == linear_cursor - c->term.grid->offset; int x = col * c->term.cell_width; int y = row * c->term.cell_height; @@ -155,46 +160,58 @@ grid_render_update(struct context *c, struct buffer *buf, const struct damage *d if (cell->attrs.conceal) continue; - struct glyph_cache *cache = attrs_to_font(c, &cell->attrs); - - cairo_set_source_rgba( - buf->cairo, foreground.r, foreground.g, foreground.b, foreground.a); - - if (strlen(cell->c) == 1 && cache->cache[(int)cell->c[0]] != NULL) { - cairo_matrix_t matrix; - cairo_matrix_init_translate(&matrix, -x, -y); + /* + * cairo_show_glyphs() apparently works *much* faster when + * called once with a large array of glyphs, compared to + * multiple calls with a single glyph. + * + * So, collect glyphs until cell attributes change, then we + * 'flush' (render) the glyphs. + */ - cairo_pattern_t *pat = cache->cache[(int)cell->c[0]]; - cairo_pattern_set_matrix(pat, &matrix); + if (memcmp(&cell->attrs, &gseq.attrs, sizeof(cell->attrs)) != 0 || + gseq.count >= sizeof(gseq.glyphs) / sizeof(gseq.glyphs[0]) - 10 || + memcmp(&gseq.foreground, &foreground, sizeof(foreground)) != 0) + { + if (gseq.count >= sizeof(gseq.glyphs) / sizeof(gseq.glyphs[0]) - 10) + LOG_WARN("hit glyph limit"); + cairo_set_scaled_font(buf->cairo, attrs_to_font(c, &gseq.attrs)); + cairo_set_source_rgba( + buf->cairo, gseq.foreground.r, gseq.foreground.g, + gseq.foreground.b, gseq.foreground.a); -#if 1 - cairo_pattern_set_matrix(pat, &matrix); - cairo_mask(buf->cairo, pat); -#else /* TODO: blit image instead - but doesn't (yet) handle colors */ cairo_set_operator(buf->cairo, CAIRO_OPERATOR_OVER); - cairo_set_source(buf->cairo, pat); - cairo_rectangle(buf->cairo, x, y, width, height); - cairo_fill(buf->cairo); -#endif - } else { - cairo_glyph_t *glyphs = NULL; - int num_glyphs = 0; - - cairo_status_t status = cairo_scaled_font_text_to_glyphs( - cache->font, x, y + c->fextents.ascent, - cell->c, strlen(cell->c), &glyphs, &num_glyphs, - NULL, NULL, NULL); - - if (status != CAIRO_STATUS_SUCCESS) { - if (glyphs != NULL) - cairo_glyph_free(glyphs); - continue; - } + cairo_show_glyphs(buf->cairo, gseq.glyphs, gseq.count); - cairo_set_scaled_font(buf->cairo, cache->font); - cairo_show_glyphs(buf->cairo, glyphs, num_glyphs); - cairo_glyph_free(glyphs); + gseq.g = gseq.glyphs; + gseq.count = 0; + gseq.attrs = cell->attrs; + gseq.foreground = foreground; } + + int new_glyphs + = sizeof(gseq.glyphs) / sizeof(gseq.glyphs[0]) - gseq.count; + + cairo_status_t status = cairo_scaled_font_text_to_glyphs( + attrs_to_font(c, &cell->attrs), x, y + c->fextents.ascent, + cell->c, strlen(cell->c), &gseq.g, &new_glyphs, + NULL, NULL, NULL); + + if (status != CAIRO_STATUS_SUCCESS) + continue; + + gseq.g += new_glyphs; + gseq.count += new_glyphs; + assert(gseq.count <= sizeof(gseq.glyphs) / sizeof(gseq.glyphs[0])); + } + + if (gseq.count > 0) { + cairo_set_scaled_font(buf->cairo, attrs_to_font(c, &gseq.attrs)); + cairo_set_source_rgba( + buf->cairo, gseq.foreground.r, gseq.foreground.g, + gseq.foreground.b, gseq.foreground.a); + cairo_set_operator(buf->cairo, CAIRO_OPERATOR_OVER); + cairo_show_glyphs(buf->cairo, gseq.glyphs, gseq.count); } wl_surface_damage_buffer( @@ -826,23 +843,23 @@ main(int argc, const char *const *argv) thrd_create(&keyboard_repeater_id, &keyboard_repeater, &c.term); const char *font_name = "Dina:pixelsize=12"; - c.fonts[0].font = font_from_name(font_name); - if (c.fonts[0].font == NULL) + c.fonts[0] = font_from_name(font_name); + if (c.fonts[0] == NULL) goto out; { char fname[1024]; snprintf(fname, sizeof(fname), "%s:style=bold", font_name); - c.fonts[1].font = font_from_name(fname); + c.fonts[1] = font_from_name(fname); snprintf(fname, sizeof(fname), "%s:style=italic", font_name); - c.fonts[2].font = font_from_name(fname); + c.fonts[2] = font_from_name(fname); snprintf(fname, sizeof(fname), "%s:style=bold italic", font_name); - c.fonts[3].font = font_from_name(fname); + c.fonts[3] = font_from_name(fname); } - cairo_scaled_font_extents(c.fonts[0].font, &c.fextents); + cairo_scaled_font_extents(c.fonts[0], &c.fextents); c.term.cell_width = (int)ceil(c.fextents.max_x_advance); c.term.cell_height = (int)ceil(c.fextents.height); @@ -850,46 +867,6 @@ main(int argc, const char *const *argv) c.fextents.height, c.fextents.max_x_advance); assert(c.fextents.max_y_advance == 0); - for (size_t i; i < sizeof(c.fonts) / sizeof(c.fonts[0]); i++) { - cairo_scaled_font_t *font = c.fonts[i].font; - - for (size_t j = 0; j < 256; j++) { - const char text[2] = {(char)j, '\0'}; - - cairo_glyph_t *glyphs = NULL; - int num_glyphs = 0; - - cairo_status_t status = cairo_scaled_font_text_to_glyphs( - font, 0, 0 + c.fextents.ascent, - text, 1, &glyphs, &num_glyphs, NULL, NULL, NULL); - - if (status != CAIRO_STATUS_SUCCESS || num_glyphs != 1) { - if (glyphs != NULL) - cairo_glyph_free(glyphs); - continue; - } - - cairo_surface_t *surf = cairo_image_surface_create( - CAIRO_FORMAT_ARGB32, c.term.cell_width, c.term.cell_height); - cairo_t *ca = cairo_create(surf); - - cairo_set_scaled_font(ca, font); - cairo_set_source_rgba(ca, 1.0, 1.0, 1.0, 1.0); - cairo_show_glyphs(ca, glyphs, num_glyphs); - - cairo_glyph_free(glyphs); - cairo_destroy(ca); - - assert(surf != NULL); - assert(cairo_surface_status(surf) == CAIRO_STATUS_SUCCESS); - c.fonts[i].surf[j] = surf; - - cairo_pattern_t *pat = cairo_pattern_create_for_surface(surf); - assert(cairo_pattern_status(pat) == CAIRO_STATUS_SUCCESS); - c.fonts[i].cache[j] = pat; - } - } - if (c.term.ptmx == -1) { LOG_ERRNO("failed to open pseudo terminal"); goto out; @@ -1052,14 +1029,8 @@ out: free(c.term.alt.cells); for (size_t i = 0; i < sizeof(c.fonts) / sizeof(c.fonts[0]); i++) { - struct glyph_cache *fcache = &c.fonts[i]; - if (fcache->font != NULL) - cairo_scaled_font_destroy(fcache->font); - - for (size_t i = 0; i < sizeof(fcache->cache) / sizeof(fcache->cache[0]); i++) { - if (fcache->cache[i] != NULL) - cairo_pattern_destroy(fcache->cache[i]); - } + if (c.fonts[i] != NULL) + cairo_scaled_font_destroy(c.fonts[i]); } if (c.term.ptmx != -1) -- cgit v1.3 From d5158b2432dfdd64c464b3da733dae4ab31e4b52 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 2 Jul 2019 22:31:52 +0200 Subject: render: track last cursor position in absolute values This seems to fix an issue where we sometimes saw "ghost" cursors when scrolling. --- main.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 1e835a5b..24371687 100644 --- a/main.c +++ b/main.c @@ -386,11 +386,11 @@ grid_render_scroll_reverse(struct context *c, struct buffer *buf, static void grid_render(struct context *c) { - static struct cursor last_cursor = {.linear = 0, .col = 0, .row = 0}; + static int last_cursor; if (tll_length(c->term.grid->damage) == 0 && tll_length(c->term.grid->scroll_damage) == 0 && - last_cursor.linear == c->term.cursor.linear) + last_cursor == c->term.cursor.linear) { return; } @@ -444,12 +444,11 @@ grid_render(struct context *c) /* TODO: break out to function */ /* Re-render last cursor cell and current cursor cell */ - - if (last_cursor.linear != c->term.cursor.linear) { + /* Make sure previous cursor is refreshed (to avoid "ghost" cursors) */ + if (last_cursor != c->term.cursor.linear) { struct damage prev_cursor = { .type = DAMAGE_UPDATE, - .range = {.start = c->term.grid->offset + last_cursor.linear, - .length = 1}, + .range = {.start = last_cursor, .length = 1}, }; grid_render_update(c, buf, &prev_cursor); } @@ -459,7 +458,7 @@ grid_render(struct context *c) .range = {.start = c->term.grid->offset + c->term.cursor.linear, .length = 1}, }; grid_render_update(c, buf, &cursor); - last_cursor = c->term.cursor; + last_cursor = c->term.grid->offset + c->term.cursor.linear; c->term.grid->offset %= c->term.grid->size; -- cgit v1.3 From dfaa5f56407f4035dcae6445ed5ffec52782258c Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 2 Jul 2019 22:32:25 +0200 Subject: main: make sure cursor is inside the new row/col limits on resize --- main.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'main.c') diff --git a/main.c b/main.c index 24371687..b82fa7a7 100644 --- a/main.c +++ b/main.c @@ -546,6 +546,11 @@ resize(struct context *c, int width, int height) if (c->term.scroll_region.end == old_rows) c->term.scroll_region.end = c->term.rows; + term_cursor_to( + &c->term, + min(c->term.cursor.row, c->term.rows), + min(c->term.cursor.col, c->term.cols)); + term_damage_all(&c->term); if (!c->frame_is_scheduled) -- cgit v1.3 From 2bca2a894ed9f4a4ce8ec15b30cc3e2ed487cc07 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 09:46:13 +0200 Subject: main: add --font/-f command line option --- main.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index b82fa7a7..88c08998 100644 --- a/main.c +++ b/main.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include @@ -408,7 +409,6 @@ grid_render(struct context *c) last_buf = buf; } - tll_foreach(c->term.grid->scroll_damage, it) { switch (it->item.type) { case DAMAGE_SCROLL: @@ -803,10 +803,40 @@ keyboard_repeater(void *arg) } int -main(int argc, const char *const *argv) +main(int argc, char *const *argv) { int ret = EXIT_FAILURE; + static const struct option longopts[] = { + {"font", required_argument, 0, 'f'}, + {NULL, no_argument, 0, 0}, + }; + + const char *font_name = "Dina:pixelsize=12"; + + while (true) { + int c = getopt_long(argc, argv, ":f:h", longopts, NULL); + if (c == -1) + break; + + switch (c) { + case 'f': + font_name = optarg; + break; + + case 'h': + break; + + case ':': + fprintf(stderr, "error: -%c: missing required argument\n", optopt); + return EXIT_FAILURE; + + case '?': + fprintf(stderr, "error: -%c: invalid option\n", optopt); + return EXIT_FAILURE; + } + } + setlocale(LC_ALL, ""); int repeat_pipe_fds[2] = {-1, -1}; @@ -846,7 +876,6 @@ main(int argc, const char *const *argv) thrd_t keyboard_repeater_id; thrd_create(&keyboard_repeater_id, &keyboard_repeater, &c.term); - const char *font_name = "Dina:pixelsize=12"; c.fonts[0] = font_from_name(font_name); if (c.fonts[0] == NULL) goto out; -- cgit v1.3 From 048f619b1916f844eca0366b762ed1b87128a27f Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 09:46:39 +0200 Subject: render: fix last-cursor comparison --- main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main.c') diff --git a/main.c b/main.c index 88c08998..e3612d2e 100644 --- a/main.c +++ b/main.c @@ -391,7 +391,7 @@ grid_render(struct context *c) if (tll_length(c->term.grid->damage) == 0 && tll_length(c->term.grid->scroll_damage) == 0 && - last_cursor == c->term.cursor.linear) + last_cursor == c->term.grid->offset + c->term.cursor.linear) { return; } -- cgit v1.3 From a7a28ff5816c0f80a439c4ad828c6f0028493b1f Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 10:45:49 +0200 Subject: scrolling: initial reverse scrolling support - no scroll regions --- grid.c | 23 +++++++++++++---------- grid.h | 6 +++--- main.c | 19 +++++++++++++++---- terminal.c | 46 ++++++++++++++-------------------------------- 4 files changed, 45 insertions(+), 49 deletions(-) (limited to 'main.c') diff --git a/grid.c b/grid.c index a21e0c88..99e66665 100644 --- a/grid.c +++ b/grid.c @@ -8,12 +8,15 @@ #include "log.h" struct cell * -grid_get_range(struct grid *grid, size_t start, size_t *length) +grid_get_range(struct grid *grid, int start, int *length) { #define min(x, y) ((x) < (y) ? (x) : (y)) assert(*length <= grid->size); - size_t real_start = (grid->offset + start) % grid->size; + int real_start = (grid->offset + start) % grid->size; + if (real_start < 0) + real_start += grid->size; + assert(real_start >= 0); assert(real_start < grid->size); *length = min(*length, grid->size - real_start); @@ -24,11 +27,11 @@ grid_get_range(struct grid *grid, size_t start, size_t *length) } void -grid_memset(struct grid *grid, size_t start, int c, size_t length) +grid_memset(struct grid *grid, int start, int c, int length) { - size_t left = length; + int left = length; while (left > 0) { - size_t count = left; + int count = left; struct cell *cells = grid_get_range(grid, start, &count); assert(count > 0); @@ -42,14 +45,14 @@ grid_memset(struct grid *grid, size_t start, int c, size_t length) } void -grid_memmove(struct grid *grid, size_t dst, size_t src, size_t length) +grid_memmove(struct grid *grid, int dst, int src, int length) { - size_t left = length; - size_t copy_idx = 0; + int left = length; + int copy_idx = 0; struct cell copy[left]; while (left > 0) { - size_t count = left; + int count = left; struct cell *src_cells = grid_get_range(grid, src, &count); memcpy(©[copy_idx], src_cells, count * sizeof(copy[0])); @@ -63,7 +66,7 @@ grid_memmove(struct grid *grid, size_t dst, size_t src, size_t length) copy_idx = 0; while (left > 0) { - size_t count = left; + int count = left; struct cell *dst_cells = grid_get_range(grid, dst, &count); memcpy(dst_cells, ©[copy_idx], count * sizeof(copy[0])); diff --git a/grid.h b/grid.h index 275d81bc..59d9e58b 100644 --- a/grid.h +++ b/grid.h @@ -3,6 +3,6 @@ #include #include "terminal.h" -struct cell *grid_get_range(struct grid *grid, size_t start, size_t *length); -void grid_memset(struct grid *grid, size_t start, int c, size_t length); -void grid_memmove(struct grid *grid, size_t dst, size_t src, size_t length); +struct cell *grid_get_range(struct grid *grid, int start, int *length); +void grid_memset(struct grid *grid, int start, int c, int length); +void grid_memmove(struct grid *grid, int dst, int src, int length); diff --git a/main.c b/main.c index e3612d2e..460f36e4 100644 --- a/main.c +++ b/main.c @@ -118,10 +118,19 @@ grid_render_update(struct context *c, struct buffer *buf, const struct damage *d row += col == 0 ? 1 : 0) { - //LOG_DBG("UPDATE: %d (%dx%d)", linear_cursor, row, col); + assert(row >= 0); + assert(row < c->term.rows); + assert(col >= 0); + assert(col < c->term.cols); - const struct cell *cell - = &c->term.grid->cells[linear_cursor % c->term.grid->size]; + int cell_idx = linear_cursor % c->term.grid->size; + if (cell_idx < 0) + cell_idx += c->term.grid->size; + + assert(cell_idx >= 0); + assert(cell_idx < c->term.rows * c->term.cols); + + const struct cell *cell = &c->term.grid->cells[cell_idx]; /* Cursor here? */ bool has_cursor @@ -376,7 +385,7 @@ grid_render_scroll_reverse(struct context *c, struct buffer *buf, struct damage erase = { .type = DAMAGE_ERASE, .range = { - .start = dmg->scroll.region.start * cols, + .start = c->term.grid->offset + dmg->scroll.region.start * cols, .length = min(dmg->scroll.region.end - dmg->scroll.region.start, dmg->scroll.lines) * cols, }, @@ -461,6 +470,8 @@ grid_render(struct context *c) last_cursor = c->term.grid->offset + c->term.cursor.linear; c->term.grid->offset %= c->term.grid->size; + if (c->term.grid->offset < 0) + c->term.grid->offset += c->term.grid->size; //cairo_surface_flush(buf->cairo_surface); wl_surface_attach(c->wl.surface, buf->wl_buf, 0, 0); diff --git a/terminal.c b/terminal.c index 2c96e3cf..d7eeba15 100644 --- a/terminal.c +++ b/terminal.c @@ -134,8 +134,7 @@ term_damage_scroll(struct terminal *term, enum damage_type damage_type, } else break; } - } else - assert(false); + } if (tll_length(term->grid->scroll_damage) > 0) { struct damage *dmg = &tll_back(term->grid->scroll_damage); @@ -187,11 +186,11 @@ term_cursor_to(struct terminal *term, int row, int col) term->cursor.col = col; term->cursor.row = row; - size_t len = term->cols; + int len = term->cols; term->grid->cur_line = grid_get_range( term->grid, term->cursor.linear - col, &len); - assert(len == (size_t)term->cols); + assert(len == term->cols); } void @@ -277,11 +276,11 @@ term_scroll_partial(struct terminal *term, struct scroll_region region, int rows term_damage_scroll(term, DAMAGE_SCROLL, region, rows); - size_t len = term->cols; + int len = term->cols; term->grid->cur_line = grid_get_range( term->grid, term->cursor.linear - term->cursor.col, &len); - assert(len == (size_t)term->cols); + assert(len == term->cols); } void @@ -294,37 +293,20 @@ void term_scroll_reverse_partial(struct terminal *term, struct scroll_region region, int rows) { - if (rows >= region.end - region.start) { - assert(false && "todo"); - return; - } + assert(region.start == 0); + assert(region.end == term->rows); -#if 0 - int cell_dst = (region.start + rows) * term->cols; - int cell_src = (region.start + 0) * term->cols; - int cell_count = (region.end - region.start - rows) * term->cols; - - LOG_DBG("moving %d lines from row %d to row %d", cell_count / term->cols, - cell_src / term->cols, cell_dst / term->cols); - - const int bytes = cell_count * sizeof(term->grid->cells[0]); - memmove( - &term->grid->cells[cell_dst], &term->grid->cells[cell_src], - bytes); + term->grid->offset -= rows * term->cols; - memset(&term->grid->cells[cell_src], 0, - rows * term->cols * sizeof(term->grid->cells[0])); + grid_memset(term->grid, region.start * term->cols, 0, rows * term->cols); term_damage_scroll(term, DAMAGE_SCROLL_REVERSE, region, rows); -#else - /* TODO */ - assert(false); - assert(region.start == 0 && region.end == 0); - assert(rows < term->rows); - term->grid->offset -= rows * term->cols; - term_damage_scroll(term, DAMAGE_SCROLL_REVERSE, region, rows); -#endif + int len = term->cols; + term->grid->cur_line = grid_get_range( + term->grid, term->cursor.linear - term->cursor.col, &len); + + assert(len == term->cols); } void -- cgit v1.3 From 5e8c75aa38ee0fc394556e0759b42b1713948412 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 14:14:46 +0200 Subject: csi: implement 'civis' (show/hide cursor) --- csi.c | 4 ++-- main.c | 3 ++- terminal.h | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'main.c') diff --git a/csi.c b/csi.c index dd292b79..57da1c06 100644 --- a/csi.c +++ b/csi.c @@ -567,7 +567,7 @@ csi_dispatch(struct terminal *term, uint8_t final) break; case 25: - LOG_WARN("unimplemented: civis"); + term->hide_cursor = false; break; case 1000: @@ -625,7 +625,7 @@ csi_dispatch(struct terminal *term, uint8_t final) break; case 25: - LOG_WARN("unimplemented: civis"); + term->hide_cursor = true; break; case 1000: diff --git a/main.c b/main.c index 460f36e4..a29f5d8c 100644 --- a/main.c +++ b/main.c @@ -134,7 +134,8 @@ grid_render_update(struct context *c, struct buffer *buf, const struct damage *d /* Cursor here? */ bool has_cursor - = c->term.cursor.linear == linear_cursor - c->term.grid->offset; + = (!c->term.hide_cursor && + (c->term.cursor.linear == linear_cursor - c->term.grid->offset)); int x = col * c->term.cell_width; int y = row * c->term.cell_height; diff --git a/terminal.h b/terminal.h index 66f6bde0..a96b1b70 100644 --- a/terminal.h +++ b/terminal.h @@ -131,6 +131,7 @@ struct terminal { pid_t slave; int ptmx; + bool hide_cursor; enum decckm decckm; enum keypad_mode keypad_mode; bool bracketed_paste; -- cgit v1.3 From f87d4f856a277553be35fbee8c3abe2765d978dd Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 15:16:38 +0200 Subject: main: mitigate screen flashes on slow client If a client writes to the PTY "too slow", we often end up flashing the screen. This could for example be caused by a client first erasing a line, then we render that frame, followed by the client updating the just-erased line. When we render _that_ frame, it will be perceived as a flash. Mitigate this by trying to read client data again, after finishing processing one batch, but before rendering. To avoid hanging on client output (and never rendering anything), limit this to at most 3 iterations. This may have to be tweaked. --- main.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index a29f5d8c..133880ee 100644 --- a/main.c +++ b/main.c @@ -8,6 +8,7 @@ #include #include #include +#include #include //#include @@ -987,6 +988,20 @@ main(int argc, char *const *argv) break; } + /* Read logic requires non-blocking mode */ + { + int fd_flags = fcntl(c.term.ptmx, F_GETFL); + if (fd_flags == -1) { + LOG_ERRNO("failed to set non blocking mode on PTY master"); + goto out; + } + + if (fcntl(c.term.ptmx, F_SETFL, fd_flags | O_NONBLOCK) == -1) { + LOG_ERRNO("failed to set non blocking mode on PTY master"); + goto out; + } + } + while (true) { struct pollfd fds[] = { {.fd = wl_display_get_fd(c.wl.display), .events = POLLIN}, @@ -1011,16 +1026,18 @@ main(int argc, char *const *argv) } if (fds[1].revents & POLLIN) { - uint8_t data[8192]; - ssize_t count = read(c.term.ptmx, data, sizeof(data)); - if (count < 0) { - LOG_ERRNO("failed to read from pseudo terminal"); - break; - } + for (size_t i = 0; i < 3; i++) { + uint8_t data[8192]; + ssize_t count = read(c.term.ptmx, data, sizeof(data)); + if (count < 0) { + if (errno != EAGAIN) + LOG_ERRNO("failed to read from pseudo terminal"); + break; + } - //LOG_DBG("%.*s", (int)count, data); + vt_from_slave(&c.term, data, count); + } - vt_from_slave(&c.term, data, count); if (!c.frame_is_scheduled) grid_render(&c); } -- cgit v1.3 From 1373d18dbc7b04141347a20a58867c1c79cf6daf Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 20:21:03 +0200 Subject: logging: disable debug logging by default --- csi.c | 2 +- grid.c | 2 +- input.c | 2 +- main.c | 2 +- osc.c | 2 +- slave.c | 2 +- terminal.c | 2 +- vt.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'main.c') diff --git a/csi.c b/csi.c index 530a494c..4be35c60 100644 --- a/csi.c +++ b/csi.c @@ -10,7 +10,7 @@ #endif #define LOG_MODULE "csi" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" #include "grid.h" diff --git a/grid.c b/grid.c index 99e66665..178883e4 100644 --- a/grid.c +++ b/grid.c @@ -4,7 +4,7 @@ #include #define LOG_MODULE "grid" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" struct cell * diff --git a/input.c b/input.c index 5e61d49b..319de914 100644 --- a/input.c +++ b/input.c @@ -10,7 +10,7 @@ #include #define LOG_MODULE "input" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" #include "terminal.h" diff --git a/main.c b/main.c index 133880ee..b69f42de 100644 --- a/main.c +++ b/main.c @@ -17,7 +17,7 @@ #include #define LOG_MODULE "main" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" #include "font.h" diff --git a/osc.c b/osc.c index 5f71287e..2882d546 100644 --- a/osc.c +++ b/osc.c @@ -1,7 +1,7 @@ #include "osc.h" #define LOG_MODULE "osc" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" bool diff --git a/slave.c b/slave.c index edb5e9c6..676d4ce2 100644 --- a/slave.c +++ b/slave.c @@ -9,7 +9,7 @@ #include #define LOG_MODULE "slave" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" void diff --git a/terminal.c b/terminal.c index 7ba0aa13..4de5a1a8 100644 --- a/terminal.c +++ b/terminal.c @@ -4,7 +4,7 @@ #include #define LOG_MODULE "terminal" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" #include "grid.h" diff --git a/vt.c b/vt.c index b2cc07fa..c5786b2f 100644 --- a/vt.c +++ b/vt.c @@ -5,7 +5,7 @@ #include #define LOG_MODULE "vt" -#define LOG_ENABLE_DBG 1 +#define LOG_ENABLE_DBG 0 #include "log.h" #include "csi.h" #include "osc.h" -- cgit v1.3 From 3c67628c57b03f6faabe61d04b13297eac80bb6a Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 3 Jul 2019 21:18:06 +0200 Subject: vt: implement (untested!) smam and rmam (auto margins) Default is auto-margins enabled (scroll when cursor reaches right margin). --- csi.c | 4 ++-- main.c | 1 + vt.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'main.c') diff --git a/csi.c b/csi.c index 6fca2c24..bb805134 100644 --- a/csi.c +++ b/csi.c @@ -585,7 +585,7 @@ csi_dispatch(struct terminal *term, uint8_t final) break; case 7: - LOG_WARN("unimplemented: smam (automatic margins)"); + term->auto_margin = true; break; case 12: @@ -655,7 +655,7 @@ csi_dispatch(struct terminal *term, uint8_t final) break; case 7: - LOG_WARN("unimplemented: smam (automatic margins)"); + term->auto_margin = false; break; case 12: diff --git a/main.c b/main.c index b69f42de..a87598c4 100644 --- a/main.c +++ b/main.c @@ -864,6 +864,7 @@ main(int argc, char *const *argv) .ptmx = posix_openpt(O_RDWR | O_NOCTTY), .decckm = DECCKM_CSI, .keypad_mode = KEYPAD_NUMERICAL, /* TODO: verify */ + .auto_margin = true, .vt = { .state = 1, /* STATE_GROUND */ }, diff --git a/vt.c b/vt.c index b00b840d..8f1db921 100644 --- a/vt.c +++ b/vt.c @@ -690,7 +690,7 @@ action(struct terminal *term, enum action action, uint8_t c) break; case ACTION_PRINT: { - if (term->print_needs_wrap) { + if (term->auto_margin && term->print_needs_wrap) { if (term->cursor.row == term->scroll_region.end - 1) { term_scroll(term, 1); term_cursor_to(term, term->cursor.row, 0); -- cgit v1.3