support inline images in chat.

Merge pull request #351 from ZoiteChat/reduce-client-restarts
Reduce needed client restarts for settings changes.
2026-07-21 10:29:24 +00:00 · 2026-07-20 14:33:20 -06:00 · 2026-07-19 17:02:04 -06:00 · 2026-07-16 08:48:33 -06:00 · 2026-07-16 02:29:43 -06:00 · 2026-07-15 23:56:05 -06:00
35 changed files with 3640 additions and 136 deletions
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -28,6 +28,7 @@ src/fe-gtk/fe-gtk.c
 src/fe-gtk/fkeys.c
 src/fe-gtk/gtkutil.c
 src/fe-gtk/ignoregui.c
+src/fe-gtk/inline-image.c
 src/fe-gtk/joind.c
 src/fe-gtk/maingui.c
 src/fe-gtk/menu.c
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -564,6 +564,7 @@ const struct prefs vars[] =
 	{"net_proxy_use", P_OFFINT (hex_net_proxy_use), TYPE_INT},
 	{"net_proxy_user", P_OFFSET (hex_net_proxy_user), TYPE_STR},
 	{"net_reconnect_delay", P_OFFINT (hex_net_reconnect_delay), TYPE_INT},
+	{"net_remote_media", P_OFFINT (hex_net_remote_media), TYPE_BOOL},
 	{"net_throttle", P_OFFINT (hex_net_throttle), TYPE_BOOL},

 	{"notify_timeout", P_OFFINT (hex_notify_timeout), TYPE_INT},
@@ -776,6 +777,8 @@ load_default_config(void)
 	prefs.hex_gui_hide_menu = 1;
 #endif
 	prefs.hex_gui_ctrlq_quit = 1;
+	/* hex_net_remote_media stays 0: loading remote media can reveal the
+	   user's IP address, so it is strictly opt-in */
 	prefs.hex_gui_input_attr = 1;
 	prefs.hex_gui_input_icon = 1;
 	prefs.hex_gui_input_nick = 1;
--- a/src/common/gtk3-theme-service.c
+++ b/src/common/gtk3-theme-service.c
@@ -695,10 +695,15 @@ zoitechat_gtk3_theme_service_discover (void)
 		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);

 	{
 		const char *xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
--- a/src/common/zoitechat.h
+++ b/src/common/zoitechat.h
@@ -204,6 +204,7 @@ struct zoitechatprefs
 	unsigned int hex_net_auto_reconnect;
 	unsigned int hex_net_auto_reconnectonfail;
 	unsigned int hex_net_proxy_auth;
+	unsigned int hex_net_remote_media;
 	unsigned int hex_net_throttle;
 	unsigned int hex_notify_whois_online;
 	unsigned int hex_perl_warnings;
--- a/src/fe-gtk/chanview.c
+++ b/src/fe-gtk/chanview.c
@@ -307,6 +307,109 @@ chanview_set_impl (chanview *cv, int type)
 		cv->func_focus (cv->focused);
 }

+void
+chanview_set_sorted (chanview *cv, gboolean sorted)
+{
+	cv->sorted = sorted ? 1 : 0;
+}
+
+void
+chanview_set_use_icons (chanview *cv, gboolean use_icons)
+{
+	cv->use_icons = use_icons ? 1 : 0;
+}
+
+void
+chanview_set_trunc_len (chanview *cv, int trunc_len)
+{
+	cv->trunc_len = trunc_len;
+}
+
+typedef struct
+{
+	chan *ch;
+	int old_pos;
+} chanview_sort_entry;
+
+/* re-sort the session rows below one parent with cb_compare, leaving
+ * utility rows (tag != 0) in place; mirrors chanview_insert_sorted() */
+static void
+chanview_resort_children (chanview *cv, GtkTreeIter *parent)
+{
+	GtkTreeModel *model = GTK_TREE_MODEL (cv->store);
+	GtkTreeIter iter;
+	chanview_sort_entry *entries;
+	int *positions;
+	gint *new_order;
+	chan *ch;
+	int n, i, j, count;
+
+	n = gtk_tree_model_iter_n_children (model, parent);
+	if (n < 2)
+		return;
+
+	entries = g_new0 (chanview_sort_entry, n);
+	positions = g_new0 (int, n);
+	new_order = g_new0 (gint, n);
+
+	count = 0;
+	for (i = 0; i < n; i++)
+	{
+		new_order[i] = i;
+		if (!gtk_tree_model_iter_nth_child (model, &iter, parent, i))
+			continue;
+		gtk_tree_model_get (model, &iter, COL_CHAN, &ch, -1);
+		if (ch && ch->tag == 0 && ch->userdata)
+		{
+			entries[count].ch = ch;
+			entries[count].old_pos = i;
+			positions[count] = i;
+			count++;
+		}
+	}
+
+	/* stable insertion sort; tab groups stay small so this is cheap */
+	for (i = 1; i < count; i++)
+	{
+		chanview_sort_entry key = entries[i];
+
+		j = i - 1;
+		while (j >= 0 && cv->cb_compare (entries[j].ch->userdata, key.ch->userdata) > 0)
+		{
+			entries[j + 1] = entries[j];
+			j--;
+		}
+		entries[j + 1] = key;
+	}
+
+	for (i = 0; i < count; i++)
+		new_order[positions[i]] = entries[i].old_pos;
+
+	gtk_tree_store_reorder (cv->store, parent, new_order);
+
+	g_free (entries);
+	g_free (positions);
+	g_free (new_order);
+}
+
+/* top-level rows keep their order (insertion never sorts them either);
+ * only the children within each family are sorted */
+void
+chanview_resort (chanview *cv)
+{
+	GtkTreeIter iter;
+
+	if (!cv->cb_compare)
+		return;
+
+	if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (cv->store), &iter))
+	{
+		do
+			chanview_resort_children (cv, &iter);
+		while (gtk_tree_model_iter_next (GTK_TREE_MODEL (cv->store), &iter));
+	}
+}
+
 static void
 chanview_free_ch (chanview *cv, GtkTreeIter *iter)
 {
--- a/src/fe-gtk/chanview.h
+++ b/src/fe-gtk/chanview.h
@@ -34,6 +34,10 @@ void chanview_set_callbacks (chanview *cv,
 	gboolean (*cb_contextmenu) (chanview *, chan *, int tag, void *userdata, GdkEventButton *),
 	int (*cb_compare) (void *a, void *b));
 void chanview_set_impl (chanview *cv, int type);
+void chanview_set_sorted (chanview *cv, gboolean sorted);
+void chanview_set_use_icons (chanview *cv, gboolean use_icons);
+void chanview_set_trunc_len (chanview *cv, int trunc_len);
+void chanview_resort (chanview *cv);
 chan *chanview_add (chanview *cv, char *name, void *family, void *userdata, gboolean allow_closure, int tag, GdkPixbuf *icon);
 int chanview_get_size (chanview *cv);
 GtkWidget *chanview_get_box (chanview *cv);
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -49,6 +49,7 @@
 #include "chanlist.h"
 #include "joind.h"
 #include "xtext.h"
+#include "inline-image.h"
 #include "theme/theme-gtk.h"
 #include "menu.h"
 #include "notifygui.h"
@@ -943,7 +944,13 @@ void
 fe_print_text (struct session *sess, char *text, time_t stamp,
 			   gboolean no_activity)
 {
-	PrintTextRaw (sess->res->buffer, (unsigned char *)text, prefs.hex_text_indent, stamp);
+	/* image links become a "[view image]" placeholder with a hidden URL */
+	char *filtered = inline_image_filter_text (text);
+
+	PrintTextRaw (sess->res->buffer,
+					  (unsigned char *)(filtered ? filtered : text),
+					  prefs.hex_text_indent, stamp);
+	g_free (filtered);

 	if (no_activity || !sess->gui->is_tab)
 		return;
--- a/src/fe-gtk/fe-gtk.vcxproj
+++ b/src/fe-gtk/fe-gtk.vcxproj
@@ -59,6 +59,7 @@ powershell "Get-Content -Encoding UTF8 '$(ZoiteChatLib)zoitechat.rc.utf8' | Out-
    <ClInclude Include="fkeys.h" />
    <ClInclude Include="gtkutil.h" />
    <ClInclude Include="icon-resolver.h" />
+    <ClInclude Include="inline-image.h" />
    <ClInclude Include="joind.h" />
    <ClInclude Include="maingui.h" />
    <ClInclude Include="preferences-persistence.h" />
@@ -102,6 +103,7 @@ powershell "Get-Content -Encoding UTF8 '$(ZoiteChatLib)zoitechat.rc.utf8' | Out-
    <ClCompile Include="gtkutil.c" />
    <ClCompile Include="icon-resolver.c" />
    <ClCompile Include="ignoregui.c" />
+    <ClCompile Include="inline-image.c" />
    <ClCompile Include="joind.c" />
    <ClCompile Include="maingui.c" />
    <ClCompile Include="menu.c" />
--- a/src/fe-gtk/fe-gtk.vcxproj.filters
+++ b/src/fe-gtk/fe-gtk.vcxproj.filters
@@ -45,6 +45,9 @@
    <ClInclude Include="icon-resolver.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="inline-image.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="joind.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -170,6 +173,9 @@
    <ClCompile Include="ignoregui.c">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="inline-image.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="joind.c">
      <Filter>Source Files</Filter>
    </ClCompile>
--- a/src/fe-gtk/inline-image.c
+++ b/src/fe-gtk/inline-image.c
--- a/src/fe-gtk/inline-image.h
+++ b/src/fe-gtk/inline-image.h
@@ -0,0 +1,45 @@
+/* ZoiteChat
+ * Copyright (C) 2026 ZoiteChat contributors.
+ *
+ * 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_INLINE_IMAGE_H
+#define ZOITECHAT_INLINE_IMAGE_H
+
+#include "xtext.h"
+
+/* does this look like a direct http(s) link to an image file? */
+gboolean inline_image_is_image_url (const char *url);
+
+/* show the image behind 'url' inline below 'ent', or hide it again if it is
+ * already shown.  Errors are reported to 'sess'. */
+void inline_image_toggle (session *sess, GtkXText *xtext, textentry *ent,
+								  const char *url);
+
+/* replace image links in a message with a clickable placeholder label that
+ * hides the URL.  Returns a newly allocated string, or NULL if the text has
+ * no image links (or the feature is off). */
+char *inline_image_filter_text (const char *text);
+
+/* pop up a window with a larger version of the entry's inline image */
+void inline_image_show_viewer (GtkXText *xtext, textentry *ent);
+
+/* can downloads go through the proxy configured for ZoiteChat (or is no
+ * proxy configured)?  FALSE means loading media would have to bypass the
+ * user's proxy, which is never done. */
+gboolean inline_image_proxy_usable (void);
+
+#endif
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -59,6 +59,7 @@
 #include "pixmaps.h"
 #include "plugin-tray.h"
 #include "xtext.h"
+#include "inline-image.h"
 #include "sexy-spell-entry.h"
 #include "gtkutil.h"

@@ -569,6 +570,18 @@ mg_create_tab_colors (void)
        away_list = mg_attr_list_create (&gui_palette[THEME_TOKEN_TAB_AWAY], FALSE);
 }

+static PangoAttrList *
+mg_attr_list_for_tab_state (int state)
+{
+        if (state & TAB_STATE_NEW_HILIGHT)
+                return nickseen_list;
+        if (state & TAB_STATE_NEW_MSG)
+                return newmsg_list;
+        if (state & TAB_STATE_NEW_DATA)
+                return newdata_list;
+        return plain_list;
+}
+
 static void
 set_window_urgency (GtkWidget *win, gboolean set)
 {
@@ -714,7 +727,10 @@ mg_set_access_icon (session_gui *gui, GdkPixbuf *pix, gboolean away)
 {
        if (gui->op_xpm)
        {
-                if (pix == gtk_image_get_pixbuf (GTK_IMAGE (gui->op_xpm))) /* no change? */
+                /* no change? (the pref check makes sure a live settings
+                   change can still remove the icon) */
+                if (pix == gtk_image_get_pixbuf (GTK_IMAGE (gui->op_xpm)) &&
+                         prefs.hex_gui_input_icon)
                {
                        mg_set_myself_away (gui, away);
                        return;
@@ -3596,6 +3612,48 @@ mg_create_topicbar (session *sess, GtkWidget *box)
 	mg_create_chanmodebuttons (gui, bbox);
 }

+/* re-apply the multi-line topic and inline mode button preferences to an
+ * already built topic bar (see mg_create_topicbar () for the layout) */
+
+static void
+mg_update_topicbar_layout (session_gui *gui)
+{
+	GtkWidget *topic = gui->topic_entry;
+	GtkWidget *vbox = gui->topic_bar;
+	GtkWidget *topic_scroll;
+	GtkWidget *hbox;
+	GtkWidget *mode_hbox;
+	GtkWidget *desired_parent;
+	GtkWidget *current_parent;
+	gboolean wrap;
+
+	if (!topic || !GTK_IS_TEXT_VIEW (topic) || !vbox || !gui->topicbutton_box)
+		return;
+
+	wrap = prefs.hex_gui_topicbar_multiline && !prefs.hex_gui_mode_buttons_inline;
+	gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (topic),
+		wrap ? GTK_WRAP_WORD_CHAR : GTK_WRAP_NONE);
+
+	topic_scroll = gtk_widget_get_parent (topic);
+	hbox = topic_scroll ? gtk_widget_get_parent (topic_scroll) : NULL;
+	mode_hbox = gtk_widget_get_parent (gui->topicbutton_box);
+
+	if (mode_hbox && hbox)
+	{
+		desired_parent = prefs.hex_gui_mode_buttons_inline ? hbox : vbox;
+		current_parent = gtk_widget_get_parent (mode_hbox);
+		if (current_parent && current_parent != desired_parent)
+		{
+			g_object_ref (mode_hbox);
+			gtk_container_remove (GTK_CONTAINER (current_parent), mode_hbox);
+			gtk_box_pack_start (GTK_BOX (desired_parent), mode_hbox, 0, 0, 0);
+			g_object_unref (mode_hbox);
+		}
+	}
+
+	mg_topicbar_update_height (topic);
+}
+
 /* check if a word is clickable */

 static int
@@ -3630,7 +3688,13 @@ mg_word_clicked (GtkWidget *xtext, char *word, GdkEventButton *even)
        {
                if (word == NULL)
                {
-                        mg_focus (sess);
+                        /* a click on a shown inline image opens the viewer */
+                        textentry *img_ent = gtk_xtext_get_clicked_image_entry (GTK_XTEXT (xtext));
+
+                        if (img_ent)
+                                inline_image_show_viewer (GTK_XTEXT (xtext), img_ent);
+                        else
+                                mg_focus (sess);
                        return;
                }

@@ -3642,6 +3706,20 @@ mg_word_clicked (GtkWidget *xtext, char *word, GdkEventButton *even)
                        case WORD_HOST6:
                        case WORD_HOST:
                                word[end] = 0;
+                                /* image links toggle an inline preview instead
+                                   of opening the browser */
+                                if (word_type == WORD_URL &&
+                                    prefs.hex_net_remote_media &&
+                                    inline_image_is_image_url (word + start))
+                                {
+                                        textentry *ent = gtk_xtext_get_clicked_entry (GTK_XTEXT (xtext));
+
+                                        if (ent)
+                                        {
+                                                inline_image_toggle (sess, GTK_XTEXT (xtext), ent, word + start);
+                                                break;
+                                        }
+                                }
                                fe_open_url (word + start);
                        }
                }
@@ -3670,7 +3748,8 @@ mg_word_clicked (GtkWidget *xtext, char *word, GdkEventButton *even)
        case WORD_HOST:
                word[end] = 0;
                word += start;
-                menu_urlmenu (even, word);
+                menu_urlmenu_entry (even, word, xtext,
+                                    gtk_xtext_get_clicked_entry (GTK_XTEXT (xtext)));
                break;
        case WORD_NICK:
                word[end] = 0;
@@ -4004,8 +4083,12 @@ mg_create_userlist (session_gui *gui, GtkWidget *box)
        gtk_widget_set_margin_end (gui->namelistinfo, 0);
        gtk_widget_set_hexpand (gui->namelistinfo, TRUE);
        gtk_widget_set_halign (gui->namelistinfo, GTK_ALIGN_FILL);
+        /* always pack it so the preference can be toggled without a
+           restart; visibility is controlled explicitly */
+        gtk_widget_set_no_show_all (gui->namelistinfo, TRUE);
+        gtk_box_pack_start (GTK_BOX (vbox), gui->namelistinfo, 0, 0, 0);
        if (prefs.hex_gui_ulist_count)
-                gtk_box_pack_start (GTK_BOX (vbox), gui->namelistinfo, 0, 0, 0);
+                gtk_widget_show (gui->namelistinfo);

        gui->user_tree = ulist = userlist_create (vbox);

@@ -4904,7 +4987,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);
 }
@@ -5229,6 +5316,10 @@ mg_apply_setup (void)
                sess = list->data;
                gtk_xtext_set_time_stamp (sess->res->buffer, prefs.hex_stamp_text);
                ((xtext_buffer *)sess->res->buffer)->needs_recalc = TRUE;
+                /* the attribute lists were just recreated, so re-apply the
+                   color matching each tab's activity state */
+                if (sess->res->tab)
+                        chan_set_color (sess->res->tab, mg_attr_list_for_tab_state (sess->tab_state));
                if (!sess->gui->is_tab || !done_main)
                        mg_place_userlist_and_chanview (sess->gui);
                if (sess->gui->is_tab)
@@ -5271,6 +5362,49 @@ fe_buttons_update (session *sess)
                gtk_widget_hide (sess->gui->button_box);
 }

+/* tab label for a session that has no joined channel: the channel we are
+ * waiting to join in parentheses, or "<none>". tbuf must hold CHANLEN+6. */
+
+static void
+mg_tab_pending_name (session *sess, char *tbuf)
+{
+        if (sess->waitchannel[0])
+        {
+                if (prefs.hex_gui_tab_trunc > 2 && g_utf8_strlen (sess->waitchannel, -1) > prefs.hex_gui_tab_trunc)
+                {
+                        /* truncate long channel names */
+                        tbuf[0] = '(';
+                        strcpy (tbuf + 1, sess->waitchannel);
+                        g_utf8_offset_to_pointer(tbuf, prefs.hex_gui_tab_trunc)[0] = 0;
+                        strcat (tbuf, "..)");
+                } else
+                {
+                        sprintf (tbuf, "(%s)", sess->waitchannel);
+                }
+        }
+        else
+                strcpy (tbuf, _("<none>"));
+}
+
+/* re-apply the tab label truncation preference to a session's tab */
+
+static void
+mg_retrunc_tab (session *sess)
+{
+        char tbuf[CHANLEN+6];
+
+        if (!sess->res->tab)
+                return;
+
+        if (sess->channel[0])
+                chan_rename (sess->res->tab, sess->channel, prefs.hex_gui_tab_trunc);
+        else
+        {
+                mg_tab_pending_name (sess, tbuf);
+                chan_rename (sess->res->tab, tbuf, prefs.hex_gui_tab_trunc);
+        }
+}
+
 void
 fe_clear_channel (session *sess)
 {
@@ -5279,22 +5413,7 @@ fe_clear_channel (session *sess)

        if (sess->gui->is_tab)
        {
-                if (sess->waitchannel[0])
-                {
-                        if (prefs.hex_gui_tab_trunc > 2 && g_utf8_strlen (sess->waitchannel, -1) > prefs.hex_gui_tab_trunc)
-                        {
-                                /* truncate long channel names */
-                                tbuf[0] = '(';
-                                strcpy (tbuf + 1, sess->waitchannel);
-                                g_utf8_offset_to_pointer(tbuf, prefs.hex_gui_tab_trunc)[0] = 0;
-                                strcat (tbuf, "..)");
-                        } else
-                        {
-                                sprintf (tbuf, "(%s)", sess->waitchannel);
-                        }
-                }
-                else
-                        strcpy (tbuf, _("<none>"));
+                mg_tab_pending_name (sess, tbuf);
                chan_rename (sess->res->tab, tbuf, prefs.hex_gui_tab_trunc);
        }

@@ -5418,6 +5537,110 @@ fe_set_channel (session *sess)
                chan_rename (sess->res->tab, sess->channel, prefs.hex_gui_tab_trunc);
 }

+static void
+mg_apply_live_prefs_to_gui (session_gui *gui, session *sess, const mg_live_prefs *changes)
+{
+        if (changes->meters)
+                mg_update_meters (gui);
+
+        if (changes->ulist_columns && gui->user_tree)
+                userlist_rebuild_columns (gui->user_tree);
+
+        if (changes->ulist_count && gui->namelistinfo)
+        {
+                if (prefs.hex_gui_ulist_count)
+                        gtk_widget_show (gui->namelistinfo);
+                else
+                        gtk_widget_hide (gui->namelistinfo);
+        }
+
+        if (changes->input_box && gui->nick_box)
+        {
+                if (prefs.hex_gui_input_nick)
+                        gtk_widget_show (gui->nick_box);
+                else
+                        gtk_widget_hide (gui->nick_box);
+        }
+
+        /* refresh the access icon; re-filling the user list rows can
+           clear it as a side effect, so restore it here too */
+        if ((changes->input_box || changes->ulist_rows) && sess && is_session (sess))
+        {
+                if (sess->type == SESS_DIALOG)
+                        mg_set_access_icon (gui, NULL, sess->server->is_away);
+                else
+                        mg_set_access_icon (gui, get_user_icon (sess->server, sess->me), sess->server->is_away);
+        }
+
+        if (changes->topic_bar)
+                mg_update_topicbar_layout (gui);
+
+        if (changes->transparency && gui->window)
+                gtk_widget_set_opacity (gui->window, (prefs.hex_gui_transparency / 255.));
+}
+
+/* apply preference changes that used to require a restart. called by
+ * setup.c after the new prefs have been committed. */
+
+void
+mg_apply_live_prefs (const mg_live_prefs *changes)
+{
+        GSList *list;
+        session *sess;
+        int done_main = FALSE;
+
+        if (!changes)
+                return;
+
+        /* the tab bar / channel tree lives in the shared tab window */
+        if (mg_gui && mg_gui->chanview)
+        {
+                if (changes->tab_resort)
+                {
+                        chanview_set_sorted (mg_gui->chanview, prefs.hex_gui_tab_sort);
+                        chanview_resort (mg_gui->chanview);
+                }
+                if (changes->tab_trunc)
+                        chanview_set_trunc_len (mg_gui->chanview, prefs.hex_gui_tab_trunc);
+                if (changes->chanview || changes->tab_resort)
+                {
+                        chanview_set_use_icons (mg_gui->chanview,
+                                                                                        prefs.hex_gui_tab_icons && (pix_tree_channel || pix_tree_dialog ||
+                                                                                                                                                                 pix_tree_server || pix_tree_util));
+                        /* rebuild the tab bar / tree widgets from the model */
+                        chanview_set_impl (mg_gui->chanview, prefs.hex_gui_tab_layout);
+                }
+        }
+
+        list = sess_list;
+        while (list)
+        {
+                sess = list->data;
+
+                if (changes->tab_trunc)
+                        mg_retrunc_tab (sess);
+                if (changes->ulist_sort)
+                        userlist_apply_sort (sess);
+                if (changes->ulist_rows)
+                        userlist_refill (sess);
+
+                if (sess->gui->is_tab)
+                {
+                        /* only apply to the shared tab window once, using the
+                           front-most session for session-dependent bits */
+                        if (!done_main)
+                        {
+                                done_main = TRUE;
+                                mg_apply_live_prefs_to_gui (sess->gui, current_tab, changes);
+                        }
+                }
+                else
+                        mg_apply_live_prefs_to_gui (sess->gui, sess, changes);
+
+                list = list->next;
+        }
+}
+
 void
 fe_set_typing (session *sess, const char *nick, const char *state)
 {
--- a/src/fe-gtk/maingui.h
+++ b/src/fe-gtk/maingui.h
@@ -37,6 +37,24 @@ GtkWidget *mg_create_generic_tab (char *name, char *title, int force_toplevel, i
 void mg_set_title (GtkWidget *button, char *title);
 void mg_set_access_icon (session_gui *gui, GdkPixbuf *pix, gboolean away);
 void mg_apply_setup (void);
+
+/* which parts of the GUI need a live rebuild after a preferences change */
+typedef struct
+{
+	unsigned int chanview:1;			/* rebuild the tab bar / channel tree */
+	unsigned int tab_resort:1;		/* re-sort channel tabs */
+	unsigned int tab_trunc:1;			/* re-truncate tab labels */
+	unsigned int ulist_columns:1;	/* rebuild user list columns */
+	unsigned int ulist_rows:1;		/* re-fill user list rows */
+	unsigned int ulist_sort:1;		/* re-apply user list sort order */
+	unsigned int ulist_count:1;		/* user count label visibility */
+	unsigned int meters:1;				/* rebuild lag/throttle meters */
+	unsigned int input_box:1;			/* nick box visibility and access icon */
+	unsigned int topic_bar:1;			/* topic wrap mode and mode button placement */
+	unsigned int transparency:1;	/* main window opacity */
+} mg_live_prefs;
+
+void mg_apply_live_prefs (const mg_live_prefs *changes);
 void mg_apply_session_font_prefs (session_gui *gui);
 void mg_close_sess (session *);
 void mg_tab_close (session *sess);
--- a/src/fe-gtk/menu.c
+++ b/src/fe-gtk/menu.c
@@ -45,6 +45,7 @@
 #include "../common/util.h"
 #include "../common/text.h"
 #include "xtext.h"
+#include "inline-image.h"
 #include "ascii.h"
 #include "banlist.h"
 #include "chanlist.h"
@@ -1056,8 +1057,40 @@ open_url_cb (GtkWidget *item, char *url)
 	handle_command (current_sess, buf, FALSE);
 }

+/* the text entry the open URL menu was created for; the widget pointer is
+   nulled automatically if the widget dies while the menu is up */
+static GtkXText *urlmenu_xtext = NULL;
+static textentry *urlmenu_ent = NULL;
+
+static void
+menu_urlmenu_set_entry (GtkWidget *xtext, textentry *ent)
+{
+	if (urlmenu_xtext)
+		g_object_remove_weak_pointer (G_OBJECT (urlmenu_xtext),
+												(gpointer *) &urlmenu_xtext);
+	urlmenu_xtext = xtext ? GTK_XTEXT (xtext) : NULL;
+	urlmenu_ent = ent;
+	if (urlmenu_xtext)
+		g_object_add_weak_pointer (G_OBJECT (urlmenu_xtext),
+											(gpointer *) &urlmenu_xtext);
+}
+
+static void
+inline_image_menu_cb (GtkWidget *item, char *url)
+{
+	if (urlmenu_xtext == NULL || urlmenu_ent == NULL)
+		return;
+
+	/* the line may have scrolled out of the buffer since the menu opened */
+	if (!gtk_xtext_buffer_contains (urlmenu_xtext, urlmenu_ent))
+		return;
+
+	inline_image_toggle (current_sess, urlmenu_xtext, urlmenu_ent, url);
+}
+
 void
-menu_urlmenu (GdkEventButton *event, char *url)
+menu_urlmenu_entry (GdkEventButton *event, char *url, GtkWidget *xtext,
+						  textentry *ent)
 {
 	GtkWidget *menu;
 	char *tmp, *chop;
@@ -1065,6 +1098,14 @@ menu_urlmenu (GdkEventButton *event, char *url)
 	g_free (str_copy);
 	str_copy = g_strdup (url);

+	if (xtext == NULL || ent == NULL || !prefs.hex_net_remote_media ||
+		 !inline_image_is_image_url (str_copy))
+	{
+		xtext = NULL;
+		ent = NULL;
+	}
+	menu_urlmenu_set_entry (xtext, ent);
+
 	menu = menu_new ();
 	/* more than 51 chars? Chop it */
 	if (g_utf8_strlen (str_copy, -1) >= 52)
@@ -1087,6 +1128,15 @@ menu_urlmenu (GdkEventButton *event, char *url)
 		menu_quick_item_with_callback (open_url_cb, _("Connect"), menu, str_copy);
 	else
 		menu_quick_item_with_callback (open_url_cb, _("Open Link in Browser"), menu, str_copy);
+	if (ent)
+	{
+		const char *shown = gtk_xtext_entry_get_image_url (GTK_XTEXT (xtext), ent);
+
+		menu_quick_item_with_callback (inline_image_menu_cb,
+			shown && strcmp (shown, str_copy) == 0 ?
+				_("Hide Inline Image") : _("Show Image Inline"),
+			menu, str_copy);
+	}
 	menu_quick_item_with_callback (copy_to_clipboard_cb, _("Copy Selected Link"), menu, str_copy);
 	/* custom ones from urlhandlers.conf */
 	menu_create (menu, urlhandler_list, str_copy, TRUE);
@@ -1094,6 +1144,12 @@ menu_urlmenu (GdkEventButton *event, char *url)
 	menu_popup (menu, event, NULL);
 }

+void
+menu_urlmenu (GdkEventButton *event, char *url)
+{
+	menu_urlmenu_entry (event, url, NULL, NULL);
+}
+
 static void
 menu_chan_cycle (GtkWidget * menu, char *chan)
 {
--- a/src/fe-gtk/menu.h
+++ b/src/fe-gtk/menu.h
@@ -20,8 +20,11 @@
 #ifndef ZOITECHAT_MENU_H
 #define ZOITECHAT_MENU_H

+#include "xtext.h"
+
 GtkWidget *menu_create_main (void *accel_group, int bar, int away, int toplevel, GtkWidget **menu_widgets);
 void menu_urlmenu (GdkEventButton * event, char *url);
+void menu_urlmenu_entry (GdkEventButton *event, char *url, GtkWidget *xtext, textentry *ent);
 void menu_chanmenu (session *sess, GdkEventButton * event, char *chan);
 void menu_addfavoritemenu (server *serv, GtkWidget *menu, char *channel, gboolean istree);
 void menu_addconnectmenu (server *serv, GtkWidget *menu);
--- a/src/fe-gtk/meson.build
+++ b/src/fe-gtk/meson.build
@@ -23,6 +23,7 @@ zoitechat_gtk_sources = [
  'gtkutil.c',
  'icon-resolver.c',
  'ignoregui.c',
+  'inline-image.c',
  'joind.c',
  'menu.c',
  'maingui.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],
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -673,6 +673,11 @@ static const setting network_settings[] =
        {ST_ENTRY,      N_("Username:"), P_OFFSETNL(hex_net_proxy_user), 0, 0, sizeof prefs.hex_net_proxy_user},
        {ST_ENTRY,      N_("Password:"), P_OFFSETNL(hex_net_proxy_pass), 0, GINT_TO_POINTER(1), sizeof prefs.hex_net_proxy_pass},

+        {ST_HEADER,     N_("Remote Media"), 0, 0, 0, 0},
+        {ST_TOGGLE,     N_("Allow loading remote media (inline images) when clicked"),
+                                        P_OFFINTNL(hex_net_remote_media),
+                                        N_("Loading remote media contacts the site hosting it, which can reveal your IP address and that you viewed the message. You are asked for confirmation before each new domain is contacted."), 0, 0},
+
        {ST_END, 0, 0, 0, 0, 0}
 };

@@ -1045,28 +1050,30 @@ setup_create_spin (GtkWidget *table, int row, const setting *set)
        return wid;
 }

+static guint setup_trans_apply_tag = 0;
+/* the window opacity the dialog opened with, so cancelling can undo the
+ * live preview done by the slider */
+static int setup_transparency_snapshot;
+
 static gint
-setup_apply_trans (int *tag)
+setup_apply_trans (gpointer userdata)
 {
        prefs.hex_gui_transparency = setup_prefs.hex_gui_transparency;
-        gtk_widget_set_opacity (current_sess->gui->window,
-                                                        (prefs.hex_gui_transparency / 255.));
+        if (current_sess)
+                gtk_widget_set_opacity (current_sess->gui->window,
+                                                                (prefs.hex_gui_transparency / 255.));

-        *tag = 0;
+        setup_trans_apply_tag = 0;
        return 0;
 }

 static void
 setup_hscale_cb (GtkRange *wid, const setting *set)
 {
-        static int tag = 0;
-
        setup_set_int (&setup_prefs, set, (int) gtk_range_get_value (wid));

-        if (tag == 0)
-        {
-                tag = g_idle_add ((GSourceFunc) setup_apply_trans, &tag);
-        }
+        if (setup_trans_apply_tag == 0)
+                setup_trans_apply_tag = g_idle_add ((GSourceFunc) setup_apply_trans, NULL);
 }

 static void
@@ -1091,7 +1098,8 @@ setup_create_hscale (GtkWidget *table, int row, const setting *set)

 #ifndef WIN32 /* Windows always supports this */
        /* Only used for transparency currently */
-        if (!gdk_screen_is_composited (gtk_widget_get_screen (current_sess->gui->window)))
+        if (current_sess &&
+                 !gdk_screen_is_composited (gtk_widget_get_screen (current_sess->gui->window)))
                gtk_widget_set_sensitive (wid, FALSE);
 #endif
 }
@@ -2293,7 +2301,9 @@ setup_apply (struct zoitechatprefs *pr)
 	ThemeChangedEvent event;
 	struct zoitechatprefs old_prefs = prefs;
 	int old_dark_mode = prefs.hex_gui_dark_mode;
+	mg_live_prefs live_changes;

+	memset (&live_changes, 0, sizeof (live_changes));

 #define DIFF(a) (pr->a != prefs.a)

@@ -2301,40 +2311,49 @@ setup_apply (struct zoitechatprefs *pr)
        if (DIFF (hex_gui_lang))
                noapply = TRUE;
 #endif
-        if (DIFF (hex_gui_compact))
-                noapply = TRUE;
-        if (DIFF (hex_gui_input_icon))
-                noapply = TRUE;
-        if (DIFF (hex_gui_input_nick))
-                noapply = TRUE;
-        if (DIFF (hex_gui_lagometer))
-                noapply = TRUE;
-        if (DIFF (hex_gui_mode_buttons_inline))
-                noapply = TRUE;
-        if (DIFF (hex_gui_tab_icons))
-                noapply = TRUE;
-        if (DIFF (hex_gui_tab_closebuttons))
-                noapply = TRUE;
+        /* server tabs are only created when a connection is opened, so
+           existing connections keep their current tabs until a restart;
+           the channel tree indentation is still re-applied below */
        if (DIFF (hex_gui_tab_server))
+        {
                noapply = TRUE;
-        if (DIFF (hex_gui_tab_small))
-                noapply = TRUE;
+                live_changes.chanview = TRUE;
+        }
+
+        if (DIFF (hex_gui_compact))
+        {
+                live_changes.chanview = TRUE;
+                live_changes.ulist_columns = TRUE;
+        }
+        if (DIFF (hex_gui_input_icon) || DIFF (hex_gui_input_nick))
+                live_changes.input_box = TRUE;
+        if (DIFF (hex_gui_lagometer) || DIFF (hex_gui_throttlemeter))
+                live_changes.meters = TRUE;
+        if (DIFF (hex_gui_mode_buttons_inline) || DIFF (hex_gui_topicbar_multiline))
+                live_changes.topic_bar = TRUE;
+        if (DIFF (hex_gui_tab_icons) || DIFF (hex_gui_tab_closebuttons) ||
+                 DIFF (hex_gui_tab_small))
+                live_changes.chanview = TRUE;
        if (DIFF (hex_gui_tab_sort))
-                noapply = TRUE;
+                live_changes.tab_resort = TRUE;
        if (DIFF (hex_gui_tab_trunc))
-                noapply = TRUE;
-        if (DIFF (hex_gui_throttlemeter))
-                noapply = TRUE;
-        if (DIFF (hex_gui_topicbar_multiline))
-                noapply = TRUE;
+                live_changes.tab_trunc = TRUE;
        if (DIFF (hex_gui_ulist_count))
-                noapply = TRUE;
+                live_changes.ulist_count = TRUE;
        if (DIFF (hex_gui_ulist_icons))
-                noapply = TRUE;
+                live_changes.ulist_rows = TRUE;
        if (DIFF (hex_gui_ulist_show_hosts))
-                noapply = TRUE;
+        {
+                live_changes.ulist_columns = TRUE;
+                live_changes.ulist_rows = TRUE; /* hostnames may be stale */
+        }
        if (DIFF (hex_gui_ulist_sort))
-                noapply = TRUE;
+                live_changes.ulist_sort = TRUE;
+        /* compare against the pre-dialog value: the slider previews the
+           opacity live on the current window only, so OK still needs to
+           apply it to the other windows */
+        if (pr->hex_gui_transparency != setup_transparency_snapshot)
+                live_changes.transparency = TRUE;

        if ((pr->hex_gui_tab_pos == 5 || pr->hex_gui_tab_pos == 6) &&
                 pr->hex_gui_tab_layout == 2 && pr->hex_gui_tab_pos != prefs.hex_gui_tab_pos)
@@ -2378,6 +2397,8 @@ setup_apply (struct zoitechatprefs *pr)

 	theme_manager_dispatch_setup_apply (&event);

+	mg_apply_live_prefs (&live_changes);
+
        if (noapply)
                fe_message (_("Some settings were changed that require a"
                                                " restart to take full effect."), FE_MSG_WARN);
@@ -2410,6 +2431,9 @@ setup_ok_cb (GtkWidget *but, GtkWidget *win)
        if (save_result.success)
        {
                theme_preferences_stage_commit ();
+                /* the previewed values were accepted, so the close handler
+                   must not revert them */
+                setup_transparency_snapshot = prefs.hex_gui_transparency;
                gtk_widget_destroy (win);
                return;
        }
@@ -2472,6 +2496,24 @@ setup_close_cb (GtkWidget *win, GtkWidget **swin)
 {
        *swin = NULL;

+        /* drop any pending transparency preview and undo the previewed
+           opacity when the dialog is cancelled; after OK the snapshot
+           was updated so this is a no-op */
+        if (setup_trans_apply_tag)
+        {
+                g_source_remove (setup_trans_apply_tag);
+                setup_trans_apply_tag = 0;
+        }
+        if (prefs.hex_gui_transparency != setup_transparency_snapshot)
+        {
+                mg_live_prefs revert_changes;
+
+                prefs.hex_gui_transparency = setup_transparency_snapshot;
+                memset (&revert_changes, 0, sizeof (revert_changes));
+                revert_changes.transparency = TRUE;
+                mg_apply_live_prefs (&revert_changes);
+        }
+
        theme_preferences_stage_discard ();

        if (font_dialog)
@@ -2493,6 +2535,7 @@ setup_open (void)
        memcpy (&setup_prefs, &prefs, sizeof (prefs));

        color_change = FALSE;
+        setup_transparency_snapshot = prefs.hex_gui_transparency;
        theme_preferences_stage_begin ();
        setup_window = setup_window_open ();

--- a/src/fe-gtk/theme/tests/test-theme-access-routing.c
+++ b/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);
--- a/src/fe-gtk/theme/tests/test-theme-gtk3-settings.c
+++ b/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;

--- a/src/fe-gtk/theme/tests/test-theme-gtk3-stub.c
+++ b/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;
+}
--- a/src/fe-gtk/theme/tests/test-theme-preferences-gtk3-populate.c
+++ b/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;
 }
@@ -419,6 +421,43 @@ 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)
 {
@@ -430,5 +469,7 @@ main (int argc, char **argv)
                         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 ();
 }
--- a/src/fe-gtk/theme/theme-access.c
+++ b/src/fe-gtk/theme/theme-access.c
@@ -20,6 +20,8 @@

 #include "theme-access.h"

+#include "theme-css.h"
+#include "theme-gtk3.h"
 #include "theme-runtime.h"


@@ -116,6 +118,17 @@ theme_access_lookup_named_color (GtkStyleContext *context, const char *const *na
 {
 	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))
@@ -149,6 +162,8 @@ theme_access_get_gtk_palette_map (GtkWidget *widget, ThemeGtkPaletteMap *out_map
 	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;

@@ -160,6 +175,16 @@ theme_access_get_gtk_palette_map (GtkWidget *widget, ThemeGtkPaletteMap *out_map
 	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_resolve_map_background (context, GTK_STATE_FLAG_NORMAL, base_fallbacks,
 					     &out_map->text_background);
@@ -173,6 +198,10 @@ theme_access_get_gtk_palette_map (GtkWidget *widget, ThemeGtkPaletteMap *out_map
 	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;
 }
--- a/src/fe-gtk/theme/theme-application.c
+++ b/src/fe-gtk/theme/theme-application.c
@@ -56,12 +56,11 @@ 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;
-		else
-			prefer_dark = theme_policy_system_prefers_dark ();
+		/* 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
 	{
--- a/src/fe-gtk/theme/theme-css.c
+++ b/src/fe-gtk/theme/theme-css.c
@@ -60,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)
 {
--- a/src/fe-gtk/theme/theme-css.h
+++ b/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);
--- a/src/fe-gtk/theme/theme-gtk3.c
+++ b/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;
+}
--- a/src/fe-gtk/theme/theme-gtk3.h
+++ b/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
--- a/src/fe-gtk/theme/theme-manager.c
+++ b/src/fe-gtk/theme/theme-manager.c
@@ -590,11 +590,7 @@ 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_policy_is_dark_mode_active (prefs.hex_gui_dark_mode);
 	if (context)
--- a/src/fe-gtk/theme/theme-preferences.c
+++ b/src/fe-gtk/theme/theme-preferences.c
@@ -106,6 +106,11 @@ typedef struct
        gboolean staged_dirty[THEME_TOKEN_COUNT];
        GdkRGBA snapshot[THEME_TOKEN_COUNT];
        GdkRGBA staged[THEME_TOKEN_COUNT];
+        /* the GTK3 theme selection is previewed live from the combo, so
+         * remember what was active when the dialog opened in order to
+         * restore it when the dialog is cancelled */
+        char gtk3_theme_snapshot[sizeof ((struct zoitechatprefs *) 0)->hex_gui_gtk3_theme];
+        int gtk3_variant_snapshot;
 } theme_preferences_stage_state;

 static theme_preferences_stage_state theme_preferences_stage;
@@ -204,6 +209,11 @@ theme_preferences_stage_begin (void)
        memset (&theme_preferences_stage, 0, sizeof (theme_preferences_stage));
        theme_preferences_stage.active = TRUE;

+        g_strlcpy (theme_preferences_stage.gtk3_theme_snapshot,
+                   prefs.hex_gui_gtk3_theme,
+                   sizeof (theme_preferences_stage.gtk3_theme_snapshot));
+        theme_preferences_stage.gtk3_variant_snapshot = prefs.hex_gui_gtk3_variant;
+
        for (token = THEME_TOKEN_MIRC_0; token < THEME_TOKEN_COUNT; token++)
        {
                GdkRGBA rgba;
@@ -237,12 +247,36 @@ theme_preferences_stage_commit (void)
        memset (&theme_preferences_stage, 0, sizeof (theme_preferences_stage));
 }

+/* undo a live GTK3 theme preview: put the selection that was active when
+ * the dialog opened back and re-apply it */
+static void
+theme_preferences_stage_restore_gtk3 (void)
+{
+        if (g_strcmp0 (prefs.hex_gui_gtk3_theme, theme_preferences_stage.gtk3_theme_snapshot) == 0 &&
+            prefs.hex_gui_gtk3_variant == theme_preferences_stage.gtk3_variant_snapshot)
+                return;
+
+        g_strlcpy (prefs.hex_gui_gtk3_theme,
+                   theme_preferences_stage.gtk3_theme_snapshot,
+                   sizeof (prefs.hex_gui_gtk3_theme));
+        prefs.hex_gui_gtk3_variant = theme_preferences_stage.gtk3_variant_snapshot;
+
+        theme_gtk3_apply_current (NULL);
+        theme_manager_dispatch_changed (THEME_CHANGED_REASON_THEME_PACK |
+                                        THEME_CHANGED_REASON_PALETTE |
+                                        THEME_CHANGED_REASON_WIDGET_STYLE |
+                                        THEME_CHANGED_REASON_USERLIST |
+                                        THEME_CHANGED_REASON_MODE);
+}
+
 void
 theme_preferences_stage_discard (void)
 {
        if (!theme_preferences_stage.active)
                return;

+        /* restore the GTK3 theme first so the color snapshot below wins */
+        theme_preferences_stage_restore_gtk3 ();
        theme_preferences_stage_sync_runtime_to_snapshot ();
        memset (&theme_preferences_stage, 0, sizeof (theme_preferences_stage));
 }
@@ -1567,7 +1601,6 @@ theme_preferences_gtk3_sync_runtime_palette (theme_preferences_ui *ui)
 {
 	ThemeWidgetStyleValues style_values;
 	GtkWidget *style_source = NULL;
-	gboolean follows_system_theme = prefs.hex_gui_gtk3_theme[0] == '\0';

 	if (ui && ui->parent)
 		style_source = GTK_WIDGET (ui->parent);
@@ -1578,34 +1611,16 @@ theme_preferences_gtk3_sync_runtime_palette (theme_preferences_ui *ui)

 	theme_get_widget_style_values_for_widget (style_source, &style_values);

-	if (follows_system_theme)
-	{
-		/* Following the system GTK3 theme: leave the mapped tokens
-		 * unpinned so they keep tracking the theme, and only refresh
-		 * what the dialog shows. */
-		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);
-		return;
-	}
-
-	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
--- a/src/fe-gtk/userlistgui.c
+++ b/src/fe-gtk/userlistgui.c
@@ -796,16 +796,12 @@ userlist_store_color (GtkListStore *store, GtkTreeIter *iter, ThemeSemanticToken
 	}
 }

-GtkListStore *
-userlist_create_model (session *sess)
+static void
+userlist_model_set_sort (GtkListStore *store, session *sess)
 {
-	GtkListStore *store;
 	GtkTreeIterCompareFunc cmp_func;
 	GtkSortType sort_type;

-	store = gtk_list_store_new (6, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING,
-										G_TYPE_STRING, G_TYPE_POINTER, THEME_GTK_COLOR_TYPE);
-
 	switch (prefs.hex_gui_ulist_sort)
 	{
 	case 0:
@@ -825,18 +821,77 @@ userlist_create_model (session *sess)
 		sort_type = GTK_SORT_DESCENDING;
 		break;
 	default:
-		/* No sorting */
+		/* No sorting; rows keep their current order and new rows
+		   go wherever they are inserted */
+		gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(store),
+							GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, GTK_SORT_ASCENDING);
 		gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE(store), NULL, NULL, NULL);
-		return store;
+		return;
 	}

 	gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE(store), cmp_func, sess, NULL);
 	gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(store),
 						GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, sort_type);
+}
+
+GtkListStore *
+userlist_create_model (session *sess)
+{
+	GtkListStore *store;
+
+	store = gtk_list_store_new (6, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING,
+										G_TYPE_STRING, G_TYPE_POINTER, THEME_GTK_COLOR_TYPE);
+	userlist_model_set_sort (store, sess);

 	return store;
 }

+void
+userlist_apply_sort (session *sess)
+{
+	if (!sess->res || !sess->res->user_model)
+		return;
+
+	userlist_model_set_sort (sess->res->user_model, sess);
+}
+
+/* remove and re-insert every row, so per-row content that depends on
+ * preferences (mode icons vs. text prefixes, hostnames) is rebuilt */
+void
+userlist_refill (session *sess)
+{
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	GSList *users = NULL;
+	GSList *it;
+	struct User *user;
+
+	if (!sess->res || !sess->res->user_model)
+		return;
+
+	model = GTK_TREE_MODEL (sess->res->user_model);
+	if (gtk_tree_model_get_iter_first (model, &iter))
+	{
+		do
+		{
+			gtk_tree_model_get (model, &iter, COL_USER, &user, -1);
+			if (user)
+				users = g_slist_prepend (users, user);
+		}
+		while (gtk_tree_model_iter_next (model, &iter));
+	}
+
+	fe_userlist_clear (sess);
+
+	/* fe_userlist_insert() prepends, so inserting in reverse display
+	   order restores the on-screen order for unsorted lists; sorted
+	   models position the rows themselves */
+	for (it = users; it; it = it->next)
+		fe_userlist_insert (sess, it->data, FALSE);
+
+	g_slist_free (users);
+}
+
 static void
 userlist_add_columns (GtkTreeView * treeview)
 {
@@ -906,6 +961,23 @@ userlist_add_columns (GtkTreeView * treeview)
 	}
 }

+void
+userlist_rebuild_columns (GtkWidget *treeview)
+{
+	GList *columns;
+	GList *it;
+
+	if (!treeview)
+		return;
+
+	columns = gtk_tree_view_get_columns (GTK_TREE_VIEW (treeview));
+	for (it = columns; it; it = it->next)
+		gtk_tree_view_remove_column (GTK_TREE_VIEW (treeview), it->data);
+	g_list_free (columns);
+
+	userlist_add_columns (GTK_TREE_VIEW (treeview));
+}
+
 static gint
 userlist_click_cb (GtkWidget *widget, GdkEventButton *event, gpointer userdata)
 {
--- a/src/fe-gtk/userlistgui.h
+++ b/src/fe-gtk/userlistgui.h
@@ -24,6 +24,9 @@ void userlist_set_value (GtkWidget *treeview, gfloat val);
 gfloat userlist_get_value (GtkWidget *treeview);
 GtkWidget *userlist_create (GtkWidget *box);
 GtkListStore *userlist_create_model (session *sess);
+void userlist_apply_sort (session *sess);
+void userlist_refill (session *sess);
+void userlist_rebuild_columns (GtkWidget *treeview);
 void userlist_show (session *sess);
 void userlist_select (session *sess, char *name);
 void fe_userlist_set_typing (session *sess, const char *nick, const char *state);
--- a/src/fe-gtk/xtext.c
+++ b/src/fe-gtk/xtext.c
@@ -92,8 +92,104 @@ struct textentry
 	guchar pad1;
 	guchar pad2;
 	GList *marks;	/* List of found strings */
+	GdkPixbuf *image;	/* inline image shown below the text, or NULL */
+	GdkPixbuf *image_full;	/* larger version for the image viewer */
+	char *image_url;	/* the URL the image was loaded from */
 };

+/* inline image display */
+#define XTEXT_IMAGE_PADDING 4
+#define XTEXT_IMAGE_MAX_WIDTH 480
+#define XTEXT_IMAGE_MAX_HEIGHT 360
+#define XTEXT_IMAGE_FULL_MAX_WIDTH 1600
+#define XTEXT_IMAGE_FULL_MAX_HEIGHT 1200
+
+/* an inline image load that has been started but not yet completed;
+   ent/buf/xtext are invalidated (entry removed) when any of them dies */
+typedef struct
+{
+	guint id;
+	GtkXText *xtext;
+	xtext_buffer *buf;
+	textentry *ent;
+	char *url;
+} xtext_image_pending;
+
+static GSList *image_pending_list = NULL;
+static guint image_pending_next_id = 1;
+
+static void
+gtk_xtext_image_pending_forget (gboolean (*match) (xtext_image_pending *, gconstpointer), gconstpointer data)
+{
+	GSList *list = image_pending_list;
+
+	while (list)
+	{
+		GSList *next = list->next;
+		xtext_image_pending *pending = list->data;
+
+		if (match (pending, data))
+		{
+			image_pending_list = g_slist_delete_link (image_pending_list, list);
+			g_free (pending->url);
+			g_free (pending);
+		}
+		list = next;
+	}
+}
+
+static gboolean
+gtk_xtext_image_pending_match_ent (xtext_image_pending *pending, gconstpointer ent)
+{
+	return pending->ent == ent;
+}
+
+static gboolean
+gtk_xtext_image_pending_match_buf (xtext_image_pending *pending, gconstpointer buf)
+{
+	return pending->buf == buf;
+}
+
+static gboolean
+gtk_xtext_image_pending_match_xtext (xtext_image_pending *pending, gconstpointer xtext)
+{
+	return pending->xtext == xtext;
+}
+
+/* number of extra screen lines an entry needs for its inline image */
+
+static int
+gtk_xtext_image_rows (GtkXText *xtext, textentry *ent)
+{
+	if (ent->image == NULL || xtext->fontsize <= 0)
+		return 0;
+
+	return (gdk_pixbuf_get_height (ent->image) + XTEXT_IMAGE_PADDING * 2 +
+			  xtext->fontsize - 1) / xtext->fontsize;
+}
+
+/* free an entry's inline image and drop any pending load aimed at it;
+   must be called whenever a textentry is freed */
+
+static void
+gtk_xtext_ent_free_image (textentry *ent)
+{
+	gtk_xtext_image_pending_forget (gtk_xtext_image_pending_match_ent, ent);
+
+	if (ent->image)
+	{
+		g_object_unref (ent->image);
+		ent->image = NULL;
+	}
+	if (ent->image_full)
+	{
+		g_object_unref (ent->image_full);
+		ent->image_full = NULL;
+	}
+	g_free (ent->image_url);
+	ent->image_url = NULL;
+}
+
 enum
 {
 	WORD_CLICK,
@@ -213,6 +309,7 @@ static gboolean gtk_xtext_search_init (xtext_buffer *buf, const gchar *text, gtk
 static char * gtk_xtext_get_word (GtkXText * xtext, int x, int y, textentry ** ret_ent, int *ret_off, int *ret_len, GSList **slp);
 static gboolean gtk_xtext_word_select_char (const unsigned char *ch);
 static gboolean gtk_xtext_get_word_select_range (GtkXText *xtext, int x, int y, textentry **ret_ent, int *ret_off, int *ret_len);
+static textentry * gtk_xtext_image_hit (GtkXText *xtext, int x, int y);

 static inline void
 gtk_xtext_cursor_unref (GdkCursor *cursor)
@@ -1062,6 +1159,8 @@ gtk_xtext_dispose (GObject *object)
 {
 	GtkXText *xtext = GTK_XTEXT (object);

+	gtk_xtext_image_pending_forget (gtk_xtext_image_pending_match_xtext, xtext);
+	g_clear_pointer (&xtext->tooltip_url, g_free);
 	gtk_xtext_cleanup (xtext);

 	if (G_OBJECT_CLASS (gtk_xtext_parent_class)->dispose)
@@ -1443,7 +1542,7 @@ gtk_xtext_find_x (GtkXText * xtext, int x, textentry * ent, int subline,

 	str = ent->str + gtk_xtext_find_subline (xtext, ent, subline);
 	if (str >= ent->str + ent->str_len)
-		return 0;
+		return ent->str_len;	/* e.g. the blank rows of an inline image */

 	/* Let user select left a few pixels to grab hidden text e.g. '<' */
 	if (x < indent - xtext->space_width)
@@ -2143,6 +2242,7 @@ gtk_xtext_get_word (GtkXText * xtext, int x, int y, textentry ** ret_ent,
 	int len;
 	int out_of_bounds = 0;
 	int len_to_offset = 0;
+	gboolean has_hidden;

 	ent = gtk_xtext_find_char (xtext, x, y, &offset, &out_of_bounds);
 	if (ent == NULL || out_of_bounds || offset < 0 || offset >= ent->str_len)
@@ -2187,10 +2287,15 @@ gtk_xtext_get_word (GtkXText * xtext, int x, int y, textentry ** ret_ent,
 	if (ret_len)
 		*ret_len = len;		/* Length before stripping */

+	/* a word with hidden text is a placeholder (e.g. an inline image link
+	   label); its whole visible part acts as the link */
+	has_hidden = memchr (word, ATTR_HIDDEN, len) != NULL;
+
 	word = gtk_xtext_strip_color (word, len, xtext->scratch_buffer, NULL, slp, FALSE);

 	/* avoid turning the cursor into a hand for non-url part of the word */
-	if (xtext->urlcheck_function && xtext->urlcheck_function (GTK_WIDGET (xtext), word))
+	if (!has_hidden &&
+		 xtext->urlcheck_function && xtext->urlcheck_function (GTK_WIDGET (xtext), word))
 	{
 		int start, end;
 		url_last (&start, &end);
@@ -2274,12 +2379,43 @@ gtk_xtext_unrender_hilight (GtkXText *xtext)
 	xtext->un_hilight = FALSE;
 }

+/* show (or stop showing) the destination URL of a hovered placeholder
+   word as the widget's tooltip */
+
+static void
+gtk_xtext_set_url_tooltip (GtkXText *xtext, const char *url, int url_len)
+{
+	if (url == NULL)
+	{
+		if (xtext->tooltip_url)
+		{
+			g_free (xtext->tooltip_url);
+			xtext->tooltip_url = NULL;
+			gtk_widget_set_tooltip_text (GTK_WIDGET (xtext), NULL);
+			xtext->tooltip_stamp_set = FALSE;
+		}
+		return;
+	}
+
+	if (xtext->tooltip_url &&
+		 strlen (xtext->tooltip_url) == (gsize) url_len &&
+		 memcmp (xtext->tooltip_url, url, url_len) == 0)
+		return;
+
+	g_free (xtext->tooltip_url);
+	xtext->tooltip_url = g_strndup (url, url_len);
+	gtk_widget_set_tooltip_text (GTK_WIDGET (xtext), xtext->tooltip_url);
+	xtext->tooltip_stamp_set = FALSE;
+}
+
 static gboolean
 gtk_xtext_leave_notify (GtkWidget * widget, GdkEventCrossing * event)
 {
 	GtkXText *xtext = GTK_XTEXT (widget);
 	GdkWindow *window = gtk_widget_get_window (widget);

+	gtk_xtext_set_url_tooltip (xtext, NULL, 0);
+
 	if (xtext->cursor_hand)
 	{
 		gtk_xtext_unrender_hilight (xtext);
@@ -2343,6 +2479,7 @@ gtk_xtext_get_word_adjust (GtkXText *xtext, int x, int y, textentry **word_ent,
 	GSList *slp = NULL;
 	unsigned char *word;
 	int word_type = 0;
+	gboolean placeholder = FALSE;

 	word = gtk_xtext_get_word (xtext, x, y, word_ent, offset, len, &slp);
 	if (word)
@@ -2352,7 +2489,18 @@ gtk_xtext_get_word_adjust (GtkXText *xtext, int x, int y, textentry **word_ent,
 		word_type = xtext->urlcheck_function (GTK_WIDGET (xtext), word);
 		if (word_type > 0)
 		{
-			if (url_last (&laststart, &lastend))
+			/* words with hidden text are placeholders (e.g. inline image
+			   links): hilight the whole word, not just the URL inside it */
+			if (memchr ((*word_ent)->str + *offset, ATTR_HIDDEN, *len))
+			{
+				/* the label hides the real destination, so show the full
+				   URL as a tooltip while hovering */
+				placeholder = TRUE;
+				if (url_last (&laststart, &lastend) && lastend > laststart)
+					gtk_xtext_set_url_tooltip (xtext,
+						(const char *) word + laststart, lastend - laststart);
+			}
+			else if (url_last (&laststart, &lastend))
 			{
 				int cumlen, startadj = 0, endadj = 0;
 				offlen_t *meta;
@@ -2382,6 +2530,9 @@ gtk_xtext_get_word_adjust (GtkXText *xtext, int x, int y, textentry **word_ent,
 	}
 	g_slist_free_full (slp, g_free);

+	if (!placeholder)
+		gtk_xtext_set_url_tooltip (xtext, NULL, 0);
+
 	return word_type;
 }

@@ -2513,6 +2664,20 @@ gtk_xtext_motion_notify (GtkWidget * widget, GdkEventMotion * event)
 	}

 tooltip_check:
+	/* hovering an inline image? it opens the viewer when clicked */
+	if (gtk_xtext_image_hit (xtext, x, y))
+	{
+		if (xtext->hilight_ent)	/* moving here straight from a link */
+			gtk_xtext_leave_notify (widget, NULL);
+		if (!xtext->cursor_hand)
+		{
+			gdk_window_set_cursor (window, xtext->hand_cursor);
+			xtext->cursor_hand = TRUE;
+			xtext->cursor_resize = FALSE;
+		}
+		return FALSE;
+	}
+
 	if (xtext->buffer->time_stamp && xtext->buffer->indent > 0 && x >= 0 && x < xtext->stamp_width)
 	{
 		textentry *ent = gtk_xtext_find_char (xtext, x, y, NULL, NULL);
@@ -2620,6 +2785,46 @@ gtk_xtext_unselect (GtkXText *xtext)
 	xtext->buffer->last_ent_end = NULL;
 }

+/* check whether the given widget coordinates hit an entry's inline image;
+   returns the entry if so */
+
+static textentry *
+gtk_xtext_image_hit (GtkXText *xtext, int x, int y)
+{
+	textentry *ent;
+	int line, subline, image_rows, text_rows, rel_y, img_x;
+
+	if (xtext->fontsize <= 0)
+		return NULL;
+
+	/* adjust y value for negative rounding, double to int */
+	if (y < 0)
+		y -= xtext->fontsize;
+
+	line = (y + xtext->pixel_offset) / xtext->fontsize;
+	ent = gtk_xtext_nth (xtext, line + (int) xtext_adj_get_value (xtext->adj),
+								&subline);
+	if (ent == NULL || ent->image == NULL)
+		return NULL;
+
+	image_rows = gtk_xtext_image_rows (xtext, ent);
+	text_rows = ent->subline_count - image_rows;
+	if (subline < text_rows)
+		return NULL;
+
+	img_x = xtext->buffer->indent + XTEXT_IMAGE_PADDING;
+	if (x < img_x || x >= img_x + gdk_pixbuf_get_width (ent->image))
+		return NULL;
+
+	rel_y = (subline - text_rows) * xtext->fontsize +
+		(y + xtext->pixel_offset) - (line * xtext->fontsize) -
+		XTEXT_IMAGE_PADDING;
+	if (rel_y < 0 || rel_y >= gdk_pixbuf_get_height (ent->image))
+		return NULL;
+
+	return ent;
+}
+
 static gboolean
 gtk_xtext_button_release (GtkWidget * widget, GdkEventButton * event)
 {
@@ -2692,8 +2897,15 @@ gtk_xtext_button_release (GtkWidget * widget, GdkEventButton * event)

 		if (!gtk_xtext_is_selecting (xtext))
 		{
-			word = gtk_xtext_get_word (xtext, event_x, event_y, 0, 0, 0, 0);
+			textentry *word_ent = NULL;
+
+			word = gtk_xtext_get_word (xtext, event_x, event_y, &word_ent, 0, 0, 0);
+			xtext->clicked_ent = word ? word_ent : NULL;
+			xtext->clicked_image_ent = word ? NULL :
+				gtk_xtext_image_hit (xtext, event_x, event_y);
 			g_signal_emit (G_OBJECT (xtext), xtext_signals[WORD_CLICK], 0, word ? word : NULL, event);
+			xtext->clicked_ent = NULL;
+			xtext->clicked_image_ent = NULL;
 		}
 	}

@@ -2720,14 +2932,16 @@ gtk_xtext_button_press (GtkWidget * widget, GdkEventButton * event)

 	if (event->button == 3 || event->button == 2) /* right/middle click */
 	{
-		word = gtk_xtext_get_word (xtext, x, y, 0, 0, 0, 0);
+		word = gtk_xtext_get_word (xtext, x, y, &ent, 0, 0, 0);
 		if (word)
 		{
+			xtext->clicked_ent = ent;
 			g_signal_emit (G_OBJECT (xtext), xtext_signals[WORD_CLICK], 0,
 								word, event);
 		} else
 			g_signal_emit (G_OBJECT (xtext), xtext_signals[WORD_CLICK], 0,
 								"", event);
+		xtext->clicked_ent = NULL;
 		return FALSE;
 	}

@@ -4105,6 +4319,7 @@ gtk_xtext_render_line (GtkXText * xtext, textentry * ent, int line,
 	unsigned char *str;
 	int indent, taken, entline, len, y, start_subline;
 	int emphasis = 0;
+	int image_rows;

 	entline = taken = 0;
 	str = ent->str;
@@ -4175,6 +4390,56 @@ gtk_xtext_render_line (GtkXText * xtext, textentry * ent, int line,
 	}
 	while (str < ent->str + ent->str_len);

+	/* draw the inline image on its blank rows below the text.  'subline'
+	   still holds the rows left to skip when the page starts inside the
+	   image area (the text loop above only consumes text sublines). */
+	image_rows = gtk_xtext_image_rows (xtext, ent);
+	if (image_rows > 0)
+	{
+		int skip = MIN (subline, image_rows);
+		int rows = image_rows - skip;
+		int first_row_y = (xtext->fontsize * line) - xtext->pixel_offset;
+		int drawn = 0;
+		gboolean render_image = !xtext->dont_render && !xtext->skip_border_fills &&
+			!xtext->render_hilights_only;
+
+		while (rows > 0 && line < lines_max)
+		{
+			y = (xtext->fontsize * line) + xtext->font->ascent - xtext->pixel_offset;
+			if (render_image)
+			{
+				int bg_x = MAX (0, xtext->clip_x);
+				int bg_w = MIN (win_width + MARGIN, xtext->clip_x2) - bg_x;
+
+				if (bg_w > 0)
+					xtext_draw_bg (xtext, bg_x, y - xtext->font->ascent, bg_w, xtext->fontsize);
+				gtk_xtext_draw_sep (xtext, y - xtext->font->ascent);
+			}
+			line++;
+			taken++;
+			rows--;
+			drawn++;
+		}
+
+		if (drawn > 0 && render_image)
+		{
+			/* this may be the shared draw context, so the clip has to be
+			   undone before anything else is rendered with it */
+			cairo_t *cr = xtext_create_context (xtext);
+			int img_x = xtext->buffer->indent + XTEXT_IMAGE_PADDING;
+			int img_y = first_row_y - (skip * xtext->fontsize) + XTEXT_IMAGE_PADDING;
+
+			cairo_save (cr);
+			cairo_rectangle (cr, 0, first_row_y, win_width + MARGIN,
+								  drawn * xtext->fontsize);
+			cairo_clip (cr);
+			gdk_cairo_set_source_pixbuf (cr, ent->image, img_x, img_y);
+			cairo_paint (cr);
+			cairo_restore (cr);
+			cairo_destroy (cr);
+		}
+	}
+
 	gtk_xtext_draw_marker (xtext, ent, y - xtext->fontsize * (taken + start_subline));

 	return taken;
@@ -4333,6 +4598,7 @@ gtk_xtext_lines_taken (xtext_buffer *buf, textentry * ent)
 	unsigned char *str;
 	int indent, len;
 	int win_width;
+	int image_rows, i;

 	g_slist_free (ent->sublines);
 	ent->sublines = NULL;
@@ -4342,21 +4608,27 @@ gtk_xtext_lines_taken (xtext_buffer *buf, textentry * ent)
 	if (win_width >= ent->indent + ent->str_width)
 	{
 		ent->sublines = g_slist_append (ent->sublines, GINT_TO_POINTER (ent->str_len));
-		ent->subline_count = 1;
-		return ent->subline_count;
 	}
-
-	indent = ent->indent;
-	str = ent->str;
-
-	do
+	else
 	{
-		len = find_next_wrap (buf->xtext, ent, str, win_width, indent);
-		ent->sublines = g_slist_append (ent->sublines, GINT_TO_POINTER (str + len - ent->str));
-		indent = buf->indent;
-		str += len;
+		indent = ent->indent;
+		str = ent->str;
+
+		do
+		{
+			len = find_next_wrap (buf->xtext, ent, str, win_width, indent);
+			ent->sublines = g_slist_append (ent->sublines, GINT_TO_POINTER (str + len - ent->str));
+			indent = buf->indent;
+			str += len;
+		}
+		while (str < ent->str + ent->str_len);
 	}
-	while (str < ent->str + ent->str_len);
+
+	/* extra blank rows that make room for an attached inline image;
+	   their offset is str_len, i.e. past the end of the text */
+	image_rows = gtk_xtext_image_rows (buf->xtext, ent);
+	for (i = 0; i < image_rows; i++)
+		ent->sublines = g_slist_append (ent->sublines, GINT_TO_POINTER ((gint) ent->str_len));

 	ent->subline_count = g_slist_length (ent->sublines);
 	return ent->subline_count;
@@ -4779,6 +5051,8 @@ gtk_xtext_kill_ent (xtext_buffer *buffer, textentry *ent)
 	ent->sublines = NULL;
 	ent->subline_count = 0;

+	gtk_xtext_ent_free_image (ent);
+
 	g_free (ent);
 	return visible;
 }
@@ -4916,6 +5190,7 @@ gtk_xtext_clear (xtext_buffer *buf, int lines)
 		while (buf->text_first)
 		{
 			next = buf->text_first->next;
+			gtk_xtext_ent_free_image (buf->text_first);
 			g_free (buf->text_first);
 			buf->text_first = next;
 		}
@@ -5435,6 +5710,9 @@ gtk_xtext_append_entry (xtext_buffer *buf, textentry * ent, time_t stamp)
 	ent->next = NULL;
 	ent->marks = NULL;
 	ent->subline_count = 0;
+	ent->image = NULL;
+	ent->image_full = NULL;
+	ent->image_url = NULL;

 	if (ent->indent < MARGIN)
 		ent->indent = MARGIN;	  /* 2 pixels is the left margin */
@@ -5955,13 +6233,260 @@ gtk_xtext_buffer_free (xtext_buffer *buf)
 		gtk_xtext_search_fini (buf);
 	}

+	gtk_xtext_image_pending_forget (gtk_xtext_image_pending_match_buf, buf);
+
 	ent = buf->text_first;
 	while (ent)
 	{
 		next = ent->next;
+		gtk_xtext_ent_free_image (ent);
 		g_free (ent);
 		ent = next;
 	}

 	g_free (buf);
 }
+
+/* ========================================= */
+/* ========== INLINE IMAGE API ============= */
+/* ========================================= */
+
+/* the entry the last word_click signal was emitted for; only valid while
+   handling that signal */
+
+textentry *
+gtk_xtext_get_clicked_entry (GtkXText *xtext)
+{
+	return xtext->clicked_ent;
+}
+
+/* the entry whose inline image the last word_click signal (with a NULL
+   word) landed on; only valid while handling that signal */
+
+textentry *
+gtk_xtext_get_clicked_image_entry (GtkXText *xtext)
+{
+	return xtext->clicked_image_ent;
+}
+
+/* check that 'ent' is still an entry of the currently shown buffer; used to
+   validate entry pointers that were remembered across main loop iterations */
+
+gboolean
+gtk_xtext_buffer_contains (GtkXText *xtext, textentry *ent)
+{
+	textentry *walk;
+
+	if (ent == NULL)
+		return FALSE;
+
+	for (walk = xtext->buffer->text_first; walk; walk = walk->next)
+	{
+		if (walk == ent)
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
+gboolean
+gtk_xtext_entry_has_image (GtkXText *xtext, textentry *ent)
+{
+	return ent != NULL && ent->image != NULL;
+}
+
+/* the URL of the entry's attached image, or NULL if it has none */
+
+const char *
+gtk_xtext_entry_get_image_url (GtkXText *xtext, textentry *ent)
+{
+	return ent && ent->image ? ent->image_url : NULL;
+}
+
+/* larger version of the entry's attached image, for the viewer */
+
+GdkPixbuf *
+gtk_xtext_entry_get_full_image (GtkXText *xtext, textentry *ent)
+{
+	if (ent == NULL)
+		return NULL;
+	return ent->image_full ? ent->image_full : ent->image;
+}
+
+/* the entry's subline count changed (image attached or removed):
+   redo its layout, fix the scrollbar and redraw */
+
+static void
+gtk_xtext_image_relayout (GtkXText *xtext, xtext_buffer *buf, textentry *ent)
+{
+	buf->num_lines -= ent->subline_count;
+	buf->num_lines += gtk_xtext_lines_taken (buf, ent);
+	buf->pagetop_ent = NULL;
+	dontscroll (buf);
+
+	if (xtext->buffer == buf)
+	{
+		gtk_xtext_adjustment_set (buf, TRUE);
+		if (buf->scrollbar_down)
+			xtext_adj_set_value (xtext->adj,
+				xtext_adj_get_upper (xtext->adj) -
+				xtext_adj_get_page_size (xtext->adj));
+		if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
+			gtk_widget_queue_draw (GTK_WIDGET (xtext));
+	}
+}
+
+/* scale down (never up) to fit within max_width x max_height */
+
+static GdkPixbuf *
+gtk_xtext_image_scale_max (GdkPixbuf *pixbuf, int max_width, int max_height)
+{
+	int width = gdk_pixbuf_get_width (pixbuf);
+	int height = gdk_pixbuf_get_height (pixbuf);
+	int new_width, new_height;
+	double scale;
+
+	if (width < 1 || height < 1)
+		return NULL;
+
+	if (width <= max_width && height <= max_height)
+		return g_object_ref (pixbuf);
+
+	scale = MIN ((double) max_width / width, (double) max_height / height);
+	new_width = MAX (1, (int) (width * scale));
+	new_height = MAX (1, (int) (height * scale));
+
+	return gdk_pixbuf_scale_simple (pixbuf, new_width, new_height,
+											  GDK_INTERP_BILINEAR);
+}
+
+/* scale down (never up) to fit the usual text area */
+
+static GdkPixbuf *
+gtk_xtext_image_scale (xtext_buffer *buf, GdkPixbuf *pixbuf)
+{
+	int max_width = XTEXT_IMAGE_MAX_WIDTH;
+	int avail;
+
+	avail = buf->window_width - buf->indent - MARGIN - XTEXT_IMAGE_PADDING * 2;
+	if (avail >= 64 && avail < max_width)
+		max_width = avail;
+
+	return gtk_xtext_image_scale_max (pixbuf, max_width, XTEXT_IMAGE_MAX_HEIGHT);
+}
+
+/* register an asynchronous image load for 'ent'.  Returns a handle to pass
+   to gtk_xtext_image_load_finish(), or 0 if the entry already has an image
+   or a load underway. */
+
+guint
+gtk_xtext_image_load_begin (GtkXText *xtext, textentry *ent, const char *url)
+{
+	xtext_image_pending *pending;
+	GSList *list;
+
+	if (ent == NULL || ent->image != NULL)
+		return 0;
+
+	for (list = image_pending_list; list; list = list->next)
+	{
+		pending = list->data;
+		if (pending->ent == ent)
+			return 0;
+	}
+
+	pending = g_new0 (xtext_image_pending, 1);
+	pending->id = image_pending_next_id++;
+	if (image_pending_next_id == 0)	/* skip 0 on wrap, it means failure */
+		image_pending_next_id = 1;
+	pending->xtext = xtext;
+	pending->buf = xtext->buffer;
+	pending->ent = ent;
+	pending->url = g_strdup (url);
+	image_pending_list = g_slist_prepend (image_pending_list, pending);
+
+	return pending->id;
+}
+
+/* complete a load started with gtk_xtext_image_load_begin().  pixbuf may be
+   NULL to abandon the load (e.g. download failed).  Returns TRUE if the
+   image was attached, FALSE if it was dropped (failure, or the entry is
+   gone).  The caller keeps ownership of the pixbuf. */
+
+gboolean
+gtk_xtext_image_load_finish (guint handle, GdkPixbuf *pixbuf)
+{
+	xtext_image_pending *pending = NULL;
+	GSList *list;
+	GdkPixbuf *scaled;
+	GtkXText *xtext;
+	xtext_buffer *buf;
+	textentry *ent;
+
+	if (handle == 0)
+		return FALSE;
+
+	for (list = image_pending_list; list; list = list->next)
+	{
+		xtext_image_pending *walk = list->data;
+		if (walk->id == handle)
+		{
+			pending = walk;
+			break;
+		}
+	}
+
+	if (pending == NULL)	/* entry, buffer or widget died meanwhile */
+		return FALSE;
+
+	xtext = pending->xtext;
+	buf = pending->buf;
+	ent = pending->ent;
+	image_pending_list = g_slist_remove (image_pending_list, pending);
+
+	if (pixbuf == NULL || ent->image != NULL)
+	{
+		g_free (pending->url);
+		g_free (pending);
+		return FALSE;
+	}
+
+	scaled = gtk_xtext_image_scale (buf, pixbuf);
+	if (scaled == NULL)
+	{
+		g_free (pending->url);
+		g_free (pending);
+		return FALSE;
+	}
+
+	ent->image = scaled;
+	ent->image_full = gtk_xtext_image_scale_max (pixbuf,
+		XTEXT_IMAGE_FULL_MAX_WIDTH, XTEXT_IMAGE_FULL_MAX_HEIGHT);
+	ent->image_url = pending->url;	/* transferred */
+	g_free (pending);
+	gtk_xtext_image_relayout (xtext, buf, ent);
+
+	return TRUE;
+}
+
+/* remove an entry's inline image again.  Returns FALSE if it had none. */
+
+gboolean
+gtk_xtext_image_remove (GtkXText *xtext, textentry *ent)
+{
+	if (ent == NULL || ent->image == NULL)
+		return FALSE;
+
+	g_object_unref (ent->image);
+	ent->image = NULL;
+	if (ent->image_full)
+	{
+		g_object_unref (ent->image_full);
+		ent->image_full = NULL;
+	}
+	g_free (ent->image_url);
+	ent->image_url = NULL;
+	gtk_xtext_image_relayout (xtext, xtext->buffer, ent);
+
+	return TRUE;
+}
--- a/src/fe-gtk/xtext.h
+++ b/src/fe-gtk/xtext.h
@@ -192,6 +192,7 @@ struct _GtkXText
 	int hilight_end;
 	time_t tooltip_stamp;
 	unsigned int tooltip_stamp_set:1;
+	char *tooltip_url;			  /* URL shown while hovering a placeholder */

 	guint16 fontwidth[128];	  /* each char's width, only the ASCII ones */

@@ -254,6 +255,9 @@ struct _GtkXText
 	unsigned int force_render:1;
 	unsigned int color_paste:1; /* CTRL was pressed when selection finished */

+	textentry *clicked_ent;		  /* entry under the last word_click, or NULL */
+	textentry *clicked_image_ent; /* entry whose inline image was clicked */
+
 	/* settings/prefs */
 	unsigned int auto_indent:1;
 	unsigned int thinline:1;
@@ -309,4 +313,19 @@ void gtk_xtext_buffer_free (xtext_buffer *buf);
 void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render);
 void gtk_xtext_copy_selection (GtkXText *xtext);

+/* inline image support.  A textentry can have one image attached, which is
+ * rendered below its text.  Loading is asynchronous: begin() registers the
+ * target entry and returns a handle, finish() attaches the downloaded pixbuf
+ * if the entry still exists.  The handle stays valid even if the entry, its
+ * buffer or the widget are destroyed in the meantime. */
+textentry *gtk_xtext_get_clicked_entry (GtkXText *xtext);
+textentry *gtk_xtext_get_clicked_image_entry (GtkXText *xtext);
+gboolean gtk_xtext_buffer_contains (GtkXText *xtext, textentry *ent);
+gboolean gtk_xtext_entry_has_image (GtkXText *xtext, textentry *ent);
+const char *gtk_xtext_entry_get_image_url (GtkXText *xtext, textentry *ent);
+GdkPixbuf *gtk_xtext_entry_get_full_image (GtkXText *xtext, textentry *ent);
+guint gtk_xtext_image_load_begin (GtkXText *xtext, textentry *ent, const char *url);
+gboolean gtk_xtext_image_load_finish (guint handle, GdkPixbuf *pixbuf);
+gboolean gtk_xtext_image_remove (GtkXText *xtext, textentry *ent);
+
 #endif
--- a/win32/copy/copy.vcxproj
+++ b/win32/copy/copy.vcxproj
@@ -78,6 +78,7 @@
      <Gtk3Immodules Include="$(DepsRoot)\lib\gtk-3.0\3.0.0\immodules\**\*" />
      <Gtk3PrintBackends Include="$(DepsRoot)\lib\gtk-3.0\3.0.0\printbackends\**\*" />
      <GSettingsSchemas Include="$(DepsRoot)\share\glib-2.0\schemas\*" />
+      <GioModules Include="$(DepsRoot)\lib\gio\modules\**\*" />
      <GdkPixbufLoaders Include="$(DepsRoot)\lib\gdk-pixbuf-2.0\**\loaders\**\*" />
      <GdkPixbufLoaderCache Include="$(DepsRoot)\lib\gdk-pixbuf-2.0\**\loaders.cache" />

@@ -96,6 +97,7 @@
    <Copy SourceFiles="@(GdkPixbufLoaders)" DestinationFiles="@(GdkPixbufLoaders->'$(ZoiteChatRel)\lib\gdk-pixbuf-2.0\%(RecursiveDir)%(Filename)%(Extension)')" />
    <Copy SourceFiles="@(GdkPixbufLoaderCache)" DestinationFiles="@(GdkPixbufLoaderCache->'$(ZoiteChatRel)\lib\gdk-pixbuf-2.0\%(RecursiveDir)%(Filename)%(Extension)')" />
    <Copy SourceFiles="@(GSettingsSchemas)" DestinationFiles="@(GSettingsSchemas->'$(ZoiteChatRel)\share\glib-2.0\schemas\%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(GioModules)" DestinationFiles="@(GioModules->'$(ZoiteChatRel)\lib\gio\modules\%(RecursiveDir)%(Filename)%(Extension)')" />
    <Copy SourceFiles="@(Share)" DestinationFiles="@(Share->'$(ZoiteChatRel)\share\%(RecursiveDir)%(Filename)%(Extension)')" />
    <Copy SourceFiles="..\..\COPYING" DestinationFolder="$(ZoiteChatRel)\share\doc\zoitechat" />
    <Copy SourceFiles="$(WinSparklePath)\COPYING" DestinationFolder="$(ZoiteChatRel)\share\doc\WinSparkle" />
--- a/win32/installer/zoitechat.iss.tt
+++ b/win32/installer/zoitechat.iss.tt
@@ -151,6 +151,7 @@ Source: "tiff.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "plugins\hcnotifications-winrt.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: libs

 Source: "lib\enchant\*"; DestDir: "{app}\lib\enchant"; Flags: ignoreversion; Components: libs
+Source: "lib\gio\modules\*"; DestDir: "{app}\lib\gio\modules"; Flags: ignoreversion recursesubdirs; Components: libs

 Source: "girepository-2.0-0.dll"; DestDir: "{app}"; Flags: ignoreversion skipifsourcedoesntexist; Components: langs\lua
 Source: "lua51.dll"; DestDir: "{app}"; Flags: ignoreversion skipifsourcedoesntexist; Components: langs\lua
Author	SHA1	Message	Date
deepend-tildeclub	8c1b920b27	support inline images in chat.	2026-07-20 14:33:20 -06:00
deepend-tildeclub	8150d6c48c	Merge pull request #351 from ZoiteChat/reduce-client-restarts Reduce needed client restarts for settings changes.	2026-07-19 17:02:04 -06:00
deepend-tildeclub	05ee0dbdb5	Reduce needed client restarts for settings changes.	2026-07-16 08:48:33 -06:00
deepend-tildeclub	2db3076c92	Merge pull request #350 from ZoiteChat/fix-gtk3-quirks fix a few GTK3 theming quirks	2026-07-16 02:29:43 -06:00
deepend-tildeclub	90daed18df	fix a few GTK3 theming quirks	2026-07-15 23:56:05 -06:00
deepend-tildeclub	65dd2c645a	Merge pull request #345 from ZoiteChat/gtk3-consistency-fixes theming: respect system theme by default	2026-07-14 14:27:08 -06:00