Unified emoji support across builds, fixed picker bugs, and added CI checks.

This commit is contained in:
2026-09-10 07:13:41 -06:00
parent bb3893d36c
commit 8bf2caf20d
41 changed files with 40267 additions and 174 deletions

View File

@@ -416,6 +416,7 @@ const struct prefs vars[] =
{"gui_dialog_left", P_OFFINT (hex_gui_dialog_left), TYPE_INT},
{"gui_dialog_top", P_OFFINT (hex_gui_dialog_top), TYPE_INT},
{"gui_dialog_width", P_OFFINT (hex_gui_dialog_width), TYPE_INT},
{"gui_emoji_skin_tone", P_OFFINT (hex_gui_emoji_skin_tone), TYPE_INT},
{"gui_filesize_iec", P_OFFINT (hex_gui_filesize_iec), TYPE_BOOL},
{"gui_focus_omitalerts", P_OFFINT (hex_gui_focus_omitalerts), TYPE_BOOL},
{"gui_hide_menu", P_OFFINT (hex_gui_hide_menu), TYPE_BOOL},

View File

@@ -55,6 +55,7 @@
<ClCompile Include="chanopt.c" />
<ClCompile Include="ctcp.c" />
<ClCompile Include="dcc.c" />
<ClCompile Include="emoji-data.c" />
<ClCompile Include="history.c" />
<ClCompile Include="plugin-identd.c" />
<ClCompile Include="ignore.c" />
@@ -113,6 +114,8 @@
SET SOLUTIONDIR=$(SolutionDir)..\
"$(Python3Path)\python.exe" $(ProjectDir)make-te.py "$(ProjectDir)textevents.in" "$(ZoiteChatLib)textevents.h" "$(ZoiteChatLib)textenums.h"
"$(Python3Path)\python.exe" $(ProjectDir)gen-public-suffix.py "$(ZoiteChatLib)public_suffix_data.h"
"$(Python3Path)\python.exe" "$(SolutionDir)..\tools\gen-emoji-data.py" "$(SolutionDir)..\data\emoji\emoji-test.txt" "$(SolutionDir)..\data\emoji\cldr-annotations-en.xml" "$(SolutionDir)..\data\emoji\cldr-annotations-derived-en.xml" "$(SolutionDir)..\data\emoji\gemoji.json" "$(SolutionDir)..\data\emoji\VERSIONS" "$(ZoiteChatLib)emoji-data-table.h"
if errorlevel 1 exit /b 1
powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\config.h.tt" "$(ZoiteChatLib)config.h"
$(GlibGenMarshal) --prefix=_zoitechat_marshal --header "$(ProjectDir)marshalers.list" --output "$(ZoiteChatLib)marshal.h"
$(GlibGenMarshal) --prefix=_zoitechat_marshal --body "$(ProjectDir)marshalers.list" --output "$(ZoiteChatLib)marshal.c"

239
src/common/emoji-data.c Normal file
View File

@@ -0,0 +1,239 @@
/* ZoiteChat
* Copyright (C) 2026 deepend-tildeclub.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <string.h>
#include <glib.h>
#include <glib/gi18n.h>
#include "emoji-data.h"
#include "emoji-data-table.h"
gsize
emoji_data_count (void)
{
return G_N_ELEMENTS (emoji_entries_table);
}
const EmojiEntry *
emoji_data_entry (gsize index)
{
g_return_val_if_fail (index < G_N_ELEMENTS (emoji_entries_table), NULL);
return &emoji_entries_table[index];
}
static GHashTable *
emoji_sequence_index (void)
{
static GHashTable *table = NULL;
gsize i;
int tone;
if (table)
return table;
table = g_hash_table_new (g_str_hash, g_str_equal);
for (i = 0; i < G_N_ELEMENTS (emoji_entries_table); i++)
{
const EmojiEntry *entry = &emoji_entries_table[i];
g_hash_table_insert (table, (gpointer) entry->sequence,
GSIZE_TO_POINTER (i * EMOJI_TONE_COUNT + 1));
if (entry->tone_set < 0)
continue;
for (tone = EMOJI_TONE_LIGHT; tone < EMOJI_TONE_COUNT; tone++)
{
const char *seq =
emoji_tone_sets_table[entry->tone_set].sequence[tone - 1];
g_hash_table_insert (table, (gpointer) seq,
GSIZE_TO_POINTER (i * EMOJI_TONE_COUNT + tone + 1));
}
}
return table;
}
const EmojiEntry *
emoji_data_find_by_sequence (const char *sequence, EmojiTone *tone_out)
{
gpointer value;
gsize packed;
if (tone_out)
*tone_out = EMOJI_TONE_NONE;
if (!sequence || !*sequence)
return NULL;
value = g_hash_table_lookup (emoji_sequence_index (), sequence);
if (!value)
return NULL;
packed = GPOINTER_TO_SIZE (value) - 1;
if (tone_out)
*tone_out = (EmojiTone) (packed % EMOJI_TONE_COUNT);
return &emoji_entries_table[packed / EMOJI_TONE_COUNT];
}
const char *
emoji_data_group_display_name (EmojiGroup group)
{
static const char *const names[EMOJI_GROUP_COUNT] =
{
N_("Smileys & Emotion"),
N_("People & Body"),
N_("Animals & Nature"),
N_("Food & Drink"),
N_("Travel & Places"),
N_("Activities"),
N_("Objects"),
N_("Symbols"),
N_("Flags"),
};
g_return_val_if_fail ((guint) group < EMOJI_GROUP_COUNT, "");
return _(names[group]);
}
const char *
emoji_data_group_icon_sequence (EmojiGroup group)
{
static const char *const icons[EMOJI_GROUP_COUNT] =
{
"\360\237\230\200", /* 😀 */
"\360\237\221\213", /* 👋 */
"\360\237\220\273", /* 🐻 */
"\360\237\215\224", /* 🍔 */
"\360\237\232\227", /* 🚗 */
"\342\232\275", /* ⚽ */
"\360\237\222\241", /* 💡 */
"\360\237\224\243", /* 🔣 */
"\360\237\217\201", /* 🏁 */
};
g_return_val_if_fail ((guint) group < EMOJI_GROUP_COUNT, "");
return icons[group];
}
const char *
emoji_data_tone_display_name (EmojiTone tone)
{
static const char *const names[EMOJI_TONE_COUNT] =
{
N_("No skin tone"),
N_("Light skin tone"),
N_("Medium-light skin tone"),
N_("Medium skin tone"),
N_("Medium-dark skin tone"),
N_("Dark skin tone"),
};
g_return_val_if_fail ((guint) tone < EMOJI_TONE_COUNT, "");
return _(names[tone]);
}
const char *
emoji_entry_sequence_for_tone (const EmojiEntry *entry, EmojiTone tone)
{
g_return_val_if_fail (entry != NULL, NULL);
if (tone == EMOJI_TONE_NONE || (guint) tone >= EMOJI_TONE_COUNT ||
entry->tone_set < 0)
return entry->sequence;
return emoji_tone_sets_table[entry->tone_set].sequence[tone - 1];
}
char **
emoji_search_tokenize (const char *text)
{
GPtrArray *tokens;
char *folded;
char **split;
gsize i;
if (!text || !g_utf8_validate (text, -1, NULL))
return NULL;
folded = g_utf8_casefold (text, -1);
split = g_strsplit_set (folded, " \t\n", -1);
g_free (folded);
tokens = g_ptr_array_new ();
for (i = 0; split[i]; i++)
{
const char *token = split[i];
gsize len;
while (*token == ':')
token++;
len = strlen (token);
while (len > 0 && token[len - 1] == ':')
len--;
if (len > 0)
g_ptr_array_add (tokens, g_strndup (token, len));
}
g_strfreev (split);
if (tokens->len == 0)
{
g_ptr_array_free (tokens, TRUE);
return NULL;
}
g_ptr_array_add (tokens, NULL);
return (char **) g_ptr_array_free (tokens, FALSE);
}
gboolean
emoji_entry_matches (const EmojiEntry *entry, char *const *needle_tokens)
{
gsize i;
g_return_val_if_fail (entry != NULL, FALSE);
if (!needle_tokens || !needle_tokens[0])
return FALSE;
for (i = 0; needle_tokens[i]; i++)
{
if (!strstr (entry->search, needle_tokens[i]))
return FALSE;
}
return TRUE;
}
const char *
emoji_data_unicode_version (void)
{
return emoji_data_unicode_version_str;
}
const char *
emoji_data_cldr_version (void)
{
return emoji_data_cldr_version_str;
}

91
src/common/emoji-data.h Normal file
View File

@@ -0,0 +1,91 @@
/* ZoiteChat
* Copyright (C) 2026 deepend-tildeclub.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
/* Bundled emoji catalog, generated at build time from pinned Unicode,
* CLDR and gemoji data (see data/emoji/ and tools/gen-emoji-data.py).
* Every entry is a fully-qualified Unicode sequence; nothing here depends
* on the GTK runtime's emoji data. The catalog only decides what users
* can find and insert - rendering stays with the platform's fonts, and
* IRC always receives the plain Unicode sequence. */
#ifndef ZOITECHAT_EMOJI_DATA_H
#define ZOITECHAT_EMOJI_DATA_H
#include <glib.h>
typedef enum
{
EMOJI_GROUP_SMILEYS_EMOTION,
EMOJI_GROUP_PEOPLE_BODY,
EMOJI_GROUP_ANIMALS_NATURE,
EMOJI_GROUP_FOOD_DRINK,
EMOJI_GROUP_TRAVEL_PLACES,
EMOJI_GROUP_ACTIVITIES,
EMOJI_GROUP_OBJECTS,
EMOJI_GROUP_SYMBOLS,
EMOJI_GROUP_FLAGS,
EMOJI_GROUP_COUNT
} EmojiGroup;
typedef enum
{
EMOJI_TONE_NONE,
EMOJI_TONE_LIGHT,
EMOJI_TONE_MEDIUM_LIGHT,
EMOJI_TONE_MEDIUM,
EMOJI_TONE_MEDIUM_DARK,
EMOJI_TONE_DARK,
EMOJI_TONE_COUNT
} EmojiTone;
typedef struct
{
const char *sequence;
const char *name;
const char *search;
const char *aliases;
guint8 group;
gint16 tone_set;
} EmojiEntry;
typedef struct
{
const char *sequence[EMOJI_TONE_COUNT - 1];
} EmojiToneSet;
gsize emoji_data_count (void);
const EmojiEntry *emoji_data_entry (gsize index);
const EmojiEntry *emoji_data_find_by_sequence (const char *sequence,
EmojiTone *tone_out);
const char *emoji_data_group_display_name (EmojiGroup group);
const char *emoji_data_group_icon_sequence (EmojiGroup group);
const char *emoji_data_tone_display_name (EmojiTone tone);
const char *emoji_entry_sequence_for_tone (const EmojiEntry *entry,
EmojiTone tone);
char **emoji_search_tokenize (const char *text);
gboolean emoji_entry_matches (const EmojiEntry *entry,
char *const *needle_tokens);
const char *emoji_data_unicode_version (void);
const char *emoji_data_cldr_version (void);
#endif

View File

@@ -3,6 +3,7 @@ common_sources = [
'chanopt.c',
'ctcp.c',
'dcc.c',
'emoji-data.c',
'gtk3-theme-service.c',
'zoitechat.c',
'history.c',
@@ -109,6 +110,20 @@ public_suffix_data = custom_target('public_suffix_data_h',
command: [python3, files('gen-public-suffix.py'), '@OUTPUT@']
)
emoji_data_table = custom_target('emoji_data_table_h',
input: [
'../../data/emoji/emoji-test.txt',
'../../data/emoji/cldr-annotations-en.xml',
'../../data/emoji/cldr-annotations-derived-en.xml',
'../../data/emoji/gemoji.json',
'../../data/emoji/VERSIONS',
],
output: 'emoji-data-table.h',
command: [python3, files('../../tools/gen-emoji-data.py'),
'@INPUT0@', '@INPUT1@', '@INPUT2@', '@INPUT3@', '@INPUT4@',
'@OUTPUT@']
)
textevents = custom_target('textevents',
input: 'textevents.in',
output: ['textevents.h', 'textenums.h'],
@@ -132,7 +147,7 @@ if get_option('plugin')
endif
zoitechat_common = static_library('zoitechatcommon',
sources: [textevents, public_suffix_data] + marshal + common_sources + secretstore_sources,
sources: [textevents, public_suffix_data, emoji_data_table] + marshal + common_sources + secretstore_sources,
include_directories: config_h_include,
dependencies: common_deps + common_sysinfo_deps,
c_args: common_cflags,
@@ -167,3 +182,18 @@ test('GTK3 Theme Service Tests', gtk3_theme_service_tests,
protocol: 'tap',
timeout: 120,
)
emoji_data_tests = executable('emoji_data_tests',
[
'tests/test-emoji-data.c',
'emoji-data.c',
emoji_data_table,
],
include_directories: [config_h_include, include_directories('.')],
dependencies: [libgio_dep],
)
test('Emoji Data Tests', emoji_data_tests,
protocol: 'tap',
timeout: 120,
)

View File

@@ -0,0 +1,243 @@
/* ZoiteChat
* Copyright (C) 2026 deepend-tildeclub.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <string.h>
#include <glib.h>
#include "../emoji-data.h"
#define GRINNING_FACE "\360\237\230\200" /* 😀 */
#define DUCK "\360\237\246\206" /* 🦆 */
#define THUMBS_UP "\360\237\221\215" /* 👍 */
#define WAVE_DARK "\360\237\221\213\360\237\217\277" /* 👋🏿 */
#define MEDIUM_TONE_MODIFIER "\360\237\217\275" /* U+1F3FD */
#define KEYCAP_HASH "#\357\270\217\342\203\243" /* #️⃣ */
static const EmojiEntry *
find_by_name (const char *name)
{
gsize i;
for (i = 0; i < emoji_data_count (); i++)
{
const EmojiEntry *entry = emoji_data_entry (i);
if (!strcmp (entry->name, name))
return entry;
}
return NULL;
}
static void
test_catalog_integrity (void)
{
gsize i;
g_assert_cmpuint (emoji_data_count (), >=, 1800);
for (i = 0; i < emoji_data_count (); i++)
{
const EmojiEntry *entry = emoji_data_entry (i);
g_assert_nonnull (entry->sequence);
g_assert_true (*entry->sequence != '\0');
g_assert_true (g_utf8_validate (entry->sequence, -1, NULL));
g_assert_nonnull (entry->name);
g_assert_true (*entry->name != '\0');
g_assert_true (g_utf8_validate (entry->name, -1, NULL));
g_assert_nonnull (entry->search);
g_assert_true (*entry->search != '\0');
g_assert_nonnull (entry->aliases);
g_assert_cmpuint (entry->group, <, EMOJI_GROUP_COUNT);
g_assert_cmpint (entry->tone_set, >=, -1);
}
}
static void
test_cldr_order (void)
{
const EmojiEntry *first = emoji_data_entry (0);
g_assert_cmpstr (first->sequence, ==, GRINNING_FACE);
g_assert_cmpuint (first->group, ==, EMOJI_GROUP_SMILEYS_EMOTION);
}
static void
test_groups (void)
{
int group;
gboolean seen[EMOJI_GROUP_COUNT] = { FALSE };
gsize i;
for (group = 0; group < EMOJI_GROUP_COUNT; group++)
{
g_assert_true (*emoji_data_group_display_name (group) != '\0');
g_assert_true (*emoji_data_group_icon_sequence (group) != '\0');
}
for (i = 0; i < emoji_data_count (); i++)
seen[emoji_data_entry (i)->group] = TRUE;
for (group = 0; group < EMOJI_GROUP_COUNT; group++)
g_assert_true (seen[group]);
}
static void
test_search_by_keyword (void)
{
const EmojiEntry *duck = find_by_name ("duck");
char **tokens = emoji_search_tokenize ("Duck");
g_assert_nonnull (duck);
g_assert_cmpstr (duck->sequence, ==, DUCK);
g_assert_nonnull (tokens);
g_assert_true (emoji_entry_matches (duck, tokens));
g_strfreev (tokens);
tokens = emoji_search_tokenize ("bird");
g_assert_true (emoji_entry_matches (duck, tokens));
g_strfreev (tokens);
tokens = emoji_search_tokenize ("no-such-emoji-keyword");
g_assert_false (emoji_entry_matches (duck, tokens));
g_strfreev (tokens);
}
static void
test_search_by_alias (void)
{
const EmojiEntry *thumbs = find_by_name ("thumbs up");
char **tokens;
g_assert_nonnull (thumbs);
g_assert_nonnull (strstr (thumbs->aliases, "thumbsup"));
tokens = emoji_search_tokenize (":thumbsup:");
g_assert_nonnull (tokens);
g_assert_true (emoji_entry_matches (thumbs, tokens));
g_strfreev (tokens);
}
static void
test_multi_token_search (void)
{
const EmojiEntry *flag = find_by_name ("flag: Canada");
char **tokens = emoji_search_tokenize ("flag canada");
g_assert_nonnull (flag);
g_assert_cmpuint (flag->group, ==, EMOJI_GROUP_FLAGS);
g_assert_nonnull (tokens);
g_assert_true (emoji_entry_matches (flag, tokens));
g_strfreev (tokens);
}
static void
test_skin_tones (void)
{
const EmojiEntry *thumbs = find_by_name ("thumbs up");
const EmojiEntry *duck = find_by_name ("duck");
const char *toned;
g_assert_nonnull (thumbs);
g_assert_cmpint (thumbs->tone_set, >=, 0);
toned = emoji_entry_sequence_for_tone (thumbs, EMOJI_TONE_MEDIUM);
g_assert_cmpstr (toned, !=, thumbs->sequence);
g_assert_nonnull (strstr (toned, MEDIUM_TONE_MODIFIER));
g_assert_cmpstr (emoji_entry_sequence_for_tone (thumbs, EMOJI_TONE_NONE),
==, thumbs->sequence);
g_assert_cmpstr (emoji_entry_sequence_for_tone (thumbs, (EmojiTone) -1), ==, thumbs->sequence);
g_assert_cmpstr (emoji_entry_sequence_for_tone (thumbs, EMOJI_TONE_COUNT), ==, thumbs->sequence);
g_assert_nonnull (duck);
g_assert_cmpint (duck->tone_set, ==, -1);
g_assert_cmpstr (emoji_entry_sequence_for_tone (duck, EMOJI_TONE_DARK),
==, duck->sequence);
}
static void
test_find_by_sequence (void)
{
EmojiTone tone;
const EmojiEntry *entry;
entry = emoji_data_find_by_sequence (GRINNING_FACE, &tone);
g_assert_nonnull (entry);
g_assert_cmpstr (entry->name, ==, "grinning face");
g_assert_cmpuint (tone, ==, EMOJI_TONE_NONE);
entry = emoji_data_find_by_sequence (WAVE_DARK, &tone);
g_assert_nonnull (entry);
g_assert_cmpstr (entry->name, ==, "waving hand");
g_assert_cmpuint (tone, ==, EMOJI_TONE_DARK);
g_assert_null (emoji_data_find_by_sequence ("not an emoji", &tone));
g_assert_null (emoji_data_find_by_sequence ("", NULL));
g_assert_null (emoji_data_find_by_sequence (NULL, NULL));
}
static void
test_grapheme_sequences_intact (void)
{
const EmojiEntry *keycap = find_by_name ("keycap: #");
const EmojiEntry *family = find_by_name ("family: man, woman, boy");
g_assert_nonnull (keycap);
g_assert_cmpstr (keycap->sequence, ==, KEYCAP_HASH);
g_assert_nonnull (family);
g_assert_nonnull (strstr (family->sequence, "\342\200\215"));
}
static void
test_tokenize_edge_cases (void)
{
g_assert_null (emoji_search_tokenize (NULL));
g_assert_null (emoji_search_tokenize (""));
g_assert_null (emoji_search_tokenize (" "));
g_assert_null (emoji_search_tokenize (":::"));
g_assert_null (emoji_search_tokenize ("\377"));
}
static void
test_versions (void)
{
g_assert_true (*emoji_data_unicode_version () != '\0');
g_assert_true (*emoji_data_cldr_version () != '\0');
}
int
main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/emoji-data/catalog-integrity", test_catalog_integrity);
g_test_add_func ("/emoji-data/cldr-order", test_cldr_order);
g_test_add_func ("/emoji-data/groups", test_groups);
g_test_add_func ("/emoji-data/search-by-keyword", test_search_by_keyword);
g_test_add_func ("/emoji-data/search-by-alias", test_search_by_alias);
g_test_add_func ("/emoji-data/multi-token-search", test_multi_token_search);
g_test_add_func ("/emoji-data/skin-tones", test_skin_tones);
g_test_add_func ("/emoji-data/find-by-sequence", test_find_by_sequence);
g_test_add_func ("/emoji-data/grapheme-sequences-intact",
test_grapheme_sequences_intact);
g_test_add_func ("/emoji-data/tokenize-edge-cases",
test_tokenize_edge_cases);
g_test_add_func ("/emoji-data/versions", test_versions);
return g_test_run ();
}

View File

@@ -260,6 +260,7 @@ struct zoitechatprefs
int hex_gui_dialog_left;
int hex_gui_dialog_top;
int hex_gui_dialog_width;
int hex_gui_emoji_skin_tone;
int hex_gui_lagometer;
int hex_gui_lang;
int hex_gui_pane_divider_position;