From dcebf9c7f954a55350b68d0ead1935612c4e2e05 Mon Sep 17 00:00:00 2001 From: Berke Güzel Date: Thu, 15 Oct 2026 13:04:01 +0300 Subject: Rename the library to wsap_vtcore ncurses installs and defines struct term. In a file that includes both headers, an ncurses TERMINAL * and this library's terminal are silently the same type. The name wsap_vtcore avoids the clash. The public header is now . Every global symbol uses the wsap_vtcore_ prefix, every macro uses WSAP_VTCORE_, and the shared library is libwsap_vtcore.so.0. The default terminal name is now "wsap_vtcore". The ISA override variable is WSAP_VTCORE_ISA. No other behavior changes. The amalgamation writes wsap_vtcore.c and wsap_vtcore.h. Co-Authored-By: Claude Haiku 5.5 --- include/term/unicode/width.h | 56 -------------------------------------------- 1 file changed, 56 deletions(-) delete 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 deleted file mode 100644 index a85ec77..0000000 --- a/include/term/unicode/width.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef TERM_UNICODE_WIDTH_H -#define TERM_UNICODE_WIDTH_H - -#include -#include -#include - -struct term_unicode_range { uint32_t lo, hi; }; - -#include "unicode_data.inc" - -static inline bool term_in_ranges(const struct term_unicode_range *ranges, size_t count, uint32_t cp) -{ - if (count == 0 || cp < ranges[0].lo || cp > ranges[count - 1].hi) - return false; - const struct term_unicode_range *base = ranges; - size_t n = count; - while (n > 1) { - size_t half = n / 2; - base = (base[half].lo <= cp) ? base + half : base; - n -= half; - } - return cp <= base->hi; -} - -#define TERM_IN_TABLE(table, cp) term_in_ranges(table, sizeof(table) / sizeof(table[0]), cp) - -static inline int term_unicode_width(uint32_t cp) -{ - if (cp > 0x10FFFF || TERM_IN_TABLE(term_nonprintable, cp)) - return -1; - if (TERM_IN_TABLE(term_zero_width, cp)) - return 0; - return TERM_IN_TABLE(term_unicode_wide, cp) ? 2 : 1; -} - -static inline bool term_unicode_extended_pictographic(uint32_t cp) -{ - return TERM_IN_TABLE(term_extended_pictographic, cp); -} - -static inline bool term_unicode_emoji_presentation(uint32_t cp) -{ - return TERM_IN_TABLE(term_emoji_presentation, cp); -} - -static inline bool term_unicode_spacing_mark(uint32_t cp) -{ - if (cp < 0x903 || ((cp - 0xABEDu) < (0x11000u - 0xABEDu)) || cp > 0x1D281) - return false; - return TERM_IN_TABLE(term_spacing_mark, cp); -} - -#undef TERM_IN_TABLE - -#endif -- cgit v1.2.3