PolytreeDE
/
rofi
mirror of https://github.com/davatorium/rofi.git
1
0
Fork 0
Code Releases Activity

More Unicode normalization with `-normalize-match` (#1813) 

Normalize the string to a fully decomposed form, then filter out mark/accent characters.
This commit is contained in:
Naïm Favier 2023-02-16 19:34:24 +01:00 committed by GitHub
parent 1b1aa37f20
commit f6248c6ea9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/helper.c
View File

@ -175,30 +175,25 @@ static gchar *prefix_regex(const char *input) {
return retv;
}
static char *utf8_helper_simplify_string(const char *s) {
gunichar buf2[G_UNICHAR_MAX_DECOMPOSITION_LENGTH] = {
0,
};
static char *utf8_helper_simplify_string(const char *os) {
char buf[6] = {
0,
};
// Compose the string in maximally composed form.
// Normalize the string to a fully decomposed form, then filter out mark/accent characters.
char *s = g_utf8_normalize(os, -1, G_NORMALIZE_ALL);
ssize_t str_size = (g_utf8_strlen(s, -1) * 6 + 2 + 1) * sizeof(char);
char *str = g_malloc0(str_size);
char *striter = str;
for (const char *iter = s; iter && *iter; iter = g_utf8_next_char(iter)) {
gunichar uc = g_utf8_get_char(iter);
int l = 0;
gsize dl = g_unichar_fully_decompose(uc, FALSE, buf2,
G_UNICHAR_MAX_DECOMPOSITION_LENGTH);
if (dl) {
l = g_unichar_to_utf8(buf2[0], buf);
} else {
l = g_unichar_to_utf8(uc, buf);
if (!g_unichar_ismark(uc)) {
int l = g_unichar_to_utf8(uc, buf);
memcpy(striter, buf, l);
striter += l;
}
memcpy(striter, buf, l);
striter += l;
}
g_free(s);
return str;
}