Fix GTK populate test stub linkage

Add Ctrl+W close + Ctrl+Shift+T tab reopen

flatpak/net.zoite.Zoitechat.json

@@ -7,13 +7,14 @@
   "command": "zoitechat",
   "finish-args": [
     "--share=ipc",
-    "--socket=wayland",
+    "--socket=x11",
-    "--socket=fallback-x11",
     "--share=network",
     "--socket=pulseaudio",
     "--filesystem=xdg-download",
     "--filesystem=xdg-data/themes:ro",
     "--filesystem=xdg-data/icons:ro",
+    "--filesystem=~/.themes:ro",
+    "--filesystem=~/.icons:ro",
     "--filesystem=xdg-run/tray-icon:create",
     "--env=GTK_CSD=1",
     "--talk-name=org.freedesktop.Notifications",
@@ -44,9 +45,9 @@
       "buildsystem": "meson",
       "sources": [
         {
-          "type": "archive",
+          "type": "git",
-          "url": "https://github.com/pavouk/lgi/archive/c9b8e4473c6421f2a215d8c06c0d94b86eb0b26a.tar.gz",
+          "url": "https://github.com/pavouk/lgi.git",
-          "sha256": "db67b2b7ee89fa566f783486d56be7203552a997bc55f35020b57dd2776b9943"
+          "commit": "c9b8e4473c6421f2a215d8c06c0d94b86eb0b26a"
         }
       ]
     },

src/fe-gtk/chanview-tree.c

@@ -45,6 +45,8 @@ cv_tree_sel_cb (GtkTreeSelection *sel, chanview *cv)
 	GtkTreeModel *model;
 	GtkTreeIter prev_iter;
 	GtkTreeIter iter;
+	GtkTreePath *path;
+	GtkTreeView *view;
 	chan *ch;
 	chan *prev_ch;
 	gboolean has_prev;
@@ -60,6 +62,20 @@ cv_tree_sel_cb (GtkTreeSelection *sel, chanview *cv)
 		if (has_prev)
 		{
 			gtk_tree_model_get (model, &prev_iter, COL_CHAN, &prev_ch, -1);
+			if (prev_ch != ch && gtk_tree_store_is_ancestor (cv->store, &iter, &prev_iter))
+			{
+				view = gtk_tree_selection_get_tree_view (sel);
+				path = gtk_tree_model_get_path (model, &iter);
+				if (path)
+				{
+					if (!gtk_tree_view_row_expanded (view, path))
+					{
+						gtk_tree_path_free (path);
+						return;
+					}
+					gtk_tree_path_free (path);
+				}
+			}
 			if (prev_ch != ch)
 				gtk_tree_store_set (cv->store, &prev_iter, COL_UNDERLINE, PANGO_UNDERLINE_NONE, -1);
 		}

src/fe-gtk/fkeys.c

@@ -443,6 +443,27 @@ key_handle_key_press (GtkWidget *wid, GdkEventKey *evt, session *sess)
 	if (!list)
 		return FALSE;
 	current_sess = sess;
+	if ((evt->state & GDK_CONTROL_MASK) &&
+		!(evt->state & (GDK_MOD1_MASK | GDK_META_MASK)))
+	{
+		if (!(evt->state & GDK_SHIFT_MASK) &&
+			(evt->keyval == GDK_KEY_w || evt->keyval == GDK_KEY_W))
+		{
+			if (sess->type == SESS_CHANNEL)
+			{
+				fe_close_window (sess);
+				g_signal_stop_emission_by_name (G_OBJECT (wid), "key-press-event");
+				return 1;
+			}
+		}
+		if ((evt->state & GDK_SHIFT_MASK) &&
+			(evt->keyval == GDK_KEY_t || evt->keyval == GDK_KEY_T))
+		{
+			mg_reopen_closed_channel_tab ();
+			g_signal_stop_emission_by_name (G_OBJECT (wid), "key-press-event");
+			return 1;
+		}
+	}
 
 	if (plugin_emit_keypress (sess, evt->state, evt->keyval, gdk_keyval_to_unicode (evt->keyval)))
 		return 1;

src/fe-gtk/maingui.c

@@ -468,6 +468,14 @@ static session_gui static_mg_gui;
 static session_gui *mg_gui = NULL;      /* the shared irc tab */
 static int ignore_chanmode = FALSE;
 static const char chan_flags[] = { 'c', 'n', 't', 'i', 'm', 'l', 'k' };
+typedef struct
+{
+	int server_id;
+	char channel[CHANLEN];
+	char key[64];
+}
+mg_closed_channel_tab;
+static GSList *mg_closed_channel_tabs;
 
 static chan *active_tab = NULL; /* active tab */
 GtkWidget *parent_window = NULL;                        /* the master window */
@@ -1643,6 +1651,71 @@ mg_tab_close_cb (GtkWidget *dialog, gint arg1, session *sess)
         }
 }
 
+static void
+mg_closed_channel_tabs_add (session *sess)
+{
+	mg_closed_channel_tab *item;
+	GSList *last;
+
+	if (!sess || sess->type != SESS_CHANNEL || !sess->channel[0])
+		return;
+
+	item = g_new0 (mg_closed_channel_tab, 1);
+	item->server_id = sess->server->id;
+	g_strlcpy (item->channel, sess->channel, sizeof (item->channel));
+	g_strlcpy (item->key, sess->channelkey, sizeof (item->key));
+	mg_closed_channel_tabs = g_slist_prepend (mg_closed_channel_tabs, item);
+	if (g_slist_length (mg_closed_channel_tabs) > 20)
+	{
+		last = g_slist_last (mg_closed_channel_tabs);
+		g_free (last->data);
+		mg_closed_channel_tabs = g_slist_delete_link (mg_closed_channel_tabs, last);
+	}
+}
+
+void
+mg_reopen_closed_channel_tab (void)
+{
+	mg_closed_channel_tab *item;
+	GSList *head;
+	GSList *list;
+	server *serv;
+	session *sess;
+
+	if (!mg_closed_channel_tabs)
+		return;
+
+	head = mg_closed_channel_tabs;
+	item = head->data;
+	mg_closed_channel_tabs = g_slist_delete_link (mg_closed_channel_tabs, head);
+	if (!item)
+		return;
+
+	serv = NULL;
+	for (list = serv_list; list; list = list->next)
+	{
+		server *candidate = list->data;
+		if (candidate->id == item->server_id)
+		{
+			serv = candidate;
+			break;
+		}
+	}
+	if (serv && serv->connected && item->channel[0])
+	{
+		sess = find_channel (serv, item->channel);
+		if (sess)
+			fe_ctrl_gui (sess, 2, 0);
+		else
+		{
+			new_ircwindow (serv, item->channel, SESS_CHANNEL, 1);
+			serv->p_join (serv, item->channel, item->key);
+		}
+	}
+
+	g_free (item);
+}
+
 void
 mg_tab_close (session *sess)
 {
@@ -1650,11 +1723,12 @@ mg_tab_close (session *sess)
         GSList *list;
         int i;
 
-        if (chan_remove (sess->res->tab, FALSE))
+	if (chan_remove (sess->res->tab, FALSE))
-        {
+	{
-                sess->res->tab = NULL;
+		mg_closed_channel_tabs_add (sess);
-                mg_ircdestroy (sess);
+		sess->res->tab = NULL;
-        }
+		mg_ircdestroy (sess);
+	}
         else
         {
                 for (i = 0, list = sess_list; list; list = list->next)
@@ -2497,6 +2571,7 @@ mg_topic_word_is_clickable (const char *word, int word_pos)
 {
         int start;
         int end;
+        int word_type;
 
         if (!word || word[0] == 0)
                 return FALSE;
@@ -2504,7 +2579,8 @@ mg_topic_word_is_clickable (const char *word, int word_pos)
         if (strcmp (word, "/") == 0)
                 return FALSE;
 
-        if (url_check_word (word) == 0)
+        word_type = url_check_word (word);
+        if (word_type != WORD_URL && word_type != WORD_HOST && word_type != WORD_HOST6)
                 return FALSE;
 
         url_last (&start, &end);
@@ -2553,7 +2629,8 @@ mg_topic_button_release_cb (GtkWidget *entry, GdkEventButton *event, gpointer us
         if (!word)
                 return FALSE;
 
-        if (mg_topic_word_is_clickable (word, word_pos))
+        if ((event->state & 13) == prefs.hex_gui_url_mod &&
+            mg_topic_word_is_clickable (word, word_pos))
         {
                 url_last (&start, &end);
                 word[end] = 0;

src/fe-gtk/maingui.h

@@ -40,6 +40,7 @@ void mg_apply_setup (void);
 void mg_apply_session_font_prefs (session_gui *gui);
 void mg_close_sess (session *);
 void mg_tab_close (session *sess);
+void mg_reopen_closed_channel_tab (void);
 void mg_detach (session *sess, int mode);
 void mg_progressbar_create (session_gui *gui);
 void mg_progressbar_destroy (session_gui *gui);

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

@@ -59,6 +59,17 @@ fe_open_url (const char *url)
         (void)url;
 }
 
+char *
+get_xdir (void)
+{
+        return (char *)"/tmp";
+}
+
+void
+load_text_events (void)
+{
+}
+
 gboolean
 theme_get_color (ThemeSemanticToken token, GdkRGBA *color)
 {