ui: let right sidebar shrink proper; left-align counts, ellipsize lists, stop content forcing width

fix: style GTK selection nodes too, not just rows/cells

changelog.rst

@@ -1,6 +1,15 @@
 ZoiteChat ChangeLog
 =================
 
+2.18.0~pre4 (2026-03-15)
+------------------------
+
+- Fixed a regression where Ctrl+A could incorrectly mark you away instead of selecting all text.
+- Fixed a crash when toggling the GUI with F9 or the menu toggle action.
+- Fixed sidebar collapse behavior on fresh installs.
+- Added multiline topic bar support with clickable URLs.
+- Improved GTK selection styling so text selection is shown visually on topic and chat text box.
+
 2.18.0~pre3 (2026-03-13)
 ------------------------
 

data/misc/net.zoite.Zoitechat.appdata.xml.in

@@ -29,6 +29,18 @@
     <id>zoitechat.desktop</id>
   </provides>
 <releases>
+  <release date="2026-03-14" version="2.18.0~pre4">
+    <description>
+      <p>UI fixes, topic bar improvements, and selection styling updates:</p>
+      <ul>
+        <li>Fixed a regression where <code>Ctrl+A</code> could incorrectly mark you away instead of selecting all text.</li>
+        <li>Fixed a crash when toggling the GUI with <code>F9</code> or the menu toggle action.</li>
+        <li>Fixed sidebar collapse behavior on fresh installs.</li>
+        <li>Added multiline topic bar support with clickable URLs.</li>
+        <li>Improved GTK selection styling so text selection is shown visually in the topic bar and chat input box.</li>
+      </ul>
+    </description>
+  </release>
   <release date="2026-03-13" version="2.18.0~pre3">
     <description>
       <p>GTK3 theming, UI, and platform improvements:</p>

meson.build

@@ -1,5 +1,5 @@
 project('zoitechat', 'c',
-  version: '2.18.0~pre3',
+  version: '2.18.0~pre4',
   meson_version: '>= 0.55.0',
   default_options: [
     'c_std=c17',

plugins/python/python.py

@@ -19,7 +19,7 @@ else:
 if not hasattr(sys, 'argv'):
     sys.argv = ['<zoitechat>']
 
-VERSION = b'2.18.0~pre3'
+VERSION = b'2.18.0~pre4'
 PLUGIN_NAME = ffi.new('char[]', b'Python')
 PLUGIN_DESC = ffi.new('char[]', b'Python %d.%d scripting interface' % (sys.version_info[0], sys.version_info[1]))
 PLUGIN_VERSION = ffi.new('char[]', VERSION)

src/fe-gtk/chanview-tree.c

@@ -131,6 +131,7 @@ cv_tree_init (chanview *cv)
 									 GTK_SHADOW_IN);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (win),
 											  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (win), 1);
 	gtk_container_add (GTK_CONTAINER (cv->box), win);
 	gtk_widget_show (win);
 
@@ -180,6 +181,7 @@ cv_tree_init (chanview *cv)
 	renderer = gtk_cell_renderer_text_new ();
 	if (prefs.hex_gui_compact)
 		g_object_set (G_OBJECT (renderer), "ypad", 0, NULL);
+	g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 	gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer), 1);
 	gtk_tree_view_column_pack_start(col, renderer, TRUE);
 	gtk_tree_view_column_set_attributes (col, renderer,
@@ -188,6 +190,9 @@ cv_tree_init (chanview *cv)
 								  "underline", COL_UNDERLINE,
 								  NULL);
 	gtk_tree_view_column_set_expand (col, TRUE);
+	gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_FIXED);
+	gtk_tree_view_column_set_fixed_width (col, 1);
+	gtk_tree_view_column_set_min_width (col, 1);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(view), col);									
 
 	g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (view))),

src/fe-gtk/fe-gtk.c

@@ -758,11 +758,15 @@ fe_set_topic (session *sess, char *topic, char *stripped_topic)
 	{
 		if (prefs.hex_text_stripcolor_topic)
 		{
-			gtk_entry_set_text (GTK_ENTRY (sess->gui->topic_entry), stripped_topic);
+			gtk_text_buffer_set_text (
+				gtk_text_view_get_buffer (GTK_TEXT_VIEW (sess->gui->topic_entry)),
+				stripped_topic, -1);
 		}
 		else
 		{
-			gtk_entry_set_text (GTK_ENTRY (sess->gui->topic_entry), topic);
+			gtk_text_buffer_set_text (
+				gtk_text_view_get_buffer (GTK_TEXT_VIEW (sess->gui->topic_entry)),
+				topic, -1);
 		}
 		mg_set_topic_tip (sess);
 	}

src/fe-gtk/maingui.c

@@ -920,13 +920,18 @@ mg_unpopulate (session *sess)
 {
         restore_gui *res;
         session_gui *gui;
+        GtkTextBuffer *topic_buffer;
+        GtkTextIter start;
+        GtkTextIter end;
         int i;
 
         gui = sess->gui;
         res = sess->res;
 
         res->input_text = g_strdup (SPELL_ENTRY_GET_TEXT (gui->input_box));
-        res->topic_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (gui->topic_entry)));
+        topic_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (gui->topic_entry));
+        gtk_text_buffer_get_bounds (topic_buffer, &start, &end);
+        res->topic_text = gtk_text_buffer_get_text (topic_buffer, &start, &end, FALSE);
         res->limit_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (gui->limit_entry)));
         res->key_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (gui->key_entry)));
         if (gui->laginfo)
@@ -1003,6 +1008,9 @@ void
 mg_set_topic_tip (session *sess)
 {
         char *text;
+        GtkTextBuffer *topic_buffer;
+        GtkTextIter start;
+        GtkTextIter end;
 
         switch (sess->type)
         {
@@ -1017,11 +1025,14 @@ mg_set_topic_tip (session *sess)
                         gtk_widget_set_tooltip_text (sess->gui->topic_entry, _("No topic is set"));
                 break;
         default:
-                if (gtk_entry_get_text (GTK_ENTRY (sess->gui->topic_entry)) &&
-                         gtk_entry_get_text (GTK_ENTRY (sess->gui->topic_entry))[0])
-                        gtk_widget_set_tooltip_text (sess->gui->topic_entry, (char *)gtk_entry_get_text (GTK_ENTRY (sess->gui->topic_entry)));
+                topic_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (sess->gui->topic_entry));
+                gtk_text_buffer_get_bounds (topic_buffer, &start, &end);
+                text = gtk_text_buffer_get_text (topic_buffer, &start, &end, FALSE);
+                if (text[0])
+                        gtk_widget_set_tooltip_text (sess->gui->topic_entry, text);
                 else
                         gtk_widget_set_tooltip_text (sess->gui->topic_entry, NULL);
+                g_free (text);
         }
 }
 
@@ -1052,9 +1063,14 @@ mg_userlist_showhide (session *sess, int show)
         session_gui *gui = sess->gui;
         int handle_size;
         int right_size;
+        int min_right_size;
         GtkAllocation allocation;
 
-        right_size = MAX (prefs.hex_gui_pane_right_size, prefs.hex_gui_pane_right_size_min);
+        gtk_widget_get_size_request (gui->user_box, &min_right_size, NULL);
+        if (min_right_size < 1)
+                min_right_size = 1;
+
+        right_size = MAX (prefs.hex_gui_pane_right_size, min_right_size);
 
         if (show)
         {
@@ -1164,7 +1180,7 @@ mg_populate (session *sess)
                 /* hide the userlist */
                 mg_decide_userlist (sess, FALSE);
                 /* shouldn't edit the topic */
-                gtk_editable_set_editable (GTK_EDITABLE (gui->topic_entry), FALSE);
+                gtk_text_view_set_editable (GTK_TEXT_VIEW (gui->topic_entry), FALSE);
                 /* might be hidden from server tab */
                 if (prefs.hex_gui_topicbar)
                         gtk_widget_show (gui->topic_bar);
@@ -1186,8 +1202,8 @@ mg_populate (session *sess)
                         gtk_widget_show (gui->topicbutton_box);
                 /* show the userlist */
                 mg_decide_userlist (sess, FALSE);
-                /* let the topic be editted */
-                gtk_editable_set_editable (GTK_EDITABLE (gui->topic_entry), TRUE);
+                /* let the topic be edited */
+                gtk_text_view_set_editable (GTK_TEXT_VIEW (gui->topic_entry), TRUE);
                 if (prefs.hex_gui_topicbar)
                         gtk_widget_show (gui->topic_bar);
         }
@@ -1207,8 +1223,21 @@ mg_populate (session *sess)
         if (gui->is_tab)
                 gtk_widget_set_sensitive (gui->menu, TRUE);
 
-        /* restore all the GtkEntry's */
-        mg_restore_entry (gui->topic_entry, &res->topic_text);
+        if (res->topic_text)
+        {
+                GtkTextBuffer *topic_buffer;
+
+                topic_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (gui->topic_entry));
+                gtk_text_buffer_set_text (topic_buffer, res->topic_text, -1);
+                g_free (res->topic_text);
+                res->topic_text = NULL;
+        } else
+        {
+                GtkTextBuffer *topic_buffer;
+
+                topic_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (gui->topic_entry));
+                gtk_text_buffer_set_text (topic_buffer, "", -1);
+        }
         mg_restore_speller (gui->input_box, &res->input_text);
         mg_restore_entry (gui->key_entry, &res->key_text);
         mg_restore_entry (gui->limit_entry, &res->limit_text);
@@ -2114,24 +2143,173 @@ mg_create_userlistbuttons (GtkWidget *box)
 }
 
 static void
-mg_topic_cb (GtkWidget *entry, gpointer userdata)
+mg_topic_cb (GtkWidget *entry)
 {
         session *sess = current_sess;
+        GtkTextBuffer *topic_buffer;
+        GtkTextIter start;
+        GtkTextIter end;
         char *text;
 
         if (sess->channel[0] && sess->server->connected && sess->type == SESS_CHANNEL)
         {
-                text = (char *)gtk_entry_get_text (GTK_ENTRY (entry));
+                topic_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry));
+                gtk_text_buffer_get_bounds (topic_buffer, &start, &end);
+                text = gtk_text_buffer_get_text (topic_buffer, &start, &end, FALSE);
                 if (text[0] == 0)
-                        text = NULL;
-                sess->server->p_topic (sess->server, sess->channel, text);
+                        sess->server->p_topic (sess->server, sess->channel, NULL);
+                else
+                        sess->server->p_topic (sess->server, sess->channel, text);
+                g_free (text);
         } else
-                gtk_entry_set_text (GTK_ENTRY (entry), "");
+        {
+                topic_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry));
+                gtk_text_buffer_set_text (topic_buffer, "", -1);
+        }
         /* restore focus to the input widget, where the next input will most
 likely be */
         gtk_widget_grab_focus (sess->gui->input_box);
 }
 
+static gboolean
+mg_topic_key_press_cb (GtkWidget *entry, GdkEventKey *event, gpointer userdata)
+{
+        if (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)
+        {
+                mg_topic_cb (entry);
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
+static char *
+mg_topic_get_word_at_pos (GtkWidget *entry, gdouble event_x, gdouble event_y)
+{
+        GtkTextBuffer *buffer;
+        GtkTextIter iter;
+        GtkTextIter start;
+        GtkTextIter end;
+        int x;
+        int y;
+
+        x = (int)event_x;
+        y = (int)event_y;
+        gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (entry), GTK_TEXT_WINDOW_TEXT,
+                                               x, y, &x, &y);
+        gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW (entry), &iter, x, y);
+
+        start = iter;
+        while (!gtk_text_iter_starts_line (&start))
+        {
+                GtkTextIter prev = start;
+                gunichar ch;
+
+                gtk_text_iter_backward_char (&prev);
+                ch = gtk_text_iter_get_char (&prev);
+                if (g_unichar_isspace (ch))
+                        break;
+                start = prev;
+        }
+
+        end = iter;
+        while (!gtk_text_iter_ends_line (&end))
+        {
+                gunichar ch;
+
+                ch = gtk_text_iter_get_char (&end);
+                if (ch == 0 || g_unichar_isspace (ch))
+                        break;
+                gtk_text_iter_forward_char (&end);
+        }
+
+        if (gtk_text_iter_equal (&start, &end))
+                return NULL;
+
+        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry));
+        return gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+}
+
+static void
+mg_topic_set_cursor (GtkWidget *entry, GdkCursorType cursor_type)
+{
+        GdkWindow *text_window;
+        GdkDisplay *display;
+        GdkCursor *cursor;
+
+        text_window = gtk_text_view_get_window (GTK_TEXT_VIEW (entry), GTK_TEXT_WINDOW_TEXT);
+        if (!text_window)
+                return;
+
+        display = gdk_window_get_display (text_window);
+        cursor = gdk_cursor_new_for_display (display, cursor_type);
+        gdk_window_set_cursor (text_window, cursor);
+        g_object_unref (cursor);
+}
+
+static gboolean
+mg_topic_word_is_clickable (const char *word)
+{
+        if (!word || word[0] == 0)
+                return FALSE;
+
+        if (strcmp (word, "/") == 0)
+                return FALSE;
+
+        return url_check_word (word) != 0;
+}
+
+static gboolean
+mg_topic_motion_cb (GtkWidget *entry, GdkEventMotion *event, gpointer userdata)
+{
+        char *word;
+        gboolean word_is_clickable;
+
+        word = mg_topic_get_word_at_pos (entry, event->x, event->y);
+        word_is_clickable = mg_topic_word_is_clickable (word);
+        if (word_is_clickable)
+                mg_topic_set_cursor (entry, GDK_HAND2);
+        else
+                mg_topic_set_cursor (entry, GDK_XTERM);
+        g_free (word);
+
+        return FALSE;
+}
+
+static gboolean
+mg_topic_leave_cb (GtkWidget *entry, GdkEventCrossing *event, gpointer userdata)
+{
+        mg_topic_set_cursor (entry, GDK_XTERM);
+        return FALSE;
+}
+
+static gboolean
+mg_topic_button_release_cb (GtkWidget *entry, GdkEventButton *event, gpointer userdata)
+{
+        char *word;
+        int start;
+        int end;
+
+        if (event->button != 1)
+                return FALSE;
+
+        word = mg_topic_get_word_at_pos (entry, event->x, event->y);
+        if (!word)
+                return FALSE;
+
+        if (mg_topic_word_is_clickable (word))
+        {
+                url_last (&start, &end);
+                word[end] = 0;
+                fe_open_url (word + start);
+                g_free (word);
+                return TRUE;
+        }
+
+        g_free (word);
+        return FALSE;
+}
+
 static void
 mg_tabwindow_kill_cb (GtkWidget *win, gpointer userdata)
 {
@@ -2415,6 +2593,20 @@ mg_apply_entry_style (GtkWidget *entry)
 	theme_manager_apply_entry_palette (entry, input_style->font_desc);
 }
 
+static gboolean
+mg_entry_select_all (GtkWidget *entry, GdkEventKey *event, gpointer userdata)
+{
+	if ((event->state & GDK_CONTROL_MASK) &&
+		!(event->state & (GDK_SHIFT_MASK | GDK_MOD1_MASK | GDK_META_MASK)) &&
+		(event->keyval == GDK_KEY_a || event->keyval == GDK_KEY_A))
+	{
+		gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
 static void
 mg_create_chanmodebuttons (session_gui *gui, GtkWidget *box)
 {
@@ -2434,6 +2626,8 @@ mg_create_chanmodebuttons (session_gui *gui, GtkWidget *box)
         mg_apply_emoji_fallback_widget (gui->key_entry);
         g_signal_connect (G_OBJECT (gui->key_entry), "activate",
                                                         G_CALLBACK (mg_key_entry_cb), NULL);
+        g_signal_connect (G_OBJECT (gui->key_entry), "key_press_event",
+                                                        G_CALLBACK (mg_entry_select_all), NULL);
 
         if (prefs.hex_gui_input_style)
                 mg_apply_entry_style (gui->key_entry);
@@ -2447,6 +2641,8 @@ mg_create_chanmodebuttons (session_gui *gui, GtkWidget *box)
         mg_apply_emoji_fallback_widget (gui->limit_entry);
         g_signal_connect (G_OBJECT (gui->limit_entry), "activate",
                                                         G_CALLBACK (mg_limit_entry_cb), NULL);
+        g_signal_connect (G_OBJECT (gui->limit_entry), "key_press_event",
+                                                        G_CALLBACK (mg_entry_select_all), NULL);
 
         if (prefs.hex_gui_input_style)
                 mg_apply_entry_style (gui->limit_entry);
@@ -2470,12 +2666,18 @@ mg_dialog_button_cb (GtkWidget *wid, char *cmd)
         char buf[128];
         char *host = "";
         char *topic;
+        char *topic_text;
+        GtkTextBuffer *topic_buffer;
+        GtkTextIter start;
+        GtkTextIter end;
 
         if (!current_sess)
                 return;
 
-        topic = (char *)(gtk_entry_get_text (GTK_ENTRY (current_sess->gui->topic_entry)));
-        topic = strrchr (topic, '@');
+        topic_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (current_sess->gui->topic_entry));
+        gtk_text_buffer_get_bounds (topic_buffer, &start, &end);
+        topic_text = gtk_text_buffer_get_text (topic_buffer, &start, &end, FALSE);
+        topic = strrchr (topic_text, '@');
         if (topic)
                 host = topic + 1;
 
@@ -2484,6 +2686,7 @@ mg_dialog_button_cb (GtkWidget *wid, char *cmd)
                                          current_sess->channel, "");
 
         handle_command (current_sess, buf, TRUE);
+        g_free (topic_text);
 
         /* dirty trick to avoid auto-selection */
         SPELL_ENTRY_SET_EDITABLE (current_sess->gui->input_box, FALSE);
@@ -2530,16 +2733,23 @@ mg_create_topicbar (session *sess, GtkWidget *box)
         if (!gui->is_tab)
                 sess->res->tab = NULL;
 
-        gui->topic_entry = topic = sexy_spell_entry_new ();
+        gui->topic_entry = topic = gtk_text_view_new ();
         gtk_widget_set_name (topic, "zoitechat-inputbox");
-        sexy_spell_entry_set_checked (SEXY_SPELL_ENTRY (topic), FALSE);
+        gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (topic), GTK_WRAP_WORD_CHAR);
+        gtk_text_view_set_left_margin (GTK_TEXT_VIEW (topic), 4);
+        gtk_text_view_set_right_margin (GTK_TEXT_VIEW (topic), 4);
         gtk_box_pack_start (GTK_BOX (hbox), topic, TRUE, TRUE, 0);
         mg_apply_emoji_fallback_widget (topic);
-        g_signal_connect (G_OBJECT (topic), "activate",
-                                                        G_CALLBACK (mg_topic_cb), 0);
-
-        if (prefs.hex_gui_input_style)
-                mg_apply_entry_style (topic);
+        gtk_widget_add_events (topic, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
+                                      GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
+        g_signal_connect (G_OBJECT (topic), "key-press-event",
+                                                        G_CALLBACK (mg_topic_key_press_cb), NULL);
+        g_signal_connect (G_OBJECT (topic), "button-release-event",
+                                                        G_CALLBACK (mg_topic_button_release_cb), NULL);
+        g_signal_connect (G_OBJECT (topic), "motion-notify-event",
+                                                        G_CALLBACK (mg_topic_motion_cb), NULL);
+        g_signal_connect (G_OBJECT (topic), "leave-notify-event",
+                                                        G_CALLBACK (mg_topic_leave_cb), NULL);
 
         gui->topicbutton_box = bbox = mg_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
         gtk_box_pack_start (GTK_BOX (hbox), bbox, 0, 0, 0);
@@ -2910,6 +3120,8 @@ mg_create_userlist (session_gui *gui, GtkWidget *box)
                 gtk_box_pack_start (GTK_BOX (vbox), frame, 0, 0, GUI_SPACING);
 
         gui->namelistinfo = gtk_label_new (NULL);
+        gtk_label_set_xalign (GTK_LABEL (gui->namelistinfo), 0.0f);
+        gtk_widget_set_halign (gui->namelistinfo, GTK_ALIGN_START);
         gtk_container_add (GTK_CONTAINER (frame), gui->namelistinfo);
 
         gui->user_tree = ulist = userlist_create (vbox);
@@ -2984,12 +3196,12 @@ mg_create_center (session *sess, session_gui *gui, GtkWidget *box)
 
         if (prefs.hex_gui_win_swap)
         {
-                gtk_paned_pack2 (GTK_PANED (gui->hpane_left), gui->vpane_left, FALSE, TRUE);
+                gtk_paned_pack2 (GTK_PANED (gui->hpane_left), gui->vpane_left, FALSE, FALSE);
 			    gtk_paned_pack1 (GTK_PANED (gui->hpane_left), gui->hpane_right, TRUE, TRUE);
         }
         else
         {
-                gtk_paned_pack1 (GTK_PANED (gui->hpane_left), gui->vpane_left, FALSE, TRUE);
+                gtk_paned_pack1 (GTK_PANED (gui->hpane_left), gui->vpane_left, FALSE, FALSE);
 			    gtk_paned_pack2 (GTK_PANED (gui->hpane_left), gui->hpane_right, TRUE, TRUE);
         }
         gtk_paned_pack2 (GTK_PANED (gui->hpane_right), gui->vpane_right, FALSE, TRUE);
@@ -4088,7 +4300,8 @@ fe_clear_channel (session *sess)
 
         if (!sess->gui->is_tab || sess == current_tab)
         {
-                gtk_entry_set_text (GTK_ENTRY (gui->topic_entry), "");
+                gtk_text_buffer_set_text (
+                        gtk_text_view_get_buffer (GTK_TEXT_VIEW (gui->topic_entry)), "", -1);
 
                 if (gui->op_xpm)
                 {

src/fe-gtk/menu.c

@@ -869,6 +869,9 @@ menu_nickmenu (session *sess, GdkEventButton *event, char *nick, int num_sel)
 static void
 menu_showhide_cb (session *sess)
 {
+	if (!sess->gui->menu || !GTK_IS_WIDGET (sess->gui->menu))
+		return;
+
 	if (prefs.hex_gui_hide_menu)
 		gtk_widget_hide (sess->gui->menu);
 	else
@@ -926,6 +929,11 @@ menu_setting_foreach (void (*callback) (session *), int id, guint state)
 	while (list)
 	{
 		sess = list->data;
+		if (!sess || !sess->gui)
+		{
+			list = list->next;
+			continue;
+		}
 
 		if (!sess->gui->is_tab || !maindone)
 		{
@@ -935,9 +943,20 @@ menu_setting_foreach (void (*callback) (session *), int id, guint state)
 			{
 				GtkWidget *menu_item = sess->gui->menu_item[id];
 
-				if (menu_item != NULL)
+				if (menu_item != NULL && GTK_IS_CHECK_MENU_ITEM (menu_item))
 				{
-					gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), state);
+					guint toggled_signal = g_signal_lookup ("toggled", G_OBJECT_TYPE (menu_item));
+
+					if (toggled_signal != 0)
+					{
+						g_signal_handlers_block_matched (menu_item, G_SIGNAL_MATCH_ID, toggled_signal, 0, NULL, NULL, NULL);
+						gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), state);
+						g_signal_handlers_unblock_matched (menu_item, G_SIGNAL_MATCH_ID, toggled_signal, 0, NULL, NULL, NULL);
+					}
+					else
+					{
+						gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_item), state);
+					}
 				}
 			}
 			if (callback)
@@ -952,7 +971,7 @@ void
 menu_bar_toggle (void)
 {
 	prefs.hex_gui_hide_menu = !prefs.hex_gui_hide_menu;
-	menu_setting_foreach (menu_showhide_cb, MENU_ID_MENUBAR, !prefs.hex_gui_hide_menu);
+	menu_setting_foreach (menu_showhide_cb, -1, !prefs.hex_gui_hide_menu);
 }
 
 static void
@@ -2170,6 +2189,11 @@ menu_foreach_gui (menu_entry *me, void (*callback) (GtkWidget *, menu_entry *, c
 	while (list)
 	{
 		sess = list->data;
+		if (!sess || !sess->gui)
+		{
+			list = list->next;
+			continue;
+		}
 		/* do it only once for tab sessions, since they share a GUI */
 		if (!sess->gui->is_tab || !tabdone)
 		{
@@ -2595,13 +2619,14 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
 normalitem:
 			if (mymenu[i].key != 0)
 				gtk_widget_add_accelerator (item, "activate", accel_group,
-										mymenu[i].key,
-										mymenu[i].key == GDK_KEY_F1 ? 0 :
-										mymenu[i].key == GDK_KEY_w ? close_mask :
-										(g_ascii_isupper (mymenu[i].key)) ?
-											STATE_SHIFT | STATE_CTRL :
-											STATE_CTRL,
-										GTK_ACCEL_VISIBLE);
+									mymenu[i].key,
+									mymenu[i].key == GDK_KEY_F1 ? 0 :
+									mymenu[i].key == GDK_KEY_w ? close_mask :
+									mymenu[i].id == MENU_ID_AWAY ? away_mask :
+									(g_ascii_isupper (mymenu[i].key)) ?
+										STATE_SHIFT | STATE_CTRL :
+										STATE_CTRL,
+									GTK_ACCEL_VISIBLE);
 			if (mymenu[i].callback)
 				g_signal_connect (G_OBJECT (item), "activate",
 										G_CALLBACK (mymenu[i].callback), 0);

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

@@ -27,6 +27,12 @@ typedef struct
 	guint16 bg_red;
 	guint16 bg_green;
 	guint16 bg_blue;
+	guint16 sel_fg_red;
+	guint16 sel_fg_green;
+	guint16 sel_fg_blue;
+	guint16 sel_bg_red;
+	guint16 sel_bg_green;
+	guint16 sel_bg_blue;
 } ThemeCssInputFingerprint;
 
 static GtkCssProvider *theme_css_input_provider;
@@ -92,6 +98,12 @@ theme_css_input_fingerprint_matches (const ThemeCssInputFingerprint *next)
 	if (theme_css_input_fp.bg_red != next->bg_red || theme_css_input_fp.bg_green != next->bg_green
 		|| theme_css_input_fp.bg_blue != next->bg_blue)
 		return FALSE;
+	if (theme_css_input_fp.sel_fg_red != next->sel_fg_red || theme_css_input_fp.sel_fg_green != next->sel_fg_green
+		|| theme_css_input_fp.sel_fg_blue != next->sel_fg_blue)
+		return FALSE;
+	if (theme_css_input_fp.sel_bg_red != next->sel_bg_red || theme_css_input_fp.sel_bg_green != next->sel_bg_green
+		|| theme_css_input_fp.sel_bg_blue != next->sel_bg_blue)
+		return FALSE;
 	if (g_strcmp0 (theme_css_input_fp.theme_name, next->theme_name) != 0)
 		return FALSE;
 	if (g_strcmp0 (theme_css_input_fp.font, next->font) != 0)
@@ -119,7 +131,9 @@ theme_css_input_fingerprint_clear (void)
 
 static char *
 theme_css_build_input (const char *theme_name, guint16 fg_red, guint16 fg_green, guint16 fg_blue,
-						guint16 bg_red, guint16 bg_green, guint16 bg_blue)
+					guint16 bg_red, guint16 bg_green, guint16 bg_blue,
+					guint16 sel_fg_red, guint16 sel_fg_green, guint16 sel_fg_blue,
+					guint16 sel_bg_red, guint16 sel_bg_green, guint16 sel_bg_blue)
 {
 	GString *css = g_string_new ("");
 
@@ -137,6 +151,11 @@ theme_css_build_input (const char *theme_name, guint16 fg_red, guint16 fg_green,
 		"%s {"
 		"color: #%02x%02x%02x;"
 		"caret-color: #%02x%02x%02x;"
+		"}"
+		"%s selection, %s text selection, %s:focus selection, %s:focus text selection, %s *:selected, %s *:selected:focus {"
+		"background-color: #%02x%02x%02x;"
+		"color: #%02x%02x%02x;"
+		"text-shadow: none;"
 		"}",
 		theme_css_selector_input,
 		(bg_red >> 8), (bg_green >> 8), (bg_blue >> 8),
@@ -144,7 +163,15 @@ theme_css_build_input (const char *theme_name, guint16 fg_red, guint16 fg_green,
 		(fg_red >> 8), (fg_green >> 8), (fg_blue >> 8),
 		theme_css_selector_input_text,
 		(fg_red >> 8), (fg_green >> 8), (fg_blue >> 8),
-		(fg_red >> 8), (fg_green >> 8), (fg_blue >> 8));
+		(fg_red >> 8), (fg_green >> 8), (fg_blue >> 8),
+		theme_css_selector_input,
+		theme_css_selector_input,
+		theme_css_selector_input,
+		theme_css_selector_input,
+		theme_css_selector_input,
+		theme_css_selector_input,
+		(sel_bg_red >> 8), (sel_bg_green >> 8), (sel_bg_blue >> 8),
+		(sel_fg_red >> 8), (sel_fg_green >> 8), (sel_fg_blue >> 8));
 
 	return g_string_free (css, FALSE);
 }
@@ -177,6 +204,10 @@ theme_css_reload_input_style (gboolean enabled, const PangoFontDescription *font
 								 &next.fg_red, &next.fg_green, &next.fg_blue);
 			theme_palette_color_get_rgb16 (&style_values.background,
 								 &next.bg_red, &next.bg_green, &next.bg_blue);
+			theme_palette_color_get_rgb16 (&style_values.selection_foreground,
+							 &next.sel_fg_red, &next.sel_fg_green, &next.sel_fg_blue);
+			theme_palette_color_get_rgb16 (&style_values.selection_background,
+							 &next.sel_bg_red, &next.sel_bg_green, &next.sel_bg_blue);
 			next.colors_set = TRUE;
 		}
 
@@ -193,7 +224,9 @@ theme_css_reload_input_style (gboolean enabled, const PangoFontDescription *font
 
 		css = theme_css_build_input (theme_name ? theme_name : "",
 			next.fg_red, next.fg_green, next.fg_blue,
-			next.bg_red, next.bg_green, next.bg_blue);
+			next.bg_red, next.bg_green, next.bg_blue,
+			next.sel_fg_red, next.sel_fg_green, next.sel_fg_blue,
+			next.sel_bg_red, next.sel_bg_green, next.sel_bg_blue);
 		gtk_css_provider_load_from_data (theme_css_input_provider, css, -1, NULL);
 		g_free (css);
 		theme_css_apply_app_provider (GTK_STYLE_PROVIDER (theme_css_input_provider));
@@ -276,7 +309,7 @@ theme_css_apply_palette_widget (GtkWidget *widget, const GdkRGBA *bg, const GdkR
 	if (fg)
 		g_string_append_printf (css, " color: %s;", fg_color);
 	g_string_append (css, " }");
-	g_string_append_printf (css, ".%s *:selected, .%s *:selected:focus, .%s *:selected:hover, .%s treeview.view:selected, .%s treeview.view:selected:focus, .%s treeview.view:selected:hover, .%s row:selected, .%s row:selected:focus, .%s row:selected:hover {", theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class);
+	g_string_append_printf (css, ".%s *:selected, .%s *:selected:focus, .%s *:selected:hover, .%s treeview.view:selected, .%s treeview.view:selected:focus, .%s treeview.view:selected:hover, .%s row:selected, .%s row:selected:focus, .%s row:selected:hover, .%s selection, .%s text selection, .%s entry selection, .%s entry text selection, .%s:focus selection, .%s:focus text selection {", theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class, theme_css_selector_palette_class);
 	if (sel_bg_color)
 		g_string_append_printf (css, " background-color: %s;", sel_bg_color);
 	else if (bg)

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

@@ -1132,25 +1132,12 @@ theme_preferences_create_color_page (GtkWindow *parent,
 static void
 theme_preferences_open_gtk3_folder_cb (GtkWidget *button, gpointer user_data)
 {
-        theme_preferences_ui *ui = user_data;
-        GAppInfo *handler;
         char *themes_dir;
 
+        (void)user_data;
         (void)button;
         themes_dir = zoitechat_gtk3_theme_service_get_user_themes_dir ();
         g_mkdir_with_parents (themes_dir, 0700);
-
-        handler = g_app_info_get_default_for_uri_scheme ("file");
-        if (!handler)
-        {
-                theme_preferences_show_message (ui,
-                                                GTK_MESSAGE_ERROR,
-                                                _("No application is configured to open folders."));
-                g_free (themes_dir);
-                return;
-        }
-
-        g_object_unref (handler);
         fe_open_url (themes_dir);
         g_free (themes_dir);
 }

src/fe-gtk/userlistgui.c

@@ -52,6 +52,29 @@ enum
 
 static void userlist_store_color (GtkListStore *store, GtkTreeIter *iter, ThemeSemanticToken token, gboolean has_token);
 
+static void
+userlist_update_min_width (session *sess)
+{
+	GtkRequisition minimum;
+	GtkRequisition natural;
+	GtkWidget *scrolled_window;
+	int width;
+
+	if (!sess || !sess->gui || !sess->gui->user_box || !sess->gui->namelistinfo || !sess->gui->user_tree)
+		return;
+
+	gtk_widget_get_preferred_size (sess->gui->namelistinfo, &minimum, &natural);
+	width = MAX (minimum.width, natural.width);
+	if (width < 1)
+		width = 1;
+
+	scrolled_window = gtk_widget_get_parent (sess->gui->user_tree);
+	if (GTK_IS_SCROLLED_WINDOW (scrolled_window))
+		gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (scrolled_window), width);
+	gtk_widget_set_size_request (sess->gui->user_tree, width, -1);
+	gtk_widget_set_size_request (sess->gui->user_box, width, -1);
+}
+
 GdkPixbuf *
 get_user_icon (server *serv, struct User *user)
 {
@@ -110,9 +133,11 @@ fe_userlist_numbers (session *sess)
 			g_snprintf (tbuf, sizeof (tbuf), _("%d ops, %d total"), sess->ops, sess->total);
 			tbuf[sizeof (tbuf) - 1] = 0;
 			gtk_label_set_text (GTK_LABEL (sess->gui->namelistinfo), tbuf);
+			userlist_update_min_width (sess);
 		} else
 		{
 			gtk_label_set_text (GTK_LABEL (sess->gui->namelistinfo), NULL);
+			userlist_update_min_width (sess);
 		}
 
 		if (sess->type == SESS_CHANNEL && prefs.hex_gui_win_ucount)
@@ -662,6 +687,7 @@ static void
 userlist_add_columns (GtkTreeView * treeview)
 {
 	GtkCellRenderer *renderer;
+	GtkTreeViewColumn *column;
 
 	/* icon column */
 	renderer = gtk_cell_renderer_pixbuf_new ();
@@ -670,15 +696,22 @@ userlist_add_columns (GtkTreeView * treeview)
 	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
 																-1, NULL, renderer,
 																"pixbuf", 0, NULL);
+	column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), 0);
+	gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
 
 	/* nick column */
 	renderer = gtk_cell_renderer_text_new ();
 	if (prefs.hex_gui_compact)
 		g_object_set (G_OBJECT (renderer), "ypad", 0, NULL);
+	g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 	gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer), 1);
 	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
 																-1, NULL, renderer,
 													"text", 1, THEME_GTK_FOREGROUND_PROPERTY, 4, NULL);
+	column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), 1);
+	gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
+	gtk_tree_view_column_set_expand (column, TRUE);
+	gtk_tree_view_column_set_min_width (column, 1);
 
 	if (prefs.hex_gui_ulist_show_hosts)
 	{
@@ -686,10 +719,15 @@ userlist_add_columns (GtkTreeView * treeview)
 		renderer = gtk_cell_renderer_text_new ();
 		if (prefs.hex_gui_compact)
 			g_object_set (G_OBJECT (renderer), "ypad", 0, NULL);
+		g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 		gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer), 1);
 		gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
 																	-1, NULL, renderer,
 																	"text", 2, NULL);
+		column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), 2);
+		gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
+		gtk_tree_view_column_set_expand (column, TRUE);
+		gtk_tree_view_column_set_min_width (column, 1);
 	}
 }
 

win32/version.txt

@@ -1 +1 @@
-2.18.0~pre3
+2.18.0~pre4