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 /config.h | |
| 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 'config.h')
| -rw-r--r-- | config.h | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -2,6 +2,7 @@ #include <stdint.h> #include <stdbool.h> +#include <uchar.h> #include <tllist.h> @@ -80,7 +81,7 @@ struct config { char *shell; char *title; char *app_id; - wchar_t *word_delimiters; + char32_t *word_delimiters; bool login_shell; bool locked_title; @@ -142,21 +143,21 @@ struct config { SCROLLBACK_INDICATOR_FORMAT_TEXT, } format; - wchar_t *text; + char32_t *text; } indicator; float multiplier; } scrollback; struct { - wchar_t *label_letters; + char32_t *label_letters; struct config_spawn_template launch; enum { OSC8_UNDERLINE_URL_MODE, OSC8_UNDERLINE_ALWAYS, } osc8_underline; - wchar_t **protocols; - wchar_t *uri_characters; + char32_t **protocols; + char32_t *uri_characters; size_t prot_count; size_t max_prot_len; } url; |
