diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-05-14 22:12:51 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-05-14 22:12:51 +0000 |
| commit | a5ec26ccc91051dc25628906b9cbce542e4c7402 (patch) | |
| tree | 31474ac30e17843337a9a5c70506a4bf31aaf67c | |
| parent | grid: don’t depend on wcwidth() (diff) | |
grid: reflow: no need to check for combining characters
Since we no longer call wcwidth(), we don’t need the base character.
| -rw-r--r-- | grid.c | 31 |
1 files changed, 10 insertions, 21 deletions
@@ -491,6 +491,8 @@ grid_resize_and_reflow( /* Walk current line of the old grid */ for (int c = 0; c < old_cols; c++) { + const struct cell *old_cell = &old_row->cells[c]; + wchar_t wc = old_cell->wc; /* Check if this cell is one of the tracked cells */ bool is_tracking_point = false; @@ -512,7 +514,7 @@ grid_resize_and_reflow( } } - if (old_row->cells[c].wc == 0 && !is_tracking_point) { + if (wc == 0 && !is_tracking_point) { empty_count++; continue; } @@ -529,35 +531,22 @@ grid_resize_and_reflow( if (new_col_idx + 1 > new_cols) line_wrap(); - new_row->cells[new_col_idx] = old_row->cells[c - empty_count + i]; + size_t idx = c - empty_count + i; + + new_row->cells[new_col_idx].wc = 0; + new_row->cells[new_col_idx].attrs = old_row->cells[idx].attrs; new_row->cells[new_col_idx].attrs.clean = 1; new_col_idx++; } empty_count = 0; - wchar_t wc = old_row->cells[c].wc; - if (wc >= CELL_COMB_CHARS_LO && - wc < (CELL_COMB_CHARS_LO + compose_count)) - { - wc = composed[wc - CELL_COMB_CHARS_LO].base; - } - - const struct cell *old_cell = &old_row->cells[c]; - wc = old_cell->wc; - if (wc == CELL_SPACER) continue; - if (wc >= CELL_COMB_CHARS_LO && - wc < (CELL_COMB_CHARS_LO + compose_count)) - { - wc = composed[wc - CELL_COMB_CHARS_LO].base; - } - - if (wc < CELL_SPACER && - c + 1 < old_cols && - old_row->cells[c + 1].wc > CELL_SPACER) + if (unlikely(wc < CELL_SPACER && + c + 1 < old_cols && + old_row->cells[c + 1].wc > CELL_SPACER)) { int width = old_row->cells[c + 1].wc - CELL_SPACER + 1; assert(wcwidth(wc) == width); |
