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 --- misc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'misc.c') diff --git a/misc.c b/misc.c index ea89e94e..7e33e65a 100644 --- a/misc.c +++ b/misc.c @@ -1,17 +1,16 @@ #include "misc.h" - -#include +#include "char32.h" bool -isword(wchar_t wc, bool spaces_only, const wchar_t *delimiters) +isword(char32_t wc, bool spaces_only, const char32_t *delimiters) { if (spaces_only) - return iswgraph(wc); + return isc32graph(wc); - if (wcschr(delimiters, wc) != NULL) + if (c32chr(delimiters, wc) != NULL) return false; - return iswgraph(wc); + return isc32graph(wc); } void -- cgit v1.3