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 --- tests/test-config.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/test-config.c b/tests/test-config.c index d22e96a8..657ea00a 100644 --- a/tests/test-config.c +++ b/tests/test-config.c @@ -70,17 +70,17 @@ test_string(struct context *ctx, bool (*parse_fun)(struct context *ctx), } static void -test_wstring(struct context *ctx, bool (*parse_fun)(struct context *ctx), - const char *key, wchar_t *const *ptr) +test_c32string(struct context *ctx, bool (*parse_fun)(struct context *ctx), + const char *key, char32_t *const *ptr) { ctx->key = key; static const struct { const char *option_string; - const wchar_t *value; + const char32_t *value; bool invalid; } input[] = { - {"a string", L"a string"}, + {"a string", U"a string"}, }; for (size_t i = 0; i < ALEN(input); i++) { @@ -96,10 +96,11 @@ test_wstring(struct context *ctx, bool (*parse_fun)(struct context *ctx), BUG("[%s].%s=%s: failed to parse", ctx->section, ctx->key, ctx->value); } - if (wcscmp(*ptr, input[i].value) != 0) { + if (c32cmp(*ptr, input[i].value) != 0) { BUG("[%s].%s=%s: set value (%ls) not the expected one (%ls)", ctx->section, ctx->key, ctx->value, - *ptr, input[i].value); + (const wchar_t *)*ptr, + (const wchar_t *)input[i].value); } } } @@ -412,7 +413,7 @@ test_section_main(void) test_string(&ctx, &parse_section_main, "term", &conf.term); test_string(&ctx, &parse_section_main, "app-id", &conf.app_id); - test_wstring(&ctx, &parse_section_main, "word-delimiters", &conf.word_delimiters); + test_c32string(&ctx, &parse_section_main, "word-delimiters", &conf.word_delimiters); test_boolean(&ctx, &parse_section_main, "login-shell", &conf.login_shell); test_boolean(&ctx, &parse_section_main, "box-drawings-uses-font-glyphs", &conf.box_drawings_uses_font_glyphs); @@ -526,7 +527,7 @@ test_section_url(void) (const char *[]){"url-mode", "always"}, (int []){OSC8_UNDERLINE_URL_MODE, OSC8_UNDERLINE_ALWAYS}, (int *)&conf.url.osc8_underline); - test_wstring(&ctx, &parse_section_url, "label-letters", &conf.url.label_letters); + test_c32string(&ctx, &parse_section_url, "label-letters", &conf.url.label_letters); /* TODO: protocols (list of wchars) */ /* TODO: uri-characters (wchar string, but sorted) */ -- cgit v1.3