diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-08-21 12:50:42 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2022-02-05 16:00:54 +0000 |
| commit | e0227266cabc015c282774ac898e3f52dce943df (patch) | |
| tree | 84a5a7c58ec52eff77c9ee4d9b7a6fe9bb0f1718 /input.c | |
| parent | Merge branch 'config-no-null-strings-in-printf' (diff) | |
fcft: adapt to API changes in fcft-3.x
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
Diffstat (limited to 'input.c')
| -rw-r--r-- | input.c | 15 |
1 files changed, 7 insertions, 8 deletions
@@ -1123,16 +1123,15 @@ legacy_kbd_protocol(struct seat *seat, struct terminal *term, } else if (term->meta.eight_bit && count == 1) { - const wchar_t wc = 0x80 | utf8[0]; + const char32_t wc = 0x80 | utf8[0]; - char wc_as_utf8[8]; - mbstate_t ps = {0}; - size_t chars = wcrtomb(wc_as_utf8, wc, &ps); + char utf8_meta[MB_CUR_MAX]; + size_t chars = c32rtomb(utf8_meta, wc, &(mbstate_t){0}); if (chars != (size_t)-1) - term_to_slave(term, wc_as_utf8, chars); + term_to_slave(term, utf8_meta, chars); else - term_to_slave(term, wc_as_utf8, count); + term_to_slave(term, utf8, count); } else { @@ -1585,8 +1584,8 @@ key_press_release(struct seat *seat, struct terminal *term, uint32_t serial, xkb_compose_state_get_utf8( seat->kbd.xkb_compose_state, (char *)utf8, count + 1); - wchar_t wc; - if (mbtowc(&wc, (const char *)utf8, count) == count) + char32_t wc; + if (mbrtoc32(&wc, (const char *)utf8, count, &(mbstate_t){0}) == count) utf32 = wc; } else { xkb_state_key_get_utf8( |
