aboutsummaryrefslogtreecommitdiff
path: root/box-drawing.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-01-07 16:00:58 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-01-11 08:31:08 +0000
commita6fc8b5da4a3bfc9b1d3994797826518103879ac (patch)
tree7ee4333c53847900a895b566d5414ee375ba23fd /box-drawing.c
parentconfig: str_to_color(): use LOG_AND_NOTIFY(), not just LOG() (diff)
config: line-height, letter-spacing: values are in pt by default, but we allow px
If the value is specified without a unit, then the value is assumed to be in points, subject to DPI scaling. The value can optionally have a ‘px’ suffix, in which case the value is treated as a raw pixel count.
Diffstat (limited to 'box-drawing.c')
-rw-r--r--box-drawing.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/box-drawing.c b/box-drawing.c
index 0fa44cd3..6bfaef82 100644
--- a/box-drawing.c
+++ b/box-drawing.c
@@ -2064,13 +2064,23 @@ box_drawing(const struct terminal *term, wchar_t wc)
};
draw_glyph(wc, &buf);
+ const struct config *conf = term->conf;
+
+ int x_ofs = conf->horizontal_letter_offset.px > 0
+ ? conf->horizontal_letter_offset.px
+ : conf->horizontal_letter_offset.pt * term->font_dpi / 72.;
+ int y_ofs = conf->vertical_letter_offset.px > 0
+ ? conf->vertical_letter_offset.px
+ : conf->vertical_letter_offset.pt * term->font_dpi / 72.;
+
+
struct fcft_glyph *glyph = xmalloc(sizeof(*glyph));
*glyph = (struct fcft_glyph){
.wc = wc,
.cols = 1,
.pix = pix,
- .x = -term->conf->horizontal_letter_offset,
- .y = term->conf->vertical_letter_offset + term->fonts[0]->ascent,
+ .x = -x_ofs,
+ .y = y_ofs + term->fonts[0]->ascent,
.width = width,
.height = height,
.advance = {