From 7ce767ab87ca915b2ac4023cc95dbda81fe87abd Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Fri, 30 Apr 2021 20:31:47 +0200 Subject: config: add ‘beam-thickness’ option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Rename cursor.style value ‘bar’ to ‘beam’. ‘bar’ remains recognized, but should eventually be deprecated and then removed. * Add ‘cursor.beam-thickness’ option, a pt-or-px value specifying the thickness of the beam cursor. Defaults to 1.5pt. * Rename (and export) pt_or_px_as_pixels() to term_pt_or_px_as_pixels() * Change term_pt_or_px_as_pixels() to round point values instead of truncating them. --- terminal.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'terminal.c') diff --git a/terminal.c b/terminal.c index bcb8a868..cd1ecbd9 100644 --- a/terminal.c +++ b/terminal.c @@ -600,12 +600,12 @@ err_sem_destroy: return false; } -static int -pt_or_px_as_pixels(const struct terminal *term, - const struct pt_or_px *pt_or_px) +int +term_pt_or_px_as_pixels(const struct terminal *term, + const struct pt_or_px *pt_or_px) { return pt_or_px->px == 0 - ? pt_or_px->pt * term->font_dpi / 72 + ? round(pt_or_px->pt * term->font_dpi / 72) : pt_or_px->px; } @@ -636,15 +636,15 @@ term_set_fonts(struct terminal *term, struct fcft_font *fonts[static 4]) (term->fonts[0]->space_advance.x > 0 ? term->fonts[0]->space_advance.x : term->fonts[0]->max_advance.x) - + pt_or_px_as_pixels(term, &conf->letter_spacing); + + term_pt_or_px_as_pixels(term, &conf->letter_spacing); term->cell_height = term->font_line_height.px >= 0 - ? pt_or_px_as_pixels(term, &term->font_line_height) + ? term_pt_or_px_as_pixels(term, &term->font_line_height) : max(term->fonts[0]->height, term->fonts[0]->ascent + term->fonts[0]->descent); - term->font_x_ofs = pt_or_px_as_pixels(term, &conf->horizontal_letter_offset); - term->font_y_ofs = pt_or_px_as_pixels(term, &conf->vertical_letter_offset); + term->font_x_ofs = term_pt_or_px_as_pixels(term, &conf->horizontal_letter_offset); + term->font_y_ofs = term_pt_or_px_as_pixels(term, &conf->vertical_letter_offset); LOG_INFO("cell width=%d, height=%d", term->cell_width, term->cell_height); -- cgit v1.3