aboutsummaryrefslogtreecommitdiff
path: root/vt.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2025-01-24 08:52:57 +0000
committerDaniel Eklöf <daniel@ekloef.se>2025-02-06 06:42:37 +0000
commit1181f74d19f6f9e881b539ed9fdb8cc17d03f7bf (patch)
treed38f9c59090587e4037906195ae71881d4bfcd60 /vt.c
parentterm: insert-mode: handle combining characters correctly (diff)
composed: re-factor: break out key calculation from vt.c
Diffstat (limited to 'vt.c')
-rw-r--r--vt.c24
1 files changed, 2 insertions, 22 deletions
diff --git a/vt.c b/vt.c
index bd1cf4ca..8f5d27d9 100644
--- a/vt.c
+++ b/vt.c
@@ -647,26 +647,6 @@ action_put(struct terminal *term, uint8_t c)
dcs_put(term, c);
}
-static inline uint32_t
-chain_key(uint32_t old_key, uint32_t new_wc)
-{
- unsigned bits = 32 - __builtin_clz(CELL_COMB_CHARS_HI - CELL_COMB_CHARS_LO);
-
- /* Rotate old key 8 bits */
- uint32_t new_key = (old_key << 8) | (old_key >> (bits - 8));
-
- /* xor with new char */
- new_key ^= new_wc;
-
- /* Multiply with magic hash constant */
- new_key *= 2654435761ul;
-
- /* And mask, to ensure the new value is within range */
- new_key &= CELL_COMB_CHARS_HI - CELL_COMB_CHARS_LO;
-
- return new_key;
-}
-
#if defined(FOOT_GRAPHEME_CLUSTERING)
static int
emoji_vs_compare(const void *_key, const void *_entry)
@@ -738,9 +718,9 @@ action_utf8_print(struct terminal *term, char32_t wc)
if (composed != NULL) {
base = composed->chars[0];
last = composed->chars[composed->count - 1];
- key = chain_key(composed->key, wc);
+ key = composed_key_from_key(composed->key, wc);
} else
- key = chain_key(base, wc);
+ key = composed_key_from_key(base, wc);
#if defined(FOOT_GRAPHEME_CLUSTERING)
if (grapheme_clustering) {