aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-05-04 08:48:01 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-05-04 08:48:01 +0000
commitf08f880911c302a22bd20ab39554f67515ec8656 (patch)
tree94b63e82de88f266513d68bbfab4b0bafa4790bd /render.c
parentMerge branch 'bg-alpha-on-default-bg-only' (diff)
parentbox-drawing: add Unicode 13 U+1FB70 - U+1FB8B (diff)
Merge branch 'more-unicode-13-box-drawings'
Related to #471
Diffstat (limited to 'render.c')
-rw-r--r--render.c31
1 files changed, 28 insertions, 3 deletions
diff --git a/render.c b/render.c
index 7d5dc8d7..9bcd11ba 100644
--- a/render.c
+++ b/render.c
@@ -484,12 +484,32 @@ render_cell(struct terminal *term, pixman_image_t *pix,
base = composed->base;
}
- if (unlikely((base >= 0x2500 && base <= 0x259f) ||
- (base >= 0x1fb00 && base <= 0x1fb3b)) &&
+ if (unlikely(
+ /* Classic box drawings */
+ (base >= 0x2500 && base <= 0x259f) ||
+
+ /*
+ * Unicode 13 "Symbols for Legacy Computing"
+ * sub-ranges below.
+ *
+ * Note, the full range is U+1FB00 - U+1FBF9
+ */
+
+ /* Unicode 13 sextants */
+ (base >= 0x1fb00 && base <= 0x1fb3b) ||
+
+ /* Unicode 13 partial blocks */
+ /* TODO: there's more here! */
+ (base >= 0x1fb70 && base <= 0x1fb8b)) &&
+
likely(!term->conf->box_drawings_uses_font_glyphs))
{
/* Box drawing characters */
- size_t idx = base >= 0x1fb00 ? base - 0x1fb00 + 160 : base - 0x2500;
+ size_t idx = base >= 0x1fb00
+ ? (base >= 0x1fb70
+ ? base - 0x1fb70 + 220
+ : base - 0x1fb00 + 160)
+ : base - 0x2500;
xassert(idx < ALEN(term->box_drawing));
if (likely(term->box_drawing[idx] != NULL))
@@ -3090,10 +3110,15 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
sixel_reflow(term);
+#if defined(_DEBUG) && LOG_ENABLE_DBG
LOG_DBG("resize: %dx%d, grid: cols=%d, rows=%d "
"(left-margin=%d, right-margin=%d, top-margin=%d, bottom-margin=%d)",
term->width, term->height, term->cols, term->rows,
term->margins.left, term->margins.right, term->margins.top, term->margins.bottom);
+#else
+ LOG_INFO("resize: %dx%d pixels, %dx%d chars",
+ term->width, term->height, term->cols, term->rows);
+#endif
if (term->scroll_region.start >= term->rows)
term->scroll_region.start = 0;