From e0227266cabc015c282774ac898e3f52dce943df Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sat, 21 Aug 2021 14:50:42 +0200 Subject: fcft: adapt to API changes in fcft-3.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fcft no longer uses wchar_t, but plain uint32_t to represent codepoints. Since we do a fair amount of string operations in foot, it still makes sense to use something that actually _is_ a string (or character), rather than an array of uint32_t. For this reason, we switch out all wchar_t usage in foot to char32_t. We also verify, at compile-time, that char32_t used UTF-32 (which is what fcft expects). Unfortunately, there are no string functions for char32_t. To avoid having to re-implement all wcs*() functions, we add a small wrapper layer of c32*() functions. These wrapper functions take char32_t arguments, but then simply call the corresponding wcs*() function. For this to work, wcs*() must _also_ be UTF-32 compatible. We can check for the presence of the __STDC_ISO_10646__ macro. If set, wchar_t is at least 4 bytes and its internal representation is UTF-32. FreeBSD does *not* define this macro, because its internal wchar_t representation depends on the current locale. It _does_ use UTF-32 _if_ the current locale is UTF-8. Since foot enforces UTF-8, we simply need to check if __FreeBSD__ is defined. Other fcft API changes: * fcft_glyph_rasterize() -> fcft_codepoint_rasterize() * font.space_advance has been removed * ‘tags’ have been removed from fcft_grapheme_rasterize() * ‘fcft_log_init()’ removed * ‘fcft_init()’ and ‘fcft_fini()’ must be explicitly called --- terminal.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) (limited to 'terminal.c') diff --git a/terminal.c b/terminal.c index 84a43290..3b935909 100644 --- a/terminal.c +++ b/terminal.c @@ -671,16 +671,12 @@ term_set_fonts(struct terminal *term, struct fcft_font *fonts[static 4]) const struct config *conf = term->conf; - const struct fcft_glyph *M = fcft_glyph_rasterize( - term->fonts[0], L'M', term->font_subpixel); + const struct fcft_glyph *M = fcft_rasterize_char_utf32( + fonts[0], U'M', term->font_subpixel); + int advance = M != NULL ? M->advance.x : term->fonts[0]->max_advance.x; - term->cell_width = - (M != NULL - ? M->advance.x - : (term->fonts[0]->space_advance.x > 0 - ? term->fonts[0]->space_advance.x - : term->fonts[0]->max_advance.x)) - + term_pt_or_px_as_pixels(term, &conf->letter_spacing); + term->cell_width = advance + + term_pt_or_px_as_pixels(term, &conf->letter_spacing); term->cell_height = term->font_line_height.px >= 0 ? term_pt_or_px_as_pixels(term, &term->font_line_height) @@ -3208,7 +3204,7 @@ print_spacer(struct terminal *term, int col, int remaining) } void -term_print(struct terminal *term, wchar_t wc, int width) +term_print(struct terminal *term, char32_t wc, int width) { xassert(width > 0); @@ -3218,11 +3214,11 @@ term_print(struct terminal *term, wchar_t wc, int width) wc >= 0x60 && wc <= 0x7e) { /* 0x60 - 0x7e */ - static const wchar_t vt100_0[] = { - L'◆', L'▒', L'␉', L'␌', L'␍', L'␊', L'°', L'±', /* ` - g */ - L'␤', L'␋', L'┘', L'┐', L'┌', L'└', L'┼', L'⎺', /* h - o */ - L'⎻', L'─', L'⎼', L'⎽', L'├', L'┤', L'┴', L'┬', /* p - w */ - L'│', L'≤', L'≥', L'π', L'≠', L'£', L'·', /* x - ~ */ + static const char32_t vt100_0[] = { + U'◆', U'▒', U'␉', U'␌', U'␍', U'␊', U'°', U'±', /* ` - g */ + U'␤', U'␋', U'┘', U'┐', U'┌', U'└', U'┼', U'⎺', /* h - o */ + U'⎻', U'─', U'⎼', U'⎽', U'├', U'┤', U'┴', U'┬', /* p - w */ + U'│', U'≤', U'≥', U'π', U'≠', U'£', U'·', /* x - ~ */ }; xassert(width == 1); @@ -3291,13 +3287,13 @@ term_print(struct terminal *term, wchar_t wc, int width) } static void -ascii_printer_generic(struct terminal *term, wchar_t wc) +ascii_printer_generic(struct terminal *term, char32_t wc) { term_print(term, wc, 1); } static void -ascii_printer_fast(struct terminal *term, wchar_t wc) +ascii_printer_fast(struct terminal *term, char32_t wc) { struct grid *grid = term->grid; @@ -3333,7 +3329,7 @@ ascii_printer_fast(struct terminal *term, wchar_t wc) } static void -ascii_printer_single_shift(struct terminal *term, wchar_t wc) +ascii_printer_single_shift(struct terminal *term, char32_t wc) { ascii_printer_generic(term, wc); term->charsets.selected = term->charsets.saved; @@ -3343,7 +3339,7 @@ ascii_printer_single_shift(struct terminal *term, wchar_t wc) void term_update_ascii_printer(struct terminal *term) { - void (*new_printer)(struct terminal *term, wchar_t wc) = + void (*new_printer)(struct terminal *term, char32_t wc) = unlikely(tll_length(term->grid->sixel_images) > 0 || term->vt.osc8.uri != NULL || term->charsets.set[term->charsets.selected] == CHARSET_GRAPHIC || -- cgit v1.3