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 --- ime.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'ime.c') diff --git a/ime.c b/ime.c index 81e63884..e7e5937a 100644 --- a/ime.c +++ b/ime.c @@ -9,6 +9,7 @@ #define LOG_MODULE "ime" #define LOG_ENABLE_DBG 0 #include "log.h" +#include "char32.h" #include "render.h" #include "search.h" #include "terminal.h" @@ -159,26 +160,29 @@ done(void *data, struct zwp_text_input_v3 *zwp_text_input_v3, /* 4. Calculate surrounding text to send - not supported */ /* 5. Insert new pre-edit text */ - size_t wchars = seat->ime.preedit.pending.text != NULL - ? mbstowcs(NULL, seat->ime.preedit.pending.text, 0) - : 0; + char32_t *allocated_preedit_text = NULL; - if (wchars == 0 || wchars == (size_t)-1) { + if (seat->ime.preedit.pending.text == NULL || + seat->ime.preedit.pending.text[0] == '\0' || + (allocated_preedit_text = ambstoc32(seat->ime.preedit.pending.text)) == NULL) + { ime_reset_pending_preedit(seat); return; } - /* First, convert to unicode */ - seat->ime.preedit.text = xmalloc((wchars + 1) * sizeof(wchar_t)); - mbstowcs(seat->ime.preedit.text, seat->ime.preedit.pending.text, wchars); - seat->ime.preedit.text[wchars] = L'\0'; + xassert(seat->ime.preedit.pending.text != NULL); + xassert(allocated_preedit_text != NULL); + + seat->ime.preedit.text = allocated_preedit_text; + + size_t wchars = c32len(seat->ime.preedit.text); /* Next, count number of cells needed */ size_t cell_count = 0; size_t widths[wchars + 1]; for (size_t i = 0; i < wchars; i++) { - int width = max(wcwidth(seat->ime.preedit.text[i]), 1); + int width = max(c32width(seat->ime.preedit.text[i]), 1); widths[i] = width; cell_count += width; } @@ -238,7 +242,7 @@ done(void *data, struct zwp_text_input_v3 *zwp_text_input_v3, * * To do this, we use mblen() to step though the utf-8 * pre-edit string, advancing a unicode character index as - * we go, *and* advancing a *cell* index using wcwidth() + * we go, *and* advancing a *cell* index using c32width() * of the unicode character. * * When we find the matching *byte* index, we at the same -- cgit v1.3