From 4384435941b8c7658856b381d071aee2e0035e89 Mon Sep 17 00:00:00 2001 From: Berke Güzel Date: Mon, 12 Oct 2026 17:49:34 +0300 Subject: term: move the term core to subprojects/term The core now builds, tests, and benchmarks alone, as a Meson subproject with no dependency on the main tree. - include/term/ holds term.h and the header-only unicode/. src/ holds the core and its private headers. The main tree gets only include/term through term_dep, so it cannot reach a private header. - The term tests, the term benchmarks, the Kitty parser suite, and tools/amalgamate.py and tools/generate_unicode.py move with it. The tests run as term:. - The main build passes its -march (arch_flag) and b_ndebug to the subproject. A directory configured before this commit needs meson configure -Dterm:arch_flag=-march=... once. - The term tests compile with -UNDEBUG. They do work inside assert. - The subproject exports term_test_dep with term_api.h, for the main tree's render, thumbnail, color, and selection tests. - The Kitty bridge used struct vector2i and has not compiled since the public API redesign. It builds again. 2 of its 14 tests fail: REP after a tab, and a cursor report after a resize. - dirgraph.py drops the term and unicode layers. Its self-test uses pty. - The symbols test ignores the __odr_asan symbols that ASan adds. Co-Authored-By: Claude Opus 5.5 --- include/term/unicode/width.h | 55 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 include/term/unicode/width.h (limited to 'include/term/unicode/width.h') diff --git a/include/term/unicode/width.h b/include/term/unicode/width.h new file mode 100644 index 0000000..fc639c8 --- /dev/null +++ b/include/term/unicode/width.h @@ -0,0 +1,55 @@ +#ifndef TERM_UNICODE_WIDTH_H +#define TERM_UNICODE_WIDTH_H + +#include +#include +#include + +struct unicode_range { uint32_t lo, hi; }; + +#include "unicode_data.inc" + +static inline bool in_ranges(const struct unicode_range *ranges, size_t count, uint32_t cp) +{ + size_t lo = 0, hi = count; + while (lo < hi) { + size_t mid = lo + (hi - lo) / 2; + if (cp < ranges[mid].lo) + hi = mid; + else if (cp > ranges[mid].hi) + lo = mid + 1; + else + return true; + } + return false; +} + +#define IN_TABLE(table, cp) in_ranges(table, sizeof(table) / sizeof(table[0]), cp) + +static inline int unicode_width(uint32_t cp) +{ + if (cp > 0x10FFFF || IN_TABLE(nonprintable, cp)) + return -1; + if (IN_TABLE(zero_width, cp)) + return 0; + return IN_TABLE(wide, cp) ? 2 : 1; +} + +static inline bool unicode_extended_pictographic(uint32_t cp) +{ + return IN_TABLE(extended_pictographic, cp); +} + +static inline bool unicode_emoji_presentation(uint32_t cp) +{ + return IN_TABLE(emoji_presentation, cp); +} + +static inline bool unicode_spacing_mark(uint32_t cp) +{ + return IN_TABLE(spacing_mark, cp); +} + +#undef IN_TABLE + +#endif -- cgit v1.2.3