Keep installed headers from shadowing or polluting host names

The pkg-config file put include/term on the host's include path, so
ncurses' term.h could be picked up in place of ours. Hosts now write
<term/term.h> and the package adds only its include directory.

The installed Unicode API had unprefixed names that collide with host
symbols and macros. Rename them: term_ for functions, types, and static
tables, TERM_ for macros and include guards. unicode_data.inc and
tools/generate_unicode.py are renamed to match. The generator's inputs
here are Unicode 15.1 and the checked-in table is 18.0.0, so the table
data was not regenerated. Only the declarations were checked against
the generator.

utf8.h casts the malloc result so it compiles as C++.

header_test.sh now includes <term/term.h> with only include/ on the path.
It also checks that a host which defines unicode_width, UTF8_ACCEPT,
GRAPHEME_MAX_LEN, in_ranges, and similar names compiles with the Unicode
headers as C11 and C++, in both declaration orders.

Co-Authored-By: Claude Haiku 5.5 <noreply@anthropic.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/src/hist.c b/src/hist.c
index 344cdc8..fff0bfe 100644
--- a/src/hist.c
+++ b/src/hist.c
@@ -42,7 +42,7 @@
 #define ROWS_UNKNOWN 255
 /* Bytes one cell can need, except a cluster. */
 #define CELL_BYTES 5
-#define CLUSTER_BYTES (2 + GRAPHEME_MAX_LEN * 4)
+#define CLUSTER_BYTES (2 + TERM_GRAPHEME_MAX_LEN * 4)
 
 /* ---- Parts and pages ---- */
 
@@ -1039,8 +1039,8 @@ static int uniform_utf8_prefix(const struct cell *cells, int len, uint8_t *dst,
 static TERM_NOINLINE size_t encode_cluster(uint8_t *dst, const struct gstore *g,
                                                        uint32_t handle, uint16_t f)
 {
-    uint32_t cps[GRAPHEME_MAX_LEN];
-    int n = term_gstore_expand(g, handle, cps, GRAPHEME_MAX_LEN);
+    uint32_t cps[TERM_GRAPHEME_MAX_LEN];
+    int n = term_gstore_expand(g, handle, cps, TERM_GRAPHEME_MAX_LEN);
     size_t b = 0;
     dst[b++] = PREFIX_CLUSTER;
     dst[b++] = (uint8_t)((n & 0x1f) | ((f & CELL_WIDE) ? 0x80 : 0) |
@@ -1053,7 +1053,7 @@ static TERM_NOINLINE size_t encode_cluster(uint8_t *dst, const struct gstore *g,
 static size_t encode_shaped(uint8_t *dst, uint32_t cp, uint16_t f, const struct gstore *g,
                             uint8_t *flags)
 {
-    if (grapheme_is_handle(cp)) {
+    if (term_grapheme_is_handle(cp)) {
         *flags |= HLINE_HAS_CLUSTER | ((f & CELL_WIDE) ? HLINE_HAS_WIDE : 0);
         return encode_cluster(dst, g, cp, f);
     }
@@ -1155,7 +1155,7 @@ static int encode_cells(struct hist_runs *r, const struct cell *cells, int n, ui
             continue;
         uint32_t cp = c->c;
         bool simple = !(f & (CELL_WIDE | CELL_EMOJI | CELL_TEXT)) && cp - 0x20u < 0x60u;
-        if (!simple && grapheme_is_handle(cp) &&
+        if (!simple && term_grapheme_is_handle(cp) &&
             bytes + CLUSTER_BYTES + (size_t)(n - i) * CELL_BYTES > cap)
             break;
         uint32_t sl = (uint32_t)(f & STYLE_FLAGS) | ((uint32_t)c->pad << 16);
@@ -2516,12 +2516,12 @@ static const uint8_t *text_cell(const uint8_t *s, const uint8_t *end, struct gst
     }
     uint8_t k = s[1];
     s += 2;
-    uint32_t cps[GRAPHEME_MAX_LEN];
+    uint32_t cps[TERM_GRAPHEME_MAX_LEN];
     int n = 0;
     for (int i = 0; i < (k & 0x1f) && s < end; i++) {
         uint32_t c;
         s += get_utf8(s, end, &c);
-        if (n < GRAPHEME_MAX_LEN)
+        if (n < TERM_GRAPHEME_MAX_LEN)
             cps[n++] = c;
     }
     *cp = n == 0 ? ' ' : (g && n > 1) ? term_gstore_intern(g, cps, n) : cps[0];