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. --- grid.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'grid.c') diff --git a/grid.c b/grid.c index 67f6e57a..bb8d46eb 100644 --- a/grid.c +++ b/grid.c @@ -6,3 +6,37 @@ #define LOG_MODULE "grid" #define LOG_ENABLE_DBG 1 #include "log.h" + +struct cell * +grid_get_range(struct grid *grid, size_t start, size_t *length) +{ +#define min(x, y) ((x) < (y) ? (x) : (y)) + assert(*length <= grid->size); + + size_t real_start = (grid->offset + start) % grid->size; + assert(real_start < grid->size); + + *length = min(*length, grid->size - real_start); + assert(real_start + *length <= grid->size); + + return &grid->cells[real_start]; +#undef min +} + +void +grid_memset(struct grid *grid, size_t start, int c, size_t length) +{ + size_t left = length; + while (left > 0) { + size_t count = left; + struct cell *cells = grid_get_range(grid, start, &count); + + assert(count > 0); + assert(count <= left); + + memset(cells, c, count * sizeof(cells[0])); + + left -= count; + start += count; + } +} -- cgit v1.3 From 482f56b4a2f9a30a57b78188cd3faa5e21bbb588 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 1 Jul 2019 19:18:52 +0200 Subject: grid: implement a memmove-sort-of function grid_memmove() moves cell data from one index to another, taking the grid offset into account. --- grid.c | 33 +++++++++++++++++++++++++++++++++ grid.h | 1 + 2 files changed, 34 insertions(+) (limited to 'grid.c') diff --git a/grid.c b/grid.c index bb8d46eb..a21e0c88 100644 --- a/grid.c +++ b/grid.c @@ -40,3 +40,36 @@ grid_memset(struct grid *grid, size_t start, int c, size_t length) start += count; } } + +void +grid_memmove(struct grid *grid, size_t dst, size_t src, size_t length) +{ + size_t left = length; + size_t copy_idx = 0; + struct cell copy[left]; + + while (left > 0) { + size_t count = left; + struct cell *src_cells = grid_get_range(grid, src, &count); + + memcpy(©[copy_idx], src_cells, count * sizeof(copy[0])); + + left -= count; + src += count; + copy_idx += count; + } + + left = length; + copy_idx = 0; + + while (left > 0) { + size_t count = left; + struct cell *dst_cells = grid_get_range(grid, dst, &count); + + memcpy(dst_cells, ©[copy_idx], count * sizeof(copy[0])); + + left -= count; + dst += count; + copy_idx += count; + } +} diff --git a/grid.h b/grid.h index 3a5f3f4b..275d81bc 100644 --- a/grid.h +++ b/grid.h @@ -5,3 +5,4 @@ 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); -- 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 'grid.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 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 'grid.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