Add .hct support to colors.conf import

Refine cmd-char parsing for pasted path text

data/icons/zoitechat-b.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:svg="http://www.w3.org/2000/svg"
-     version="1.1"
-     width="0.213333in" height="0.213333in"
-     viewBox="0 0 64 64">
-  <defs>
-  </defs>
-  <image id="raster0"
-         x="0"
-         y="0"
-         width="64"
-         height="64"
-         opacity="1.000000"
-         href="data:image/png;base64,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" />
-</svg>

data/icons/zoitechat-shadowless.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:svg="http://www.w3.org/2000/svg"
-     version="1.1"
-     width="0.213333in" height="0.213333in"
-     viewBox="0 0 64 64">
-  <defs>
-  </defs>
-  <image id="raster0"
-         x="0"
-         y="0"
-         width="64"
-         height="64"
-         opacity="1.000000"
-         href="data:image/png;base64,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" />
-</svg>

data/misc/meson.build

@@ -13,10 +13,10 @@ if get_option('gtk-frontend')
       install_dir: metainfodir
     )
 
-    appstream_util = find_program('appstream-util', required: false)
+    appstreamcli = find_program('appstreamcli', required: false)
-    if appstream_util.found()
+    if appstreamcli.found()
-      test('Validate net.zoite.Zoitechat.appdata.xml', appstream_util,
+      test('Validate net.zoite.Zoitechat.appdata.xml', appstreamcli,
-        args: ['validate-relax', zoitechat_appdata]
+        args: ['validate', zoitechat_appdata]
       )
     endif
   endif
@@ -97,11 +97,18 @@ if get_option('plugin')
     conf.set('SUMMARY', metainfo[1])
     conf.set('LICENSE', metainfo[2])
 
-    configure_file(
+    plugin_appdata = configure_file(
       input: 'net.zoite.Zoitechat.Plugin.metainfo.xml.in',
       output: 'net.zoite.Zoitechat.Plugin.@0@.metainfo.xml'.format(name),
       configuration: conf,
       install_dir: get_option('install-plugin-metainfo') ? metainfodir : '',
     )
+
+    if appstreamcli.found()
+      test('Validate net.zoite.Zoitechat.Plugin.@0@.metainfo.xml'.format(name), appstreamcli,
+        args: ['validate', plugin_appdata]
+    )
+    endif
+
   endforeach
 endif

src/common/gtk3-theme-service.c

@@ -1221,6 +1221,94 @@ extract_archive (const char *source, GError **error)
 	#endif
 }
 
+static char *
+path_find_first_file_recursive (const char *root, const char *name, int depth)
+{
+	GDir *dir;
+	const char *entry;
+
+	if (!root || !name || depth < 0 || !g_file_test (root, G_FILE_TEST_IS_DIR))
+		return NULL;
+
+	{
+		char *candidate = g_build_filename (root, name, NULL);
+		if (g_file_test (candidate, G_FILE_TEST_IS_REGULAR))
+			return candidate;
+		g_free (candidate);
+	}
+
+	if (depth == 0)
+		return NULL;
+
+	dir = g_dir_open (root, 0, NULL);
+	if (!dir)
+		return NULL;
+
+	while ((entry = g_dir_read_name (dir)) != NULL)
+	{
+		char *child = g_build_filename (root, entry, NULL);
+		char *found = NULL;
+
+		if (g_file_test (child, G_FILE_TEST_IS_DIR))
+			found = path_find_first_file_recursive (child, name, depth - 1);
+		g_free (child);
+		if (found)
+		{
+			g_dir_close (dir);
+			return found;
+		}
+	}
+
+	g_dir_close (dir);
+	return NULL;
+}
+
+gboolean
+zoitechat_gtk3_theme_service_read_archive_text_file (const char *archive_path, const char *name, char **contents, GError **error)
+{
+	char *root;
+	char *path;
+	gboolean ok;
+	GError *local_error = NULL;
+
+	if (contents)
+		*contents = NULL;
+	if (!archive_path || !*archive_path)
+		return g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, "No archive path provided."), FALSE;
+	if (!name || !*name)
+		return g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, "No file name provided."), FALSE;
+	if (!contents)
+		return g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_INVAL, "No output buffer provided."), FALSE;
+
+	root = extract_archive (archive_path, error);
+	if (!root)
+		return FALSE;
+
+	path = path_find_first_file_recursive (root, name, 8);
+	if (!path)
+	{
+		remove_tree (root);
+		g_free (root);
+		return g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_NOENT, "Requested file was not found in archive."), FALSE;
+	}
+
+	ok = g_file_get_contents (path, contents, NULL, &local_error);
+	g_free (path);
+	remove_tree (root);
+	g_free (root);
+
+	if (!ok)
+	{
+		if (error)
+			*error = local_error;
+		else
+			g_clear_error (&local_error);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
 gboolean
 zoitechat_gtk3_theme_service_import (const char *source_path, char **imported_id, GError **error)
 {

src/common/gtk3-theme-service.h

@@ -48,5 +48,6 @@ gboolean zoitechat_gtk3_theme_service_remove_user_theme (const char *theme_id, G
 char *zoitechat_gtk3_theme_pick_css_dir_for_minor (const char *theme_root, int preferred_minor);
 char *zoitechat_gtk3_theme_pick_css_dir (const char *theme_root);
 GPtrArray *zoitechat_gtk3_theme_build_inheritance_chain (const char *theme_root);
+gboolean zoitechat_gtk3_theme_service_read_archive_text_file (const char *archive_path, const char *name, char **contents, GError **error);
 
 #endif

src/common/outbound.c

@@ -4883,6 +4883,9 @@ xit:
 static int
 handle_user_input (session *sess, char *text, int history, int nocommand)
 {
+	char cmd_char = prefs.hex_input_command_char[0];
+	unsigned int i;
+
 	if (*text == '\0')
 		return 1;
 
@@ -4890,51 +4893,23 @@ handle_user_input (session *sess, char *text, int history, int nocommand)
 		history_add (&sess->history, text);
 
 	/* is it NOT a command, just text? */
-	if (nocommand || text[0] != prefs.hex_input_command_char[0])
+	if (nocommand || text[0] != cmd_char)
 	{
 		handle_say (sess, text, TRUE);
 		return 1;
 	}
 
-	/* check for // */
+	for (i = 1; text[i]; i++)
-	if (text[0] == prefs.hex_input_command_char[0] && text[1] == prefs.hex_input_command_char[0])
 	{
-		handle_say (sess, text + 1, TRUE);
+		if (text[i] == cmd_char)
-		return 1;
+		{
+			handle_say (sess, text, TRUE);
+			return 1;
+		}
+		if (text[i] == ' ')
+			break;
 	}
 
-#if 0 /* Who would remember all this? */
-	if (prefs.hex_input_command_char[0] == '/')
-	{
-		int i;
-		const char *unix_dirs [] = {
-			"/bin/",
-			"/boot/",
-			"/dev/",
-			"/etc/",
-			"/home/",
-			"/lib/",
-			"/lost+found/",
-			"/mnt/",
-			"/opt/",
-			"/proc/",
-			"/root/",
-			"/sbin/",
-			"/tmp/",
-			"/usr/",
-			"/var/",
-			"/gnome/",
-			NULL
-		};
-		for (i = 0; unix_dirs[i] != NULL; i++)
-			if (strncmp (text, unix_dirs[i], strlen (unix_dirs[i]))==0)
-			{
-				handle_say (sess, text, TRUE);
-				return 1;
-			}
-	}
-#endif
-
 	return handle_command (sess, text + 1, TRUE);
 }
 

src/fe-gtk/chanview-tabs.c

@@ -744,9 +744,9 @@ cv_tabs_add (chanview *cv, chan *ch, char *name, GtkTreeIter *parent)
 
 	but = gtk_toggle_button_new ();
 	gtk_widget_set_name (but, "zoitechat-tab");
-	gtk_widget_set_size_request (but, -1, 18);
+	gtk_widget_set_size_request (but, -1, 14);
 	gtk_widget_add_events (but, GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
-	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
 	label = gtk_label_new (name);
 	close_button = gtk_button_new ();
 	gtk_style_context_add_class (gtk_widget_get_style_context (close_button), "flat");
@@ -755,8 +755,8 @@ cv_tabs_add (chanview *cv, chan *ch, char *name, GtkTreeIter *parent)
 	gtk_button_set_always_show_image (GTK_BUTTON (close_button), TRUE);
 	gtk_widget_set_can_focus (close_button, FALSE);
 	gtk_container_add (GTK_CONTAINER (close_button), close_icon);
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);
+	gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (but), hbox);
 	g_object_set_data (G_OBJECT (but), "tab-label", label);
 	g_object_set_data (G_OBJECT (but), "tab-close-button", close_button);

src/fe-gtk/maingui.c

@@ -4431,7 +4431,7 @@ mg_create_topwindow (session *sess)
 
 #ifdef G_OS_WIN32
 	parent_win = gtk_widget_get_window (win);
-	gdk_window_add_filter (parent_win, mg_win32_filter, win);
+	gdk_window_add_filter (parent_win, mg_win32_filter, NULL);
 #endif
 }
 
@@ -4464,8 +4464,6 @@ static GdkFilterReturn
 mg_win32_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
 {
         MSG *msg = (MSG*)xevent;
-        GtkWidget *win = GTK_IS_WIDGET (data) ? GTK_WIDGET (data) : NULL;
-        static gboolean handling_syscommand = FALSE;
 
 	if (!msg)
 		return GDK_FILTER_CONTINUE;
@@ -4482,30 +4480,6 @@ mg_win32_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
 		return GDK_FILTER_CONTINUE;
 	}
 
-	if (msg->message == WM_SYSCOMMAND && win && !handling_syscommand)
-	{
-		const UINT command = ((UINT) msg->wParam) & 0xFFF0u;
-
-		if (command == SC_MINIMIZE || command == SC_RESTORE)
-		{
-			handling_syscommand = TRUE;
-
-			if (command == SC_MINIMIZE)
-			{
-				ShowWindow (msg->hwnd, SW_MINIMIZE);
-			}
-			else
-			{
-				ShowWindow (msg->hwnd, SW_RESTORE);
-				ShowWindow (msg->hwnd, SW_SHOW);
-				SetForegroundWindow (msg->hwnd);
-			}
-
-			handling_syscommand = FALSE;
-			return GDK_FILTER_REMOVE;
-		}
-	}
-
 	if (msg->message == WM_COPYDATA)
 	{
 		COPYDATASTRUCT *copy_data = (COPYDATASTRUCT *)msg->lParam;
@@ -4635,7 +4609,7 @@ mg_create_tabwindow (session *sess)
 
 #ifdef G_OS_WIN32
 	parent_win = gtk_widget_get_window (win);
-	gdk_window_add_filter (parent_win, mg_win32_filter, win);
+	gdk_window_add_filter (parent_win, mg_win32_filter, NULL);
 #endif
 }
 

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

@@ -188,6 +188,16 @@ zoitechat_gtk3_theme_service_import (const char *source_path, char **imported_id
         return FALSE;
 }
 
+gboolean
+zoitechat_gtk3_theme_service_read_archive_text_file (const char *archive_path, const char *name, char **contents, GError **error)
+{
+        (void)archive_path;
+        (void)name;
+        (void)contents;
+        (void)error;
+        return FALSE;
+}
+
 gboolean
 zoitechat_gtk3_theme_service_remove_user_theme (const char *theme_id, GError **error)
 {

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

@@ -1038,40 +1038,60 @@ static void
 theme_preferences_import_colors_conf_cb (GtkWidget *button, gpointer user_data)
 {
         gboolean *color_change_flag = user_data;
-        GtkWidget *dialog;
+        GtkFileChooserNative *dialog;
         char *path;
+        char *lower_path;
         char *cfg;
         GError *error = NULL;
         gboolean any_imported = FALSE;
         ThemeSemanticToken token;
+        GtkFileFilter *filter;
 
-        dialog = gtk_file_chooser_dialog_new (_("Import colors.conf colors"),
+        dialog = gtk_file_chooser_native_new (_("Import colors.conf colors"),
                                               GTK_WINDOW (gtk_widget_get_toplevel (button)),
                                               GTK_FILE_CHOOSER_ACTION_OPEN,
-                                              _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                              _("_Import"),
-                                              _("_Import"), GTK_RESPONSE_ACCEPT,
+                                              _("_Cancel"));
-                                              NULL);
-        gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), TRUE);
         gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), FALSE);
+        filter = gtk_file_filter_new ();
+        gtk_file_filter_set_name (filter, _("Theme colors (*.conf, *.hct)"));
+        gtk_file_filter_add_pattern (filter, "*.conf");
+        gtk_file_filter_add_pattern (filter, "*.hct");
+        gtk_file_filter_add_pattern (filter, "*.HCT");
+        gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
-        if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_ACCEPT)
+        if (gtk_native_dialog_run (GTK_NATIVE_DIALOG (dialog)) != GTK_RESPONSE_ACCEPT)
         {
-                gtk_widget_destroy (dialog);
+                g_object_unref (dialog);
                 return;
         }
 
         path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-        gtk_widget_destroy (dialog);
+        g_object_unref (dialog);
         if (!path)
                 return;
 
-        if (!g_file_get_contents (path, &cfg, NULL, &error))
+        lower_path = g_ascii_strdown (path, -1);
+        if (g_str_has_suffix (lower_path, ".hct"))
+        {
+                if (!zoitechat_gtk3_theme_service_read_archive_text_file (path, "colors.conf", &cfg, &error))
+                {
+                        theme_preferences_show_import_error (button, _("Failed to read colors.conf from .hct file."));
+                        g_clear_error (&error);
+                        g_free (lower_path);
+                        g_free (path);
+                        return;
+                }
+        }
+        else if (!g_file_get_contents (path, &cfg, NULL, &error))
         {
                 theme_preferences_show_import_error (button, _("Failed to read colors.conf file."));
                 g_clear_error (&error);
+                g_free (lower_path);
                 g_free (path);
                 return;
         }
+        g_free (lower_path);
 
         for (token = THEME_TOKEN_MIRC_0; token < THEME_TOKEN_COUNT; token++)
         {

src/fe-gtk/userlistgui.c

@@ -550,9 +550,9 @@ fe_userlist_insert (session *sess, struct User *newuser, gboolean sel)
 			prefix_escaped = g_markup_escape_text (prefix_text, -1);
 			prefix_color = userlist_prefix_color (newuser->prefix[0]);
 			if (prefix_color)
-				prefix = g_strdup_printf ("<b><span foreground=\"%s\">%s</span></b>", prefix_color, prefix_escaped);
+				prefix = g_strdup_printf ("<span foreground=\"%s\">%s</span>", prefix_color, prefix_escaped);
 			else
-				prefix = g_strdup_printf ("<b>%s</b>", prefix_escaped);
+				prefix = g_strdup (prefix_escaped);
 			g_free (prefix_escaped);
 		}
 		pix = NULL;