aboutsummaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-08-21 12:50:42 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-02-05 16:00:54 +0000
commite0227266cabc015c282774ac898e3f52dce943df (patch)
tree84a5a7c58ec52eff77c9ee4d9b7a6fe9bb0f1718 /main.c
parentMerge 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 'main.c')
-rw-r--r--main.c38
1 files changed, 22 insertions, 16 deletions
diff --git a/main.c b/main.c
index 9a87678e..756a42b8 100644
--- a/main.c
+++ b/main.c
@@ -34,6 +34,12 @@
#include "xmalloc.h"
#include "xsnprintf.h"
+#include "char32.h"
+
+#if !defined(__STDC_UTF_32__) || !__STDC_UTF_32__
+ #error "char32_t does not use UTF-32"
+#endif
+
static bool
fdm_sigint(struct fdm *fdm, int signo, void *data)
{
@@ -90,16 +96,14 @@ print_usage(const char *prog_name)
bool
locale_is_utf8(void)
{
- xassert(strlen(u8"ö") == 2);
-
- wchar_t w;
- if (mbtowc(&w, u8"ö", 2) != 2)
- return false;
+ static const char u8[] = u8"ö";
+ xassert(strlen(u8) == 2);
- if (w != U'ö')
+ char32_t w;
+ if (mbrtoc32(&w, u8, 2, &(mbstate_t){0}) != 2)
return false;
- return true;
+ return w == U'ö';
}
struct shutdown_context {
@@ -408,15 +412,6 @@ main(int argc, char *const *argv)
log_init(log_colorize, as_server && log_syslog,
as_server ? LOG_FACILITY_DAEMON : LOG_FACILITY_USER, log_level);
- _Static_assert((int)LOG_CLASS_ERROR == (int)FCFT_LOG_CLASS_ERROR,
- "fcft log level enum offset");
- _Static_assert((int)LOG_COLORIZE_ALWAYS == (int)FCFT_LOG_COLORIZE_ALWAYS,
- "fcft colorize enum mismatch");
- fcft_log_init(
- (enum fcft_log_colorize)log_colorize,
- as_server && log_syslog,
- (enum fcft_log_class)log_level);
-
if (argc > 0) {
argc -= optind;
argv += optind;
@@ -499,6 +494,14 @@ main(int argc, char *const *argv)
return EXIT_SUCCESS;
}
+ _Static_assert((int)LOG_CLASS_ERROR == (int)FCFT_LOG_CLASS_ERROR,
+ "fcft log level enum offset");
+ _Static_assert((int)LOG_COLORIZE_ALWAYS == (int)FCFT_LOG_COLORIZE_ALWAYS,
+ "fcft colorize enum mismatch");
+ fcft_init(
+ (enum fcft_log_colorize)log_colorize,
+ as_server && log_syslog,
+ (enum fcft_log_class)log_level);
fcft_set_scaling_filter(conf.tweak.fcft_filter);
if (conf_term != NULL) {
@@ -646,6 +649,8 @@ main(int argc, char *const *argv)
if (aborted || tll_length(wayl->terms) == 0)
ret = EXIT_SUCCESS;
+ LOG_INFO("%zu", c32len(U"foobar"));
+
out:
free(_cwd);
server_destroy(server);
@@ -665,6 +670,7 @@ out:
unlink(pid_file);
LOG_INFO("goodbye");
+ fcft_fini();
log_deinit();
return ret == EXIT_SUCCESS && !as_server ? shutdown_ctx.exit_code : ret;
}