diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-06-28 12:24:30 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-06-28 12:24:30 +0000 |
| commit | aa1951a4d28789426aca2702f6dfce642e3b3d04 (patch) | |
| tree | c271fd732828d4b1e6000646bb920e510bb8a856 | |
| parent | render: sixel: regression: need to take current offset into account when early-quitting sixel ren... (diff) | |
sixel: overwrite-by-row: optimize: break out of loop as soon as possible
Since the images are sorted, we can break out of the loop as soon as
we detect an image that *ends before* the row we're looking for.
In order for the row comparisons to work, the row numbers must be
re-based against the current scrollback offset, or the
scrollback *end*, to be precise.
| -rw-r--r-- | sixel.c | 38 |
1 files changed, 24 insertions, 14 deletions
@@ -392,20 +392,29 @@ sixel_overwrite_by_rectangle( _sixel_overwrite_by_rectangle(term, start, col, height, width); } -/* Row numbers are absolute */ -static void -_sixel_overwrite_by_row(struct terminal *term, int row, int col, int width) +/* Row numbers are relative to grid offset */ +void +sixel_overwrite_by_row(struct terminal *term, int _row, int col, int width) { assert(col >= 0); - assert(row >= 0); - assert(row < term->grid->num_rows); + assert(_row >= 0); + assert(_row < term->rows); assert(col >= 0); assert(col + width <= term->grid->num_cols); if (likely(tll_length(term->grid->sixel_images) == 0)) return; + const int scrollback_end + = (term->grid->offset + term->rows) & (term->grid->num_rows - 1); + + const int row = (term->grid->offset + _row) & (term->grid->num_rows - 1); + const int grid_relative_row + = (term->grid->offset + row + - scrollback_end + + term->grid->num_rows) & (term->grid->num_rows - 1); + tll_foreach(term->grid->sixel_images, it) { struct sixel *six = &it->item; const int six_start = six->pos.row; @@ -414,6 +423,16 @@ _sixel_overwrite_by_row(struct terminal *term, int row, int col, int width) /* We should never generate scrollback wrapping sixels */ assert(six_end >= six_start); + const int six_grid_relative_end + = (six->pos.row + six->rows - 1 + - scrollback_end + + term->grid->num_rows) & (term->grid->num_rows - 1); + + if (six_grid_relative_end < grid_relative_row) { + /* All remaining sixels are *before* "our" row */ + break; + } + if (row >= six_start && row <= six_end) { const int col_start = six->pos.col; const int col_end = six->pos.col + six->cols - 1; @@ -431,15 +450,6 @@ _sixel_overwrite_by_row(struct terminal *term, int row, int col, int width) } void -sixel_overwrite_by_row(struct terminal *term, int row, int col, int width) -{ - _sixel_overwrite_by_row( - term, - (term->grid->offset + row) & (term->grid->num_rows - 1), - col, width); -} - -void sixel_overwrite_at_cursor(struct terminal *term, int width) { sixel_overwrite_by_row( |
