replace deprecated gtk_window_set_policy
[claws.git] / src / grouplistdialog.c
index cc90abe5d5263811ae3791142fa538d7c619c0a6..9a90027d8747067df864a67b741acfdba149f061 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * 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
@@ -52,7 +52,7 @@
 #include "recv.h"
 #include "socket.h"
 
-#define GROUPLIST_DIALOG_WIDTH         480
+#define GROUPLIST_DIALOG_WIDTH         450
 #define GROUPLIST_DIALOG_HEIGHT                400
 #define GROUPLIST_COL_NAME_WIDTH       250
 
@@ -70,31 +70,33 @@ static Folder *news_folder;
 static GSList *subscribed;
 
 static void grouplist_dialog_create    (void);
-static void grouplist_dialog_set_list  (gchar          *pattern);
+static void grouplist_dialog_set_list  (const gchar    *pattern,
+                                        gboolean        refresh);
+static void grouplist_search           (void);
 static void grouplist_clear            (void);
-static void grouplist_recv_func                (SockInfo       *sock,
+static gboolean grouplist_recv_func    (SockInfo       *sock,
                                         gint            count,
                                         gint            read_bytes,
                                         gpointer        data);
 
+static gint window_deleted     (GtkWidget      *widget,
+                                GdkEventAny    *event,
+                                gpointer        data);
 static void ok_clicked         (GtkWidget      *widget,
                                 gpointer        data);
 static void cancel_clicked     (GtkWidget      *widget,
                                 gpointer        data);
 static void refresh_clicked    (GtkWidget      *widget,
                                 gpointer        data);
-static void key_pressed                (GtkWidget      *widget,
+static gboolean key_pressed    (GtkWidget      *widget,
                                 GdkEventKey    *event,
                                 gpointer        data);
-static void ctree_selected     (GtkCTree       *ctree,
-                                GtkCTreeNode   *node,
-                                gint            column,
-                                gpointer        data);
-static void ctree_unselected   (GtkCTree       *ctree,
-                                GtkCTreeNode   *node,
-                                gint            column,
+static gboolean button_press_cb (GtkCTree      *ctree,
+                                GdkEventButton *button,
                                 gpointer        data);
 static void entry_activated    (GtkEditable    *editable);
+static void search_clicked     (GtkWidget      *widget,
+                                gpointer        data);
 
 GSList *grouplist_dialog(Folder *folder)
 {
@@ -118,12 +120,12 @@ GSList *grouplist_dialog(Folder *folder)
        subscribed = NULL;
        for (node = folder->node->children; node != NULL; node = node->next) {
                item = FOLDER_ITEM(node->data);
-               subscribed = g_slist_append(subscribed, g_strdup(item->name));
+               subscribed = g_slist_append(subscribed, g_strdup(item->path));
        }
 
-       grouplist_dialog_set_list(NULL);
+       grouplist_dialog_set_list(NULL, TRUE);
 
-       gtk_main();
+       if (ack) gtk_main();
 
        manage_window_focus_out(dialog, NULL, NULL);
        gtk_widget_hide(dialog);
@@ -137,7 +139,7 @@ GSList *grouplist_dialog(Folder *folder)
                     node = node->next) {
                        item = FOLDER_ITEM(node->data);
                        subscribed = g_slist_append(subscribed,
-                                                   g_strdup(item->name));
+                                                   g_strdup(item->path));
                }
        }
 
@@ -151,6 +153,7 @@ static void grouplist_dialog_create(void)
        GtkWidget *vbox;
        GtkWidget *hbox;
        GtkWidget *msg_label;
+       GtkWidget *search_button;
        GtkWidget *confirm_area;
        GtkWidget *cancel_button;       
        GtkWidget *refresh_button;      
@@ -159,21 +162,18 @@ static void grouplist_dialog_create(void)
        gint i;
 
        dialog = gtk_dialog_new();
-       gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, TRUE, FALSE);
-       gtk_widget_set_usize(dialog,
-                            GROUPLIST_DIALOG_WIDTH, GROUPLIST_DIALOG_HEIGHT);
+       gtk_window_set_resizable(GTK_WINDOW(dialog), TRUE);
+       gtk_widget_set_size_request(dialog,
+                                   GROUPLIST_DIALOG_WIDTH, GROUPLIST_DIALOG_HEIGHT);
        gtk_container_set_border_width
                (GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 5);
        gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
-       gtk_window_set_title(GTK_WINDOW(dialog), _("Subscribe to newsgroup"));
-       gtk_signal_connect(GTK_OBJECT(dialog), "delete_event",
-                          GTK_SIGNAL_FUNC(cancel_clicked), NULL);
-       gtk_signal_connect(GTK_OBJECT(dialog), "key_press_event",
-                          GTK_SIGNAL_FUNC(key_pressed), NULL);
-       gtk_signal_connect(GTK_OBJECT(dialog), "focus_in_event",
-                          GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
-       gtk_signal_connect(GTK_OBJECT(dialog), "focus_out_event",
-                          GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+       gtk_window_set_title(GTK_WINDOW(dialog), _("Newsgroup subscription"));
+       g_signal_connect(G_OBJECT(dialog), "delete_event",
+                        G_CALLBACK(window_deleted), NULL);
+       g_signal_connect(G_OBJECT(dialog), "key_press_event",
+                        G_CALLBACK(key_pressed), NULL);
+       MANAGE_WINDOW_SIGNALS_CONNECT(dialog);
 
        gtk_widget_realize(dialog);
 
@@ -184,13 +184,25 @@ static void grouplist_dialog_create(void)
        hbox = gtk_hbox_new(FALSE, 0);
        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
-       msg_label = gtk_label_new(_("Input subscribing newsgroup:"));
+       msg_label = gtk_label_new(_("Select newsgroups for subscription:"));
+       gtk_box_pack_start(GTK_BOX(hbox), msg_label, FALSE, FALSE, 0);
+
+       hbox = gtk_hbox_new(FALSE, 8);
+       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+       msg_label = gtk_label_new(_("Find groups:"));
        gtk_box_pack_start(GTK_BOX(hbox), msg_label, FALSE, FALSE, 0);
 
        entry = gtk_entry_new();
-       gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
-       gtk_signal_connect(GTK_OBJECT(entry), "activate",
-                          GTK_SIGNAL_FUNC(entry_activated), NULL);
+       gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
+       g_signal_connect(G_OBJECT(entry), "activate",
+                        G_CALLBACK(entry_activated), NULL);
+
+       search_button = gtk_button_new_with_label(_(" Search "));
+       gtk_box_pack_start(GTK_BOX(hbox), search_button, FALSE, FALSE, 0);
+
+       g_signal_connect(G_OBJECT(search_button), "clicked",
+                        G_CALLBACK(search_clicked), NULL);
 
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_box_pack_start(GTK_BOX (vbox), scrolledwin, TRUE, TRUE, 0);
@@ -212,10 +224,8 @@ static void grouplist_dialog_create(void)
        for (i = 0; i < 3; i++)
                GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
                                       GTK_CAN_FOCUS);
-       gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
-                          GTK_SIGNAL_FUNC(ctree_selected), NULL);
-       gtk_signal_connect(GTK_OBJECT(ctree), "tree_unselect_row",
-                          GTK_SIGNAL_FUNC(ctree_unselected), NULL);
+       g_signal_connect(G_OBJECT(ctree), "button-press-event",
+                        G_CALLBACK(button_press_cb), NULL);
 
        hbox = gtk_hbox_new(FALSE, 0);
        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
@@ -231,32 +241,27 @@ static void grouplist_dialog_create(void)
                          confirm_area);
        gtk_widget_grab_default(ok_button);
 
-       gtk_signal_connect(GTK_OBJECT(ok_button), "clicked",
-                          GTK_SIGNAL_FUNC(ok_clicked), NULL);
-       gtk_signal_connect(GTK_OBJECT(cancel_button), "clicked",
-                          GTK_SIGNAL_FUNC(cancel_clicked), NULL);
-       gtk_signal_connect(GTK_OBJECT(refresh_button), "clicked",
-                          GTK_SIGNAL_FUNC(refresh_clicked), NULL);
+       g_signal_connect(G_OBJECT(ok_button), "clicked",
+                        G_CALLBACK(ok_clicked), NULL);
+       g_signal_connect(G_OBJECT(cancel_button), "clicked",
+                        G_CALLBACK(cancel_clicked), NULL);
+       g_signal_connect(G_OBJECT(refresh_button), "clicked",
+                        G_CALLBACK(refresh_clicked), NULL);
 
        gtk_widget_show_all(GTK_DIALOG(dialog)->vbox);
 }
 
-static GHashTable *last_node_table;
 static GHashTable *branch_node_table;
 
 static void grouplist_hash_init(void)
 {
-       last_node_table = g_hash_table_new(g_str_hash, g_str_equal);
        branch_node_table = g_hash_table_new(g_str_hash, g_str_equal);
 }
 
 static void grouplist_hash_done(void)
 {
        hash_free_strings(branch_node_table);
-       hash_free_strings(last_node_table);
-
        g_hash_table_destroy(branch_node_table);
-       g_hash_table_destroy(last_node_table);
 }
 
 static GtkCTreeNode *grouplist_hash_get_branch_node(const gchar *name)
@@ -270,26 +275,6 @@ static void grouplist_hash_set_branch_node(const gchar *name,
        g_hash_table_insert(branch_node_table, g_strdup(name), node);
 }
 
-static GtkCTreeNode *grouplist_hash_get_last_node(const gchar *name)
-{
-       return g_hash_table_lookup(last_node_table, name);
-}
-
-static void grouplist_hash_set_last_node(const gchar *name,
-                                        GtkCTreeNode *node)
-{
-       gchar *key;
-       gpointer value;
-
-       if (g_hash_table_lookup_extended(last_node_table, name,
-                                        (gpointer *)&key, &value)) {
-               g_hash_table_remove(last_node_table, name);
-               g_free(key);
-       }
-
-       g_hash_table_insert(last_node_table, g_strdup(name), node);
-}
-
 static gchar *grouplist_get_parent_name(const gchar *name)
 {
        gchar *p;
@@ -300,7 +285,8 @@ static gchar *grouplist_get_parent_name(const gchar *name)
        return g_strndup(name, p - name);
 }
 
-static GtkCTreeNode *grouplist_create_parent(const gchar *name)
+static GtkCTreeNode *grouplist_create_parent(const gchar *name,
+                                            const gchar *pattern)
 {
        GtkCTreeNode *parent;
        GtkCTreeNode *node;
@@ -315,14 +301,17 @@ static GtkCTreeNode *grouplist_create_parent(const gchar *name)
        cols[1] = cols[2] = "";
 
        parent_name = grouplist_get_parent_name(name);
-       parent = grouplist_create_parent(parent_name);
+       parent = grouplist_create_parent(parent_name, pattern);
 
-       node = grouplist_hash_get_last_node(parent_name);
+       node = parent ? GTK_CTREE_ROW(parent)->children
+               : GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
        node = gtk_ctree_insert_node(GTK_CTREE(ctree), parent, node,
                                     cols, 0, NULL, NULL, NULL, NULL,
                                     FALSE, FALSE);
+       if (parent && fnmatch(pattern, parent_name, 0) != 0)
+               gtk_ctree_expand(GTK_CTREE(ctree), parent);
        gtk_ctree_node_set_selectable(GTK_CTREE(ctree), node, FALSE);
-       grouplist_hash_set_last_node(parent_name, node);
+
        grouplist_hash_set_branch_node(name, node);
 
        g_free(parent_name);
@@ -330,7 +319,8 @@ static GtkCTreeNode *grouplist_create_parent(const gchar *name)
        return node;
 }
 
-static GtkCTreeNode *grouplist_create_branch(NewsGroupInfo *ginfo)
+static GtkCTreeNode *grouplist_create_branch(NewsGroupInfo *ginfo,
+                                            const gchar *pattern)
 {
        GtkCTreeNode *node;
        GtkCTreeNode *parent;
@@ -357,7 +347,7 @@ static GtkCTreeNode *grouplist_create_branch(NewsGroupInfo *ginfo)
                cols[2] = _("unknown");
 
        parent_name = grouplist_get_parent_name(name);
-       parent = grouplist_create_parent(parent_name);
+       parent = grouplist_create_parent(parent_name, pattern);
        node = grouplist_hash_get_branch_node(name);
        if (node) {
                gtk_ctree_set_node_info(GTK_CTREE(ctree), node, cols[0], 0,
@@ -365,23 +355,37 @@ static GtkCTreeNode *grouplist_create_branch(NewsGroupInfo *ginfo)
                gtk_ctree_node_set_text(GTK_CTREE(ctree), node, 1, cols[1]);
                gtk_ctree_node_set_text(GTK_CTREE(ctree), node, 2, cols[2]);
        } else {
-               node = grouplist_hash_get_last_node(parent_name);
+               node = parent ? GTK_CTREE_ROW(parent)->children
+                       : GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
                node = gtk_ctree_insert_node(GTK_CTREE(ctree), parent, node,
                                             cols, 0, NULL, NULL, NULL, NULL,
                                             TRUE, FALSE);
+               if (parent && fnmatch(pattern, parent_name, 0) != 0)
+                       gtk_ctree_expand(GTK_CTREE(ctree), parent);
        }
        gtk_ctree_node_set_selectable(GTK_CTREE(ctree), node, TRUE);
        if (node)
                gtk_ctree_node_set_row_data(GTK_CTREE(ctree), node, ginfo);
 
-       grouplist_hash_set_last_node(parent_name, node);
-
        g_free(parent_name);
 
        return node;
 }
 
-static void grouplist_dialog_set_list(gchar *pattern)
+static void grouplist_expand_upwards(GtkCTree *ctree, const gchar *name) {
+       const gchar *ptr;
+       gchar *newname=g_malloc0(strlen(name));
+
+       for (ptr=name; *ptr; ptr++) {
+               if (*ptr == '.')
+                       gtk_ctree_expand(ctree, 
+                               grouplist_hash_get_branch_node(newname));
+               newname[ptr-name] = *ptr;
+       }
+       g_free(newname);
+}
+
+static void grouplist_dialog_set_list(const gchar *pattern, gboolean refresh)
 {
        GSList *cur;
        GtkCTreeNode *node;
@@ -392,41 +396,42 @@ static void grouplist_dialog_set_list(gchar *pattern)
        if (!pattern || *pattern == '\0')
                pattern = "*";
 
-       grouplist_clear();
+       if (refresh) {
+               ack = TRUE;
+               grouplist_clear();
+               recv_set_ui_func(grouplist_recv_func, NULL);
+               group_list = news_get_group_list(news_folder);
+               group_list = g_slist_reverse(group_list);
+               recv_set_ui_func(NULL, NULL);
+               if (group_list == NULL && ack == TRUE) {
+                       alertpanel_error(_("Can't retrieve newsgroup list."));
+                       locked = FALSE;
+                       return;
+               }
+       } else
+               gtk_clist_clear(GTK_CLIST(ctree));
 
-       recv_set_ui_func(grouplist_recv_func, NULL);
-       group_list = news_get_group_list(news_folder);
-       group_list = g_slist_reverse(group_list);
-       recv_set_ui_func(NULL, NULL);
-       if (group_list == NULL) {
-               alertpanel_error(_("Can't retrieve newsgroup list."));
-               locked = FALSE;
-               return;
-       }
+       gtk_entry_set_text(GTK_ENTRY(entry), pattern);
 
        grouplist_hash_init();
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
-       gtk_signal_handler_block_by_func(GTK_OBJECT(ctree),
-                                        GTK_SIGNAL_FUNC(ctree_selected),
-                                        NULL);
 
        for (cur = group_list; cur != NULL ; cur = cur->next) {
                NewsGroupInfo *ginfo = (NewsGroupInfo *)cur->data;
 
                if (fnmatch(pattern, ginfo->name, 0) == 0) {
-                       node = grouplist_create_branch(ginfo);
+                       node = grouplist_create_branch(ginfo, pattern);
                        if (g_slist_find_custom(subscribed, ginfo->name,
                                                (GCompareFunc)g_strcasecmp)
-                           != NULL)
+                                               != NULL) {
                                gtk_ctree_select(GTK_CTREE(ctree), node);
+                       }
                }
        }
-
-       gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
-                                          GTK_SIGNAL_FUNC(ctree_selected),
-                                          NULL);
+       for (cur = subscribed; cur; cur = g_slist_next(cur))
+               grouplist_expand_upwards(GTK_CTREE(ctree), (gchar *)cur->data);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
 
@@ -437,22 +442,27 @@ static void grouplist_dialog_set_list(gchar *pattern)
        locked = FALSE;
 }
 
+static void grouplist_search(void)
+{
+       gchar *str;
+
+       if (locked) return;
+
+       str = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+       grouplist_dialog_set_list(str, FALSE);
+       g_free(str);
+}
+
 static void grouplist_clear(void)
 {
-       gtk_signal_handler_block_by_func(GTK_OBJECT(ctree),
-                                        GTK_SIGNAL_FUNC(ctree_unselected),
-                                        NULL);
        gtk_clist_clear(GTK_CLIST(ctree));
        gtk_entry_set_text(GTK_ENTRY(entry), "");
        news_group_list_free(group_list);
        group_list = NULL;
-       gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
-                                          GTK_SIGNAL_FUNC(ctree_unselected),
-                                          NULL);
 }
 
-static void grouplist_recv_func(SockInfo *sock, gint count, gint read_bytes,
-                               gpointer data)
+static gboolean grouplist_recv_func(SockInfo *sock, gint count, gint read_bytes,
+                                   gpointer data)
 {
        gchar buf[BUFFSIZE];
 
@@ -461,23 +471,26 @@ static void grouplist_recv_func(SockInfo *sock, gint count, gint read_bytes,
                   count, to_human_readable(read_bytes));
        gtk_label_set_text(GTK_LABEL(status_label), buf);
        GTK_EVENTS_FLUSH();
+       if (ack == FALSE)
+               return FALSE;
+       else
+               return TRUE;
 }
 
-static void ok_clicked(GtkWidget *widget, gpointer data)
+static gint window_deleted(GtkWidget *widget, GdkEventAny *event, gpointer data)
 {
-       gchar *str;
-
-       str = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+       ack = FALSE;
+       if (gtk_main_level() > 1)
+               gtk_main_quit();
 
-       if (strchr(str, '*') != NULL)
-               grouplist_dialog_set_list(str);
-       else {
-               ack = TRUE;
-               if (gtk_main_level() > 1)
-                       gtk_main_quit();
-       }
+       return TRUE;
+}
 
-       g_free(str);
+static void ok_clicked(GtkWidget *widget, gpointer data)
+{
+       ack = TRUE;
+       if (gtk_main_level() > 1)
+               gtk_main_quit();
 }
 
 static void cancel_clicked(GtkWidget *widget, gpointer data)
@@ -496,62 +509,67 @@ static void refresh_clicked(GtkWidget *widget, gpointer data)
        news_remove_group_list_cache(news_folder);
 
        str = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
-       grouplist_dialog_set_list(str);
+       grouplist_dialog_set_list(str, TRUE);
        g_free(str);
 }
 
-static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
        if (event && event->keyval == GDK_Escape)
                cancel_clicked(NULL, NULL);
+       return FALSE;
 }
 
-static void ctree_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
-                          gpointer data)
+/* clist/ctree clear old selection on click (gtk2 only)
+ * - intercept all button clicks (always return TRUE)
+ * - only allow left button single click
+ * - handle click on expander
+ * - update "subscribed" list and un-/select row
+ */
+static gboolean button_press_cb(GtkCTree *ctree, GdkEventButton *button,
+                               gpointer data)
 {
+       gint row, col;
+       GtkCTreeNode *node;
        NewsGroupInfo *ginfo;
+       GSList *list;
 
-       ginfo = gtk_ctree_node_get_row_data(ctree, node);
-       if (!ginfo) return;
+       if (button->type != GDK_BUTTON_PRESS) return TRUE;
+       if (button->button != 1) return TRUE;
 
-       subscribed = g_slist_append(subscribed, g_strdup(ginfo->name));
-}
+       gtk_clist_get_selection_info(GTK_CLIST(ctree), 
+                                    button->x, button->y, &row, &col);
+       node = gtk_ctree_node_nth(ctree, row);
+       if (!node) return TRUE;
 
-static void ctree_unselected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
-                            gpointer data)
-{
-       NewsGroupInfo *ginfo;
-       GSList *list;
+       if (gtk_ctree_is_hot_spot(ctree, button->x, button->y)) {
+               gtk_ctree_toggle_expansion(ctree, node);
+               return TRUE;
+       }
 
        ginfo = gtk_ctree_node_get_row_data(ctree, node);
-       if (!ginfo) return;
+       if (!ginfo) return TRUE;
 
        list = g_slist_find_custom(subscribed, ginfo->name,
                                   (GCompareFunc)g_strcasecmp);
        if (list) {
                g_free(list->data);
                subscribed = g_slist_remove(subscribed, list->data);
+               gtk_clist_unselect_row(GTK_CLIST(ctree), row, 0);
+       } else {
+               subscribed = g_slist_append(subscribed, g_strdup(ginfo->name));
+               gtk_clist_select_row(GTK_CLIST(ctree), row, 0);
        }
+
+       return TRUE;
 }
 
 static void entry_activated(GtkEditable *editable)
 {
-       gchar * str;
-       gboolean update_list;
-
-       str = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
-
-       update_list = FALSE;
-
-       if (strchr(str, '*') != NULL)
-         update_list = TRUE;
+       grouplist_search();
+}
 
-       if (update_list) {
-               grouplist_dialog_set_list(str);
-               g_free(str);
-       }
-       else {
-               g_free(str);
-               ok_clicked(NULL, NULL);
-       }
+static void search_clicked(GtkWidget *widget, gpointer data)
+{
+       grouplist_search();
 }