aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-15 06:20:10 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-15 06:20:10 +0000
commit6b0b3ddcccf27fd08b77945d71409ac26dfe94dc (patch)
tree837f8ae2002a0d1f91871731d370bfda77b9ba51 /render.c
parentselection: recognize empty padding cells in a forced linewrap (diff)
parentterm: print: don't pad with spacers if auto-margin is disabled (diff)
Merge branch 'multi-column-special-spacer-value'
Diffstat (limited to 'render.c')
-rw-r--r--render.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/render.c b/render.c
index 99ca03e3..a049ca05 100644
--- a/render.c
+++ b/render.c
@@ -408,10 +408,10 @@ render_cell(struct terminal *term, pixman_image_t *pix,
if (cell->wc != 0) {
wchar_t base = cell->wc;
- if (base >= COMB_CHARS_LO &&
- base < (COMB_CHARS_LO + term->composed_count))
+ if (base >= CELL_COMB_CHARS_LO &&
+ base < (CELL_COMB_CHARS_LO + term->composed_count))
{
- composed = &term->composed[base - COMB_CHARS_LO];
+ composed = &term->composed[base - CELL_COMB_CHARS_LO];
base = composed->base;
}
@@ -438,7 +438,7 @@ render_cell(struct terminal *term, pixman_image_t *pix,
if (has_cursor && term->cursor_style == CURSOR_BLOCK && term->kbd_focus)
draw_cursor(term, cell, font, pix, &fg, &bg, x, y, cell_cols);
- if (cell->wc == 0 || cell->attrs.conceal)
+ if (cell->wc == 0 || cell->wc == CELL_MULT_COL_SPACER || cell->attrs.conceal)
goto draw_cursor;
pixman_image_t *clr_pix = pixman_image_create_solid_fill(&fg);