New emoji menu w/windows 7 fixed fallback.

fix a few GTK3 theming quirks

.github/workflows/appimage-build.yml

@@ -36,7 +36,7 @@ jobs:
             libgtk-3-bin libglib2.0-bin shared-mime-info gsettings-desktop-schemas \
             liblua5.4-dev libpci-dev libperl-dev libssl-dev libayatana-appindicator3-dev \
             perl python3 python3-minimal python3-dev python3-cffi mono-devel desktop-file-utils \
-            fonts-noto-color-emoji breeze-gtk-theme \
+            breeze-gtk-theme \
             patchelf file curl
 
       - name: Configure
@@ -119,15 +119,9 @@ jobs:
             cp -a /usr/lib/x86_64-linux-gnu/libpython3*.so* AppDir/usr/lib/x86_64-linux-gnu/
           fi
 
-          if [ -d "/usr/share/gtk-3.0/emoji" ]; then
-            install -d AppDir/usr/share/gtk-3.0
-            cp -a /usr/share/gtk-3.0/emoji AppDir/usr/share/gtk-3.0/
-          fi
-
-          if [ -f "/usr/share/fonts/truetype/noto/NotoColorEmoji.ttf" ]; then
-            install -d AppDir/usr/share/fonts/truetype/noto
-            cp -a /usr/share/fonts/truetype/noto/NotoColorEmoji.ttf AppDir/usr/share/fonts/truetype/noto/
-          fi
+          # The emoji font is not bundled on Linux; the AppImage uses the
+          # host system's emoji font (e.g. fonts-noto-color-emoji).
+          test ! -e AppDir/usr/share/fonts/zoitechat/NotoColorEmoji.ttf
 
           if [ -d "/usr/lib/x86_64-linux-gnu/gtk-3.0/modules" ]; then
             install -d AppDir/usr/lib/x86_64-linux-gnu/gtk-3.0
@@ -143,7 +137,6 @@ jobs:
         run: |
           set -eux
 
-          # Include every built-in plugin except the Windows-only update plugin.
           find AppDir/usr/lib -maxdepth 4 -type f -name '*.so' -path '*/zoitechat/plugins/*' -print | sort
 
           for plugin in checksum fishlim lua perl python sysinfo; do
@@ -192,14 +185,6 @@ jobs:
             export GTK_PATH="$gtk_path_entries${GTK_PATH:+:$GTK_PATH}"
           fi
 
-          if [ -d "$APPDIR/etc/fonts" ]; then
-            export FONTCONFIG_SYSROOT="$APPDIR"
-            export FONTCONFIG_PATH="$APPDIR/etc/fonts${FONTCONFIG_PATH:+:$FONTCONFIG_PATH}"
-            if [ -f "$APPDIR/etc/fonts/fonts.conf" ]; then
-              export FONTCONFIG_FILE="$APPDIR/etc/fonts/fonts.conf"
-            fi
-          fi
-
           if [ -d "$APPDIR/usr/lib/x86_64-linux-gnu/zoitechat/plugins" ]; then
             export ZOITECHAT_LIBDIR="$APPDIR/usr/lib/x86_64-linux-gnu/zoitechat/plugins"
           elif [ -d "$APPDIR/usr/lib/zoitechat/plugins" ]; then
@@ -258,13 +243,10 @@ jobs:
             export PYTHONPATH="$pythonpath_entries${PYTHONPATH:+:$PYTHONPATH}"
           fi
 
-          # OpenSSL trust store override
           export SSL_CERT_FILE="${SSL_CERT_FILE:-$APPDIR/etc/ssl/certs/ca-certificates.crt}"
           export SSL_CERT_DIR="${SSL_CERT_DIR:-$APPDIR/etc/ssl/certs}"
           export CURL_CA_BUNDLE="${CURL_CA_BUNDLE:-$SSL_CERT_FILE}"
 
-          # Prefer Wayland if the session provides it, but keep X11 fallback.
-          # Don't override if the user already set GDK_BACKEND explicitly.
           if [ -z "${GDK_BACKEND:-}" ]; then
             if [ -n "${WAYLAND_DISPLAY:-}" ] || [ "${XDG_SESSION_TYPE:-}" = "wayland" ]; then
               export GDK_BACKEND="wayland,x11"

COPYING

@@ -336,3 +336,26 @@ proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
+
+
+
+======================================================================
+ADDITIONAL LICENSE NOTICE
+======================================================================
+
+ZoiteChat source code:
+GPL version 2
+See Above.
+
+Unicode Emoji and CLDR data:
+Unicode License v3
+data/emoji/LICENSE-UNICODE.txt
+
+gemoji shortcode data:
+MIT License
+Copyright (c) 2019 GitHub, Inc.
+data/emoji/LICENSE-GEMOJI.txt
+
+Noto Color Emoji:
+SIL Open Font License 1.1
+data/fonts/OFL.txt

data/emoji/LICENSE-UNICODE.txt

@@ -0,0 +1,39 @@
+UNICODE LICENSE V3
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2026 Unicode, Inc.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of data files and any associated documentation (the "Data Files") or
+software and any associated documentation (the "Software") to deal in the
+Data Files or Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, and/or sell
+copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that either (a)
+this copyright and permission notice appear with all copies of the Data
+Files or Software, or (b) this copyright and permission notice appear in
+associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written
+authorization of the copyright holder.

data/emoji/README.md

@@ -0,0 +1,30 @@
+# Bundled emoji data
+
+These are pinned copies of the upstream data files that
+`tools/gen-emoji-data.py` compiles into ZoiteChat's emoji picker catalog
+at build time. Bundling them means every ZoiteChat package exposes the
+same emoji, names, categories and search keywords, independent of the
+GTK runtime version or the emoji data a distribution installs under
+`/usr/share/gtk-3.0/emoji`.
+
+Nothing here affects what is sent over IRC: the picker inserts plain
+Unicode sequences. Official builds register the bundled Noto Color Emoji
+font privately for consistent rendering, while preserving platform font
+fallback if registration is unavailable.
+
+| File | Source | Version |
+| ---- | ------ | ------- |
+| `emoji-test.txt` | [Unicode emoji data](https://unicode.org/Public/emoji/17.0/emoji-test.txt) (mirrored at [unicode-org/unicodetools](https://github.com/unicode-org/unicodetools/blob/main/unicodetools/data/emoji/17.0/emoji-test.txt)) | Emoji 17.0 |
+| `cldr-annotations-en.xml` | [unicode-org/cldr](https://github.com/unicode-org/cldr/blob/release-48/common/annotations/en.xml) `common/annotations/en.xml` | CLDR release 48 |
+| `cldr-annotations-derived-en.xml` | [unicode-org/cldr](https://github.com/unicode-org/cldr/blob/release-48/common/annotationsDerived/en.xml) `common/annotationsDerived/en.xml` | CLDR release 48 |
+| `gemoji.json` | [github/gemoji](https://github.com/github/gemoji/blob/v4.1.0/db/emoji.json) `db/emoji.json` | v4.1.0 |
+
+The pinned versions are recorded in `VERSIONS`.
+
+## Licenses
+
+- `emoji-test.txt`, `cldr-annotations-en.xml`,
+  `cldr-annotations-derived-en.xml`: © Unicode, Inc., distributed under
+  the [Unicode License v3](https://www.unicode.org/license.txt).
+- `gemoji.json`: from the gemoji project, MIT licensed,
+  © GitHub, Inc.

data/emoji/VERSIONS

@@ -0,0 +1,6 @@
+# Pinned versions of the emoji source data in this directory.
+# Keep in sync with the files themselves; tools/gen-emoji-data.py
+# verifies unicode-emoji against the emoji-test.txt header.
+unicode-emoji=17.0
+cldr=48
+gemoji=4.1.0

data/fonts/OFL.txt

@@ -0,0 +1,91 @@
+Copyright 2013 Google LLC
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) shall not be
+used to promote, endorse or advertise any Modified Version, except to
+acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s)
+or with their explicit written permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

data/fonts/README.md

@@ -0,0 +1,23 @@
+# Bundled emoji font
+
+`NotoColorEmoji.ttf` reports Noto Color Emoji version 2.051 and covers
+Unicode Emoji 17.0. It is vendored from Debian's
+`fonts-noto-color-emoji` 2.051 package, built from the corresponding
+Google Noto Emoji release.
+
+The font is bundled only with Windows builds, where it is installed
+inside the application and registered only for the ZoiteChat process.
+It is not installed as a global operating-system font.
+
+Linux (and other Unix) builds do not install this file. They rely on
+the emoji font provided by the operating system instead — typically the
+distribution's Noto Color Emoji package (`fonts-noto-color-emoji` on
+Debian/Ubuntu, `google-noto-color-emoji-fonts` on Fedora).
+
+Upstream release: https://github.com/googlefonts/noto-emoji/releases/tag/v2.051
+
+Vendored file SHA-256:
+`dac5c27651082d6c53dab5081f50d2022ddf6877d730fa919cf6a4fc2af22de0`
+
+The font is distributed under the SIL Open Font License 1.1. See
+`OFL.txt`.

data/fonts/meson.build

@@ -0,0 +1,13 @@
+emoji_font_dir = join_paths(get_option('datadir'), 'fonts', 'zoitechat')
+emoji_font_doc_dir = join_paths(get_option('datadir'), 'doc', 'zoitechat', 'fonts')
+
+install_data(
+  'NotoColorEmoji.ttf',
+  install_dir: emoji_font_dir,
+)
+
+install_data(
+  'OFL.txt',
+  'README.md',
+  install_dir: emoji_font_doc_dir,
+)

data/meson.build

@@ -3,6 +3,11 @@ if get_option('plugin')
 endif
 
 if get_option('gtk-frontend')
+  # The bundled emoji font ships only with Windows builds; Linux and other
+  # Unix systems use the system emoji font package instead.
+  if host_machine.system() == 'windows'
+    subdir('fonts')
+  endif
   subdir('icons')
   subdir('misc')
   subdir('man')

flatpak/net.zoite.Zoitechat.json

@@ -65,7 +65,8 @@
         "/share/man"
       ],
       "post-install": [
-        "install -d /app/extensions"
+        "install -d /app/extensions",
+        "test ! -e /app/share/fonts/zoitechat/NotoColorEmoji.ttf"
       ],
       "sources": [
         {

packaging/fedora/zoitechat.spec

@@ -31,6 +31,7 @@ BuildRequires:  pkgconfig(lua)
 BuildRequires:  pkgconfig(openssl) >= 0.9.8
 BuildRequires:  pkgconfig(python3)
 
+Requires:       google-noto-color-emoji-fonts
 Requires:       hicolor-icon-theme
 Requires:       iso-codes
 

po/POTFILES

@@ -4,6 +4,7 @@ data/misc/net.zoite.Zoitechat.ThemeManager.desktop.in
 src/common/cfgfiles.c
 src/common/chanopt.c
 src/common/dcc.c
+src/common/emoji-data.c
 src/common/zoitechat.c
 src/common/ignore.c
 src/common/inbound.c
@@ -24,6 +25,7 @@ src/fe-gtk/banlist.c
 src/fe-gtk/chanlist.c
 src/fe-gtk/dccgui.c
 src/fe-gtk/editlist.c
+src/fe-gtk/emoji-picker.c
 src/fe-gtk/fe-gtk.c
 src/fe-gtk/fkeys.c
 src/fe-gtk/gtkutil.c

src/common/cfgfiles.c

@@ -40,18 +40,18 @@
 
 #define DEF_FONT "Monospace 9"
 #ifdef WIN32
-#define DEF_FONT_ALTER "Segoe UI Emoji,Arial Unicode MS,Lucida Sans Unicode,Meiryo,Symbola,Unifont"
+#define DEF_FONT_ALTER "Segoe UI Emoji,Segoe UI Symbol,Arial Unicode MS,Lucida Sans Unicode,Meiryo,Symbola,Unifont"
 #else
 #define DEF_FONT_ALTER "Arial Unicode MS,Segoe UI Emoji,Lucida Sans Unicode,Meiryo,Symbola,Unifont"
 #endif
 
 const char * const languages[LANGUAGES_LENGTH] = {
-	"af", "sq", "am", "ast", "az", "eu", "be", "bg", "ca", "zh_CN",      /*  0 ..  9 */
-	"zh_TW", "cs", "da", "nl", "en_GB", "en", "et", "fi", "fr", "gl",    /* 10 .. 19 */
-	"de", "el", "gu", "hi", "hu", "id", "it", "ja_JP", "kn", "rw",       /* 20 .. 29 */
-	"ko", "lv", "lt", "mk", "ml", "ms", "nb", "no", "pl", "pt",          /* 30 .. 39 */
-	"pt_BR", "pa", "ru", "sr", "sk", "sl", "es", "sv", "th", "tr",       /* 40 .. 49 */
-	"uk", "vi", "wa"                                                     /* 50 .. */
+	"af", "sq", "am", "ast", "az", "eu", "be", "bg", "ca", "zh_CN",
+	"zh_TW", "cs", "da", "nl", "en_GB", "en", "et", "fi", "fr", "gl",
+	"de", "el", "gu", "hi", "hu", "id", "it", "ja_JP", "kn", "rw",
+	"ko", "lv", "lt", "mk", "ml", "ms", "nb", "no", "pl", "pt",
+	"pt_BR", "pa", "ru", "sr", "sk", "sl", "es", "sv", "th", "tr",
+	"uk", "vi", "wa"
 };
 
 void
@@ -78,8 +78,6 @@ list_addentry (GSList ** list, char *cmd, char *name)
 	*list = g_slist_append (*list, pop);
 }
 
-/* read it in from a buffer to our linked list */
-
 static void
 list_load_from_data (GSList ** list, char *ibuf, int size)
 {
@@ -181,9 +179,9 @@ list_delentry (GSList ** list, char *name)
 char *
 cfg_get_str (char *cfg, const char *var, char *dest, int dest_len)
 {
-	char buffer[128];	/* should be plenty for a variable name */
+	char buffer[128];
 
-	sprintf (buffer, "%s ", var);	/* add one space, this way it works against var - var2 checks too */
+	sprintf (buffer, "%s ", var);
 
 	while (1)
 	{
@@ -197,8 +195,6 @@ cfg_get_str (char *cfg, const char *var, char *dest, int dest_len)
 				cfg++;
 			while (*cfg == ' ')
 				cfg++;
-			/*while (*cfg == ' ' || *cfg == '=')
-			   cfg++; */
 			value = cfg;
 			while (*cfg != 0 && *cfg != '\n')
 				cfg++;
@@ -293,7 +289,7 @@ cfg_get_int (char *cfg, char *var)
 	return atoi (str);
 }
 
-char *xdir = NULL;	/* utf-8 encoding */
+char *xdir = NULL;
 
 #ifdef WIN32
 #include <windows.h>
@@ -416,6 +412,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},
@@ -435,7 +432,6 @@ const struct prefs vars[] =
 	{"gui_pane_right_size_min", P_OFFINT (hex_gui_pane_right_size_min), TYPE_INT},
 	{"gui_quit_dialog", P_OFFINT (hex_gui_quit_dialog), TYPE_BOOL},
 	{"gui_search_pos", P_OFFINT (hex_gui_search_pos), TYPE_INT},
-	/* {"gui_single", P_OFFINT (hex_gui_single), TYPE_BOOL}, */
 	{"gui_slist_fav", P_OFFINT (hex_gui_slist_fav), TYPE_BOOL},
 	{"gui_slist_select", P_OFFINT (hex_gui_slist_select), TYPE_INT},
 	{"gui_slist_skip", P_OFFINT (hex_gui_slist_skip), TYPE_BOOL},

src/common/common.vcxproj

@@ -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,7 @@
 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"
 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"

src/common/emoji-data.c

@@ -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 (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 (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 (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 || 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)
+		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;
+}

src/common/emoji-data.h

@@ -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

src/common/fe.h

@@ -142,6 +142,7 @@ void fe_set_away (server *serv);
 void fe_serverlist_open (session *sess);
 void fe_get_bool (char *title, char *prompt, void *callback, void *userdata);
 void fe_get_str (char *prompt, char *def, void *callback, void *ud);
+void fe_get_password (char *prompt, void *callback, void *ud);
 void fe_get_int (char *prompt, int def, void *callback, void *ud);
 #define FRF_WRITE 1				/* save file */
 #define FRF_MULTIPLE 2			/* multi-select */

src/common/gtk3-theme-service.c

@@ -315,6 +315,59 @@ resolve_parent_theme_root (const char *child_theme_root, const char *parent_name
 		return home_local;
 	g_free (home_local);
 
+	{
+		const char *xdg_data_home = g_getenv ("XDG_DATA_HOME");
+
+		if (xdg_data_home && xdg_data_home[0])
+		{
+			candidate = g_build_filename (xdg_data_home, "themes", parent_name, NULL);
+			if (path_exists_as_dir (candidate))
+				return candidate;
+			g_free (candidate);
+		}
+	}
+
+	candidate = g_build_filename (g_get_user_data_dir (), "themes", parent_name, NULL);
+	if (path_exists_as_dir (candidate))
+		return candidate;
+	g_free (candidate);
+
+	{
+		const char *xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
+		guint i;
+
+		if (xdg_data_dirs && xdg_data_dirs[0])
+		{
+			char **data_dirs = g_strsplit (xdg_data_dirs, G_SEARCHPATH_SEPARATOR_S, -1);
+
+			for (i = 0; data_dirs && data_dirs[i]; i++)
+			{
+				if (!data_dirs[i][0])
+					continue;
+				candidate = g_build_filename (data_dirs[i], "themes", parent_name, NULL);
+				if (path_exists_as_dir (candidate))
+				{
+					g_strfreev (data_dirs);
+					return candidate;
+				}
+				g_free (candidate);
+			}
+			g_strfreev (data_dirs);
+		}
+		else
+		{
+			const char *const *system_data_dirs = g_get_system_data_dirs ();
+
+			for (i = 0; system_data_dirs && system_data_dirs[i]; i++)
+			{
+				candidate = g_build_filename (system_data_dirs[i], "themes", parent_name, NULL);
+				if (path_exists_as_dir (candidate))
+					return candidate;
+				g_free (candidate);
+			}
+		}
+	}
+
 	user_dir = zoitechat_gtk3_theme_service_get_user_themes_dir ();
 	candidate = g_build_filename (user_dir, parent_name, NULL);
 	g_free (user_dir);
@@ -632,18 +685,55 @@ zoitechat_gtk3_theme_service_discover (void)
 
 	g_mkdir_with_parents (user_dir, 0700);
 
-	user_data_themes = g_build_filename (g_get_user_data_dir (), "themes", NULL);
+	/* Prefer the live XDG environment over GLib's process-cached copies so
+	 * theme lookup matches what GTK resolves for the running session. */
+	{
+		const char *xdg_data_home = g_getenv ("XDG_DATA_HOME");
+
+		if (xdg_data_home && xdg_data_home[0])
+			user_data_themes = g_build_filename (xdg_data_home, "themes", NULL);
+		else
+			user_data_themes = g_build_filename (g_get_user_data_dir (), "themes", NULL);
+	}
+	/* Scan the app's own themes dir first: imported themes get a symlink
+	 * under the XDG data themes dir so GTK can resolve gtk-theme-name, and
+	 * scanning that link first would make the canonical-root dedup keep
+	 * the symlink path - changing the theme's path-derived id and breaking
+	 * the saved gui_gtk3_theme reference on the next start. */
+	add_theme_root (user_roots, seen_user_roots, user_dir);
 	add_theme_root (user_roots, seen_user_roots, user_data_themes);
 	g_free (user_data_themes);
 	add_theme_root (user_roots, seen_user_roots, home_themes);
-	add_theme_root (user_roots, seen_user_roots, user_dir);
 
-	system_data_dirs = g_get_system_data_dirs ();
-	for (i = 0; system_data_dirs && system_data_dirs[i]; i++)
 	{
-		char *system_themes = g_build_filename (system_data_dirs[i], "themes", NULL);
-		add_theme_root (system_roots, seen_system_roots, system_themes);
-		g_free (system_themes);
+		const char *xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
+
+		if (xdg_data_dirs && xdg_data_dirs[0])
+		{
+			char **data_dirs = g_strsplit (xdg_data_dirs, G_SEARCHPATH_SEPARATOR_S, -1);
+
+			for (i = 0; data_dirs && data_dirs[i]; i++)
+			{
+				char *system_themes;
+
+				if (!data_dirs[i][0])
+					continue;
+				system_themes = g_build_filename (data_dirs[i], "themes", NULL);
+				add_theme_root (system_roots, seen_system_roots, system_themes);
+				g_free (system_themes);
+			}
+			g_strfreev (data_dirs);
+		}
+		else
+		{
+			system_data_dirs = g_get_system_data_dirs ();
+			for (i = 0; system_data_dirs && system_data_dirs[i]; i++)
+			{
+				char *system_themes = g_build_filename (system_data_dirs[i], "themes", NULL);
+				add_theme_root (system_roots, seen_system_roots, system_themes);
+				g_free (system_themes);
+			}
+		}
 	}
 
 	for (i = 0; i < system_roots->len; i++)
@@ -922,7 +1012,7 @@ static gboolean
 validate_theme_root_for_import (const char *theme_root, GError **error)
 {
 	char *index_theme;
-	GKeyFile *keyfile;
+	GKeyFile *keyfile = NULL;
 	char *css_dir;
 	char *css_path;
 	char *raw_inherits;
@@ -930,36 +1020,33 @@ validate_theme_root_for_import (const char *theme_root, GError **error)
 	guint i;
 	GError *load_error = NULL;
 
+	/* index.theme is optional for GTK3 CSS themes (GTK only needs
+	 * gtk-3.x/gtk.css), but when it is present it must be well formed so
+	 * broken archives are rejected up front. */
 	index_theme = g_build_filename (theme_root, "index.theme", NULL);
-	if (!g_file_test (index_theme, G_FILE_TEST_IS_REGULAR))
+	if (g_file_test (index_theme, G_FILE_TEST_IS_REGULAR))
 	{
-		g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
-					 "Invalid GTK3 theme at '%s': missing required index.theme at '%s'.",
-			   theme_root, index_theme);
-		g_free (index_theme);
-		return FALSE;
-	}
+		keyfile = g_key_file_new ();
+		if (!g_key_file_load_from_file (keyfile, index_theme, G_KEY_FILE_NONE, &load_error))
+		{
+			g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
+						 "Invalid GTK3 theme at '%s': failed to parse index.theme '%s': %s.",
+				   theme_root, index_theme, load_error->message);
+			g_error_free (load_error);
+			g_key_file_unref (keyfile);
+			g_free (index_theme);
+			return FALSE;
+		}
 
-	keyfile = g_key_file_new ();
-	if (!g_key_file_load_from_file (keyfile, index_theme, G_KEY_FILE_NONE, &load_error))
-	{
-		g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
-					 "Invalid GTK3 theme at '%s': failed to parse index.theme '%s': %s.",
-			   theme_root, index_theme, load_error->message);
-		g_error_free (load_error);
-		g_key_file_unref (keyfile);
-		g_free (index_theme);
-		return FALSE;
-	}
-
-	if (!g_key_file_has_group (keyfile, "Desktop Entry"))
-	{
-		g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
-					 "Invalid GTK3 theme at '%s': index.theme '%s' is missing the [Desktop Entry] section.",
-			   theme_root, index_theme);
-		g_key_file_unref (keyfile);
-		g_free (index_theme);
-		return FALSE;
+		if (!g_key_file_has_group (keyfile, "Desktop Entry"))
+		{
+			g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
+						 "Invalid GTK3 theme at '%s': index.theme '%s' is missing the [Desktop Entry] section.",
+				   theme_root, index_theme);
+			g_key_file_unref (keyfile);
+			g_free (index_theme);
+			return FALSE;
+		}
 	}
 
 	css_dir = zoitechat_gtk3_theme_pick_css_dir (theme_root);
@@ -968,7 +1055,8 @@ validate_theme_root_for_import (const char *theme_root, GError **error)
 		g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
 					 "Invalid GTK3 theme at '%s': could not resolve a GTK CSS directory (expected gtk-3.x/gtk.css).",
 					 theme_root);
-		g_key_file_unref (keyfile);
+		if (keyfile)
+			g_key_file_unref (keyfile);
 		g_free (index_theme);
 		return FALSE;
 	}
@@ -981,15 +1069,20 @@ validate_theme_root_for_import (const char *theme_root, GError **error)
 			   theme_root, css_path);
 		g_free (css_path);
 		g_free (css_dir);
-		g_key_file_unref (keyfile);
+		if (keyfile)
+			g_key_file_unref (keyfile);
 		g_free (index_theme);
 		return FALSE;
 	}
 	g_free (css_path);
 	g_free (css_dir);
 
-	raw_inherits = g_key_file_get_string (keyfile, "Desktop Entry", "Inherits", NULL);
-	g_key_file_unref (keyfile);
+	raw_inherits = NULL;
+	if (keyfile)
+	{
+		raw_inherits = g_key_file_get_string (keyfile, "Desktop Entry", "Inherits", NULL);
+		g_key_file_unref (keyfile);
+	}
 	g_free (index_theme);
 	if (!raw_inherits)
 		return TRUE;

src/common/meson.build

@@ -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,
+)

src/common/server.c

@@ -109,6 +109,58 @@ static void server_disconnect (session * sess, int sendquit, int err);
 static int server_cleanup (server * serv);
 static void server_connect (server *serv, char *hostname, int port, int no_login);
 
+typedef struct
+{
+	server *serv;
+	char hostname[128];
+	int port;
+} reconnect_password_prompt;
+
+static gboolean
+server_login_uses_password_sasl (int logintype)
+{
+	return logintype == LOGIN_SASL ||
+		logintype == LOGIN_SASL_SCRAM_SHA_1 ||
+		logintype == LOGIN_SASL_SCRAM_SHA_256 ||
+		logintype == LOGIN_SASL_SCRAM_SHA_512;
+}
+
+static void
+server_reconnect_password_cb (int cancel, char *text, void *userdata)
+{
+	reconnect_password_prompt *prompt = userdata;
+
+	if (!cancel && is_server (prompt->serv) && !prompt->serv->connected && !prompt->serv->connecting && prompt->serv->server_session)
+	{
+		prompt->serv->password[0] = 0;
+		if (text && *text)
+			safe_strcpy (prompt->serv->password, text, sizeof (prompt->serv->password));
+		server_connect (prompt->serv, prompt->hostname, prompt->port, FALSE);
+	}
+
+	g_free (prompt);
+}
+
+static gboolean
+server_prompt_reconnect_password (server *serv)
+{
+	reconnect_password_prompt *prompt;
+	char *msg;
+	ircnet *net = serv->network;
+
+	if (!net || !(net->flags & FLAG_PROMPT_PASSWORD) || !server_login_uses_password_sasl (serv->loginmethod))
+		return FALSE;
+
+	prompt = g_new0 (reconnect_password_prompt, 1);
+	prompt->serv = serv;
+	safe_strcpy (prompt->hostname, serv->hostname, sizeof (prompt->hostname));
+	prompt->port = serv->port;
+	msg = g_strdup_printf (_("Enter SASL password for %s:"), net->name ? net->name : _("this network"));
+	fe_get_password (msg, server_reconnect_password_cb, prompt);
+	g_free (msg);
+	return TRUE;
+}
+
 static void
 write_error (char *message, GError **error)
 {
@@ -734,7 +786,8 @@ timeout_auto_reconnect (server *serv)
 		serv->recondelay_tag = 0;
 		if (!serv->connected && !serv->connecting && serv->server_session)
 		{
-			server_connect (serv, serv->hostname, serv->port, FALSE);
+			if (!server_prompt_reconnect_password (serv))
+				server_connect (serv, serv->hostname, serv->port, FALSE);
 		}
 	}
 	return 0;			  /* returning 0 should remove the timeout handler */

src/common/servlist.c

@@ -439,8 +439,99 @@ servlist_favchan_copy (favchannel *fav)
 	return newfav;
 }
 
+static void servlist_connect_with_password (session *sess, ircnet *net, gboolean join, const char *password);
+
+typedef struct
+{
+	session *sess;
+	ircnet *net;
+	gboolean join;
+} servlist_password_prompt;
+
+static gboolean
+servlist_login_uses_password_sasl (int logintype)
+{
+	return logintype == LOGIN_SASL ||
+		logintype == LOGIN_SASL_SCRAM_SHA_1 ||
+		logintype == LOGIN_SASL_SCRAM_SHA_256 ||
+		logintype == LOGIN_SASL_SCRAM_SHA_512;
+}
+
+static void servlist_prompt_sasl_password (servlist_password_prompt *prompt);
+
+static void
+servlist_connect_without_password_cb (int value, void *userdata)
+{
+	servlist_password_prompt *prompt = userdata;
+
+	if (value)
+	{
+		servlist_connect_with_password (prompt->sess, prompt->net, prompt->join, NULL);
+		g_free (prompt);
+	}
+	else
+	{
+		servlist_prompt_sasl_password (prompt);
+	}
+}
+
+static void
+servlist_connect_password_cb (int cancel, char *text, void *userdata)
+{
+	servlist_password_prompt *prompt = userdata;
+	char *msg;
+
+	if (cancel)
+	{
+		fe_serverlist_open (prompt->sess);
+		g_free (prompt);
+		return;
+	}
+
+	if (text && *text)
+	{
+		servlist_connect_with_password (prompt->sess, prompt->net, prompt->join, text);
+		g_free (prompt);
+		return;
+	}
+
+	msg = g_strdup_printf (_("Continue connecting to %s without a SASL password?"), prompt->net->name ? prompt->net->name : _("this network"));
+	fe_get_bool (_("No SASL password"), msg, servlist_connect_without_password_cb, prompt);
+	g_free (msg);
+}
+
+static void
+servlist_prompt_sasl_password (servlist_password_prompt *prompt)
+{
+	char *msg;
+
+	msg = g_strdup_printf (_("Enter SASL password for %s:"), prompt->net->name ? prompt->net->name : _("this network"));
+	fe_get_password (msg, servlist_connect_password_cb, prompt);
+	g_free (msg);
+}
+
 void
 servlist_connect (session *sess, ircnet *net, gboolean join)
+{
+	int logintype;
+	servlist_password_prompt *prompt;
+
+	logintype = net && net->logintype ? net->logintype : LOGIN_DEFAULT_REAL;
+	if (net && (net->flags & FLAG_PROMPT_PASSWORD) && servlist_login_uses_password_sasl (logintype))
+	{
+		prompt = g_new0 (servlist_password_prompt, 1);
+		prompt->sess = sess;
+		prompt->net = net;
+		prompt->join = join;
+		servlist_prompt_sasl_password (prompt);
+		return;
+	}
+
+	servlist_connect_with_password (sess, net, join, NULL);
+}
+
+static void
+servlist_connect_with_password (session *sess, ircnet *net, gboolean join, const char *password)
 {
 	ircserver *ircserv;
 	GSList *list;
@@ -487,7 +578,11 @@ servlist_connect (session *sess, ircnet *net, gboolean join)
 	}
 
 	serv->password[0] = 0;
-	if ((net->flags & FLAG_USE_KEYRING) && net->name)
+	if (password && *password)
+	{
+		safe_strcpy (serv->password, password, sizeof (serv->password));
+	}
+	else if ((net->flags & FLAG_USE_KEYRING) && net->name)
 	{
 		char *stored_pass = secretstore_get_network_password (net->name);
 		if (stored_pass && *stored_pass)

src/common/servlist.h

@@ -63,7 +63,8 @@ extern GSList *network_list;
 #define FLAG_ALLOW_INVALID		32
 #define FLAG_FAVORITE			64
 #define FLAG_USE_KEYRING		128
-#define FLAG_COUNT				8
+#define FLAG_PROMPT_PASSWORD	256
+#define FLAG_COUNT				9
 
 /* Login methods. Use server password by default - if we had a NickServ password, it'd be set to 2 already by servlist_load() */
 #define LOGIN_DEFAULT_REAL		LOGIN_PASS		/* this is to set the default login method for unknown servers */

src/common/tests/test-emoji-data.c

@@ -0,0 +1,240 @@
+/* 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_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 (":::"));
+}
+
+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 ();
+}

src/common/tests/test-gtk3-theme-service.c

@@ -381,9 +381,10 @@ test_archive_without_theme_reports_css_error (void)
 	}
 	archive_path = g_build_filename (tmp_root, "invalid-theme.zip", NULL);
 
-	command = g_strdup_printf ("cd %s && zip -qr %s .", archive_root, archive_path);
+	command = g_strdup_printf ("sh -c \"cd '%s' && zip -qr '%s' .\"", archive_root, archive_path);
 	g_assert_true (g_spawn_command_line_sync (command, NULL, NULL, NULL, NULL));
 	g_free (command);
+	g_assert_true (g_file_test (archive_path, G_FILE_TEST_IS_REGULAR));
 
 	g_assert_false (zoitechat_gtk3_theme_service_import (archive_path, &imported_id, &error));
 	g_assert_null (imported_id);
@@ -397,25 +398,31 @@ test_archive_without_theme_reports_css_error (void)
 }
 
 static void
-test_import_rejects_theme_missing_index_theme (void)
+test_import_accepts_theme_missing_index_theme (void)
 {
 	char *tmp_root;
 	char *src_root;
 	char *theme_root;
 	char *imported_id = NULL;
 	GError *error = NULL;
+	ZoitechatGtk3Theme *found;
 
 	setup_test_xdir (&tmp_root);
 	src_root = g_build_filename (tmp_root, "src", NULL);
 	g_mkdir_with_parents (src_root, 0700);
 	theme_root = make_theme_dir (src_root, "NoIndex", FALSE, FALSE);
 
-	g_assert_false (zoitechat_gtk3_theme_service_import (theme_root, &imported_id, &error));
-	g_assert_null (imported_id);
-	g_assert_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL);
-	g_assert_nonnull (g_strstr_len (error->message, -1, "missing required index.theme"));
-	g_assert_nonnull (g_strstr_len (error->message, -1, "NoIndex"));
-	g_error_free (error);
+	/* index.theme is optional for GTK3 CSS themes: gtk-3.x/gtk.css alone
+	 * makes a loadable theme. */
+	g_assert_true (zoitechat_gtk3_theme_service_import (theme_root, &imported_id, &error));
+	g_assert_no_error (error);
+	g_assert_nonnull (imported_id);
+
+	found = zoitechat_gtk3_theme_find_by_id (imported_id);
+	g_assert_nonnull (found);
+	g_assert_true (g_str_has_suffix (found->path, "NoIndex"));
+	zoitechat_gtk3_theme_free (found);
+	g_free (imported_id);
 
 	g_free (theme_root);
 	g_free (src_root);
@@ -663,9 +670,10 @@ test_zip_import_nested_root (void)
 	theme = make_theme_dir (nested, "Juno-ocean", TRUE, FALSE);
 	archive_path = g_build_filename (tmp_root, "themes.zip", NULL);
 
-	command = g_strdup_printf ("cd %s && zip -qr %s .", zip_root, archive_path);
+	command = g_strdup_printf ("sh -c \"cd '%s' && zip -qr '%s' .\"", zip_root, archive_path);
 	g_assert_true (g_spawn_command_line_sync (command, NULL, NULL, NULL, NULL));
 	g_free (command);
+	g_assert_true (g_file_test (archive_path, G_FILE_TEST_IS_REGULAR));
 
 	g_assert_true (zoitechat_gtk3_theme_service_import (archive_path, &imported_id, NULL));
 	found = zoitechat_gtk3_theme_find_by_id (imported_id);
@@ -697,7 +705,7 @@ main (int argc, char **argv)
 	g_test_add_func ("/gtk3-theme-service/zip-import-nested-root", test_zip_import_nested_root);
 	g_test_add_func ("/gtk3-theme-service/invalid-archive-extract-error", test_invalid_archive_reports_extract_error);
 	g_test_add_func ("/gtk3-theme-service/archive-without-theme-css-error", test_archive_without_theme_reports_css_error);
-	g_test_add_func ("/gtk3-theme-service/import-missing-index-theme", test_import_rejects_theme_missing_index_theme);
+	g_test_add_func ("/gtk3-theme-service/import-missing-index-theme", test_import_accepts_theme_missing_index_theme);
 	g_test_add_func ("/gtk3-theme-service/import-missing-desktop-entry", test_import_rejects_index_without_desktop_entry);
 	g_test_add_func ("/gtk3-theme-service/import-unresolved-inherits", test_import_rejects_unresolved_inherits);
 	return g_test_run ();

src/common/util.c

@@ -472,6 +472,34 @@ get_cpu_arch (void)
 	return sysinfo_get_build_arch ();
 }
 
+/* RtlGetVersion is used because GetVersionEx reports a version capped by
+ * the compatibility manifest rather than the real one. */
+gboolean
+win32_is_windows_8_or_newer (void)
+{
+	typedef LONG (WINAPI *rtl_get_version_func) (PRTL_OSVERSIONINFOW);
+	rtl_get_version_func rtl_get_version;
+	RTL_OSVERSIONINFOW version;
+	HMODULE ntdll;
+
+	ntdll = GetModuleHandleW (L"ntdll.dll");
+	if (ntdll == NULL)
+		return FALSE;
+
+	rtl_get_version = (rtl_get_version_func) GetProcAddress (ntdll, "RtlGetVersion");
+	if (rtl_get_version == NULL)
+		return FALSE;
+
+	memset (&version, 0, sizeof (version));
+	version.dwOSVersionInfoSize = sizeof (version);
+	if (rtl_get_version (&version) != 0)
+		return FALSE;
+
+	/* Windows 8 is 6.2; Windows 7 is 6.1 */
+	return version.dwMajorVersion > 6 ||
+	       (version.dwMajorVersion == 6 && version.dwMinorVersion >= 2);
+}
+
 char *
 get_sys_str (int with_cpu)
 {

src/common/util.h

@@ -65,6 +65,7 @@ int waitline (int sok, char *buf, int bufsize, int);
 #ifdef WIN32
 int waitline2 (GIOChannel *source, char *buf, int bufsize);
 int get_cpu_arch (void);
+gboolean win32_is_windows_8_or_newer (void);
 #else
 #define waitline2(source,buf,size) waitline(serv->childread,buf,size,0)
 #endif

src/common/zoitechat.h

@@ -259,6 +259,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;

src/fe-gtk/chanview.c

@@ -174,7 +174,7 @@ chanview_apply_theme (chanview *cv)
 	chanview_set_font_desc (cv, font);
 
 	theme_manager_apply_channel_tree_style (w,
-			theme_manager_get_channel_tree_palette_behavior (font));
+			theme_manager_get_channel_tree_palette_behavior (cv->font_desc));
 }
 
 static void

src/fe-gtk/emoji-picker.c

@@ -0,0 +1,779 @@
+/* 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
+ */
+
+/* ZoiteChat's own emoji picker.  Replaces GTK's built-in "show-emoji-icon"
+ * entry machinery so that every build offers the same catalog (bundled at
+ * compile time from pinned Unicode/CLDR data, see src/common/emoji-data.h)
+ * regardless of the GTK runtime version or distribution emoji data.
+ * Selecting an emoji inserts the plain Unicode sequence at the cursor -
+ * nothing about what is sent over IRC changes. */
+
+#include <string.h>
+
+#include "fe-gtk.h"
+
+#include "../common/zoitechat.h"
+#include "../common/zoitechatc.h"
+#include "../common/cfgfiles.h"
+#include "../common/emoji-data.h"
+
+#include "emoji-picker.h"
+#include "preferences-persistence.h"
+
+#define EMOJI_CATEGORY_RECENT -1
+#define EMOJI_RECENTS_MAX 32
+#define EMOJI_SEARCH_MAX_RESULTS 256
+#define EMOJI_GRID_COLUMNS 9
+
+typedef struct
+{
+	GtkWidget *button;
+	GtkWidget *target;						/* weak pointer to the input entry */
+	GtkWidget *popover;
+	GtkWidget *search_entry;
+	GtkWidget *stack;
+	GtkWidget *grid;							/* GtkFlowBox */
+	GtkWidget *scroller;
+	GtkWidget *empty_label;
+	GtkWidget *category_buttons[EMOJI_GROUP_COUNT + 1];	/* [0] = recents */
+	GtkWidget *tone_buttons[EMOJI_TONE_COUNT];
+	int category;								/* EMOJI_CATEGORY_RECENT or EmojiGroup */
+	gboolean populated;
+	gboolean updating_buttons;
+} EmojiPicker;
+
+/* ------------------------------------------------------------------------ *
+ * Recently used emoji, shared by all windows and persisted across runs
+ * ------------------------------------------------------------------------ */
+
+static GPtrArray *recent_emoji = NULL;
+
+static char *
+emoji_recents_filename (void)
+{
+	return g_build_filename (get_xdir (), "emoji-recents.conf", NULL);
+}
+
+static void
+emoji_recents_load (void)
+{
+	char *filename, *contents = NULL;
+	char **lines;
+	gsize i;
+
+	if (recent_emoji)
+		return;
+
+	recent_emoji = g_ptr_array_new_with_free_func (g_free);
+
+	filename = emoji_recents_filename ();
+	if (g_file_get_contents (filename, &contents, NULL, NULL))
+	{
+		lines = g_strsplit (contents, "\n", -1);
+		for (i = 0; lines[i] && recent_emoji->len < EMOJI_RECENTS_MAX; i++)
+		{
+			g_strstrip (lines[i]);
+			/* only keep sequences that exist in the bundled catalog */
+			if (*lines[i] && emoji_data_find_by_sequence (lines[i], NULL))
+				g_ptr_array_add (recent_emoji, g_strdup (lines[i]));
+		}
+		g_strfreev (lines);
+		g_free (contents);
+	}
+	g_free (filename);
+}
+
+static void
+emoji_recents_save (void)
+{
+	GString *contents = g_string_new (NULL);
+	char *filename;
+	gsize i;
+
+	for (i = 0; i < recent_emoji->len; i++)
+	{
+		g_string_append (contents, g_ptr_array_index (recent_emoji, i));
+		g_string_append_c (contents, '\n');
+	}
+
+	filename = emoji_recents_filename ();
+	g_file_set_contents (filename, contents->str, contents->len, NULL);
+	g_free (filename);
+	g_string_free (contents, TRUE);
+}
+
+static void
+emoji_recents_add (const char *sequence)
+{
+	GPtrArray *updated;
+	gsize i;
+
+	emoji_recents_load ();
+
+	updated = g_ptr_array_new_with_free_func (g_free);
+	g_ptr_array_add (updated, g_strdup (sequence));
+	for (i = 0; i < recent_emoji->len && updated->len < EMOJI_RECENTS_MAX; i++)
+	{
+		const char *old = g_ptr_array_index (recent_emoji, i);
+
+		if (strcmp (old, sequence) != 0)
+			g_ptr_array_add (updated, g_strdup (old));
+	}
+	g_ptr_array_free (recent_emoji, TRUE);
+	recent_emoji = updated;
+
+	emoji_recents_save ();
+}
+
+/* ------------------------------------------------------------------------ *
+ * Appearance helpers
+ * ------------------------------------------------------------------------ */
+
+/* One application-wide provider so every emoji cell prefers a color emoji
+ * font without changing the fonts of surrounding widgets.  Emoji families
+ * that are not installed are simply skipped by fontconfig/Pango. */
+static void
+emoji_picker_ensure_css (void)
+{
+	static gboolean done = FALSE;
+	GtkCssProvider *provider;
+
+	if (done)
+		return;
+	done = TRUE;
+
+	provider = gtk_css_provider_new ();
+	gtk_css_provider_load_from_data (provider,
+		".zc-emoji-cell {"
+		"  font-family: \"Noto Color Emoji\", \"Segoe UI Emoji\","
+		"    \"Apple Color Emoji\", \"Twemoji Mozilla\", \"EmojiOne Color\";"
+		"  font-size: 15pt;"
+		"  padding: 2px;"
+		"}"
+		".zc-emoji-cell-small {"
+		"  font-family: \"Noto Color Emoji\", \"Segoe UI Emoji\","
+		"    \"Apple Color Emoji\", \"Twemoji Mozilla\", \"EmojiOne Color\";"
+		"}",
+		-1, NULL);
+	gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
+		GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+	g_object_unref (provider);
+}
+
+static GtkWidget *
+emoji_label_new (const char *sequence, gboolean small_cell)
+{
+	GtkWidget *label = gtk_label_new (sequence);
+
+	gtk_style_context_add_class (gtk_widget_get_style_context (label),
+										  small_cell ? "zc-emoji-cell-small" : "zc-emoji-cell");
+
+	return label;
+}
+
+static void
+emoji_picker_set_a11y_name (GtkWidget *widget, const char *name)
+{
+	AtkObject *accessible = gtk_widget_get_accessible (widget);
+
+	if (accessible)
+		atk_object_set_name (accessible, name);
+}
+
+static EmojiTone
+emoji_picker_current_tone (void)
+{
+	int tone = prefs.hex_gui_emoji_skin_tone;
+
+	if (tone < EMOJI_TONE_NONE || tone >= EMOJI_TONE_COUNT)
+		return EMOJI_TONE_NONE;
+
+	return (EmojiTone) tone;
+}
+
+/* "waving hand" / "waving hand (Dark skin tone)", with :shortcodes: on a
+ * second line - used for both tooltips and accessible names. */
+static char *
+emoji_picker_describe (const EmojiEntry *entry, EmojiTone tone)
+{
+	GString *desc = g_string_new (NULL);
+	char **aliases;
+	gsize i;
+
+	if (tone != EMOJI_TONE_NONE && entry->tone_set >= 0)
+		g_string_append_printf (desc, "%s (%s)", entry->name,
+										emoji_data_tone_display_name (tone));
+	else
+		g_string_append (desc, entry->name);
+
+	if (*entry->aliases)
+	{
+		g_string_append_c (desc, '\n');
+		aliases = g_strsplit (entry->aliases, " ", -1);
+		for (i = 0; aliases[i]; i++)
+		{
+			if (i > 0)
+				g_string_append_c (desc, ' ');
+			g_string_append_printf (desc, ":%s:", aliases[i]);
+		}
+		g_strfreev (aliases);
+	}
+
+	return g_string_free (desc, FALSE);
+}
+
+/* ------------------------------------------------------------------------ *
+ * Insertion
+ * ------------------------------------------------------------------------ */
+
+static void
+emoji_picker_insert (EmojiPicker *picker, const char *sequence)
+{
+	GtkEditable *editable;
+	int pos;
+
+	if (!picker->target || !sequence || !*sequence)
+		return;
+
+	gtk_popover_popdown (GTK_POPOVER (picker->popover));
+
+	editable = GTK_EDITABLE (picker->target);
+	gtk_editable_delete_selection (editable);
+	pos = gtk_editable_get_position (editable);
+	gtk_editable_insert_text (editable, sequence, strlen (sequence), &pos);
+
+	/* focus the entry without letting GtkEntry select everything */
+	gtk_editable_set_editable (editable, FALSE);
+	gtk_widget_grab_focus (picker->target);
+	gtk_editable_set_editable (editable, TRUE);
+	gtk_editable_set_position (editable, pos);
+
+	emoji_recents_add (sequence);
+}
+
+static void
+emoji_picker_activate_child (EmojiPicker *picker, GtkFlowBoxChild *child)
+{
+	emoji_picker_insert (picker,
+		g_object_get_data (G_OBJECT (child), "emoji-sequence"));
+}
+
+static void
+emoji_grid_child_activated_cb (GtkFlowBox *grid, GtkFlowBoxChild *child,
+										 gpointer userdata)
+{
+	emoji_picker_activate_child (userdata, child);
+}
+
+/* ------------------------------------------------------------------------ *
+ * Grid contents
+ * ------------------------------------------------------------------------ */
+
+static void
+emoji_grid_add (EmojiPicker *picker, const EmojiEntry *entry,
+					 const char *sequence, EmojiTone tone)
+{
+	GtkWidget *child, *label;
+	char *desc;
+
+	label = emoji_label_new (sequence, FALSE);
+	child = gtk_flow_box_child_new ();
+	gtk_container_add (GTK_CONTAINER (child), label);
+	g_object_set_data_full (G_OBJECT (child), "emoji-sequence",
+									g_strdup (sequence), g_free);
+
+	desc = emoji_picker_describe (entry, tone);
+	gtk_widget_set_tooltip_text (child, desc);
+	emoji_picker_set_a11y_name (child, desc);
+	g_free (desc);
+
+	gtk_container_add (GTK_CONTAINER (picker->grid), child);
+}
+
+static void
+emoji_picker_refresh (EmojiPicker *picker)
+{
+	const char *text = gtk_entry_get_text (GTK_ENTRY (picker->search_entry));
+	EmojiTone tone = emoji_picker_current_tone ();
+	GtkAdjustment *vadj;
+	gboolean any = FALSE;
+	gsize i, results = 0;
+
+	gtk_container_foreach (GTK_CONTAINER (picker->grid),
+								  (GtkCallback) gtk_widget_destroy, NULL);
+
+	if (text && *text)
+	{
+		char **tokens = emoji_search_tokenize (text);
+
+		if (tokens)
+		{
+			for (i = 0; i < emoji_data_count () &&
+							results < EMOJI_SEARCH_MAX_RESULTS; i++)
+			{
+				const EmojiEntry *entry = emoji_data_entry (i);
+
+				if (!emoji_entry_matches (entry, tokens))
+					continue;
+				emoji_grid_add (picker, entry,
+									 emoji_entry_sequence_for_tone (entry, tone), tone);
+				results++;
+			}
+			g_strfreev (tokens);
+			any = results > 0;
+		}
+		gtk_label_set_text (GTK_LABEL (picker->empty_label),
+								  _("No emoji found"));
+	}
+	else if (picker->category == EMOJI_CATEGORY_RECENT)
+	{
+		emoji_recents_load ();
+		for (i = 0; i < recent_emoji->len; i++)
+		{
+			const char *sequence = g_ptr_array_index (recent_emoji, i);
+			EmojiTone seq_tone;
+			const EmojiEntry *entry =
+				emoji_data_find_by_sequence (sequence, &seq_tone);
+
+			if (!entry)
+				continue;
+			emoji_grid_add (picker, entry, sequence, seq_tone);
+			any = TRUE;
+		}
+		gtk_label_set_text (GTK_LABEL (picker->empty_label),
+								  _("No recently used emoji"));
+	}
+	else
+	{
+		for (i = 0; i < emoji_data_count (); i++)
+		{
+			const EmojiEntry *entry = emoji_data_entry (i);
+
+			if (entry->group != picker->category)
+				continue;
+			emoji_grid_add (picker, entry,
+								 emoji_entry_sequence_for_tone (entry, tone), tone);
+			any = TRUE;
+		}
+	}
+
+	gtk_widget_show_all (picker->grid);
+	gtk_stack_set_visible_child_name (GTK_STACK (picker->stack),
+												 any ? "grid" : "empty");
+
+	vadj = gtk_scrolled_window_get_vadjustment (
+		GTK_SCROLLED_WINDOW (picker->scroller));
+	gtk_adjustment_set_value (vadj, gtk_adjustment_get_lower (vadj));
+}
+
+/* ------------------------------------------------------------------------ *
+ * Categories
+ * ------------------------------------------------------------------------ */
+
+static void
+emoji_picker_sync_category_buttons (EmojiPicker *picker)
+{
+	gsize i;
+
+	picker->updating_buttons = TRUE;
+	for (i = 0; i < G_N_ELEMENTS (picker->category_buttons); i++)
+	{
+		int category = (int) i - 1;
+
+		gtk_toggle_button_set_active (
+			GTK_TOGGLE_BUTTON (picker->category_buttons[i]),
+			category == picker->category);
+	}
+	picker->updating_buttons = FALSE;
+}
+
+static void
+emoji_category_toggled_cb (GtkToggleButton *button, gpointer userdata)
+{
+	EmojiPicker *picker = userdata;
+	int category = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button),
+																		"emoji-category"));
+
+	if (picker->updating_buttons)
+		return;
+
+	if (!gtk_toggle_button_get_active (button))
+	{
+		/* the active category cannot be untoggled */
+		if (picker->category == category)
+			emoji_picker_sync_category_buttons (picker);
+		return;
+	}
+
+	picker->category = category;
+	emoji_picker_sync_category_buttons (picker);
+
+	/* leave search mode; clearing the entry triggers the refresh */
+	if (*gtk_entry_get_text (GTK_ENTRY (picker->search_entry)))
+		gtk_entry_set_text (GTK_ENTRY (picker->search_entry), "");
+	else
+		emoji_picker_refresh (picker);
+}
+
+static GtkWidget *
+emoji_category_button_new (EmojiPicker *picker, int category,
+									const char *icon_sequence, const char *name)
+{
+	GtkWidget *button = gtk_toggle_button_new ();
+
+	gtk_container_add (GTK_CONTAINER (button),
+							 emoji_label_new (icon_sequence, TRUE));
+	gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+	gtk_widget_set_tooltip_text (button, name);
+	emoji_picker_set_a11y_name (button, name);
+	g_object_set_data (G_OBJECT (button), "emoji-category",
+							 GINT_TO_POINTER (category));
+	g_signal_connect (G_OBJECT (button), "toggled",
+							G_CALLBACK (emoji_category_toggled_cb), picker);
+
+	return button;
+}
+
+/* ------------------------------------------------------------------------ *
+ * Skin tones
+ * ------------------------------------------------------------------------ */
+
+#define EMOJI_TONE_SAMPLE "\342\234\213"		/* ✋ raised hand */
+
+static void
+emoji_tone_toggled_cb (GtkToggleButton *button, gpointer userdata)
+{
+	EmojiPicker *picker = userdata;
+	int tone = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button),
+																  "emoji-tone"));
+
+	if (!gtk_toggle_button_get_active (button))
+		return;
+	if (prefs.hex_gui_emoji_skin_tone == tone)
+		return;
+
+	prefs.hex_gui_emoji_skin_tone = tone;
+	preferences_persistence_save_all ();
+	emoji_picker_refresh (picker);
+}
+
+static GtkWidget *
+emoji_tone_row_new (EmojiPicker *picker)
+{
+	GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+	GtkWidget *button;
+	GSList *group = NULL;
+	const EmojiEntry *sample = emoji_data_find_by_sequence (EMOJI_TONE_SAMPLE,
+																			  NULL);
+	int tone;
+
+	gtk_widget_set_halign (box, GTK_ALIGN_CENTER);
+
+	for (tone = EMOJI_TONE_NONE; tone < EMOJI_TONE_COUNT; tone++)
+	{
+		const char *sequence = EMOJI_TONE_SAMPLE;
+
+		if (sample)
+			sequence = emoji_entry_sequence_for_tone (sample, tone);
+
+		button = gtk_radio_button_new (group);
+		group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
+		gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
+		gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+		gtk_container_add (GTK_CONTAINER (button),
+								 emoji_label_new (sequence, TRUE));
+		gtk_widget_set_tooltip_text (button,
+											  emoji_data_tone_display_name (tone));
+		emoji_picker_set_a11y_name (button,
+											 emoji_data_tone_display_name (tone));
+		g_object_set_data (G_OBJECT (button), "emoji-tone",
+								 GINT_TO_POINTER (tone));
+		picker->tone_buttons[tone] = button;
+
+		if (emoji_picker_current_tone () == tone)
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
+
+		g_signal_connect (G_OBJECT (button), "toggled",
+								G_CALLBACK (emoji_tone_toggled_cb), picker);
+
+		gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+	}
+
+	return box;
+}
+
+/* the pref can also change externally (/set gui_emoji_skin_tone) */
+static void
+emoji_picker_sync_tone_buttons (EmojiPicker *picker)
+{
+	EmojiTone tone = emoji_picker_current_tone ();
+
+	gtk_toggle_button_set_active (
+		GTK_TOGGLE_BUTTON (picker->tone_buttons[tone]), TRUE);
+}
+
+/* ------------------------------------------------------------------------ *
+ * Search
+ * ------------------------------------------------------------------------ */
+
+static void
+emoji_search_changed_cb (GtkSearchEntry *entry, gpointer userdata)
+{
+	emoji_picker_refresh (userdata);
+}
+
+static void
+emoji_search_activate_cb (GtkEntry *entry, gpointer userdata)
+{
+	EmojiPicker *picker = userdata;
+	GtkFlowBoxChild *child =
+		gtk_flow_box_get_child_at_index (GTK_FLOW_BOX (picker->grid), 0);
+
+	/* Enter inserts the first hit */
+	if (child)
+		emoji_picker_activate_child (picker, child);
+}
+
+static gboolean
+emoji_search_key_press_cb (GtkWidget *entry, GdkEventKey *event,
+									gpointer userdata)
+{
+	EmojiPicker *picker = userdata;
+	GtkFlowBoxChild *child;
+
+	if (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down)
+	{
+		child = gtk_flow_box_get_child_at_index (GTK_FLOW_BOX (picker->grid), 0);
+		if (child)
+		{
+			gtk_widget_grab_focus (GTK_WIDGET (child));
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+/* ------------------------------------------------------------------------ *
+ * Popover assembly
+ * ------------------------------------------------------------------------ */
+
+static void
+emoji_picker_build_contents (EmojiPicker *picker)
+{
+	GtkWidget *vbox, *categories, *button;
+	int group;
+
+	emoji_picker_ensure_css ();
+
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+	g_object_set (vbox, "margin", 6, NULL);
+
+	picker->search_entry = gtk_search_entry_new ();
+	gtk_entry_set_placeholder_text (GTK_ENTRY (picker->search_entry),
+											  _("Search emoji"));
+	emoji_picker_set_a11y_name (picker->search_entry, _("Search emoji"));
+	g_signal_connect (G_OBJECT (picker->search_entry), "search-changed",
+							G_CALLBACK (emoji_search_changed_cb), picker);
+	g_signal_connect (G_OBJECT (picker->search_entry), "activate",
+							G_CALLBACK (emoji_search_activate_cb), picker);
+	g_signal_connect (G_OBJECT (picker->search_entry), "key-press-event",
+							G_CALLBACK (emoji_search_key_press_cb), picker);
+	gtk_box_pack_start (GTK_BOX (vbox), picker->search_entry, FALSE, FALSE, 0);
+
+	categories = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+	gtk_box_set_homogeneous (GTK_BOX (categories), TRUE);
+
+	picker->category_buttons[0] = emoji_category_button_new (picker,
+		EMOJI_CATEGORY_RECENT, "\360\237\225\230" /* 🕘 */,
+		_("Recently Used"));
+	gtk_box_pack_start (GTK_BOX (categories), picker->category_buttons[0],
+							  TRUE, TRUE, 0);
+	for (group = 0; group < EMOJI_GROUP_COUNT; group++)
+	{
+		button = emoji_category_button_new (picker, group,
+			emoji_data_group_icon_sequence (group),
+			emoji_data_group_display_name (group));
+		picker->category_buttons[group + 1] = button;
+		gtk_box_pack_start (GTK_BOX (categories), button, TRUE, TRUE, 0);
+	}
+	gtk_box_pack_start (GTK_BOX (vbox), categories, FALSE, FALSE, 0);
+
+	picker->grid = gtk_flow_box_new ();
+	gtk_flow_box_set_selection_mode (GTK_FLOW_BOX (picker->grid),
+												GTK_SELECTION_NONE);
+	gtk_flow_box_set_activate_on_single_click (GTK_FLOW_BOX (picker->grid),
+															 TRUE);
+	gtk_flow_box_set_min_children_per_line (GTK_FLOW_BOX (picker->grid),
+														 EMOJI_GRID_COLUMNS);
+	gtk_flow_box_set_max_children_per_line (GTK_FLOW_BOX (picker->grid),
+														 EMOJI_GRID_COLUMNS);
+	gtk_flow_box_set_homogeneous (GTK_FLOW_BOX (picker->grid), TRUE);
+	gtk_widget_set_valign (picker->grid, GTK_ALIGN_START);
+	g_signal_connect (G_OBJECT (picker->grid), "child-activated",
+							G_CALLBACK (emoji_grid_child_activated_cb), picker);
+
+	picker->scroller = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (picker->scroller),
+											  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_min_content_height (
+		GTK_SCROLLED_WINDOW (picker->scroller), 300);
+	gtk_container_add (GTK_CONTAINER (picker->scroller), picker->grid);
+
+	picker->empty_label = gtk_label_new (_("No emoji found"));
+	gtk_style_context_add_class (
+		gtk_widget_get_style_context (picker->empty_label), "dim-label");
+
+	picker->stack = gtk_stack_new ();
+	gtk_widget_set_size_request (picker->stack, 380, -1);
+	gtk_stack_add_named (GTK_STACK (picker->stack), picker->scroller, "grid");
+	gtk_stack_add_named (GTK_STACK (picker->stack), picker->empty_label,
+								"empty");
+	gtk_box_pack_start (GTK_BOX (vbox), picker->stack, TRUE, TRUE, 0);
+
+	gtk_box_pack_start (GTK_BOX (vbox), emoji_tone_row_new (picker),
+							  FALSE, FALSE, 0);
+
+	gtk_container_add (GTK_CONTAINER (picker->popover), vbox);
+	gtk_widget_show_all (vbox);
+
+	emoji_picker_sync_category_buttons (picker);
+}
+
+static void
+emoji_popover_show_cb (GtkWidget *popover, gpointer userdata)
+{
+	EmojiPicker *picker = userdata;
+
+	if (!picker->populated)
+	{
+		picker->populated = TRUE;
+		emoji_picker_build_contents (picker);
+	}
+	else if (*gtk_entry_get_text (GTK_ENTRY (picker->search_entry)))
+	{
+		gtk_entry_set_text (GTK_ENTRY (picker->search_entry), "");
+	}
+
+	emoji_picker_sync_tone_buttons (picker);
+	emoji_picker_refresh (picker);
+	gtk_widget_grab_focus (picker->search_entry);
+}
+
+static void
+emoji_popover_closed_cb (GtkWidget *popover, gpointer userdata)
+{
+	EmojiPicker *picker = userdata;
+	GtkEditable *editable;
+
+	if (!picker->target)
+		return;
+
+	/* hand focus back to the input box without selecting its contents */
+	editable = GTK_EDITABLE (picker->target);
+	gtk_editable_set_editable (editable, FALSE);
+	gtk_widget_grab_focus (picker->target);
+	gtk_editable_set_editable (editable, TRUE);
+}
+
+static const char *
+emoji_picker_button_icon_name (void)
+{
+	static const char *icon_names[] = {
+		"face-smile-symbolic",
+		"face-smile",
+		"insert-emoticon-symbolic",
+		"insert-emoticon",
+		"zc-menu-emoji",
+	};
+	GtkIconTheme *theme = gtk_icon_theme_get_default ();
+	gsize i;
+
+	if (!theme)
+		return NULL;
+
+	for (i = 0; i < G_N_ELEMENTS (icon_names); i++)
+	{
+		if (gtk_icon_theme_has_icon (theme, icon_names[i]))
+			return icon_names[i];
+	}
+
+	return NULL;
+}
+
+static void
+emoji_picker_free (gpointer data)
+{
+	EmojiPicker *picker = data;
+
+	if (picker->target)
+		g_object_remove_weak_pointer (G_OBJECT (picker->target),
+												(gpointer *) &picker->target);
+	g_free (picker);
+}
+
+GtkWidget *
+emoji_picker_button_new (GtkWidget *target_entry)
+{
+	EmojiPicker *picker;
+	const char *icon_name;
+
+	g_return_val_if_fail (GTK_IS_ENTRY (target_entry), NULL);
+
+	picker = g_new0 (EmojiPicker, 1);
+	picker->target = target_entry;
+	picker->category = EMOJI_GROUP_SMILEYS_EMOTION;
+	g_object_add_weak_pointer (G_OBJECT (target_entry),
+										(gpointer *) &picker->target);
+
+	picker->button = gtk_menu_button_new ();
+	gtk_button_set_relief (GTK_BUTTON (picker->button), GTK_RELIEF_NONE);
+	gtk_widget_set_can_focus (picker->button, FALSE);
+	gtk_widget_set_tooltip_text (picker->button, _("Insert Emoji"));
+	emoji_picker_set_a11y_name (picker->button, _("Insert Emoji"));
+	g_object_set_data_full (G_OBJECT (picker->button), "emoji-picker",
+									picker, emoji_picker_free);
+
+	icon_name = emoji_picker_button_icon_name ();
+	if (icon_name)
+	{
+		gtk_button_set_image (GTK_BUTTON (picker->button),
+			gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU));
+	}
+	else
+	{
+		/* no themed icon anywhere: fall back to an emoji label so the
+		 * button never turns into an unusable placeholder */
+		emoji_picker_ensure_css ();
+		gtk_container_add (GTK_CONTAINER (picker->button),
+								 emoji_label_new ("\360\237\231\202" /* 🙂 */, TRUE));
+	}
+
+	/* the popover shell is cheap; its contents are built on first open so
+	 * startup cost stays unchanged */
+	picker->popover = gtk_popover_new (picker->button);
+	gtk_popover_set_position (GTK_POPOVER (picker->popover), GTK_POS_TOP);
+	g_signal_connect (G_OBJECT (picker->popover), "show",
+							G_CALLBACK (emoji_popover_show_cb), picker);
+	g_signal_connect (G_OBJECT (picker->popover), "closed",
+							G_CALLBACK (emoji_popover_closed_cb), picker);
+	gtk_menu_button_set_popover (GTK_MENU_BUTTON (picker->button),
+										  picker->popover);
+
+	return picker->button;
+}

src/fe-gtk/emoji-picker.h

@@ -0,0 +1,31 @@
+/* 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
+ */
+
+#ifndef ZOITECHAT_EMOJI_PICKER_H
+#define ZOITECHAT_EMOJI_PICKER_H
+
+#include <gtk/gtk.h>
+
+/* Creates the emoji picker button for an input entry.  The returned
+ * GtkMenuButton opens a popover with search, categories, recently used
+ * emoji and skin-tone selection; activating an emoji inserts its Unicode
+ * sequence into target_entry at the cursor.  The popover contents are
+ * built lazily on first open. */
+GtkWidget *emoji_picker_button_new (GtkWidget *target_entry);
+
+#endif

src/fe-gtk/fe-gtk.c

@@ -102,6 +102,86 @@ static const GOptionEntry gopt_entries[] =
  {NULL}
 };
 
+/* The emoji font is only bundled with Windows builds; other platforms
+ * rely on the operating system's emoji font (e.g. the distribution's
+ * Noto Color Emoji package on Linux). */
+#ifdef WIN32
+static gunichar2 *win32_private_emoji_font;
+
+static char *
+fe_bundled_emoji_font_path (void)
+{
+	const char *override_path;
+	char *font_path = NULL;
+
+	override_path = g_getenv ("ZOITECHAT_EMOJI_FONT");
+	if (override_path && *override_path)
+		font_path = g_strdup (override_path);
+	else
+	{
+		char *base_path;
+
+		base_path = g_win32_get_package_installation_directory_of_module (NULL);
+		if (base_path)
+		{
+			font_path = g_build_filename (base_path, "share", "fonts",
+			                              "zoitechat", "NotoColorEmoji.ttf", NULL);
+			g_free (base_path);
+		}
+	}
+
+	if (font_path && !g_file_test (font_path, G_FILE_TEST_IS_REGULAR))
+	{
+		g_free (font_path);
+		font_path = NULL;
+	}
+
+	return font_path;
+}
+
+static void
+fe_register_bundled_emoji_font (void)
+{
+	char *font_path;
+
+	/* Windows 7 cannot render color emoji fonts, so the bundled Noto
+	 * Color Emoji font is not registered there; emoji rendering falls
+	 * back to the monochrome Segoe UI Symbol glyphs instead. */
+	if (!win32_is_windows_8_or_newer ())
+	{
+		g_debug ("Windows 7 detected; using Segoe UI Symbol for emoji");
+		return;
+	}
+
+	font_path = fe_bundled_emoji_font_path ();
+	if (!font_path)
+	{
+		g_debug ("Bundled Noto Color Emoji font was not found; using platform font fallback");
+		return;
+	}
+
+	win32_private_emoji_font = g_utf8_to_utf16 (font_path, -1, NULL, NULL, NULL);
+	if (!win32_private_emoji_font ||
+	    AddFontResourceExW ((LPCWSTR) win32_private_emoji_font, FR_PRIVATE, NULL) == 0)
+	{
+		g_warning ("Unable to register bundled emoji font: %s", font_path);
+		g_clear_pointer (&win32_private_emoji_font, g_free);
+	}
+
+	g_free (font_path);
+}
+
+static void
+fe_unregister_bundled_emoji_font (void)
+{
+	if (win32_private_emoji_font)
+	{
+		RemoveFontResourceExW ((LPCWSTR) win32_private_emoji_font, FR_PRIVATE, NULL);
+		g_clear_pointer (&win32_private_emoji_font, g_free);
+	}
+}
+#endif
+
 #ifdef WIN32
 static void
 create_msg_dialog (gchar *title, gchar *message)
@@ -440,6 +520,8 @@ fe_args (int argc, char *argv[])
 	}
 
 #ifdef WIN32
+	fe_register_bundled_emoji_font ();
+
 	win32_set_gsettings_schema_dir ();
 	win32_set_appusermodelid ();
 	win32_configure_pixbuf_loaders ();
@@ -614,6 +696,9 @@ fe_main (void)
 #endif
 
 	gtk_main ();
+#ifdef WIN32
+	fe_unregister_bundled_emoji_font ();
+#endif
 
 	/* sleep for 2 seconds so any QUIT messages are not lost. The  */
 	/* GUI is closed at this point, so the user doesn't even know! */

src/fe-gtk/fe-gtk.vcxproj

@@ -31,7 +31,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(ArchiveLibDir);$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(DepLibs);$(ZoiteChatLib)common.lib;wbemuuid.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(DepLibs);$(ZoiteChatLib)common.lib;wbemuuid.lib;dwmapi.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
     </Link>
   </ItemDefinitionGroup>
@@ -97,6 +97,7 @@ powershell "Get-Content -Encoding UTF8 '$(ZoiteChatLib)zoitechat.rc.utf8' | Out-
     <ClCompile Include="custom-list.c" />
     <ClCompile Include="dccgui.c" />
     <ClCompile Include="editlist.c" />
+    <ClCompile Include="emoji-picker.c" />
     <ClCompile Include="fe-gtk.c" />
     <ClCompile Include="fkeys.c" />
     <ClCompile Include="gtkutil.c" />

src/fe-gtk/gtkutil.c

@@ -168,7 +168,28 @@ gtkutil_append_font_css (GString *css, const PangoFontDescription *font_desc)
 		const char *family = pango_font_description_get_family (font_desc);
 
 		if (family && *family)
-			g_string_append_printf (css, " font-family: \"%s\";", family);
+		{
+			char **families = g_strsplit (family, ",", -1);
+			gboolean appended = FALSE;
+			int i;
+
+			g_string_append (css, " font-family:");
+			for (i = 0; families[i]; i++)
+			{
+				char *name = g_strstrip (families[i]);
+
+				if (!*name)
+					continue;
+
+				if (appended)
+					g_string_append (css, ",");
+				g_string_append_printf (css, " \"%s\"", name);
+				appended = TRUE;
+			}
+			if (appended)
+				g_string_append (css, ";");
+			g_strfreev (families);
+		}
 	}
 
 	if (mask & PANGO_FONT_MASK_STYLE)
@@ -527,6 +548,43 @@ gtkutil_destroy (GtkWidget * igad, GtkWidget * dgad)
 	gtk_widget_destroy (dgad);
 }
 
+static void
+gtkutil_place_dialog (GtkWidget *dialog)
+{
+	GList *list;
+	GList *item;
+	GtkWindow *anchor = NULL;
+	gint x;
+	gint y;
+	extern GtkWidget *parent_window;
+
+	list = gtk_window_list_toplevels ();
+	for (item = list; item; item = item->next)
+	{
+		if (item->data != dialog && GTK_IS_WINDOW (item->data) &&
+			gtk_widget_get_visible (GTK_WIDGET (item->data)) &&
+			gtk_window_is_active (GTK_WINDOW (item->data)))
+		{
+			anchor = GTK_WINDOW (item->data);
+			break;
+		}
+	}
+	g_list_free (list);
+
+	if (!anchor && parent_window && parent_window != dialog && GTK_IS_WINDOW (parent_window))
+		anchor = GTK_WINDOW (parent_window);
+
+	if (anchor)
+	{
+		gtk_window_get_position (anchor, &x, &y);
+		gtk_window_move (GTK_WINDOW (dialog), x, y);
+	}
+	else
+	{
+		gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
+	}
+}
+
 static void
 gtkutil_get_str_response (GtkDialog *dialog, gint arg1, gpointer entry)
 {
@@ -540,15 +598,15 @@ gtkutil_get_str_response (GtkDialog *dialog, gint arg1, gpointer entry)
 
 	switch (arg1)
 	{
-	case GTK_RESPONSE_REJECT:
-		callback (TRUE, text, user_data);
-		gtk_widget_destroy (GTK_WIDGET (dialog));
-		break;
 	case GTK_RESPONSE_ACCEPT:
 		callback (FALSE, text, user_data);
-		gtk_widget_destroy (GTK_WIDGET (dialog));
+		break;
+	default:
+		callback (TRUE, text, user_data);
 		break;
 	}
+
+	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
 static void
@@ -557,8 +615,8 @@ gtkutil_str_enter (GtkWidget *entry, GtkWidget *dialog)
 	gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
 }
 
-void
-fe_get_str (char *msg, char *def, void *callback, void *userdata)
+static void
+gtkutil_get_str (char *msg, char *def, void *callback, void *userdata, gboolean visible)
 {
 	GtkWidget *dialog;
 	GtkWidget *entry;
@@ -572,18 +630,11 @@ fe_get_str (char *msg, char *def, void *callback, void *userdata)
 										NULL);
 	theme_manager_attach_window (dialog);
 
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
+	if (parent_window && GTK_IS_WINDOW (parent_window))
+		gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
+	gtkutil_place_dialog (dialog);
 	gtk_box_set_homogeneous (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), TRUE);
 
-	if (userdata == (void *)1)	/* nick box is usually on the very bottom, make it centered */
-	{
-		gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
-	}
-	else
-	{
-		gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
-	}
-
 	hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);
 
 	g_object_set_data (G_OBJECT (dialog), "cb", callback);
@@ -592,7 +643,8 @@ fe_get_str (char *msg, char *def, void *callback, void *userdata)
 	entry = gtk_entry_new ();
 	g_signal_connect (G_OBJECT (entry), "activate",
 						 	G_CALLBACK (gtkutil_str_enter), dialog);
-	gtk_entry_set_text (GTK_ENTRY (entry), def);
+	gtk_entry_set_text (GTK_ENTRY (entry), def ? def : "");
+	gtk_entry_set_visibility (GTK_ENTRY (entry), visible);
 	gtk_box_pack_end (GTK_BOX (hbox), entry, 0, 0, 0);
 
 	label = gtk_label_new (msg);
@@ -606,6 +658,18 @@ fe_get_str (char *msg, char *def, void *callback, void *userdata)
 	gtk_widget_show_all (dialog);
 }
 
+void
+fe_get_str (char *msg, char *def, void *callback, void *userdata)
+{
+	gtkutil_get_str (msg, def, callback, userdata, TRUE);
+}
+
+void
+fe_get_password (char *msg, void *callback, void *userdata)
+{
+	gtkutil_get_str (msg, "", callback, userdata, FALSE);
+}
+
 static void
 gtkutil_get_number_response (GtkDialog *dialog, gint arg1, gpointer spin)
 {
@@ -641,15 +705,15 @@ gtkutil_get_bool_response (GtkDialog *dialog, gint arg1, gpointer spin)
 
 	switch (arg1)
 	{
-	case GTK_RESPONSE_REJECT:
-		callback (0, user_data);
-		gtk_widget_destroy (GTK_WIDGET (dialog));
-		break;
 	case GTK_RESPONSE_ACCEPT:
 		callback (1, user_data);
-		gtk_widget_destroy (GTK_WIDGET (dialog));
+		break;
+	default:
+		callback (0, user_data);
 		break;
 	}
+
+	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
 void
@@ -667,9 +731,10 @@ fe_get_int (char *msg, int def, void *callback, void *userdata)
 										_("_OK"), GTK_RESPONSE_ACCEPT,
 										NULL);
 	theme_manager_attach_window (dialog);
+	if (parent_window && GTK_IS_WINDOW (parent_window))
+		gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
+	gtkutil_place_dialog (dialog);
 	gtk_box_set_homogeneous (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), TRUE);
-	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
 
 	hbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, TRUE, 0);
 
@@ -707,10 +772,10 @@ fe_get_bool (char *title, char *prompt, void *callback, void *userdata)
 		_("_Yes"), GTK_RESPONSE_ACCEPT,
 		NULL);
 	theme_manager_attach_window (dialog);
+	if (parent_window && GTK_IS_WINDOW (parent_window))
+		gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
+	gtkutil_place_dialog (dialog);
 	gtk_box_set_homogeneous (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), TRUE);
-	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window));
-
 
 	g_object_set_data (G_OBJECT (dialog), "cb", callback);
 	g_object_set_data (G_OBJECT (dialog), "ud", userdata);

src/fe-gtk/maingui.c

@@ -45,6 +45,7 @@
 #include "theme/theme-manager.h"
 #include "theme/theme-css.h"
 #include "banlist.h"
+#include "emoji-picker.h"
 #include "gtkutil.h"
 #include "icon-resolver.h"
 #include "joind.h"
@@ -3514,8 +3515,12 @@ mg_apply_session_font_prefs (session_gui *gui)
 		mg_topicbar_update_height (gui->topic_entry);
 	}
 
-	if (gui->input_box && prefs.hex_gui_input_style)
-		theme_manager_apply_entry_palette (gui->input_box, font);
+	if (gui->input_box)
+	{
+		if (prefs.hex_gui_input_style)
+			theme_manager_apply_entry_palette (gui->input_box, font);
+		mg_apply_emoji_fallback_widget (gui->input_box);
+	}
 
 	if (gui->chanview)
 		chanview_apply_theme (gui->chanview);
@@ -4362,13 +4367,31 @@ mg_inputbox_rightclick (GtkEntry *entry, GtkWidget *menu)
  *       font size/style/weight, and without breaking user-configured fonts.
  * ------------------------------------------------------------------------- */
 
-static const char *mg_emoji_family_fallback =
+static const char *
+mg_emoji_family_fallback (void)
+{
 #ifdef G_OS_WIN32
-        "Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji, Apple Color Emoji, Twemoji Mozilla, EmojiOne Color";
-#else
-        "Noto Color Emoji, Segoe UI Emoji, Apple Color Emoji, Twemoji Mozilla, EmojiOne Color";
-#endif
+        static char family_list[sizeof prefs.hex_text_font_alternative + 32];
 
+        if (!win32_is_windows_8_or_newer ())
+        {
+                if (prefs.hex_text_font_alternative[0])
+                {
+                        g_snprintf (family_list, sizeof family_list, "%s, Segoe UI Symbol", prefs.hex_text_font_alternative);
+                        return family_list;
+                }
+
+                return "Segoe UI Symbol";
+        }
+
+        return "Noto Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Apple Color Emoji, Twemoji Mozilla, EmojiOne Color";
+#else
+        return "Noto Color Emoji, Segoe UI Emoji, Apple Color Emoji, Twemoji Mozilla, EmojiOne Color";
+#endif
+}
+
+#ifdef G_OS_WIN32
+/* Only used by the Windows 7 fallback to GTK's built-in emoji chooser */
 static const char *
 mg_find_available_icon_name (const char *const *icon_names)
 {
@@ -4400,6 +4423,7 @@ mg_find_available_icon_name (const char *const *icon_names)
 
         return NULL;
 }
+#endif
 
 static gboolean
 mg_family_already_has_emoji (const gchar *family)
@@ -4434,14 +4458,14 @@ mg_fontdesc_with_fallback (const PangoFontDescription *base_desc, gboolean emoji
         if (emoji_first)
         {
                 family_list = g_strdup_printf ("%s, %s",
-                        mg_emoji_family_fallback,
+                        mg_emoji_family_fallback (),
                         (base_family && *base_family) ? base_family : "Sans");
         }
         else
         {
                 family_list = g_strdup_printf ("%s, %s",
                         (base_family && *base_family) ? base_family : "Sans",
-                        mg_emoji_family_fallback);
+                        mg_emoji_family_fallback ());
         }
 
         pango_font_description_set_family (desc, family_list);
@@ -4727,15 +4751,6 @@ mg_create_entry (session *sess, GtkWidget *box)
 {
         GtkWidget *hbox, *but, *entry;
         session_gui *gui = sess->gui;
-        const char *emoji_fallback_icon_names[] = {
-                "face-smile-symbolic",
-                "face-smile",
-                "insert-emoticon-symbolic",
-                "insert-emoticon",
-                "zc-menu-emoji",
-                NULL
-        };
-        const char *emoji_fallback_icon_name;
 
         gui->reply_box = mg_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
         gtk_widget_set_name (gui->reply_box, "zoitechat-replybar");
@@ -4788,16 +4803,44 @@ mg_create_entry (session *sess, GtkWidget *box)
 
         if (prefs.hex_gui_input_style)
                 mg_apply_entry_style (entry);
+        mg_apply_emoji_fallback_widget (entry);
         mg_apply_entry_scroll_artifact_fix (entry);
 
-        g_object_set (G_OBJECT (entry), "show-emoji-icon", TRUE, NULL);
-
-        if (gtk_entry_get_icon_storage_type (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY) == GTK_IMAGE_EMPTY)
+#ifdef G_OS_WIN32
+        /* Windows 7 cannot render the color emoji font that ZoiteChat's own
+         * picker is designed around, so it keeps the GTK built-in emoji
+         * chooser that was used before the picker existed (the HexChat-era
+         * behavior, which works on Windows 7). */
+        if (!win32_is_windows_8_or_newer ())
         {
-                emoji_fallback_icon_name = mg_find_available_icon_name (emoji_fallback_icon_names);
-                if (emoji_fallback_icon_name)
-                        gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, emoji_fallback_icon_name);
+                const char *emoji_fallback_icon_names[] = {
+                        "face-smile-symbolic",
+                        "face-smile",
+                        "insert-emoticon-symbolic",
+                        "insert-emoticon",
+                        "zc-menu-emoji",
+                        NULL
+                };
+
+                g_object_set (G_OBJECT (entry), "show-emoji-icon", TRUE, NULL);
+
+                if (gtk_entry_get_icon_storage_type (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY) == GTK_IMAGE_EMPTY)
+                {
+                        const char *icon_name = mg_find_available_icon_name (emoji_fallback_icon_names);
+
+                        if (icon_name)
+                                gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, icon_name);
+                }
+
+                return;
         }
+#endif
+
+        /* ZoiteChat's own emoji picker; deliberately not GTK's
+         * "show-emoji-icon" machinery, so the catalog is the same on every
+         * GTK runtime and the button always has a working callback */
+        but = emoji_picker_button_new (entry);
+        gtk_box_pack_start (GTK_BOX (hbox), but, FALSE, FALSE, 0);
 }
 
 static void
@@ -4904,7 +4947,11 @@ mg_create_menu (session_gui *gui, GtkWidget *table, int away_state)
                                                                                         gui->menu_item);
         gtk_widget_set_hexpand (gui->menu, TRUE);
         gtk_widget_set_vexpand (gui->menu, FALSE);
-        gtk_widget_set_halign (gui->menu, GTK_ALIGN_START);
+        /* Fill the row: with GTK_ALIGN_START the menu bar stops after its
+         * last item and the rest of the row shows bare window background,
+         * which reads as a two-colored menu bar whenever the theme styles
+         * menubar and window differently. */
+        gtk_widget_set_halign (gui->menu, GTK_ALIGN_FILL);
         gtk_widget_set_valign (gui->menu, GTK_ALIGN_FILL);
         gtk_grid_attach (GTK_GRID (table), gui->menu, 0, 0, 3, 1);
 }

src/fe-gtk/meson.build

@@ -18,6 +18,7 @@ zoitechat_gtk_sources = [
   'custom-list.c',
   'dccgui.c',
   'editlist.c',
+  'emoji-picker.c',
   'fe-gtk.c',
   'fkeys.c',
   'gtkutil.c',
@@ -227,6 +228,20 @@ test('Theme Access Routing Tests', theme_access_tests,
   timeout: 120,
 )
 
+theme_gtk3_settings_tests = executable('theme_gtk3_settings_tests',
+  [
+    'theme/tests/test-theme-gtk3-settings.c',
+    'theme/theme-gtk3.c',
+  ],
+  include_directories: [config_h_include],
+  dependencies: [gtk_dep],
+)
+
+test('Theme GTK3 Settings Tests', theme_gtk3_settings_tests,
+  protocol: 'tap',
+  timeout: 120,
+)
+
 theme_preferences_gtk3_populate_tests = executable('theme_preferences_gtk3_populate_tests',
   'theme/tests/test-theme-preferences-gtk3-populate.c',
   include_directories: [config_h_include],

src/fe-gtk/plugin-tray.c

@@ -71,7 +71,7 @@ typedef enum
 	WS_HIDDEN
 } WinStatus;
 
-#if !defined(WIN32) && (defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_APPINDICATOR)) && !defined(GDK_WINDOWING_X11)
+#if !defined(WIN32) && (defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_APPINDICATOR))
 #define HAVE_APPINDICATOR_BACKEND 1
 #else
 #define HAVE_APPINDICATOR_BACKEND 0
@@ -1539,6 +1539,11 @@ tray_cleanup (void)
 void
 tray_apply_setup (void)
 {
+	/* Theme/setup events can be dispatched before the tray plugin has
+	 * been registered; there is nothing to (de)activate yet. */
+	if (!ph)
+		return;
+
 	if (tray_backend_active)
 	{
 		if (!prefs.hex_gui_tray)

src/fe-gtk/servlistgui.c

@@ -88,6 +88,7 @@ static GtkWidget *edit_entry_real;
 static GtkWidget *edit_entry_pass;
 static GtkWidget *edit_check_show_pass;
 static GtkWidget *edit_check_use_keyring;
+static GtkWidget *edit_check_ask_pass;
 static GtkWidget *edit_button_encrypt_pass;
 static GtkWidget *edit_button_import_pass;
 static int edit_pass_changed;
@@ -122,7 +123,11 @@ servlist_update_password_tools (ircnet *net)
 		return;
 
 	use_keyring = net && (net->flags & FLAG_USE_KEYRING);
-	has_local = net && net->pass && *net->pass && !use_keyring && !edit_pass_changed;
+	if ((net && (net->flags & FLAG_PROMPT_PASSWORD)) ||
+		(edit_check_ask_pass && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (edit_check_ask_pass))))
+		use_keyring = FALSE;
+	has_local = net && net->pass && *net->pass && !use_keyring && !edit_pass_changed &&
+		(!edit_check_ask_pass || !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (edit_check_ask_pass)));
 	gtk_widget_set_sensitive (edit_button_encrypt_pass, has_local && !servlist_password_is_encrypted (net->pass));
 	gtk_widget_set_sensitive (edit_button_import_pass, has_local);
 }
@@ -135,6 +140,17 @@ servlist_entry_set_text_silent (GtkWidget *entry, const char *text)
 	g_signal_handlers_unblock_by_func (G_OBJECT (entry), G_CALLBACK (servlist_password_changed_cb), NULL);
 }
 
+static void
+servlist_toggle_ask_pass_cb (GtkToggleButton *toggle, gpointer userdata)
+{
+	gboolean active = gtk_toggle_button_get_active (toggle);
+
+	gtk_widget_set_sensitive (edit_check_use_keyring, !active);
+	gtk_widget_set_sensitive (edit_entry_pass, !active && (!selected_net || selected_net->logintype != LOGIN_SASLEXTERNAL));
+	gtk_widget_set_sensitive (edit_check_show_pass, !active);
+	servlist_update_password_tools (selected_net);
+}
+
 static char *
 servlist_display_password (ircnet *net)
 {
@@ -1261,6 +1277,7 @@ static void
 servlist_edit_update (ircnet *net)
 {
 	gboolean use_keyring;
+	gboolean ask_pass;
 	gboolean keyring_changed;
 	char *password = NULL;
 	servlist_update_from_entry (&net->nick, edit_entry_nick);
@@ -1269,8 +1286,23 @@ servlist_edit_update (ircnet *net)
 	servlist_update_from_entry (&net->real, edit_entry_real);
 	if (net && net->name)
 	{
-		use_keyring = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (edit_check_use_keyring));
+		ask_pass = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (edit_check_ask_pass));
+		use_keyring = !ask_pass && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (edit_check_use_keyring));
 		keyring_changed = !!(net->flags & FLAG_USE_KEYRING) != !!use_keyring;
+		if (ask_pass)
+		{
+			secretstore_delete_network_password (net->name);
+			if (net->pass)
+			{
+				memset (net->pass, 0, strlen (net->pass));
+				g_free (net->pass);
+				net->pass = NULL;
+			}
+			net->flags &= ~FLAG_USE_KEYRING;
+			net->flags |= FLAG_PROMPT_PASSWORD;
+			return;
+		}
+		net->flags &= ~FLAG_PROMPT_PASSWORD;
 		if (!edit_pass_changed && !keyring_changed)
 			return;
 		if (edit_pass_changed)
@@ -1338,6 +1370,7 @@ servlist_edit_close_cb (GtkWidget *button, gpointer userdata)
 	edit_win = NULL;
 	edit_entry_pass = NULL;
 	edit_check_show_pass = NULL;
+	edit_check_ask_pass = NULL;
 	edit_button_encrypt_pass = NULL;
 	edit_button_import_pass = NULL;
 }
@@ -2565,7 +2598,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 
 
 	/* Checkboxes and entries */
-	table3 = gtkutil_grid_new (17, 2, FALSE);
+	table3 = gtkutil_grid_new (19, 2, FALSE);
 	gtk_box_pack_start (GTK_BOX (vbox5), table3, FALSE, FALSE, 0);
 	gtk_grid_set_row_spacing (GTK_GRID (table3), 2);
 	gtk_grid_set_column_spacing (GTK_GRID (table3), 8);
@@ -2584,34 +2617,43 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 #endif
 	servlist_create_check (1, net->flags & FLAG_USE_GLOBAL, table3, 5, 0, _("Use global user information"));
 
+	edit_check_ask_pass = gtk_check_button_new_with_mnemonic (_("Ask for password on connect"));
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (edit_check_ask_pass), net->flags & FLAG_PROMPT_PASSWORD);
+	servlist_table_attach (table3, edit_check_ask_pass, 0, 2, 6, 7,
+					   FALSE, FALSE,
+					   SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
+					   SERVLIST_X_PADDING, SERVLIST_Y_PADDING);
+	g_signal_connect (G_OBJECT (edit_check_ask_pass), "toggled",
+				  G_CALLBACK (servlist_toggle_ask_pass_cb), NULL);
+
 	edit_check_use_keyring = gtk_check_button_new_with_mnemonic (_("Use system keyring"));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (edit_check_use_keyring), net->flags & FLAG_USE_KEYRING);
-	servlist_table_attach (table3, edit_check_use_keyring, 0, 2, 6, 7,
+	servlist_table_attach (table3, edit_check_use_keyring, 0, 2, 7, 8,
 					   FALSE, FALSE,
 					   SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
 					   SERVLIST_X_PADDING, SERVLIST_Y_PADDING);
 	g_signal_connect (G_OBJECT (edit_check_use_keyring), "toggled",
 				  G_CALLBACK (servlist_toggle_keyring_cb), NULL);
 
-	edit_entry_nick = servlist_create_entry (table3, _("_Nick name:"), 7, net->nick, &edit_label_nick, 0);
-	edit_entry_nick2 = servlist_create_entry (table3, _("Second choice:"), 8, net->nick2, &edit_label_nick2, 0);
-	edit_entry_real = servlist_create_entry (table3, _("Rea_l name:"), 9, net->real, &edit_label_real, 0);
-	edit_entry_user = servlist_create_entry (table3, _("_User name:"), 10, net->user, &edit_label_user, 0);
+	edit_entry_nick = servlist_create_entry (table3, _("_Nick name:"), 8, net->nick, &edit_label_nick, 0);
+	edit_entry_nick2 = servlist_create_entry (table3, _("Second choice:"), 9, net->nick2, &edit_label_nick2, 0);
+	edit_entry_real = servlist_create_entry (table3, _("Rea_l name:"), 10, net->real, &edit_label_real, 0);
+	edit_entry_user = servlist_create_entry (table3, _("_User name:"), 11, net->user, &edit_label_user, 0);
 
 	label_logintype = gtk_label_new (_("Login method:"));
-	servlist_table_attach (table3, label_logintype, 0, 1, 11, 12,
+	servlist_table_attach (table3, label_logintype, 0, 1, 12, 13,
 						   FALSE, FALSE,
 						   SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
 						   SERVLIST_X_PADDING, SERVLIST_Y_PADDING);
 	gtk_widget_set_halign (label_logintype, GTK_ALIGN_START);
 	gtk_widget_set_valign (label_logintype, GTK_ALIGN_CENTER);
 	combobox_logintypes = servlist_create_logintypecombo (notebook);
-	servlist_table_attach (table3, combobox_logintypes, 1, 2, 11, 12,
+	servlist_table_attach (table3, combobox_logintypes, 1, 2, 12, 13,
 						   FALSE, FALSE,
 						   SERVLIST_ALIGN_FILL, SERVLIST_ALIGN_FILL,
 						   4, 2);
 
-	edit_entry_pass = servlist_create_entry (table3, _("Password:"), 12, NULL, 0, _("Password used for login. If in doubt, leave blank."));
+	edit_entry_pass = servlist_create_entry (table3, _("Password:"), 13, NULL, 0, _("Password used for login. If in doubt, leave blank."));
 	if (edit_loaded_password)
 	{
 		memset (edit_loaded_password, 0, strlen (edit_loaded_password));
@@ -2644,7 +2686,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 	if (selected_net && selected_net->logintype == LOGIN_SASLEXTERNAL)
 		gtk_widget_set_sensitive (edit_entry_pass, FALSE);
 	edit_check_show_pass = gtk_check_button_new_with_mnemonic (_("Show password"));
-	servlist_table_attach (table3, edit_check_show_pass, 0, 2, 13, 14,
+	servlist_table_attach (table3, edit_check_show_pass, 0, 2, 14, 15,
 						   FALSE, FALSE,
 						   SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
 						   4, 2);
@@ -2652,14 +2694,14 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 					  G_CALLBACK (servlist_toggle_show_password_cb), edit_entry_pass);
 
 	edit_button_encrypt_pass = gtk_button_new_with_mnemonic (_("Encrypt saved password"));
-	servlist_table_attach (table3, edit_button_encrypt_pass, 0, 1, 14, 15,
+	servlist_table_attach (table3, edit_button_encrypt_pass, 0, 1, 15, 16,
 						   FALSE, FALSE,
 						   SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
 						   SERVLIST_X_PADDING, SERVLIST_Y_PADDING);
 	g_signal_connect (G_OBJECT (edit_button_encrypt_pass), "clicked",
 					  G_CALLBACK (servlist_encrypt_password_cb), net);
 	edit_button_import_pass = gtk_button_new_with_mnemonic (_("Move password to keyring"));
-	servlist_table_attach (table3, edit_button_import_pass, 1, 2, 14, 15,
+	servlist_table_attach (table3, edit_button_import_pass, 1, 2, 15, 16,
 						   FALSE, FALSE,
 						   SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
 						   4, 2);
@@ -2667,14 +2709,14 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 					  G_CALLBACK (servlist_import_password_cb), net);
 
 	label34 = gtk_label_new (_("Character set:"));
-	servlist_table_attach (table3, label34, 0, 1, 15, 16,
+	servlist_table_attach (table3, label34, 0, 1, 16, 17,
 						   FALSE, FALSE,
 						   SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
 						   SERVLIST_X_PADDING, SERVLIST_Y_PADDING);
 	gtk_widget_set_halign (label34, GTK_ALIGN_START);
 	gtk_widget_set_valign (label34, GTK_ALIGN_CENTER);
 	comboboxentry_charset = servlist_create_charsetcombo ();
-	servlist_table_attach (table3, comboboxentry_charset, 1, 2, 15, 16,
+	servlist_table_attach (table3, comboboxentry_charset, 1, 2, 16, 17,
 						   FALSE, FALSE,
 						   SERVLIST_ALIGN_FILL, SERVLIST_ALIGN_FILL,
 						   4, 2);
@@ -2700,7 +2742,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
 							G_CALLBACK (servlist_delete_client_cert_cb), net);
 	gtk_box_pack_start (GTK_BOX (hbox_cert_buttons), edit_button_cert_delete, FALSE, FALSE, 0);
 
-	servlist_table_attach (table3, hbox_cert_buttons, 0, 2, 16, 17,
+	servlist_table_attach (table3, hbox_cert_buttons, 0, 2, 17, 18,
 						   FALSE, FALSE,
 						   SERVLIST_ALIGN_START, SERVLIST_ALIGN_CENTER,
 						   SERVLIST_X_PADDING, SERVLIST_Y_PADDING);

src/fe-gtk/theme/tests/test-theme-access-routing.c

@@ -23,6 +23,7 @@
 #include <math.h>
 
 #include "../theme-access.h"
+#include "../theme-css.h"
 #include "../theme-manager.h"
 #include "../theme-runtime.h"
 #include "../../xtext-color.h"
@@ -54,6 +55,13 @@ setup_apply_real (const ThemeChangedEvent *event)
 	(void) event;
 }
 
+void
+gtkutil_append_font_css (GString *css, const PangoFontDescription *font_desc)
+{
+	(void) css;
+	(void) font_desc;
+}
+
 gboolean
 fe_dark_mode_is_enabled_for (unsigned int mode)
 {
@@ -173,6 +181,14 @@ theme_gtk3_is_active (void)
 	return stub_gtk3_active;
 }
 
+gboolean
+theme_gtk3_lookup_theme_color (const char *name, GdkRGBA *out_color)
+{
+	(void) name;
+	(void) out_color;
+	return FALSE;
+}
+
 static gboolean
 rgba_equal (const GdkRGBA *a, const GdkRGBA *b)
 {
@@ -336,6 +352,79 @@ test_access_xtext_palette_widget_mapping_when_gtk3_active (void)
 	g_object_unref (provider);
 }
 
+static void
+test_access_palette_css_does_not_feed_back_into_sampling (void)
+{
+	GtkWidget *window;
+	GtkWidget *label;
+	GtkCssProvider *theme1;
+	GtkCssProvider *theme2;
+	GdkScreen *screen;
+	XTextColor palette[2] = { 0 };
+	GdkRGBA old_bg;
+	GdkRGBA old_fg;
+	GdkRGBA expected;
+
+	if (!gtk_available)
+	{
+		g_test_message ("GTK display not available");
+		return;
+	}
+
+	reset_stubs ();
+	stub_gtk3_active = TRUE;
+	screen = gdk_screen_get_default ();
+	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	label = gtk_label_new ("mapped");
+	gtk_container_add (GTK_CONTAINER (window), label);
+	gtk_widget_realize (window);
+
+	/* Old GTK3 theme active at screen level. */
+	theme1 = gtk_css_provider_new ();
+	gtk_css_provider_load_from_data (theme1,
+		"label { color: #112233; background-color: #445566; }"
+		"label:selected { color: #778899; background-color: #aabbcc; }",
+		-1, NULL);
+	gtk_style_context_add_provider_for_screen (screen,
+		GTK_STYLE_PROVIDER (theme1), GTK_STYLE_PROVIDER_PRIORITY_USER);
+
+	/* The app paints the sampled theme colors onto the widget, like the
+	 * user list / channel tree / input box palette provider does. */
+	g_assert_true (gdk_rgba_parse (&old_bg, "#445566"));
+	g_assert_true (gdk_rgba_parse (&old_fg, "#112233"));
+	theme_css_apply_palette_widget (label, &old_bg, &old_fg, NULL);
+
+	/* The user switches to a new GTK3 theme. */
+	gtk_style_context_remove_provider_for_screen (screen, GTK_STYLE_PROVIDER (theme1));
+	theme2 = gtk_css_provider_new ();
+	gtk_css_provider_load_from_data (theme2,
+		"label { color: #00ff00; background-color: #ff0000; }"
+		"label:selected { color: #0000ff; background-color: #ffff00; }",
+		-1, NULL);
+	gtk_style_context_add_provider_for_screen (screen,
+		GTK_STYLE_PROVIDER (theme2), GTK_STYLE_PROVIDER_PRIORITY_USER);
+	gtk_style_context_reset_widgets (screen);
+
+	/* Re-sampling must see the new theme, not the palette colors the
+	 * app applied for the old theme. */
+	theme_get_xtext_colors_for_widget (label, palette, G_N_ELEMENTS (palette));
+
+	g_assert_true (stub_last_gtk_map_valid);
+	g_assert_true (gdk_rgba_parse (&expected, "#00ff00"));
+	g_assert_true (rgba_close (&stub_last_gtk_map.text_foreground, &expected));
+	g_assert_true (gdk_rgba_parse (&expected, "#ff0000"));
+	g_assert_true (rgba_close (&stub_last_gtk_map.text_background, &expected));
+
+	/* Sampling must not permanently strip the palette class. */
+	g_assert_true (gtk_style_context_has_class (gtk_widget_get_style_context (label),
+		theme_css_palette_class_name ()));
+
+	gtk_style_context_remove_provider_for_screen (screen, GTK_STYLE_PROVIDER (theme2));
+	gtk_widget_destroy (window);
+	g_object_unref (theme1);
+	g_object_unref (theme2);
+}
+
 static void
 test_access_dark_light_switch_affects_token_consumers (void)
 {
@@ -363,6 +452,8 @@ main (int argc, char **argv)
 	g_test_add_func ("/theme/access/xtext_palette_forwarding", test_access_xtext_palette_forwarding);
 	g_test_add_func ("/theme/access/xtext_palette_widget_mapping_when_gtk3_active",
 			 test_access_xtext_palette_widget_mapping_when_gtk3_active);
+	g_test_add_func ("/theme/access/palette_css_does_not_feed_back_into_sampling",
+			 test_access_palette_css_does_not_feed_back_into_sampling);
 	g_test_add_func ("/theme/access/widget_style_forwarding", test_access_widget_style_forwarding);
 	g_test_add_func ("/theme/access/dark_light_switch_affects_token_consumers",
 			 test_access_dark_light_switch_affects_token_consumers);

src/fe-gtk/theme/tests/test-theme-application-input-style.c

@@ -21,6 +21,7 @@
 #include "../../fe-gtk.h"
 
 #include "../theme-application.h"
+#include "../theme-policy.h"
 #include "../../maingui.h"
 #include "../../../common/zoitechat.h"
 #include "../../../common/zoitechatc.h"
@@ -54,6 +55,19 @@ theme_css_reload_input_style (gboolean enabled, const PangoFontDescription *font
 	css_reload_calls++;
 }
 
+gboolean
+theme_policy_system_prefers_dark (void)
+{
+	return FALSE;
+}
+
+gboolean
+theme_policy_is_dark_mode_active (unsigned int mode)
+{
+	(void) mode;
+	return FALSE;
+}
+
 void
 theme_runtime_load (void)
 {
@@ -104,7 +118,9 @@ test_invalid_font_falls_back_to_sans_11 (void)
 	g_assert_cmpint (pango_font_description_get_size (style->font_desc), ==, 11 * PANGO_SCALE);
 	g_assert_cmpint (message_calls, ==, 1);
 	g_assert_cmpint (css_reload_calls, ==, 1);
-	g_assert_true (css_enabled);
+	/* Input boxes are themed per-widget; the app-global input CSS stays
+	 * off so entries render natively under the active GTK3 theme. */
+	g_assert_false (css_enabled);
 	g_assert_nonnull (css_font_desc);
 
 	if (style->font_desc)

src/fe-gtk/theme/tests/test-theme-gtk3-settings.c

@@ -24,6 +24,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
+#include <gio/gio.h>
 
 #include "../theme-gtk3.h"
 #include "../../../common/gtk3-theme-service.h"
@@ -39,11 +40,14 @@ static char *xdg_data_home;
 static char *theme_parent_root;
 static char *theme_child_root;
 static char *theme_switch_root;
+static char *theme_chrome_root;
+
+static gboolean stub_system_prefers_dark;
 
 gboolean
 theme_policy_system_prefers_dark (void)
 {
-	return FALSE;
+	return stub_system_prefers_dark;
 }
 
 static void
@@ -131,6 +135,8 @@ zoitechat_gtk3_theme_find_by_id (const char *theme_id)
 		return make_theme (theme_id, theme_child_root);
 	if (g_strcmp0 (theme_id, "switch") == 0)
 		return make_theme (theme_id, theme_switch_root);
+	if (g_strcmp0 (theme_id, "chrome") == 0)
+		return make_theme (theme_id, theme_chrome_root);
 	return NULL;
 }
 
@@ -177,6 +183,11 @@ zoitechat_gtk3_theme_build_inheritance_chain (const char *theme_root)
 		g_ptr_array_add (chain, g_strdup (theme_switch_root));
 		return chain;
 	}
+	if (g_strcmp0 (theme_root, theme_chrome_root) == 0)
+	{
+		g_ptr_array_add (chain, g_strdup (theme_chrome_root));
+		return chain;
+	}
 	g_ptr_array_unref (chain);
 	return NULL;
 }
@@ -247,6 +258,22 @@ setup_themes (void)
 		"gtk-enable-animations=false\n"
 		"gtk-cursor-blink-time=444\n");
 
+	theme_chrome_root = g_build_filename (temp_root, "chrome", NULL);
+	g_assert_cmpint (g_mkdir_with_parents (theme_chrome_root, 0700), ==, 0);
+	ensure_css_dir (theme_chrome_root, "gtk-3.24");
+	/* Defines named colors but no window/menubar/menu rules of its own,
+	 * so all chrome styling must come from the backfill provider. */
+	{
+		char *css = g_build_filename (theme_chrome_root, "gtk-3.24", "gtk.css", NULL);
+		write_file (css,
+			"@define-color theme_bg_color #e8f4e8;\n"
+			"@define-color theme_fg_color #102010;\n"
+			"@define-color theme_selected_bg_color #3465a4;\n"
+			"@define-color theme_selected_fg_color #ffffff;\n"
+			"label { color: #102010; }\n");
+		g_free (css);
+	}
+
 	path = g_build_filename (theme_parent_root, "index.theme", NULL);
 	write_file (path, "[Desktop Entry]\nName=parent\n");
 	g_free (path);
@@ -266,11 +293,13 @@ teardown_themes (void)
 	g_free (theme_parent_root);
 	g_free (theme_child_root);
 	g_free (theme_switch_root);
+	g_free (theme_chrome_root);
 	g_free (xdg_data_home);
 	g_free (temp_root);
 	theme_parent_root = NULL;
 	theme_child_root = NULL;
 	theme_switch_root = NULL;
+	theme_chrome_root = NULL;
 	xdg_data_home = NULL;
 	temp_root = NULL;
 }
@@ -343,6 +372,205 @@ test_settings_restored_on_disable_and_switch (void)
 	g_assert_false (theme_gtk3_is_active ());
 }
 
+static void
+test_follow_system_variant_resolves_to_theme_variant (void)
+{
+	GError *error = NULL;
+
+	if (!gtk_available)
+	{
+		g_test_message ("GTK display not available");
+		return;
+	}
+
+	/* An explicitly selected in-app theme must not follow the OS
+	 * light/dark preference: the legacy FOLLOW_SYSTEM variant resolves
+	 * to the variant the theme itself provides, so the window chrome
+	 * (menu bar) stays on the theme even when the system prefers dark. */
+	stub_system_prefers_dark = TRUE;
+	g_assert_true (theme_gtk3_apply ("switch", THEME_GTK3_VARIANT_FOLLOW_SYSTEM, &error));
+	g_assert_no_error (error);
+	g_assert_true (theme_gtk3_is_active ());
+	g_assert_cmpint (theme_gtk3_active_variant (), ==, THEME_GTK3_VARIANT_PREFER_LIGHT);
+	g_assert_false (get_bool_setting ("gtk-application-prefer-dark-theme"));
+
+	stub_system_prefers_dark = FALSE;
+	theme_gtk3_disable ();
+}
+
+static void
+test_menu_bar_follows_active_theme_colors (void)
+{
+	GError *error = NULL;
+	GtkWidget *window;
+	GtkWidget *menubar;
+	GtkStyleContext *context;
+	GdkRGBA bg;
+	GdkRGBA expected;
+
+	if (!gtk_available)
+	{
+		g_test_message ("GTK display not available");
+		return;
+	}
+
+	/* The chrome theme defines no menubar rules; without the backfill
+	 * provider the menu bar would fall through to the base (OS) theme
+	 * and follow the OS dark/light mode instead of the selected theme. */
+	g_assert_true (theme_gtk3_apply ("chrome", THEME_GTK3_VARIANT_PREFER_LIGHT, &error));
+	g_assert_no_error (error);
+
+	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	menubar = gtk_menu_bar_new ();
+	gtk_container_add (GTK_CONTAINER (window), menubar);
+	gtk_widget_show_all (window);
+
+	context = gtk_widget_get_style_context (menubar);
+	G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+	gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
+	G_GNUC_END_IGNORE_DEPRECATIONS
+	g_assert_true (gdk_rgba_parse (&expected, "#e8f4e8"));
+	g_assert_cmpfloat (ABS (bg.red - expected.red), <, 0.01);
+	g_assert_cmpfloat (ABS (bg.green - expected.green), <, 0.01);
+	g_assert_cmpfloat (ABS (bg.blue - expected.blue), <, 0.01);
+
+	/* The window background must follow the theme too, or the space
+	 * around and beside the menu bar keeps the OS theme's colors. */
+	context = gtk_widget_get_style_context (window);
+	G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+	gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
+	G_GNUC_END_IGNORE_DEPRECATIONS
+	g_assert_cmpfloat (ABS (bg.red - expected.red), <, 0.01);
+	g_assert_cmpfloat (ABS (bg.green - expected.green), <, 0.01);
+	g_assert_cmpfloat (ABS (bg.blue - expected.blue), <, 0.01);
+
+	gtk_widget_destroy (window);
+	theme_gtk3_disable ();
+}
+
+static void
+test_desktop_color_sync_does_not_leak_into_chrome (void)
+{
+	GError *error = NULL;
+	GtkWidget *window;
+	GtkWidget *menubar;
+	GtkStyleContext *context;
+	GtkCssProvider *desktop_css;
+	GdkScreen *screen;
+	GdkRGBA bg;
+	GdkRGBA expected;
+	GdkRGBA injected;
+
+	if (!gtk_available)
+	{
+		g_test_message ("GTK display not available");
+		return;
+	}
+
+	/* KDE's GTK color-scheme sync (~/.config/gtk-3.0/gtk.css) redefines
+	 * the standard named colors with the OS palette at USER priority.
+	 * The switch theme defines no named colors of its own, so a naive
+	 * @theme_bg_color reference in the chrome backfill would resolve to
+	 * the injected OS dark palette; the backfill must use its neutral
+	 * variant fallback instead. */
+	screen = gdk_screen_get_default ();
+	desktop_css = gtk_css_provider_new ();
+	gtk_css_provider_load_from_data (desktop_css,
+		"@define-color theme_bg_color #1e1e1e;\n"
+		"@define-color theme_fg_color #eeeeee;\n"
+		"menubar { background-color: #1e1e1e; }\n",
+		-1, NULL);
+	gtk_style_context_add_provider_for_screen (screen,
+		GTK_STYLE_PROVIDER (desktop_css), GTK_STYLE_PROVIDER_PRIORITY_USER);
+
+	g_assert_true (theme_gtk3_apply ("switch", THEME_GTK3_VARIANT_PREFER_LIGHT, &error));
+	g_assert_no_error (error);
+
+	{
+		GtkWidget *item;
+		GdkRGBA item_bg;
+
+		window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+		menubar = gtk_menu_bar_new ();
+		item = gtk_menu_item_new_with_label ("File");
+		gtk_menu_shell_append (GTK_MENU_SHELL (menubar), item);
+		gtk_container_add (GTK_CONTAINER (window), menubar);
+		gtk_widget_show_all (window);
+
+		context = gtk_widget_get_style_context (menubar);
+		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+		gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
+		G_GNUC_END_IGNORE_DEPRECATIONS
+		g_assert_true (gdk_rgba_parse (&expected, "#f6f5f4"));
+		g_assert_true (gdk_rgba_parse (&injected, "#1e1e1e"));
+		g_assert_cmpfloat (ABS (bg.red - injected.red), >, 0.1);
+		g_assert_cmpfloat (ABS (bg.red - expected.red), <, 0.01);
+		g_assert_cmpfloat (ABS (bg.green - expected.green), <, 0.01);
+		g_assert_cmpfloat (ABS (bg.blue - expected.blue), <, 0.01);
+
+		/* The menu bar body and the menu items must be one surface. */
+		context = gtk_widget_get_style_context (item);
+		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+		gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &item_bg);
+		G_GNUC_END_IGNORE_DEPRECATIONS
+		g_assert_cmpfloat (ABS (item_bg.red - bg.red), <, 0.01);
+		g_assert_cmpfloat (ABS (item_bg.green - bg.green), <, 0.01);
+		g_assert_cmpfloat (ABS (item_bg.blue - bg.blue), <, 0.01);
+	}
+
+	gtk_widget_destroy (window);
+	theme_gtk3_disable ();
+	gtk_style_context_remove_provider_for_screen (screen, GTK_STYLE_PROVIDER (desktop_css));
+	g_object_unref (desktop_css);
+}
+
+static void
+test_stale_theme_symlink_is_replaced (void)
+{
+	GError *error = NULL;
+	char *themes_dir;
+	char *link_path;
+	char *target;
+	char *active_theme_name = NULL;
+
+	if (!gtk_available)
+	{
+		g_test_message ("GTK display not available");
+		return;
+	}
+	if (!has_default_seat ())
+	{
+		g_test_message ("No default seat available");
+		return;
+	}
+
+	/* A dangling symlink left behind by a removed theme must not block
+	 * pinning gtk-theme-name to the newly applied theme. */
+	themes_dir = g_build_filename (xdg_data_home, "themes", NULL);
+	g_assert_cmpint (g_mkdir_with_parents (themes_dir, 0700), ==, 0);
+	link_path = g_build_filename (themes_dir, "switch", NULL);
+	g_unlink (link_path);
+	{
+		GFile *link_file = g_file_new_for_path (link_path);
+		g_assert_true (g_file_make_symbolic_link (link_file, "/nonexistent/switch", NULL, NULL));
+		g_object_unref (link_file);
+	}
+
+	g_assert_true (theme_gtk3_apply ("switch", THEME_GTK3_VARIANT_PREFER_LIGHT, &error));
+	g_assert_no_error (error);
+
+	target = g_file_read_link (link_path, NULL);
+	g_assert_cmpstr (target, ==, theme_switch_root);
+	g_object_get (gtk_settings_get_default (), "gtk-theme-name", &active_theme_name, NULL);
+	g_assert_cmpstr (active_theme_name, ==, "switch");
+
+	g_free (active_theme_name);
+	g_free (target);
+	g_free (link_path);
+	g_free (themes_dir);
+	theme_gtk3_disable ();
+}
+
 int
 main (int argc, char **argv)
 {
@@ -354,6 +582,14 @@ main (int argc, char **argv)
 
 	g_test_add_func ("/theme/gtk3/settings_layer_precedence", test_settings_layer_precedence);
 	g_test_add_func ("/theme/gtk3/settings_restored_on_disable_and_switch", test_settings_restored_on_disable_and_switch);
+	g_test_add_func ("/theme/gtk3/follow_system_variant_resolves_to_theme_variant",
+			 test_follow_system_variant_resolves_to_theme_variant);
+	g_test_add_func ("/theme/gtk3/menu_bar_follows_active_theme_colors",
+			 test_menu_bar_follows_active_theme_colors);
+	g_test_add_func ("/theme/gtk3/desktop_color_sync_does_not_leak_into_chrome",
+			 test_desktop_color_sync_does_not_leak_into_chrome);
+	g_test_add_func ("/theme/gtk3/stale_theme_symlink_is_replaced",
+			 test_stale_theme_symlink_is_replaced);
 
 	prefs.hex_gui_gtk3_variant = THEME_GTK3_VARIANT_PREFER_LIGHT;
 

src/fe-gtk/theme/tests/test-theme-gtk3-stub.c

@@ -89,3 +89,9 @@ theme_gtk3_is_active (void)
 {
 	return FALSE;
 }
+
+ThemeGtk3Variant
+theme_gtk3_active_variant (void)
+{
+	return THEME_GTK3_VARIANT_FOLLOW_SYSTEM;
+}

src/fe-gtk/theme/tests/test-theme-manager-auto-refresh.c

@@ -22,6 +22,7 @@
 
 #include "../theme-manager.h"
 #include "../theme-gtk3.h"
+#include "../theme-policy.h"
 #include "../../../common/zoitechat.h"
 #include "../../../common/zoitechatc.h"
 
@@ -84,6 +85,15 @@ gboolean theme_policy_system_prefers_dark (void)
 	return stub_system_prefers_dark;
 }
 
+void theme_policy_init (void)
+{
+}
+
+void theme_policy_set_appearance_changed_callback (ThemePolicyAppearanceChangedFunc callback)
+{
+	(void) callback;
+}
+
 gboolean theme_application_apply_mode (unsigned int mode, gboolean *palette_changed)
 {
 	(void) mode;
@@ -203,6 +213,7 @@ reset_state (void)
 	idle_add_calls = 0;
 	next_idle_source_id = 33;
 	prefs.hex_gui_gtk3_variant = THEME_GTK3_VARIANT_FOLLOW_SYSTEM;
+	prefs.hex_gui_gtk3_theme[0] = '\0';
 	test_theme_gtk3_stub_reset ();
 }
 
@@ -235,12 +246,14 @@ test_auto_refresh_dispatches_mode_palette_and_style_reasons (void)
 }
 
 static void
-test_auto_refresh_ignores_non_auto_mode (void)
+test_auto_refresh_ignores_locked_in_app_theme (void)
 {
 	guint listener_id;
 
 	reset_state ();
 	prefs.hex_gui_dark_mode = ZOITECHAT_DARK_MODE_DARK;
+	g_strlcpy (prefs.hex_gui_gtk3_theme, "locked-theme", sizeof (prefs.hex_gui_gtk3_theme));
+	prefs.hex_gui_gtk3_variant = THEME_GTK3_VARIANT_PREFER_LIGHT;
 	stub_apply_mode_palette_changed = TRUE;
 	listener_id = theme_listener_register ("auto.nonauto", auto_listener, NULL);
 	theme_manager_set_idle_add_func (immediate_idle_add);
@@ -254,6 +267,7 @@ test_auto_refresh_ignores_non_auto_mode (void)
 
 	theme_manager_set_idle_add_func (NULL);
 	theme_listener_unregister (listener_id);
+	prefs.hex_gui_gtk3_theme[0] = '\0';
 }
 
 static void
@@ -263,6 +277,7 @@ test_auto_refresh_reapplies_gtk3_for_follow_system_variant (void)
 
 	reset_state ();
 	prefs.hex_gui_dark_mode = ZOITECHAT_DARK_MODE_DARK;
+	g_strlcpy (prefs.hex_gui_gtk3_theme, "system-follower", sizeof (prefs.hex_gui_gtk3_theme));
 	prefs.hex_gui_gtk3_variant = THEME_GTK3_VARIANT_FOLLOW_SYSTEM;
 	listener_id = theme_listener_register ("auto.gtk3", auto_listener, NULL);
 	theme_manager_set_idle_add_func (immediate_idle_add);
@@ -274,6 +289,39 @@ test_auto_refresh_reapplies_gtk3_for_follow_system_variant (void)
 	g_assert_cmpint (listener_calls, ==, 0);
 	g_assert_cmpint (test_theme_gtk3_stub_apply_current_calls (), ==, 1);
 
+	theme_manager_set_idle_add_func (NULL);
+	theme_listener_unregister (listener_id);
+	prefs.hex_gui_gtk3_theme[0] = '\0';
+}
+
+static void
+test_auto_refresh_follows_system_theme_without_auto_mode (void)
+{
+	guint listener_id;
+
+	reset_state ();
+	prefs.hex_gui_dark_mode = ZOITECHAT_DARK_MODE_DARK;
+	prefs.hex_gui_gtk3_variant = THEME_GTK3_VARIANT_PREFER_LIGHT;
+	listener_id = theme_listener_register ("auto.system", auto_listener, NULL);
+	theme_manager_set_idle_add_func (immediate_idle_add);
+
+	theme_manager_refresh_auto_mode ();
+
+	/* No in-app theme is selected, so a system theme change must
+	 * re-resolve the mapped palette even outside auto dark mode. */
+	g_assert_cmpint (idle_add_calls, ==, 1);
+	g_assert_cmpint (auto_state_calls, ==, 0);
+	g_assert_cmpint (listener_calls, ==, 1);
+	g_assert_true (theme_changed_event_has_reason (&last_event, THEME_CHANGED_REASON_PALETTE));
+	g_assert_true (theme_changed_event_has_reason (&last_event, THEME_CHANGED_REASON_WIDGET_STYLE));
+	g_assert_true (theme_changed_event_has_reason (&last_event, THEME_CHANGED_REASON_USERLIST));
+	g_assert_true (theme_changed_event_has_reason (&last_event, THEME_CHANGED_REASON_MODE));
+
+	/* Unchanged system state must not dispatch again. */
+	theme_manager_refresh_auto_mode ();
+	g_assert_cmpint (idle_add_calls, ==, 2);
+	g_assert_cmpint (listener_calls, ==, 1);
+
 	theme_manager_set_idle_add_func (NULL);
 	theme_listener_unregister (listener_id);
 }
@@ -284,9 +332,11 @@ main (int argc, char **argv)
 	g_test_init (&argc, &argv, NULL);
 	g_test_add_func ("/theme/manager/auto_refresh_dispatches_mode_palette_and_style_reasons",
 			 test_auto_refresh_dispatches_mode_palette_and_style_reasons);
-	g_test_add_func ("/theme/manager/auto_refresh_ignores_non_auto_mode",
-			 test_auto_refresh_ignores_non_auto_mode);
+	g_test_add_func ("/theme/manager/auto_refresh_ignores_locked_in_app_theme",
+			 test_auto_refresh_ignores_locked_in_app_theme);
 	g_test_add_func ("/theme/manager/auto_refresh_reapplies_gtk3_for_follow_system_variant",
 			 test_auto_refresh_reapplies_gtk3_for_follow_system_variant);
+	g_test_add_func ("/theme/manager/auto_refresh_follows_system_theme_without_auto_mode",
+			 test_auto_refresh_follows_system_theme_without_auto_mode);
 	return g_test_run ();
 }

src/fe-gtk/theme/tests/test-theme-manager-dispatch-routing.c

@@ -23,6 +23,7 @@
 #include <string.h>
 
 #include "../theme-manager.h"
+#include "../theme-policy.h"
 #include "../../../common/zoitechat.h"
 #include "../../../common/zoitechatc.h"
 
@@ -77,6 +78,15 @@ gboolean theme_policy_system_prefers_dark (void)
 	return FALSE;
 }
 
+void theme_policy_init (void)
+{
+}
+
+void theme_policy_set_appearance_changed_callback (ThemePolicyAppearanceChangedFunc callback)
+{
+	(void) callback;
+}
+
 gboolean theme_application_apply_mode (unsigned int mode, gboolean *palette_changed)
 {
 	(void) mode;

src/fe-gtk/theme/tests/test-theme-manager-policy.c

@@ -22,6 +22,7 @@
 
 #include "../theme-palette.h"
 #include "../theme-manager.h"
+#include "../theme-policy.h"
 #include "../../../common/zoitechat.h"
 #include "../../../common/zoitechatc.h"
 
@@ -30,6 +31,7 @@ struct session *current_tab;
 struct session *lastact_sess;
 struct zoitechatprefs prefs;
 
+static gboolean gtk_available;
 static gboolean stub_policy_dark;
 static unsigned int stub_policy_mode;
 static gboolean stub_apply_mode_result;
@@ -79,7 +81,18 @@ void zoitechat_set_theme_post_apply_callback (zoitechat_theme_post_apply_callbac
 gboolean theme_policy_is_dark_mode_active (unsigned int mode)
 {
 	stub_policy_mode = mode;
-	return stub_policy_dark;
+	if (mode == ZOITECHAT_DARK_MODE_AUTO)
+		return stub_policy_dark;
+	return fe_dark_mode_is_enabled_for (mode);
+}
+
+void theme_policy_init (void)
+{
+}
+
+void theme_policy_set_appearance_changed_callback (ThemePolicyAppearanceChangedFunc callback)
+{
+	(void) callback;
 }
 
 gboolean theme_application_apply_mode (unsigned int mode, gboolean *palette_changed)
@@ -109,11 +122,12 @@ void theme_runtime_reset_mode_colors (gboolean dark_mode)
 	(void) dark_mode;
 }
 
-gboolean theme_runtime_apply_mode (unsigned int mode, gboolean *dark_active)
+gboolean theme_runtime_apply_mode (unsigned int mode, gboolean *palette_changed)
 {
 	(void) mode;
-	(void) dark_active;
 	stub_apply_mode_calls++;
+	if (palette_changed)
+		*palette_changed = TRUE;
 	return TRUE;
 }
 
@@ -249,10 +263,11 @@ test_manager_set_token_color_routes_by_mode (void)
 	GdkRGBA color = { 0.1, 0.2, 0.3, 1.0 };
 	gboolean palette_changed = FALSE;
 
+	/* All edits target the single user palette; the mode argument is
+	 * accepted for compatibility but no longer selects a dark palette. */
 	reset_manager_stubs ();
 	stub_policy_dark = FALSE;
 	theme_manager_set_token_color (ZOITECHAT_DARK_MODE_LIGHT, THEME_TOKEN_MIRC_2, &color, &palette_changed);
-	g_assert_cmpint (stub_policy_mode, ==, ZOITECHAT_DARK_MODE_LIGHT);
 	g_assert_cmpint (stub_user_set_calls, ==, 1);
 	g_assert_cmpint (stub_dark_set_calls, ==, 0);
 	g_assert_cmpint (stub_apply_mode_calls, ==, 1);
@@ -262,16 +277,14 @@ test_manager_set_token_color_routes_by_mode (void)
 	reset_manager_stubs ();
 	stub_policy_dark = TRUE;
 	theme_manager_set_token_color (ZOITECHAT_DARK_MODE_DARK, THEME_TOKEN_MIRC_2, &color, &palette_changed);
-	g_assert_cmpint (stub_policy_mode, ==, ZOITECHAT_DARK_MODE_DARK);
-	g_assert_cmpint (stub_user_set_calls, ==, 0);
-	g_assert_cmpint (stub_dark_set_calls, ==, 1);
+	g_assert_cmpint (stub_user_set_calls, ==, 1);
+	g_assert_cmpint (stub_dark_set_calls, ==, 0);
 
 	reset_manager_stubs ();
 	stub_policy_dark = TRUE;
 	theme_manager_set_token_color (ZOITECHAT_DARK_MODE_AUTO, THEME_TOKEN_MIRC_2, &color, &palette_changed);
-	g_assert_cmpint (stub_policy_mode, ==, ZOITECHAT_DARK_MODE_AUTO);
-	g_assert_cmpint (stub_user_set_calls, ==, 0);
-	g_assert_cmpint (stub_dark_set_calls, ==, 1);
+	g_assert_cmpint (stub_user_set_calls, ==, 1);
+	g_assert_cmpint (stub_dark_set_calls, ==, 0);
 }
 
 
@@ -300,9 +313,9 @@ test_manager_set_token_color_routes_setup_indexes (void)
 		stub_policy_dark = TRUE;
 		palette_changed = FALSE;
 		theme_manager_set_token_color (ZOITECHAT_DARK_MODE_DARK, def->token, &color, &palette_changed);
-		g_assert_cmpint (stub_dark_set_calls, ==, 1);
-		g_assert_cmpint (stub_last_dark_token, ==, def->token);
-		g_assert_cmpint (stub_user_set_calls, ==, 0);
+		g_assert_cmpint (stub_user_set_calls, ==, 1);
+		g_assert_cmpint (stub_last_user_token, ==, def->token);
+		g_assert_cmpint (stub_dark_set_calls, ==, 0);
 		g_assert_true (palette_changed);
 	}
 }
@@ -345,6 +358,12 @@ test_manager_window_attach_detach_idempotence (void)
 	gulong *second_handler_ptr;
 	gulong second_handler_id;
 
+	if (!gtk_available)
+	{
+		g_test_message ("GTK display not available");
+		return;
+	}
+
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	g_assert_nonnull (window);
 
@@ -395,5 +414,6 @@ main (int argc, char **argv)
 			 test_manager_listener_registration_dispatch_and_unregister);
 	g_test_add_func ("/theme/manager/window_attach_detach_idempotence",
 			 test_manager_window_attach_detach_idempotence);
+	gtk_available = gtk_init_check (&argc, &argv);
 	return g_test_run ();
 }

src/fe-gtk/theme/tests/test-theme-preferences-gtk3-populate.c

@@ -33,6 +33,7 @@ InputStyle *input_style;
 
 static gboolean gtk_available;
 static int apply_current_calls;
+static int set_token_color_calls;
 static char applied_theme_id[256];
 static ThemeGtk3Variant applied_variant;
 static gboolean removed_selected;
@@ -104,6 +105,7 @@ theme_manager_set_token_color (unsigned int dark_mode, ThemeSemanticToken token,
         (void)dark_mode;
         (void)token;
         (void)color;
+        set_token_color_calls++;
         if (changed)
                 *changed = FALSE;
 }
@@ -309,7 +311,7 @@ theme_gtk3_is_active (void)
 #include "../theme-preferences.c"
 
 static void
-test_removed_selected_theme_commits_fallback_and_applies (void)
+test_removed_selected_theme_falls_back_to_system_default (void)
 {
         GtkWidget *page;
         theme_preferences_ui *ui;
@@ -326,23 +328,26 @@ test_removed_selected_theme_commits_fallback_and_applies (void)
         g_strlcpy (prefs.hex_gui_gtk3_theme, "removed-theme", sizeof (prefs.hex_gui_gtk3_theme));
         prefs.hex_gui_gtk3_variant = THEME_GTK3_VARIANT_PREFER_DARK;
         removed_selected = FALSE;
-        apply_current_calls = 0;
-        applied_theme_id[0] = '\0';
 
         page = theme_preferences_create_page (NULL, &setup_prefs, NULL);
         ui = g_object_get_data (G_OBJECT (page), "theme-preferences-ui");
         g_assert_nonnull (ui);
 
+        apply_current_calls = 0;
+        applied_theme_id[0] = '\0';
+
         g_assert_nonnull (ui->gtk3_remove);
         gtk_button_clicked (GTK_BUTTON (ui->gtk3_remove));
 
-        g_assert_cmpstr (prefs.hex_gui_gtk3_theme, ==, "fallback-theme");
-        g_assert_cmpstr (setup_prefs.hex_gui_gtk3_theme, ==, "fallback-theme");
-        g_assert_cmpint (prefs.hex_gui_gtk3_variant, ==, THEME_GTK3_VARIANT_PREFER_LIGHT);
-        g_assert_cmpint (setup_prefs.hex_gui_gtk3_variant, ==, THEME_GTK3_VARIANT_PREFER_LIGHT);
+        /* Removing the active in-app theme returns to the system GTK3
+         * theme ("None") instead of forcing another theme. */
+        g_assert_cmpstr (prefs.hex_gui_gtk3_theme, ==, "");
+        g_assert_cmpstr (setup_prefs.hex_gui_gtk3_theme, ==, "");
+        g_assert_cmpint (prefs.hex_gui_gtk3_variant, ==, THEME_GTK3_VARIANT_FOLLOW_SYSTEM);
+        g_assert_cmpint (setup_prefs.hex_gui_gtk3_variant, ==, THEME_GTK3_VARIANT_FOLLOW_SYSTEM);
         g_assert_cmpint (apply_current_calls, ==, 1);
-        g_assert_cmpstr (applied_theme_id, ==, "fallback-theme");
-        g_assert_cmpint (applied_variant, ==, THEME_GTK3_VARIANT_PREFER_LIGHT);
+        g_assert_cmpstr (applied_theme_id, ==, "");
+        g_assert_cmpint (applied_variant, ==, THEME_GTK3_VARIANT_FOLLOW_SYSTEM);
 
         gtk_widget_destroy (page);
 }
@@ -416,16 +421,55 @@ test_select_none_resets_theme_and_applies (void)
         gtk_widget_destroy (page);
 }
 
+static void
+test_select_theme_does_not_pin_palette_tokens (void)
+{
+        GtkWidget *page;
+        theme_preferences_ui *ui;
+        struct zoitechatprefs setup_prefs;
+
+        if (!gtk_available)
+        {
+                g_test_message ("GTK display not available");
+                return;
+        }
+
+        memset (&setup_prefs, 0, sizeof (setup_prefs));
+        memset (&prefs, 0, sizeof (prefs));
+        removed_selected = FALSE;
+        apply_current_calls = 0;
+        set_token_color_calls = 0;
+
+        page = theme_preferences_create_page (NULL, &setup_prefs, NULL);
+        ui = g_object_get_data (G_OBJECT (page), "theme-preferences-ui");
+        g_assert_nonnull (ui);
+
+        /* 0 = None, 1 = removed-theme, 2 = fallback-theme */
+        gtk_combo_box_set_active (GTK_COMBO_BOX (ui->gtk3_combo), 2);
+
+        g_assert_cmpstr (prefs.hex_gui_gtk3_theme, ==, "fallback-theme");
+        g_assert_cmpint (apply_current_calls, ==, 1);
+        /* Selecting a GTK3 theme must leave the mapped palette tokens
+         * unpinned so the user list, channel tree and input box keep
+         * resolving their colors from the active theme instead of being
+         * frozen until the next restart. */
+        g_assert_cmpint (set_token_color_calls, ==, 0);
+
+        gtk_widget_destroy (page);
+}
+
 int
 main (int argc, char **argv)
 {
         g_test_init (&argc, &argv, NULL);
         gtk_available = gtk_init_check (&argc, &argv);
-        g_test_add_func ("/theme/preferences/gtk3_removed_selection_applies_fallback",
-                         test_removed_selected_theme_commits_fallback_and_applies);
+        g_test_add_func ("/theme/preferences/gtk3_removed_selection_falls_back_to_system",
+                         test_removed_selected_theme_falls_back_to_system_default);
         g_test_add_func ("/theme/preferences/gtk3_unset_keeps_system_default",
                          test_unset_theme_keeps_system_default_without_apply);
         g_test_add_func ("/theme/preferences/gtk3_select_none_resets_theme",
                          test_select_none_resets_theme_and_applies);
+        g_test_add_func ("/theme/preferences/gtk3_select_theme_does_not_pin_palette_tokens",
+                         test_select_theme_does_not_pin_palette_tokens);
         return g_test_run ();
 }

src/fe-gtk/theme/tests/test-theme-runtime-persistence.c

@@ -290,12 +290,12 @@ test_ui_edits_persist_without_legacy_array_mutation (void)
 	theme_runtime_save ();
 
 	theme_runtime_load ();
-	theme_runtime_apply_mode (ZOITECHAT_DARK_MODE_LIGHT, NULL);
+	theme_runtime_apply_dark_mode (FALSE);
 	g_assert_true (theme_runtime_get_color (THEME_TOKEN_SELECTION_FOREGROUND, &light_loaded));
 	g_assert_true (gdk_rgba_parse (&light_expected, "#224466"));
 	g_assert_true (colors_equal (&light_loaded, &light_expected));
 
-	theme_runtime_apply_mode (ZOITECHAT_DARK_MODE_DARK, NULL);
+	theme_runtime_apply_dark_mode (TRUE);
 	g_assert_true (theme_runtime_get_color (THEME_TOKEN_SELECTION_FOREGROUND, &dark_loaded));
 	g_assert_true (gdk_rgba_parse (&dark_expected, "#88aacc"));
 	g_assert_true (colors_equal (&dark_loaded, &dark_expected));

src/fe-gtk/theme/theme-access.c

@@ -20,8 +20,9 @@
 
 #include "theme-access.h"
 
-#include "theme-runtime.h"
+#include "theme-css.h"
 #include "theme-gtk3.h"
+#include "theme-runtime.h"
 
 
 
@@ -32,7 +33,8 @@ enum
 	THEME_XTEXT_MARK_BG_INDEX = 100,
 	THEME_XTEXT_FG_INDEX = 101,
 	THEME_XTEXT_BG_INDEX = 102,
-	THEME_XTEXT_MARKER_INDEX = 103
+	THEME_XTEXT_MARKER_INDEX = 103,
+	THEME_XTEXT_MARKER_LEGACY_INDEX = 36
 };
 
 static const guint8 theme_default_99_mirc_colors[THEME_XTEXT_MIRC_COLS][3] = {
@@ -111,28 +113,95 @@ theme_access_context_get_background_color (GtkStyleContext *context, GtkStateFla
 	gtk_style_context_restore (context);
 }
 
+static gboolean
+theme_access_lookup_named_color (GtkStyleContext *context, const char *const *names, GdkRGBA *out_color)
+{
+	size_t i;
+
+	/* With an in-app GTK3 theme selected, prefer the colors resolved from
+	 * the theme itself: desktop integration CSS (e.g. KDE's color-scheme
+	 * sync) redefines the same named colors with the OS palette in the
+	 * widget cascade, which would drag OS dark/light colors into the
+	 * mapped palette. */
+	for (i = 0; names[i] != NULL; i++)
+	{
+		if (theme_gtk3_lookup_theme_color (names[i], out_color))
+			return TRUE;
+	}
+
+	for (i = 0; names[i] != NULL; i++)
+	{
+		if (gtk_style_context_lookup_color (context, names[i], out_color))
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+static void
+theme_access_resolve_map_background (GtkStyleContext *context, GtkStateFlags state,
+				     const char *const *named_fallbacks, GdkRGBA *out_color)
+{
+	GdkRGBA named;
+
+	theme_access_context_get_background_color (context, state, out_color);
+	if (out_color->alpha > 0.0)
+		return;
+
+	/* Unstyled CSS nodes (e.g. the custom chat text widget) report a fully
+	 * transparent background; fall back to the theme's named colors so the
+	 * mapped palette still follows the active GTK3 theme. */
+	if (theme_access_lookup_named_color (context, named_fallbacks, &named))
+		*out_color = named;
+}
+
 static gboolean
 theme_access_get_gtk_palette_map (GtkWidget *widget, ThemeGtkPaletteMap *out_map)
 {
+	static const char *const base_fallbacks[] = { "theme_base_color", "theme_bg_color", NULL };
+	static const char *const selected_bg_fallbacks[] = { "theme_selected_bg_color", NULL };
+	static const char *const selected_fg_fallbacks[] = { "theme_selected_fg_color", NULL };
 	GtkStyleContext *context;
+	const char *palette_class;
+	gboolean had_palette_class;
+	GdkRGBA named;
 	GdkRGBA accent;
 
 	g_return_val_if_fail (out_map != NULL, FALSE);
-	if (!theme_gtk3_is_active () || widget == NULL || !GTK_IS_WIDGET (widget))
+	if (widget == NULL || !GTK_IS_WIDGET (widget))
 		return FALSE;
 
 	context = gtk_widget_get_style_context (widget);
 	if (context == NULL)
 		return FALSE;
 
+	/* The application paints these widgets with fixed colors through the
+	 * zoitechat-palette provider.  Sampling must see the underlying GTK3
+	 * theme, not the colors we applied earlier: otherwise every theme
+	 * change reads back the previous palette and the user list, channel
+	 * tree and input box keep their stale colors until a restart. */
+	palette_class = theme_css_palette_class_name ();
+	had_palette_class = gtk_style_context_has_class (context, palette_class);
+	if (had_palette_class)
+		gtk_style_context_remove_class (context, palette_class);
+
 	theme_access_context_get_color (context, GTK_STATE_FLAG_NORMAL, &out_map->text_foreground);
-	theme_access_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &out_map->text_background);
+	theme_access_resolve_map_background (context, GTK_STATE_FLAG_NORMAL, base_fallbacks,
+					     &out_map->text_background);
 	theme_access_context_get_color (context, GTK_STATE_FLAG_SELECTED, &out_map->selection_foreground);
-	theme_access_context_get_background_color (context, GTK_STATE_FLAG_SELECTED, &out_map->selection_background);
+	theme_access_resolve_map_background (context, GTK_STATE_FLAG_SELECTED, selected_bg_fallbacks,
+					     &out_map->selection_background);
+	if (gdk_rgba_equal (&out_map->selection_foreground, &out_map->text_foreground) &&
+	    theme_access_lookup_named_color (context, selected_fg_fallbacks, &named))
+		out_map->selection_foreground = named;
 	theme_access_context_get_color (context, GTK_STATE_FLAG_LINK, &accent);
 	if (accent.alpha <= 0.0)
 		accent = out_map->selection_background;
 	out_map->accent = accent;
+
+	if (had_palette_class)
+		gtk_style_context_add_class (context, palette_class);
+
 	out_map->enabled = TRUE;
 	return TRUE;
 }
@@ -223,14 +292,35 @@ theme_get_xtext_colors (XTextColor *palette, size_t palette_len)
 void
 theme_get_xtext_colors_for_widget (GtkWidget *widget, XTextColor *palette, size_t palette_len)
 {
+	ThemeGtkPaletteMap gtk_map = { 0 };
 	ThemeWidgetStyleValues style_values;
 	GdkRGBA marker_color;
+	gboolean have_marker = FALSE;
 
 	if (!palette)
 		return;
 
-	theme_get_widget_style_values_for_widget (widget, &style_values);
-	theme_runtime_get_xtext_colors (palette, palette_len);
+	if (theme_access_get_gtk_palette_map (widget, &gtk_map))
+	{
+		theme_runtime_get_widget_style_values_mapped (&gtk_map, &style_values);
+		theme_runtime_get_xtext_colors_mapped (&gtk_map, palette, palette_len);
+	}
+	else
+	{
+		theme_runtime_get_widget_style_values (&style_values);
+		theme_runtime_get_xtext_colors (palette, palette_len);
+	}
+	if (palette_len > THEME_XTEXT_MARKER_LEGACY_INDEX)
+	{
+		/* The marker token lives at its legacy slot before the extended
+		 * mIRC palette overwrites it; keep the (possibly theme-mapped)
+		 * value for the dedicated marker index below. */
+		marker_color.red = palette[THEME_XTEXT_MARKER_LEGACY_INDEX].red;
+		marker_color.green = palette[THEME_XTEXT_MARKER_LEGACY_INDEX].green;
+		marker_color.blue = palette[THEME_XTEXT_MARKER_LEGACY_INDEX].blue;
+		marker_color.alpha = palette[THEME_XTEXT_MARKER_LEGACY_INDEX].alpha;
+		have_marker = TRUE;
+	}
 	if (palette_len >= THEME_XTEXT_MIRC_COLS)
 		theme_access_apply_default_99_palette (palette, palette_len);
 	if (palette_len > THEME_XTEXT_MARK_FG_INDEX)
@@ -249,7 +339,7 @@ theme_get_xtext_colors_for_widget (GtkWidget *widget, XTextColor *palette, size_
 	}
 	if (palette_len > THEME_XTEXT_MARKER_INDEX)
 	{
-		if (!theme_runtime_get_color (THEME_TOKEN_MARKER, &marker_color))
+		if (!have_marker && !theme_runtime_get_color (THEME_TOKEN_MARKER, &marker_color))
 			marker_color = style_values.selection_background;
 		palette[THEME_XTEXT_MARKER_INDEX].red = marker_color.red;
 		palette[THEME_XTEXT_MARKER_INDEX].green = marker_color.green;

src/fe-gtk/theme/theme-application.c

@@ -25,6 +25,7 @@
 #include "theme-css.h"
 #include "theme-runtime.h"
 #include "theme-gtk3.h"
+#include "theme-policy.h"
 #include "../maingui.h"
 #include <gtk/gtk.h>
 
@@ -55,10 +56,19 @@ theme_application_apply_toplevel_theme (gboolean dark)
 
 	if (theme_gtk3_is_active ())
 	{
-		if (prefs.hex_gui_gtk3_variant == THEME_GTK3_VARIANT_PREFER_DARK)
-			prefer_dark = TRUE;
-		else if (prefs.hex_gui_gtk3_variant == THEME_GTK3_VARIANT_PREFER_LIGHT)
-			prefer_dark = FALSE;
+		/* An explicitly selected in-app theme controls its own
+		 * variant; the OS light/dark preference must not leak into
+		 * the window chrome (menu bar, dialogs).  The active variant
+		 * is always resolved to light or dark. */
+		prefer_dark = theme_gtk3_active_variant () == THEME_GTK3_VARIANT_PREFER_DARK;
+	}
+	else
+	{
+		/* Following the system GTK3 theme: only request the dark
+		 * variant when the dark-mode preference (or the system, in
+		 * auto mode) asks for it, instead of clobbering the value
+		 * that came from the user's GTK configuration. */
+		prefer_dark = theme_policy_is_dark_mode_active (prefs.hex_gui_dark_mode);
 	}
 
 	if (settings && g_object_class_find_property (G_OBJECT_GET_CLASS (settings),

src/fe-gtk/theme/theme-css.c

@@ -29,8 +29,6 @@
 static const char *theme_css_selector_input = "#zoitechat-inputbox";
 static const char *theme_css_selector_input_text = "#zoitechat-inputbox text";
 static const char *theme_css_selector_palette_class = "zoitechat-palette";
-static const char *theme_css_selector_dark_class = "zoitechat-dark";
-static const char *theme_css_selector_light_class = "zoitechat-light";
 static const char *theme_css_palette_provider_key = "zoitechat-palette-provider";
 static const guint theme_css_provider_priority = GTK_STYLE_PROVIDER_PRIORITY_USER;
 static const char *theme_css_palette_scope_selectors =
@@ -62,6 +60,12 @@ typedef struct
 static GtkCssProvider *theme_css_input_provider;
 static ThemeCssInputFingerprint theme_css_input_fp;
 
+const char *
+theme_css_palette_class_name (void)
+{
+	return theme_css_selector_palette_class;
+}
+
 void
 theme_css_apply_app_provider (GtkStyleProvider *provider)
 {
@@ -362,61 +366,9 @@ theme_css_apply_palette_widget (GtkWidget *widget, const GdkRGBA *bg, const GdkR
 char *
 theme_css_build_toplevel_classes (void)
 {
-	return g_strdup_printf (
-		"window.%s, window.%s:backdrop, .%s {"
-		"background-color: #202020;"
-		"color: #f0f0f0;"
-		"border-color: #202020;"
-		"}"
-		"window.%s menubar, window.%s menubar:backdrop, window.%s menubar box, window.%s menubar box:backdrop, window.%s menuitem, window.%s menuitem:backdrop {"
-		"background-color: @theme_bg_color;"
-		"background-image: none;"
-		"color: @theme_fg_color;"
-		"border-color: @theme_bg_color;"
-		"}"
-		"window.%s menuitem:hover, window.%s menuitem:selected {"
-		"background-color: @theme_selected_bg_color;"
-		"background-image: none;"
-		"color: @theme_selected_fg_color;"
-		"border-color: @theme_selected_bg_color;"
-		"}"
-		"window.%s, window.%s:backdrop, .%s {"
-		"background-color: #f6f6f6;"
-		"color: #101010;"
-		"border-color: #f6f6f6;"
-		"}"
-		"window.%s menubar, window.%s menubar:backdrop, window.%s menubar box, window.%s menubar box:backdrop, window.%s menuitem, window.%s menuitem:backdrop {"
-		"background-color: @theme_bg_color;"
-		"background-image: none;"
-		"color: @theme_fg_color;"
-		"border-color: @theme_bg_color;"
-		"}"
-		"window.%s menuitem:hover, window.%s menuitem:selected {"
-		"background-color: @theme_selected_bg_color;"
-		"background-image: none;"
-		"color: @theme_selected_fg_color;"
-		"border-color: @theme_selected_bg_color;"
-		"}",
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_dark_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class,
-		theme_css_selector_light_class);
+	/* Windows, dialogs and menus must render with the colors of the active
+	 * GTK3 theme (system or in-app selected).  zoitechat-dark and
+	 * zoitechat-light are marker classes only; painting fixed colors here
+	 * overrides every theme (issue #334). */
+	return g_strdup ("");
 }

src/fe-gtk/theme/theme-css.h

@@ -30,6 +30,7 @@
  * theme_css_apply_widget_provider:
  * Use for widget-local CSS providers attached to a specific widget context.
  */
+const char *theme_css_palette_class_name (void);
 void theme_css_apply_app_provider (GtkStyleProvider *provider);
 void theme_css_remove_app_provider (GtkStyleProvider *provider);
 void theme_css_apply_widget_provider (GtkWidget *widget, GtkStyleProvider *provider);

src/fe-gtk/theme/theme-gtk3.c

@@ -33,11 +33,60 @@
 
 static GPtrArray *theme_gtk3_providers_base;
 static GPtrArray *theme_gtk3_providers_variant;
+static GtkCssProvider *theme_gtk3_chrome_provider;
+static GHashTable *theme_gtk3_theme_colors;
 static GHashTable *theme_gtk3_provider_cache;
 static gboolean theme_gtk3_active;
 static char *theme_gtk3_current_id;
 static ThemeGtk3Variant theme_gtk3_current_variant;
 
+/* Menu bar and menus fall back to the base gtk-theme-name theme (the OS
+ * theme) for any property the selected in-app theme's CSS does not define,
+ * which mixes OS dark/light colors into the chrome (issue: dark menu bar on
+ * a light in-app theme when the OS is in dark mode).  While an in-app theme
+ * is active, backfill those widgets with the theme's own named colors.  The
+ * provider sits just below the theme providers, so a theme that styles its
+ * menus keeps full control. */
+#define THEME_GTK3_CHROME_PRIORITY (GTK_STYLE_PROVIDER_PRIORITY_USER - 1)
+/* Concrete color values are formatted in: desktop integration CSS (e.g.
+ * KDE's color-scheme sync in ~/.config/gtk-3.0/gtk.css) redefines the
+ * standard named colors with the OS palette at USER priority, so a
+ * "@theme_bg_color" reference here would resolve to the OS dark/light
+ * colors instead of the selected theme's. */
+static const char theme_gtk3_chrome_css_template[] =
+	".background, .background:backdrop {"
+	" background-color: %s;"
+	" color: %s;"
+	"}"
+	"headerbar, headerbar:backdrop, .titlebar, .titlebar:backdrop {"
+	" background-color: %s;"
+	" background-image: none;"
+	" color: %s;"
+	"}";
+
+/* The menu bar body and the menu items are separate CSS surfaces; desktop
+ * integration CSS or a theme can style one but not the other, splitting
+ * the menu bar row into two colors.  These rules sit above the theme and
+ * the desktop CSS so body and items always render as one surface. */
+#define THEME_GTK3_MENU_UNIFORM_PRIORITY (GTK_STYLE_PROVIDER_PRIORITY_USER + 40)
+static const char theme_gtk3_menu_uniform_template[] =
+	"menubar, menubar:backdrop, menubar > menuitem, menubar > menuitem:backdrop,"
+	"menu, menu:backdrop, .menu, .menu:backdrop, menu > menuitem, menu > menuitem:backdrop {"
+	" background-color: %s;"
+	" background-image: none;"
+	" color: %s;"
+	"}"
+	"menubar > menuitem:hover, menubar > menuitem:selected,"
+	"menu > menuitem:hover, menu > menuitem:selected,"
+	".menu menuitem:hover, .menu menuitem:selected {"
+	" background-color: %s;"
+	" background-image: none;"
+	" color: %s;"
+	"}"
+	"menubar > menuitem:disabled, menu > menuitem:disabled {"
+	" color: alpha(%s, 0.5);"
+	"}";
+
 typedef struct
 {
 	GHashTable *defaults;
@@ -49,6 +98,7 @@ typedef struct
 static ThemeGtk3SettingsState theme_gtk3_settings_state;
 
 static gboolean settings_apply_property (GtkSettings *settings, const char *property_name, const char *raw_value);
+static void theme_gtk3_menu_uniform_apply (const char *bg, const char *fg, const char *sel_bg, const char *sel_fg);
 
 static gboolean
 theme_gtk3_theme_name_is_dark (const char *name)
@@ -399,6 +449,21 @@ settings_theme_link_search_path (const char *theme_root, const char *theme_name)
 	}
 
 	link_path = g_build_filename (themes_root, theme_name, NULL);
+
+	/* A leftover symlink from a removed or relocated theme would satisfy
+	 * the EXISTS check while pointing at the wrong (or no) theme, leaving
+	 * the base gtk-theme-name on the OS theme.  Replace it. */
+	{
+		char *link_target = g_file_read_link (link_path, NULL);
+		if (link_target)
+		{
+			if (g_strcmp0 (link_target, theme_root) != 0 ||
+			    !g_file_test (link_path, G_FILE_TEST_IS_DIR))
+				g_unlink (link_path);
+			g_free (link_target);
+		}
+	}
+
 	if (!g_file_test (link_path, G_FILE_TEST_EXISTS))
 	{
 		GFile *link_file = g_file_new_for_path (link_path);
@@ -757,12 +822,176 @@ settings_apply_from_file (const char *theme_root, const char *css_dir)
 	g_ptr_array_unref (settings_paths);
 }
 
+static gboolean
+theme_gtk3_providers_define_color (const char *name)
+{
+	char *needle = g_strdup_printf ("@define-color %s ", name);
+	gboolean found = FALSE;
+	guint i;
+
+	for (i = 0; !found && theme_gtk3_providers_base && i < theme_gtk3_providers_base->len; i++)
+	{
+		char *dump = gtk_css_provider_to_string (g_ptr_array_index (theme_gtk3_providers_base, i));
+		found = dump && strstr (dump, needle) != NULL;
+		g_free (dump);
+	}
+	for (i = 0; !found && theme_gtk3_providers_variant && i < theme_gtk3_providers_variant->len; i++)
+	{
+		char *dump = gtk_css_provider_to_string (g_ptr_array_index (theme_gtk3_providers_variant, i));
+		found = dump && strstr (dump, needle) != NULL;
+		g_free (dump);
+	}
+
+	g_free (needle);
+	return found;
+}
+
+/* Resolve a named color from the selected theme itself.  The lookup
+ * context layers the theme's providers over the screen cascade, so the
+ * theme's own @define-color wins; when the theme does not define the
+ * name at all, fall back to a neutral palette matching the theme's
+ * variant instead of whatever the desktop injected into the cascade. */
+static char *
+theme_gtk3_chrome_resolve_color (GtkStyleContext *lookup, const char *name, const char *fallback)
+{
+	GdkRGBA color;
+
+	if (!theme_gtk3_providers_define_color (name) ||
+	    !gtk_style_context_lookup_color (lookup, name, &color))
+		g_assert (gdk_rgba_parse (&color, fallback));
+
+	if (!theme_gtk3_theme_colors)
+		theme_gtk3_theme_colors = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+	{
+		GdkRGBA *stored = g_new (GdkRGBA, 1);
+		*stored = color;
+		g_hash_table_insert (theme_gtk3_theme_colors, g_strdup (name), stored);
+	}
+
+	return gdk_rgba_to_string (&color);
+}
+
+gboolean
+theme_gtk3_lookup_theme_color (const char *name, GdkRGBA *out_color)
+{
+	GdkRGBA *stored;
+
+	if (!theme_gtk3_active || !theme_gtk3_theme_colors || !name || !out_color)
+		return FALSE;
+
+	stored = g_hash_table_lookup (theme_gtk3_theme_colors, name);
+	if (!stored)
+		return FALSE;
+
+	*out_color = *stored;
+	return TRUE;
+}
+
+static void
+theme_gtk3_chrome_provider_apply (gboolean prefer_dark)
+{
+	GdkScreen *screen = gdk_screen_get_default ();
+	GtkStyleContext *lookup;
+	char *bg;
+	char *fg;
+	char *sel_bg;
+	char *sel_fg;
+	char *css;
+	guint i;
+
+	if (!screen)
+		return;
+
+	lookup = gtk_style_context_new ();
+	for (i = 0; theme_gtk3_providers_base && i < theme_gtk3_providers_base->len; i++)
+		gtk_style_context_add_provider (lookup,
+			GTK_STYLE_PROVIDER (g_ptr_array_index (theme_gtk3_providers_base, i)),
+			GTK_STYLE_PROVIDER_PRIORITY_USER);
+	for (i = 0; theme_gtk3_providers_variant && i < theme_gtk3_providers_variant->len; i++)
+		gtk_style_context_add_provider (lookup,
+			GTK_STYLE_PROVIDER (g_ptr_array_index (theme_gtk3_providers_variant, i)),
+			GTK_STYLE_PROVIDER_PRIORITY_USER);
+
+	if (theme_gtk3_theme_colors)
+		g_hash_table_remove_all (theme_gtk3_theme_colors);
+
+	bg = theme_gtk3_chrome_resolve_color (lookup, "theme_bg_color",
+					      prefer_dark ? "#242424" : "#f6f5f4");
+	fg = theme_gtk3_chrome_resolve_color (lookup, "theme_fg_color",
+					      prefer_dark ? "#eeeeee" : "#2e3436");
+	sel_bg = theme_gtk3_chrome_resolve_color (lookup, "theme_selected_bg_color", "#3584e4");
+	sel_fg = theme_gtk3_chrome_resolve_color (lookup, "theme_selected_fg_color", "#ffffff");
+	/* Not used by the chrome CSS itself, but resolved and stored for the
+	 * mapped-palette sampling fallback (chat area and friends). */
+	g_free (theme_gtk3_chrome_resolve_color (lookup, "theme_base_color",
+						 prefer_dark ? "#1e1e1e" : "#ffffff"));
+	g_object_unref (lookup);
+
+	css = g_strdup_printf (theme_gtk3_chrome_css_template,
+			       bg, fg,
+			       bg, fg);
+
+	if (!theme_gtk3_chrome_provider)
+		theme_gtk3_chrome_provider = gtk_css_provider_new ();
+	gtk_css_provider_load_from_data (theme_gtk3_chrome_provider, css, -1, NULL);
+
+	gtk_style_context_add_provider_for_screen (screen,
+		GTK_STYLE_PROVIDER (theme_gtk3_chrome_provider),
+		THEME_GTK3_CHROME_PRIORITY);
+
+	theme_gtk3_menu_uniform_apply (bg, fg, sel_bg, sel_fg);
+
+	g_free (css);
+	g_free (sel_fg);
+	g_free (sel_bg);
+	g_free (fg);
+	g_free (bg);
+}
+
+static GtkCssProvider *theme_gtk3_menu_uniform_provider;
+
+static void
+theme_gtk3_menu_uniform_apply (const char *bg, const char *fg, const char *sel_bg, const char *sel_fg)
+{
+	GdkScreen *screen = gdk_screen_get_default ();
+	char *css;
+
+	if (!screen)
+		return;
+
+	css = g_strdup_printf (theme_gtk3_menu_uniform_template, bg, fg, sel_bg, sel_fg, fg);
+	if (!theme_gtk3_menu_uniform_provider)
+		theme_gtk3_menu_uniform_provider = gtk_css_provider_new ();
+	gtk_css_provider_load_from_data (theme_gtk3_menu_uniform_provider, css, -1, NULL);
+	gtk_style_context_add_provider_for_screen (screen,
+		GTK_STYLE_PROVIDER (theme_gtk3_menu_uniform_provider),
+		THEME_GTK3_MENU_UNIFORM_PRIORITY);
+	g_free (css);
+}
+
+static void
+theme_gtk3_chrome_provider_remove (void)
+{
+	GdkScreen *screen = gdk_screen_get_default ();
+
+	if (!screen)
+		return;
+
+	if (theme_gtk3_chrome_provider)
+		gtk_style_context_remove_provider_for_screen (screen,
+			GTK_STYLE_PROVIDER (theme_gtk3_chrome_provider));
+	if (theme_gtk3_menu_uniform_provider)
+		gtk_style_context_remove_provider_for_screen (screen,
+			GTK_STYLE_PROVIDER (theme_gtk3_menu_uniform_provider));
+}
+
 static void
 theme_gtk3_remove_provider (void)
 {
 	GdkScreen *screen = gdk_screen_get_default ();
 	guint i;
 
+	theme_gtk3_chrome_provider_remove ();
 	if (screen && theme_gtk3_providers_variant)
 	{
 		for (i = 0; i < theme_gtk3_providers_variant->len; i++)
@@ -866,6 +1095,7 @@ load_css_with_variant (ZoitechatGtk3Theme *theme, ThemeGtk3Variant variant, GErr
 	}
 
 	g_ptr_array_unref (chain);
+	theme_gtk3_chrome_provider_apply (prefer_dark);
 	settings_apply_for_variant (variant);
 	theme_gtk3_reset_widgets ();
 	theme_gtk3_active = TRUE;
@@ -876,24 +1106,35 @@ static gboolean
 theme_gtk3_apply_internal (const char *theme_id, ThemeGtk3Variant variant, gboolean force_reload, GError **error)
 {
 	ZoitechatGtk3Theme *theme;
-	char *previous_id = g_strdup (theme_gtk3_current_id);
-	ThemeGtk3Variant previous_variant = theme_gtk3_current_variant;
-	gboolean had_previous = theme_gtk3_active && previous_id && previous_id[0];
+	char *previous_id;
+	ThemeGtk3Variant previous_variant;
+	gboolean had_previous;
 	gboolean ok;
 
+	theme = zoitechat_gtk3_theme_find_by_id (theme_id);
+	if (!theme)
+		return g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_NOENT, "GTK3 theme not found."), FALSE;
+
+	/* An explicitly selected in-app theme pins the rendering to that
+	 * theme: it must not flip with the OS light/dark preference.  Legacy
+	 * configs still carry FOLLOW_SYSTEM (the pre-inference default), so
+	 * resolve it to the variant the theme itself provides. */
+	if (variant == THEME_GTK3_VARIANT_FOLLOW_SYSTEM)
+		variant = theme_gtk3_infer_variant (theme);
+
 	if (!force_reload &&
 		theme_gtk3_active &&
 		g_strcmp0 (theme_gtk3_current_id, theme_id) == 0 &&
 		theme_gtk3_current_variant == variant)
-		return TRUE;
-
-	theme = zoitechat_gtk3_theme_find_by_id (theme_id);
-	if (!theme)
 	{
-		g_free (previous_id);
-		return g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_NOENT, "GTK3 theme not found."), FALSE;
+		zoitechat_gtk3_theme_free (theme);
+		return TRUE;
 	}
 
+	previous_id = g_strdup (theme_gtk3_current_id);
+	previous_variant = theme_gtk3_current_variant;
+	had_previous = theme_gtk3_active && previous_id && previous_id[0];
+
 	theme_gtk3_remove_provider ();
 	if (force_reload)
 		theme_gtk3_invalidate_provider_cache ();
@@ -961,6 +1202,12 @@ void
 theme_gtk3_disable (void)
 {
 	theme_gtk3_remove_provider ();
+	g_clear_object (&theme_gtk3_chrome_provider);
+	g_clear_pointer (&theme_gtk3_theme_colors, g_hash_table_destroy);
+	/* Following the system theme: keep the menu bar body and the menu
+	 * items on one surface too, using the system's own colors. */
+	theme_gtk3_menu_uniform_apply ("@theme_bg_color", "@theme_fg_color",
+				       "@theme_selected_bg_color", "@theme_selected_fg_color");
 	g_clear_pointer (&theme_gtk3_current_id, g_free);
 	theme_gtk3_invalidate_provider_cache ();
 	g_clear_pointer (&theme_gtk3_provider_cache, g_hash_table_destroy);
@@ -990,3 +1237,13 @@ theme_gtk3_is_active (void)
 {
 	return theme_gtk3_active;
 }
+
+ThemeGtk3Variant
+theme_gtk3_active_variant (void)
+{
+	/* Always resolved to PREFER_LIGHT or PREFER_DARK while a theme is
+	 * active; FOLLOW_SYSTEM only when no in-app theme is applied. */
+	if (!theme_gtk3_active)
+		return THEME_GTK3_VARIANT_FOLLOW_SYSTEM;
+	return theme_gtk3_current_variant;
+}

src/fe-gtk/theme/theme-gtk3.h

@@ -22,6 +22,7 @@
 #define ZOITECHAT_THEME_GTK3_H
 
 #include <glib.h>
+#include <gdk/gdk.h>
 
 typedef enum
 {
@@ -38,5 +39,7 @@ ThemeGtk3Variant theme_gtk3_variant_for_theme (const char *theme_id);
 void theme_gtk3_invalidate_provider_cache (void);
 void theme_gtk3_disable (void);
 gboolean theme_gtk3_is_active (void);
+ThemeGtk3Variant theme_gtk3_active_variant (void);
+gboolean theme_gtk3_lookup_theme_color (const char *name, GdkRGBA *out_color);
 
 #endif

src/fe-gtk/theme/theme-manager.c

@@ -58,10 +58,52 @@ typedef struct
 	gboolean resolved_dark_preference;
 	char gtk3_theme_id[sizeof prefs.hex_gui_gtk3_theme];
 	int gtk3_variant;
+	char *gtk_theme_name;
 } ThemeManagerAutoRefreshCache;
 
 static ThemeManagerAutoRefreshCache theme_manager_auto_refresh_cache;
 
+static void
+theme_manager_auto_refresh_cache_reset (void)
+{
+	g_free (theme_manager_auto_refresh_cache.gtk_theme_name);
+	memset (&theme_manager_auto_refresh_cache, 0, sizeof (theme_manager_auto_refresh_cache));
+}
+
+static void
+theme_manager_auto_refresh_cache_store (gboolean resolved_dark_preference, char *gtk_theme_name)
+{
+	theme_manager_auto_refresh_cache.initialized = TRUE;
+	theme_manager_auto_refresh_cache.resolved_dark_preference = resolved_dark_preference;
+	theme_manager_auto_refresh_cache.gtk3_variant = prefs.hex_gui_gtk3_variant;
+	g_strlcpy (theme_manager_auto_refresh_cache.gtk3_theme_id,
+		   prefs.hex_gui_gtk3_theme,
+		   sizeof (theme_manager_auto_refresh_cache.gtk3_theme_id));
+	g_free (theme_manager_auto_refresh_cache.gtk_theme_name);
+	theme_manager_auto_refresh_cache.gtk_theme_name = gtk_theme_name;
+}
+
+static char *
+theme_manager_dup_gtk_theme_name (void)
+{
+	GtkSettings *settings = gtk_settings_get_default ();
+	char *gtk_theme_name = NULL;
+
+	if (settings)
+		g_object_get (settings, "gtk-theme-name", &gtk_theme_name, NULL);
+	return gtk_theme_name;
+}
+
+/* Record the state the application started up with so that the first queued
+ * auto refresh only reacts to real changes; startup already applied the
+ * current theme, and consumers such as the tray are not ready yet. */
+static void
+theme_manager_auto_refresh_cache_prime (void)
+{
+	theme_manager_auto_refresh_cache_store (theme_policy_system_prefers_dark (),
+						theme_manager_dup_gtk_theme_name ());
+}
+
 static void theme_manager_apply_platform_window_theme (GtkWidget *window);
 
 static void
@@ -145,7 +187,9 @@ theme_manager_auto_dark_mode_changed (GtkSettings *settings, GParamSpec *pspec,
 	gboolean color_change = FALSE;
 	gboolean should_refresh_gtk3;
 	gboolean gtk3_refresh;
+	gboolean follows_system_theme;
 	gboolean resolved_dark_preference;
+	char *gtk_theme_name = NULL;
 	static gboolean in_handler = FALSE;
 
 	(void) settings;
@@ -154,39 +198,47 @@ theme_manager_auto_dark_mode_changed (GtkSettings *settings, GParamSpec *pspec,
 
 	resolved_dark_preference = theme_policy_system_prefers_dark ();
 	gtk3_refresh = theme_manager_should_refresh_gtk3 ();
+	follows_system_theme = prefs.hex_gui_gtk3_theme[0] == '\0';
 	should_refresh_gtk3 = gtk3_refresh || prefs.hex_gui_dark_mode == ZOITECHAT_DARK_MODE_AUTO;
 
+	gtk_theme_name = theme_manager_dup_gtk_theme_name ();
+
 	if (theme_manager_auto_refresh_cache.initialized &&
 	    theme_manager_auto_refresh_cache.resolved_dark_preference == resolved_dark_preference &&
 	    theme_manager_auto_refresh_cache.gtk3_variant == prefs.hex_gui_gtk3_variant &&
-	    g_strcmp0 (theme_manager_auto_refresh_cache.gtk3_theme_id, prefs.hex_gui_gtk3_theme) == 0)
+	    g_strcmp0 (theme_manager_auto_refresh_cache.gtk3_theme_id, prefs.hex_gui_gtk3_theme) == 0 &&
+	    g_strcmp0 (theme_manager_auto_refresh_cache.gtk_theme_name, gtk_theme_name) == 0)
+	{
+		g_free (gtk_theme_name);
 		return;
+	}
 
-	theme_manager_auto_refresh_cache.initialized = TRUE;
-	theme_manager_auto_refresh_cache.resolved_dark_preference = resolved_dark_preference;
-	theme_manager_auto_refresh_cache.gtk3_variant = prefs.hex_gui_gtk3_variant;
-	g_strlcpy (theme_manager_auto_refresh_cache.gtk3_theme_id,
-		   prefs.hex_gui_gtk3_theme,
-		   sizeof (theme_manager_auto_refresh_cache.gtk3_theme_id));
+	theme_manager_auto_refresh_cache_store (resolved_dark_preference, gtk_theme_name);
 
-	if (prefs.hex_gui_dark_mode != ZOITECHAT_DARK_MODE_AUTO && !gtk3_refresh)
+	if (prefs.hex_gui_dark_mode != ZOITECHAT_DARK_MODE_AUTO && !gtk3_refresh && !follows_system_theme)
 		return;
 	if (in_handler)
 		return;
 
 	in_handler = TRUE;
 
-	if (prefs.hex_gui_dark_mode == ZOITECHAT_DARK_MODE_AUTO)
+	if (prefs.hex_gui_dark_mode == ZOITECHAT_DARK_MODE_AUTO || follows_system_theme)
 	{
-		fe_set_auto_dark_mode_state (resolved_dark_preference);
 		theme_manager_commit_preferences (prefs.hex_gui_dark_mode, &color_change);
-		if (color_change)
-			theme_manager_dispatch_changed (THEME_CHANGED_REASON_PALETTE | THEME_CHANGED_REASON_WIDGET_STYLE | THEME_CHANGED_REASON_USERLIST | THEME_CHANGED_REASON_MODE);
+		if (prefs.hex_gui_dark_mode == ZOITECHAT_DARK_MODE_AUTO)
+			fe_set_auto_dark_mode_state (resolved_dark_preference);
 	}
 
 	if (should_refresh_gtk3)
 		theme_gtk3_apply_current (NULL);
 
+	if (prefs.hex_gui_dark_mode == ZOITECHAT_DARK_MODE_AUTO || follows_system_theme)
+	{
+		/* The system theme feeds the mapped palette (chat area, user
+		 * list, channel tree), so consumers must re-resolve colors. */
+		theme_manager_dispatch_changed (THEME_CHANGED_REASON_PALETTE | THEME_CHANGED_REASON_WIDGET_STYLE | THEME_CHANGED_REASON_USERLIST | THEME_CHANGED_REASON_MODE);
+	}
+
 	in_handler = FALSE;
 }
 
@@ -204,18 +256,28 @@ theme_manager_run_auto_refresh (gpointer data)
 static void
 theme_manager_queue_auto_refresh (GtkSettings *settings, GParamSpec *pspec, gpointer data)
 {
+	guint source_id;
+
 	(void) settings;
 	(void) pspec;
 
 	if (theme_manager_auto_refresh_source != 0)
 		return;
 
-	theme_manager_auto_refresh_source = theme_manager_idle_add_func (theme_manager_run_auto_refresh, data);
+	theme_manager_auto_refresh_source = 1;
+	source_id = theme_manager_idle_add_func (theme_manager_run_auto_refresh, data);
+	/* An injected idle-add may run the refresh synchronously and already
+	 * have cleared the pending marker; only keep the id while pending. */
+	if (theme_manager_auto_refresh_source != 0)
+		theme_manager_auto_refresh_source = source_id;
 }
 
 void
 theme_manager_init (void)
 {
+	static gboolean settings_signals_connected = FALSE;
+	GtkSettings *settings;
+
 	if (!theme_manager_listeners)
 		theme_manager_listeners = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL,
 									 theme_listener_free);
@@ -223,10 +285,25 @@ theme_manager_init (void)
 	if (!theme_manager_setup_listener_id)
 		theme_manager_setup_listener_id = theme_listener_register ("setup.apply", theme_manager_setup_apply_listener, NULL);
 
-	fe_set_auto_dark_mode_state (FALSE);
+	theme_policy_init ();
+	theme_policy_set_appearance_changed_callback (theme_manager_refresh_auto_mode);
+
+	settings = gtk_settings_get_default ();
+	if (settings && !settings_signals_connected)
+	{
+		g_signal_connect (settings, "notify::gtk-theme-name",
+				  G_CALLBACK (theme_manager_queue_auto_refresh), NULL);
+		g_signal_connect (settings, "notify::gtk-application-prefer-dark-theme",
+				  G_CALLBACK (theme_manager_queue_auto_refresh), NULL);
+		settings_signals_connected = TRUE;
+	}
+
+	fe_set_auto_dark_mode_state (prefs.hex_gui_dark_mode == ZOITECHAT_DARK_MODE_AUTO ?
+				     theme_policy_system_prefers_dark () : FALSE);
 	theme_application_apply_mode (prefs.hex_gui_dark_mode, NULL);
 	theme_gtk3_init ();
 	zoitechat_set_theme_post_apply_callback (theme_manager_handle_theme_applied);
+	theme_manager_auto_refresh_cache_prime ();
 }
 
 gboolean
@@ -513,13 +590,9 @@ theme_manager_apply_platform_window_theme (GtkWidget *window)
 
 	context = gtk_widget_get_style_context (window);
 	if (theme_gtk3_is_active ())
-	{
-		dark = prefs.hex_gui_gtk3_variant == THEME_GTK3_VARIANT_PREFER_DARK;
-		if (prefs.hex_gui_gtk3_variant == THEME_GTK3_VARIANT_FOLLOW_SYSTEM)
-			dark = theme_policy_system_prefers_dark ();
-	}
+		dark = theme_gtk3_active_variant () == THEME_GTK3_VARIANT_PREFER_DARK;
 	else
-		dark = theme_runtime_is_dark_active ();
+		dark = theme_policy_is_dark_mode_active (prefs.hex_gui_dark_mode);
 	if (context)
 	{
 		gtk_style_context_remove_class (context, "zoitechat-dark");
@@ -712,4 +785,5 @@ theme_manager_set_idle_add_func (ThemeManagerIdleAddFunc idle_add_func)
 {
 	theme_manager_idle_add_func = idle_add_func ? idle_add_func : g_idle_add;
 	theme_manager_auto_refresh_source = 0;
+	theme_manager_auto_refresh_cache_reset ();
 }

src/fe-gtk/theme/theme-policy.c

@@ -20,14 +20,379 @@
 
 #include "theme-policy.h"
 
+#include <string.h>
+
+#include <gtk/gtk.h>
+#include <gio/gio.h>
+
+#include "theme-gtk3.h"
 #include "../fe-gtk.h"
 #include "../../common/zoitechat.h"
 #include "../../common/zoitechatc.h"
 
+/* org.freedesktop.appearance color-scheme values (XDG desktop portal) */
+enum
+{
+	THEME_POLICY_COLOR_SCHEME_NO_PREFERENCE = 0,
+	THEME_POLICY_COLOR_SCHEME_PREFER_DARK = 1,
+	THEME_POLICY_COLOR_SCHEME_PREFER_LIGHT = 2
+};
+
+static ThemePolicyAppearanceChangedFunc policy_appearance_changed_cb;
+
+/* GtkSettings state captured before ZoiteChat writes to it, so that values
+ * coming from the user's own GTK configuration are not mistaken for values
+ * this application set. */
+static gboolean policy_initial_gtk_state_captured;
+static gboolean policy_initial_prefer_dark;
+static char *policy_initial_theme_name;
+
+#ifndef G_OS_WIN32
+static gboolean policy_portal_watch_started;
+static gboolean policy_portal_value_valid;
+static guint32 policy_portal_color_scheme;
+
+static gboolean policy_gsettings_checked;
+static GSettings *policy_gsettings_interface;
+#endif
+
+static void
+policy_capture_initial_gtk_state (void)
+{
+	GtkSettings *settings;
+
+	if (policy_initial_gtk_state_captured)
+		return;
+
+	settings = gtk_settings_get_default ();
+	if (!settings)
+		return;
+
+	g_object_get (settings,
+	              "gtk-application-prefer-dark-theme", &policy_initial_prefer_dark,
+	              "gtk-theme-name", &policy_initial_theme_name,
+	              NULL);
+	policy_initial_gtk_state_captured = TRUE;
+}
+
+static gboolean
+policy_theme_name_is_dark (const char *name)
+{
+	char *lower;
+	gboolean dark;
+
+	if (!name || !name[0])
+		return FALSE;
+
+	lower = g_ascii_strdown (name, -1);
+	dark = strstr (lower, "dark") != NULL || strstr (lower, "noir") != NULL ||
+	       strstr (lower, "black") != NULL;
+	g_free (lower);
+	return dark;
+}
+
+#ifndef G_OS_WIN32
+
+static void
+policy_notify_appearance_changed (void)
+{
+	if (policy_appearance_changed_cb)
+		policy_appearance_changed_cb ();
+}
+
+static gboolean
+policy_color_scheme_from_variant (GVariant *value, guint32 *color_scheme)
+{
+	GVariant *inner;
+	gboolean ok = FALSE;
+
+	if (!value || !color_scheme)
+		return FALSE;
+
+	inner = g_variant_ref (value);
+	while (g_variant_is_of_type (inner, G_VARIANT_TYPE_VARIANT))
+	{
+		GVariant *unwrapped = g_variant_get_variant (inner);
+
+		g_variant_unref (inner);
+		inner = unwrapped;
+	}
+
+	if (g_variant_is_of_type (inner, G_VARIANT_TYPE_UINT32))
+	{
+		*color_scheme = g_variant_get_uint32 (inner);
+		ok = TRUE;
+	}
+
+	g_variant_unref (inner);
+	return ok;
+}
+
+static void
+policy_portal_store_color_scheme (guint32 color_scheme)
+{
+	gboolean changed;
+
+	changed = !policy_portal_value_valid || policy_portal_color_scheme != color_scheme;
+	policy_portal_value_valid = TRUE;
+	policy_portal_color_scheme = color_scheme;
+
+	if (changed)
+		policy_notify_appearance_changed ();
+}
+
+static void
+policy_portal_setting_changed_cb (GDBusConnection *connection, const char *sender_name,
+                                  const char *object_path, const char *interface_name,
+                                  const char *signal_name, GVariant *parameters,
+                                  gpointer user_data)
+{
+	const char *setting_namespace = NULL;
+	const char *setting_key = NULL;
+	GVariant *value = NULL;
+	guint32 color_scheme = THEME_POLICY_COLOR_SCHEME_NO_PREFERENCE;
+
+	(void) connection;
+	(void) sender_name;
+	(void) object_path;
+	(void) interface_name;
+	(void) signal_name;
+	(void) user_data;
+
+	if (!parameters || !g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(ssv)")))
+		return;
+
+	g_variant_get (parameters, "(&s&sv)", &setting_namespace, &setting_key, &value);
+	if (g_strcmp0 (setting_namespace, "org.freedesktop.appearance") == 0 &&
+	    g_strcmp0 (setting_key, "color-scheme") == 0 &&
+	    policy_color_scheme_from_variant (value, &color_scheme))
+		policy_portal_store_color_scheme (color_scheme);
+
+	if (value)
+		g_variant_unref (value);
+}
+
+static void
+policy_portal_read_ready_cb (GObject *source, GAsyncResult *result, gpointer user_data)
+{
+	GVariant *reply;
+	GVariant *value = NULL;
+	guint32 color_scheme = THEME_POLICY_COLOR_SCHEME_NO_PREFERENCE;
+
+	(void) user_data;
+
+	reply = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, NULL);
+	if (!reply)
+		return;
+
+	if (g_variant_is_of_type (reply, G_VARIANT_TYPE ("(v)")))
+	{
+		g_variant_get (reply, "(v)", &value);
+		if (policy_color_scheme_from_variant (value, &color_scheme))
+			policy_portal_store_color_scheme (color_scheme);
+		if (value)
+			g_variant_unref (value);
+	}
+
+	g_variant_unref (reply);
+}
+
+static void
+policy_portal_bus_ready_cb (GObject *source, GAsyncResult *result, gpointer user_data)
+{
+	GDBusConnection *connection;
+
+	(void) source;
+	(void) user_data;
+
+	connection = g_bus_get_finish (result, NULL);
+	if (!connection)
+		return;
+
+	g_dbus_connection_signal_subscribe (connection,
+	                                    "org.freedesktop.portal.Desktop",
+	                                    "org.freedesktop.portal.Settings",
+	                                    "SettingChanged",
+	                                    "/org/freedesktop/portal/desktop",
+	                                    NULL,
+	                                    G_DBUS_SIGNAL_FLAGS_NONE,
+	                                    policy_portal_setting_changed_cb,
+	                                    NULL,
+	                                    NULL);
+
+	g_dbus_connection_call (connection,
+	                        "org.freedesktop.portal.Desktop",
+	                        "/org/freedesktop/portal/desktop",
+	                        "org.freedesktop.portal.Settings",
+	                        "Read",
+	                        g_variant_new ("(ss)", "org.freedesktop.appearance", "color-scheme"),
+	                        G_VARIANT_TYPE ("(v)"),
+	                        G_DBUS_CALL_FLAGS_NONE,
+	                        3000,
+	                        NULL,
+	                        policy_portal_read_ready_cb,
+	                        NULL);
+	g_object_unref (connection);
+}
+
+static void
+policy_portal_watch_start (void)
+{
+	if (policy_portal_watch_started)
+		return;
+
+	policy_portal_watch_started = TRUE;
+	g_bus_get (G_BUS_TYPE_SESSION, NULL, policy_portal_bus_ready_cb, NULL);
+}
+
+static void
+policy_gsettings_changed_cb (GSettings *settings, const char *key, gpointer user_data)
+{
+	(void) settings;
+	(void) key;
+	(void) user_data;
+
+	policy_notify_appearance_changed ();
+}
+
+static GSettings *
+policy_get_interface_gsettings (void)
+{
+	GSettingsSchemaSource *source;
+	GSettingsSchema *schema;
+	gboolean has_key;
+
+	if (policy_gsettings_checked)
+		return policy_gsettings_interface;
+
+	policy_gsettings_checked = TRUE;
+
+	source = g_settings_schema_source_get_default ();
+	if (!source)
+		return NULL;
+
+	schema = g_settings_schema_source_lookup (source, "org.gnome.desktop.interface", TRUE);
+	if (!schema)
+		return NULL;
+
+	/* Requires GLib 2.40, always satisfied by the GTK 3.22 dependency. */
+	G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+	has_key = g_settings_schema_has_key (schema, "color-scheme");
+	G_GNUC_END_IGNORE_DEPRECATIONS
+	g_settings_schema_unref (schema);
+	if (!has_key)
+		return NULL;
+
+	policy_gsettings_interface = g_settings_new ("org.gnome.desktop.interface");
+	g_signal_connect (policy_gsettings_interface, "changed::color-scheme",
+	                  G_CALLBACK (policy_gsettings_changed_cb), NULL);
+	return policy_gsettings_interface;
+}
+
+static gboolean
+policy_gsettings_color_scheme (gboolean *prefers_dark)
+{
+	GSettings *settings;
+	char *scheme;
+	gboolean explicit_preference = FALSE;
+
+	settings = policy_get_interface_gsettings ();
+	if (!settings)
+		return FALSE;
+
+	scheme = g_settings_get_string (settings, "color-scheme");
+	if (g_strcmp0 (scheme, "prefer-dark") == 0)
+	{
+		*prefers_dark = TRUE;
+		explicit_preference = TRUE;
+	}
+	else if (g_strcmp0 (scheme, "prefer-light") == 0)
+	{
+		*prefers_dark = FALSE;
+		explicit_preference = TRUE;
+	}
+	g_free (scheme);
+	return explicit_preference;
+}
+
+static gboolean
+policy_gtk_heuristic_prefers_dark (void)
+{
+	GtkSettings *settings;
+	char *theme_name = NULL;
+	gboolean dark;
+
+	policy_capture_initial_gtk_state ();
+
+	/* gtk-application-prefer-dark-theme is overwritten by ZoiteChat at
+	 * runtime, so only its captured startup value (settings.ini, XSETTINGS)
+	 * reflects the user's own configuration. */
+	if (policy_initial_gtk_state_captured && policy_initial_prefer_dark)
+		return TRUE;
+
+	if (theme_gtk3_is_active ())
+	{
+		/* gtk-theme-name currently holds the in-app theme override;
+		 * fall back to the captured system theme name. */
+		theme_name = g_strdup (policy_initial_theme_name);
+	}
+	else
+	{
+		settings = gtk_settings_get_default ();
+		if (settings)
+			g_object_get (settings, "gtk-theme-name", &theme_name, NULL);
+	}
+
+	dark = policy_theme_name_is_dark (theme_name);
+	g_free (theme_name);
+	return dark;
+}
+
+#endif /* !G_OS_WIN32 */
+
+void
+theme_policy_init (void)
+{
+	policy_capture_initial_gtk_state ();
+#ifndef G_OS_WIN32
+	policy_portal_watch_start ();
+#endif
+}
+
+void
+theme_policy_set_appearance_changed_callback (ThemePolicyAppearanceChangedFunc callback)
+{
+	policy_appearance_changed_cb = callback;
+}
+
 gboolean
 theme_policy_system_prefers_dark (void)
 {
-	return FALSE;
+#ifdef G_OS_WIN32
+	gboolean prefer_dark = FALSE;
+
+	policy_capture_initial_gtk_state ();
+
+	if (fe_win32_high_contrast_is_enabled ())
+		return FALSE;
+	if (fe_win32_try_get_system_dark (&prefer_dark))
+		return prefer_dark;
+	return policy_theme_name_is_dark (policy_initial_theme_name);
+#else
+	gboolean prefers_dark = FALSE;
+
+	policy_capture_initial_gtk_state ();
+	policy_portal_watch_start ();
+
+	if (policy_portal_value_valid &&
+	    policy_portal_color_scheme != THEME_POLICY_COLOR_SCHEME_NO_PREFERENCE)
+		return policy_portal_color_scheme == THEME_POLICY_COLOR_SCHEME_PREFER_DARK;
+
+	if (policy_gsettings_color_scheme (&prefers_dark))
+		return prefers_dark;
+
+	return policy_gtk_heuristic_prefers_dark ();
+#endif
 }
 
 gboolean

src/fe-gtk/theme/theme-policy.h

@@ -23,6 +23,10 @@
 
 #include "../fe-gtk.h"
 
+typedef void (*ThemePolicyAppearanceChangedFunc) (void);
+
+void theme_policy_init (void);
+void theme_policy_set_appearance_changed_callback (ThemePolicyAppearanceChangedFunc callback);
 gboolean theme_policy_system_prefers_dark (void);
 gboolean theme_policy_is_dark_mode_active (unsigned int mode);
 gboolean theme_policy_is_app_dark_mode_active (void);

src/fe-gtk/theme/theme-preferences.c

@@ -101,6 +101,9 @@ typedef struct
         gboolean changed;
         gboolean snapshot_valid[THEME_TOKEN_COUNT];
         gboolean staged_valid[THEME_TOKEN_COUNT];
+        /* Only explicitly edited tokens are written back to the runtime
+         * palette; untouched tokens keep following the GTK3 theme. */
+        gboolean staged_dirty[THEME_TOKEN_COUNT];
         GdkRGBA snapshot[THEME_TOKEN_COUNT];
         GdkRGBA staged[THEME_TOKEN_COUNT];
 } theme_preferences_stage_state;
@@ -147,7 +150,8 @@ theme_preferences_stage_sync_runtime_to_snapshot (void)
 
         for (token = THEME_TOKEN_MIRC_0; token < THEME_TOKEN_COUNT; token++)
         {
-                if (theme_preferences_stage.snapshot_valid[token])
+                if (theme_preferences_stage.snapshot_valid[token] &&
+                    theme_preferences_stage.staged_dirty[token])
                         theme_manager_set_token_color (ZOITECHAT_DARK_MODE_LIGHT, token,
                                                        &theme_preferences_stage.snapshot[token], NULL);
         }
@@ -160,7 +164,8 @@ theme_preferences_stage_sync_runtime_to_staged (void)
 
         for (token = THEME_TOKEN_MIRC_0; token < THEME_TOKEN_COUNT; token++)
         {
-                if (theme_preferences_stage.staged_valid[token])
+                if (theme_preferences_stage.staged_valid[token] &&
+                    theme_preferences_stage.staged_dirty[token])
                         theme_manager_set_token_color (ZOITECHAT_DARK_MODE_LIGHT, token,
                                                        &theme_preferences_stage.staged[token], NULL);
         }
@@ -179,6 +184,7 @@ theme_preferences_staged_set_color (ThemeSemanticToken token, const GdkRGBA *rgb
         {
                 theme_preferences_stage.staged[token] = *rgba;
                 theme_preferences_stage.staged_valid[token] = TRUE;
+                theme_preferences_stage.staged_dirty[token] = TRUE;
                 theme_preferences_stage_recompute_changed ();
                 if (color_change_flag)
                         *color_change_flag = theme_preferences_stage.changed;
@@ -841,6 +847,10 @@ theme_preferences_manager_dialog_response_cb (GtkDialog *dialog, gint response_i
                         ThemeSemanticToken token;
                         ThemeWidgetStyleValues style_values;
 
+                        /* The runtime palette was just reset; drop any
+                         * pending edits so the reset is not re-pinned. */
+                        memset (theme_preferences_stage.staged_dirty, 0,
+                                sizeof (theme_preferences_stage.staged_dirty));
                         for (token = THEME_TOKEN_MIRC_0; token < THEME_TOKEN_COUNT; token++)
                         {
                                 GdkRGBA rgba;
@@ -855,7 +865,6 @@ theme_preferences_manager_dialog_response_cb (GtkDialog *dialog, gint response_i
                         theme_preferences_stage.staged_valid[THEME_TOKEN_TEXT_FOREGROUND] = TRUE;
                         theme_preferences_stage.staged[THEME_TOKEN_TEXT_BACKGROUND] = style_values.background;
                         theme_preferences_stage.staged_valid[THEME_TOKEN_TEXT_BACKGROUND] = TRUE;
-                        theme_preferences_stage_sync_runtime_to_staged ();
                         theme_preferences_stage_recompute_changed ();
                         if (ui->color_change_flag)
                                 *ui->color_change_flag = theme_preferences_stage.changed;
@@ -1534,6 +1543,25 @@ theme_preferences_gtk3_sync_remove_state (theme_preferences_ui *ui)
         gtk_widget_set_sensitive (ui->gtk3_remove, source == ZOITECHAT_GTK3_THEME_SOURCE_USER);
 }
 
+static void
+theme_preferences_stage_rebase_color (ThemeSemanticToken token, const GdkRGBA *rgba)
+{
+	if (token < 0 || token >= THEME_TOKEN_COUNT || !rgba)
+		return;
+	if (!theme_preferences_stage.active)
+		return;
+
+	/* The theme changed underneath the dialog: shift the baseline so the
+	 * new theme-provided value is neither treated as a user edit nor
+	 * pinned into the runtime palette. */
+	theme_preferences_stage.snapshot[token] = *rgba;
+	theme_preferences_stage.staged[token] = *rgba;
+	theme_preferences_stage.snapshot_valid[token] = TRUE;
+	theme_preferences_stage.staged_valid[token] = TRUE;
+	theme_preferences_stage.staged_dirty[token] = FALSE;
+	theme_preferences_stage_recompute_changed ();
+}
+
 static void
 theme_preferences_gtk3_sync_runtime_palette (theme_preferences_ui *ui)
 {
@@ -1549,22 +1577,16 @@ theme_preferences_gtk3_sync_runtime_palette (theme_preferences_ui *ui)
 
 	theme_get_widget_style_values_for_widget (style_source, &style_values);
 
-	theme_preferences_staged_set_color (THEME_TOKEN_TEXT_FOREGROUND,
-	                                    &style_values.foreground,
-	                                    NULL,
-	                                    TRUE);
-	theme_preferences_staged_set_color (THEME_TOKEN_TEXT_BACKGROUND,
-	                                    &style_values.background,
-	                                    NULL,
-	                                    TRUE);
-	theme_preferences_staged_set_color (THEME_TOKEN_SELECTION_FOREGROUND,
-	                                    &style_values.selection_foreground,
-	                                    NULL,
-	                                    TRUE);
-	theme_preferences_staged_set_color (THEME_TOKEN_SELECTION_BACKGROUND,
-	                                    &style_values.selection_background,
-	                                    NULL,
-	                                    TRUE);
+	/* Leave the mapped tokens unpinned so the user list, channel tree and
+	 * input box keep resolving their colors from whatever GTK3 theme is
+	 * active (system or in-app selected), and only refresh what the
+	 * dialog shows.  Pinning theme-derived values here freezes them into
+	 * the runtime palette (and colors.conf), which left those widgets
+	 * with stale colors until the next restart. */
+	theme_preferences_stage_rebase_color (THEME_TOKEN_TEXT_FOREGROUND, &style_values.foreground);
+	theme_preferences_stage_rebase_color (THEME_TOKEN_TEXT_BACKGROUND, &style_values.background);
+	theme_preferences_stage_rebase_color (THEME_TOKEN_SELECTION_FOREGROUND, &style_values.selection_foreground);
+	theme_preferences_stage_rebase_color (THEME_TOKEN_SELECTION_BACKGROUND, &style_values.selection_background);
 }
 
 static gboolean

src/fe-gtk/xtext.c

@@ -47,6 +47,7 @@
 #include "fe-gtk.h"
 #include "xtext.h"
 #include "fkeys.h"
+#include "gtkutil.h"
 #include "theme/theme-access.h"
 
 #define charlen(str) g_utf8_skip[*(guchar *)(str)]
@@ -657,6 +658,93 @@ backend_font_open (GtkXText *xtext, char *name)
 	pango_font_metrics_unref (metrics);
 }
 
+
+#ifdef WIN32
+static gboolean
+xtext_win7_is_emoji_char (gunichar ch)
+{
+	return (ch >= 0x1f000 && ch <= 0x1faff) ||
+	       (ch >= 0x2600 && ch <= 0x27bf) ||
+	       (ch >= 0x2300 && ch <= 0x23ff) ||
+	       (ch >= 0x2b00 && ch <= 0x2bff) ||
+	       (ch >= 0xfe00 && ch <= 0xfe0f) ||
+	       ch == 0x200d;
+}
+
+static const char *
+xtext_win7_emoji_font_family (void)
+{
+	static char family[FONTNAMELEN + 1];
+	static char source[sizeof prefs.hex_text_font_alternative];
+	char **families;
+	int i;
+
+	if (win32_is_windows_8_or_newer ())
+		return NULL;
+
+	if (strcmp (source, prefs.hex_text_font_alternative) == 0 && family[0])
+		return family;
+
+	family[0] = 0;
+	g_strlcpy (source, prefs.hex_text_font_alternative, sizeof source);
+	families = g_strsplit (prefs.hex_text_font_alternative, ",", -1);
+	for (i = 0; families[i]; i++)
+	{
+		char *name = g_strstrip (families[i]);
+
+		if (*name && gtkutil_find_font (name))
+		{
+			g_strlcpy (family, name, sizeof family);
+			break;
+		}
+	}
+	g_strfreev (families);
+
+	if (!family[0] && gtkutil_find_font ("Segoe UI Symbol"))
+		g_strlcpy (family, "Segoe UI Symbol", sizeof family);
+
+	return family[0] ? family : NULL;
+}
+
+static PangoAttrList *
+xtext_win7_emoji_attrs (const char *str, int len, int emphasis)
+{
+	const char *family;
+	const char *p;
+	const char *end;
+	PangoAttrList *attrs = NULL;
+
+	family = xtext_win7_emoji_font_family ();
+	if (!family)
+		return attr_lists[emphasis];
+
+	p = str;
+	end = str + len;
+	while (p < end)
+	{
+		const char *next = g_utf8_next_char (p);
+		gunichar ch = g_utf8_get_char_validated (p, end - p);
+
+		if (ch != (gunichar)-1 && ch != (gunichar)-2 && xtext_win7_is_emoji_char (ch))
+		{
+			PangoAttribute *attr;
+
+			if (!attrs)
+				attrs = pango_attr_list_copy (attr_lists[emphasis]);
+
+			attr = pango_attr_family_new (family);
+			attr->start_index = p - str;
+			attr->end_index = next - str;
+			pango_attr_list_insert (attrs, attr);
+		}
+
+		p = next;
+	}
+
+	return attrs ? attrs : attr_lists[emphasis];
+}
+#endif
+
 static int
 backend_get_text_width_emph (GtkXText *xtext, guchar *str, int len, int emphasis)
 {
@@ -680,8 +768,18 @@ backend_get_text_width_emph (GtkXText *xtext, guchar *str, int len, int emphasis
 			deltaw = fontwidths[emphasis][*str];
 		else
 		{
+#ifdef WIN32
+			PangoAttrList *attrs = xtext_win7_emoji_attrs ((const char *)str, mbl, emphasis);
+
+			pango_layout_set_attributes (xtext->layout, attrs);
+#endif
 			pango_layout_set_text (xtext->layout, str, mbl);
 			pango_layout_get_pixel_size (xtext->layout, &deltaw, NULL);
+#ifdef WIN32
+			if (attrs != attr_lists[emphasis])
+				pango_attr_list_unref (attrs);
+			pango_layout_set_attributes (xtext->layout, attr_lists[emphasis]);
+#endif
 		}
 		width += deltaw;
 		str += mbl;
@@ -715,10 +813,18 @@ backend_draw_text_emph (GtkXText *xtext, gboolean dofill, int x, int y,
 {
 	cairo_t *cr;
 	PangoLayoutLine *line;
+#ifdef WIN32
+	PangoAttrList *attrs;
+#endif
 
 	cr = xtext_create_context (xtext);
 
+#ifdef WIN32
+	attrs = xtext_win7_emoji_attrs (str, len, emphasis);
+	pango_layout_set_attributes (xtext->layout, attrs);
+#else
 	pango_layout_set_attributes (xtext->layout, attr_lists[emphasis]);
+#endif
 	pango_layout_set_text (xtext->layout, str, len);
 
 	if (dofill)
@@ -734,7 +840,10 @@ backend_draw_text_emph (GtkXText *xtext, gboolean dofill, int x, int y,
 	cairo_move_to (cr, x, y);
 	pango_cairo_show_layout_line (cr, line);
 	cairo_restore (cr);
-
+#ifdef WIN32
+	if (attrs != attr_lists[emphasis])
+		pango_attr_list_unref (attrs);
+#endif
 	cairo_destroy (cr);
 }
 

src/fe-text/fe-text.c

@@ -857,6 +857,10 @@ fe_get_str (char *prompt, char *def, void *callback, void *ud)
 {
 }
 void
+fe_get_password (char *prompt, void *callback, void *ud)
+{
+}
+void
 fe_get_int (char *prompt, int def, void *callback, void *ud)
 {
 }

tools/gen-emoji-data.py

@@ -0,0 +1,280 @@
+#!/usr/bin/env python3
+#
+# gen-emoji-data.py - generate ZoiteChat's bundled emoji catalog
+#
+# Consumes the pinned data files checked in under data/emoji/ and emits a
+# C table that is compiled into the application, so every ZoiteChat package
+# ships the same emoji, names, categories and search keywords regardless of
+# which GTK runtime or /usr/share/gtk-3.0/emoji data a distribution provides.
+#
+# Inputs:
+#   emoji-test.txt                 Unicode emoji-test data file (catalog,
+#                                  CLDR ordering, groups, short names)
+#   cldr-annotations-en.xml        CLDR annotations (search keywords)
+#   cldr-annotations-derived-en.xml CLDR derived annotations (sequences)
+#   gemoji.json                    gemoji database (:shortcode: aliases, tags)
+#
+# Usage:
+#   gen-emoji-data.py EMOJI_TEST ANNOTATIONS DERIVED_ANNOTATIONS GEMOJI \
+#                     VERSIONS OUTPUT
+#
+# Only fully-qualified sequences are emitted, so everything the picker
+# inserts is a well-formed emoji presentation sequence.  Skin-tone variants
+# are folded into per-base tone sets: the picker shows the neutral emoji and
+# swaps in the modified sequence for the user's preferred tone.  Sequences
+# that mix two different skin tones are not emitted.
+
+import json
+import re
+import sys
+import xml.etree.ElementTree as ET
+
+# Must match the EmojiGroup enum in src/common/emoji-data.h.  "Component"
+# entries (bare tone swatches, hair styles) are not meaningful to insert.
+GROUPS = [
+    "Smileys & Emotion",
+    "People & Body",
+    "Animals & Nature",
+    "Food & Drink",
+    "Travel & Places",
+    "Activities",
+    "Objects",
+    "Symbols",
+    "Flags",
+]
+SKIPPED_GROUPS = {"Component"}
+
+# Order must match the EmojiTone enum (minus EMOJI_TONE_NONE).
+TONE_DESCRIPTORS = [
+    "light skin tone",
+    "medium-light skin tone",
+    "medium skin tone",
+    "medium-dark skin tone",
+    "dark skin tone",
+]
+TONE_MODIFIERS = set(range(0x1F3FB, 0x1F3FF + 1))
+VS16 = 0xFE0F
+
+DATA_LINE = re.compile(
+    r"^(?P<cps>[0-9A-F ]+?)\s*;\s*(?P<status>[\w-]+)\s*#\s*(?P<emoji>\S+)"
+    r"\s+E\d+\.\d+\s+(?P<name>.+)$"
+)
+
+
+def parse_emoji_test(path):
+    """Yield (group, codepoints, string, name) for fully-qualified entries."""
+    group = None
+    unicode_version = None
+    with open(path, encoding="utf-8") as fp:
+        for line in fp:
+            line = line.rstrip("\n")
+            if line.startswith("# group:"):
+                group = line.split(":", 1)[1].strip()
+                continue
+            if line.startswith("# Version:"):
+                unicode_version = line.split(":", 1)[1].strip()
+                continue
+            if not line or line.startswith("#"):
+                continue
+            m = DATA_LINE.match(line)
+            if not m:
+                continue
+            if m.group("status") != "fully-qualified":
+                continue
+            if group in SKIPPED_GROUPS:
+                continue
+            if group not in GROUPS:
+                sys.exit("gen-emoji-data.py: unknown emoji group %r; "
+                         "update GROUPS and the EmojiGroup enum" % group)
+            cps = [int(cp, 16) for cp in m.group("cps").split()]
+            yield group, cps, "".join(map(chr, cps)), m.group("name")
+    if unicode_version is None:
+        sys.exit("gen-emoji-data.py: no '# Version:' header in emoji-test.txt")
+    parse_emoji_test.version = unicode_version
+
+
+def parse_annotations(path, keywords, names):
+    root = ET.parse(path).getroot()
+    for node in root.iter("annotation"):
+        cp = node.attrib["cp"]
+        if node.attrib.get("type") == "tts":
+            names[cp] = node.text.strip()
+        else:
+            keywords[cp] = [k.strip() for k in node.text.split("|")]
+
+
+def parse_versions(path):
+    versions = {}
+    with open(path, encoding="utf-8") as fp:
+        for line in fp:
+            line = line.strip()
+            if line and not line.startswith("#") and "=" in line:
+                key, value = line.split("=", 1)
+                versions[key.strip()] = value.strip()
+    for key in ("unicode-emoji", "cldr", "gemoji"):
+        if key not in versions:
+            sys.exit("gen-emoji-data.py: %r missing from %s" % (key, path))
+    return versions
+
+
+def strip_vs16(text):
+    return text.replace(chr(VS16), "")
+
+
+def split_name(name):
+    """Split 'kiss: woman, man, light skin tone' into a base name and the
+    list of tone descriptors it contains."""
+    if ": " not in name:
+        return name, []
+    head, qualifier = name.split(": ", 1)
+    parts = [p.strip() for p in qualifier.split(",")]
+    tones = [p for p in parts if p in TONE_DESCRIPTORS]
+    rest = [p for p in parts if p not in TONE_DESCRIPTORS]
+    base = head if not rest else head + ": " + ", ".join(rest)
+    return base, tones
+
+
+def c_escape(text):
+    """Escape text as the body of a C string literal.  Non-ASCII bytes use
+    three-digit octal escapes, which cannot swallow a following character
+    the way hex escapes can."""
+    out = []
+    for byte in text.encode("utf-8"):
+        if byte in (0x22, 0x5C):  # '"' and '\\'
+            out.append("\\" + chr(byte))
+        elif 0x20 <= byte < 0x7F:
+            out.append(chr(byte))
+        else:
+            out.append("\\%03o" % byte)
+    return "".join(out)
+
+
+def build_search(name, keyword_list, aliases, tags):
+    tokens = []
+    for source in ([name] + keyword_list + tags):
+        tokens.extend(source.casefold().split())
+    tokens.extend(alias.casefold() for alias in aliases)
+    seen = {}
+    for token in tokens:
+        token = token.strip('",')
+        if token and token not in seen:
+            seen[token] = True
+    return " ".join(seen)
+
+
+def main():
+    if len(sys.argv) != 7:
+        sys.exit("usage: gen-emoji-data.py EMOJI_TEST ANNOTATIONS "
+                 "DERIVED_ANNOTATIONS GEMOJI VERSIONS OUTPUT")
+    (emoji_test, ann_path, derived_path, gemoji_path,
+     versions_path, output) = sys.argv[1:]
+
+    versions = parse_versions(versions_path)
+    cldr_version = versions["cldr"]
+
+    keywords = {}
+    cldr_names = {}
+    parse_annotations(ann_path, keywords, cldr_names)
+    parse_annotations(derived_path, keywords, cldr_names)
+
+    aliases = {}
+    tags = {}
+    with open(gemoji_path, encoding="utf-8") as fp:
+        for item in json.load(fp):
+            if "emoji" not in item:
+                continue
+            key = strip_vs16(item["emoji"])
+            aliases[key] = item.get("aliases", [])
+            tags[key] = item.get("tags", [])
+
+    entries = []           # base emoji, in CLDR order
+    by_name = {}           # base name -> index into entries
+    tone_sets = []         # list of [seq or None] * 5
+    skipped_mixed = 0
+
+    for group, cps, string, name in parse_emoji_test(emoji_test):
+        tones_in_seq = {cp for cp in cps if cp in TONE_MODIFIERS}
+        base_name, tone_descs = split_name(name)
+
+        if not tones_in_seq:
+            key = strip_vs16(string)
+            entry = {
+                "sequence": string,
+                "name": name,
+                "keywords": keywords.get(key, keywords.get(string, [])),
+                "aliases": aliases.get(key, []),
+                "tags": tags.get(key, []),
+                "group": GROUPS.index(group),
+                "tone_set": -1,
+            }
+            by_name[name] = len(entries)
+            entries.append(entry)
+            continue
+
+        # Tone-modified sequence: attach to its base if it uses one uniform
+        # tone; sequences mixing two tones are intentionally not bundled.
+        if len(tones_in_seq) != 1 or len(tone_descs) != 1:
+            skipped_mixed += 1
+            continue
+        if base_name not in by_name:
+            sys.exit("gen-emoji-data.py: no base emoji %r for %r"
+                     % (base_name, name))
+        entry = entries[by_name[base_name]]
+        if entry["tone_set"] == -1:
+            entry["tone_set"] = len(tone_sets)
+            tone_sets.append([None] * len(TONE_DESCRIPTORS))
+        tone_sets[entry["tone_set"]][TONE_DESCRIPTORS.index(tone_descs[0])] = string
+
+    for i, tone_set in enumerate(tone_sets):
+        if None in tone_set:
+            sys.exit("gen-emoji-data.py: incomplete tone set %d" % i)
+
+    unicode_version = parse_emoji_test.version
+    if unicode_version != versions["unicode-emoji"]:
+        sys.exit("gen-emoji-data.py: emoji-test.txt is Emoji %s but VERSIONS "
+                 "pins %s" % (unicode_version, versions["unicode-emoji"]))
+
+    with open(output, "w", encoding="utf-8", newline="\n") as out:
+        out.write("/*\n"
+                  " * Generated by tools/gen-emoji-data.py -- do not edit.\n"
+                  " *\n"
+                  " * Sources (pinned copies in data/emoji/):\n"
+                  " *   Unicode emoji-test.txt, Emoji %s\n"
+                  " *   CLDR annotations (en), release %s\n"
+                  " *   gemoji %s shortcode aliases\n"
+                  " */\n\n" % (unicode_version, cldr_version,
+                               versions["gemoji"]))
+
+        out.write("static const EmojiToneSet emoji_tone_sets_table[] =\n{\n")
+        for tone_set in tone_sets:
+            out.write("\t{ { %s } },\n"
+                      % ", ".join('"%s"' % c_escape(seq) for seq in tone_set))
+        out.write("};\n\n")
+
+        out.write("static const EmojiEntry emoji_entries_table[] =\n{\n")
+        for entry in entries:
+            search = build_search(entry["name"], entry["keywords"],
+                                  entry["aliases"], entry["tags"])
+            out.write('\t{ "%s", "%s", "%s", "%s", %d, %d },\n' % (
+                c_escape(entry["sequence"]),
+                c_escape(entry["name"]),
+                c_escape(search),
+                c_escape(" ".join(entry["aliases"])),
+                entry["group"],
+                entry["tone_set"],
+            ))
+        out.write("};\n\n")
+
+        out.write('static const char emoji_data_unicode_version_str[] = "%s";\n'
+                  % c_escape(unicode_version))
+        out.write('static const char emoji_data_cldr_version_str[] = "%s";\n'
+                  % c_escape(cldr_version))
+
+    sys.stderr.write("gen-emoji-data.py: %d emoji, %d tone sets, "
+                     "%d mixed-tone sequences skipped (Emoji %s, CLDR %s)\n"
+                     % (len(entries), len(tone_sets), skipped_mixed,
+                        unicode_version, cldr_version))
+
+
+if __name__ == "__main__":
+    main()

win32/copy/copy.vcxproj

@@ -82,6 +82,8 @@
       <GdkPixbufLoaderCache Include="$(DepsRoot)\lib\gdk-pixbuf-2.0\**\loaders.cache" />
 
       <FontConfig Include="$(DepsRoot)\etc\fonts\*" />
+      <EmojiFont Include="..\..\data\fonts\NotoColorEmoji.ttf" />
+      <EmojiFontLicense Include="..\..\data\fonts\OFL.txt" />
       <Share Include="share\**\*" />
       <Locale Include="$(ZoiteChatBin)locale\**\*;$(DepsRoot)\share\locale\**\*" />
       <MSWindowsTheme Include="$(DepsRoot)\share\themes\MS-Windows\**\*" />
@@ -91,6 +93,8 @@
 
     <Copy SourceFiles="@(None)" DestinationFolder="$(ZoiteChatRel)" />
     <Copy SourceFiles="@(FontConfig)" DestinationFolder="$(ZoiteChatRel)\etc\fonts" />
+    <Copy SourceFiles="@(EmojiFont)" DestinationFolder="$(ZoiteChatRel)\share\fonts\zoitechat" />
+    <Copy SourceFiles="@(EmojiFontLicense)" DestinationFolder="$(ZoiteChatRel)\share\doc\zoitechat\fonts" />
     <Copy SourceFiles="@(Gtk3Immodules)" DestinationFiles="@(Gtk3Immodules->'$(ZoiteChatRel)\lib\gtk-3.0\3.0.0\immodules\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(Gtk3PrintBackends)" DestinationFiles="@(Gtk3PrintBackends->'$(ZoiteChatRel)\lib\gtk-3.0\3.0.0\printbackends\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(GdkPixbufLoaders)" DestinationFiles="@(GdkPixbufLoaders->'$(ZoiteChatRel)\lib\gdk-pixbuf-2.0\%(RecursiveDir)%(Filename)%(Extension)')" />

win32/installer/zoitechat.iss.tt

@@ -104,6 +104,7 @@ Source: "readme.url"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "cert.pem"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
 Source: "share\doc\zoitechat\*"; DestDir: "{app}\share\doc\zoitechat"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
+Source: "share\fonts\zoitechat\*"; DestDir: "{app}\share\fonts\zoitechat"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
 Source: "share\doc\WinSparkle\*"; DestDir: "{app}\share\doc\WinSparkle"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
 Source: "share\themes\MS-Windows\*"; DestDir: "{app}\share\themes\MS-Windows"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs
 Source: "share\glib-2.0\schemas\*"; DestDir: "{app}\share\glib-2.0\schemas"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs