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.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'terminal.h') diff --git a/terminal.h b/terminal.h index 1ff4b3b6..e42c94fc 100644 --- a/terminal.h +++ b/terminal.h @@ -3,7 +3,6 @@ #include #include #include -#include #include #include @@ -65,7 +64,7 @@ static_assert(sizeof(struct attributes) == 8, "VT attribute struct too large"); #define CELL_SPACER (CELL_COMB_CHARS_HI + 1) struct cell { - wchar_t wc; + char32_t wc; struct attributes attrs; }; static_assert(sizeof(struct cell) == 12, "bad size"); @@ -182,11 +181,11 @@ struct vt_param { struct vt { int state; /* enum state */ - wchar_t last_printed; + char32_t last_printed; #if defined(FOOT_GRAPHEME_CLUSTERING) utf8proc_int32_t grapheme_state; #endif - wchar_t utf8; + char32_t utf8; struct { struct vt_param v[16]; uint8_t idx; @@ -290,7 +289,7 @@ enum url_action { URL_ACTION_COPY, URL_ACTION_LAUNCH }; struct url { uint64_t id; char *url; - wchar_t *key; + char32_t *key; struct coord start; struct coord end; enum url_action action; @@ -311,7 +310,7 @@ struct terminal { struct reaper *reaper; const struct config *conf; - void (*ascii_printer)(struct terminal *term, wchar_t c); + void (*ascii_printer)(struct terminal *term, char32_t c); pid_t slave; int ptmx; @@ -504,7 +503,7 @@ struct terminal { bool is_searching; struct { - wchar_t *buf; + char32_t *buf; size_t len; size_t sz; size_t cursor; @@ -516,7 +515,7 @@ struct terminal { size_t match_len; struct { - wchar_t *buf; + char32_t *buf; size_t len; } last; } search; @@ -639,7 +638,7 @@ struct terminal { /* TODO: wrap in a struct */ url_list_t urls; - wchar_t url_keys[5]; + char32_t url_keys[5]; bool urls_show_uri_on_jump_label; struct grid *url_grid_snapshot; @@ -734,7 +733,7 @@ void term_cursor_up(struct terminal *term, int count); void term_cursor_down(struct terminal *term, int count); void term_cursor_blink_update(struct terminal *term); -void term_print(struct terminal *term, wchar_t wc, int width); +void term_print(struct terminal *term, char32_t wc, int width); void term_scroll(struct terminal *term, int rows); void term_scroll_reverse(struct terminal *term, int rows); -- cgit v1.3