2006-02-20 [wwp] 2.0.0cvs63
[claws.git] / src / summary_search.c
index 3a2d8c8fa2a35b3bb710cb3570b895e971181ea6..f58f31974425b730b46c1c712a2f7cdb9aaef346 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-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
  *
  * 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
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtktable.h>
+#include <gtk/gtkoptionmenu.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkentry.h>
 #include <gtk/gtkhbox.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "intl.h"
 #include "main.h"
 #include "summary_search.h"
 #include "summaryview.h"
+#include "messageview.h"
 #include "mainwindow.h"
+#include "menu.h"
 #include "utils.h"
 #include "gtkutils.h"
+#include "prefs_gtk.h"
 #include "manage_window.h"
 #include "alertpanel.h"
+#include "matcher.h"
+#include "matcher_parser.h"
+#include "prefs_matcher.h"
+
+static struct SummarySearchWindow {
+       GtkWidget *window;
+
+       GtkWidget *bool_optmenu;
+
+       GtkWidget *from_entry;
+       GtkWidget *to_entry;
+       GtkWidget *subject_entry;
+       GtkWidget *body_entry;
+
+       GtkWidget *adv_condition_entry;
+       GtkWidget *adv_condition_btn;
+       GtkWidget *adv_search_checkbtn;
+
+       GtkWidget *case_checkbtn;
+
+       GtkWidget *clear_btn;
+       GtkWidget *all_btn;
+       GtkWidget *prev_btn;
+       GtkWidget *next_btn;
+       GtkWidget *close_btn;
+       GtkWidget *stop_btn;
+
+       SummaryView *summaryview;
+
+       MatcherList                     *matcher_list;
+
+       gboolean is_searching;
+} search_window;
+
+static void summary_search_create      (void);
+
+static void summary_search_execute     (gboolean        backward,
+                                        gboolean        search_all);
+
+static void summary_search_clear       (GtkButton      *button,
+                                        gpointer        data);
+static void summary_search_prev_clicked        (GtkButton      *button,
+                                        gpointer        data);
+static void summary_search_next_clicked        (GtkButton      *button,
+                                        gpointer        data);
+static void summary_search_all_clicked (GtkButton      *button,
+                                        gpointer        data);
+static void summary_search_stop_clicked        (GtkButton      *button,
+                                        gpointer        data);
+static void adv_condition_btn_clicked  (GtkButton      *button,
+                                        gpointer        data);
+
+static void from_activated             (void);
+static void to_activated               (void);
+static void subject_activated          (void);
+static void body_activated             (void);
+static void adv_condition_activated    (void);
+
+static gboolean key_pressed            (GtkWidget      *widget,
+                                        GdkEventKey    *event,
+                                        gpointer        data);
 
-static GtkWidget *window;
-static GtkWidget *from_entry;
-static GtkWidget *to_entry;
-static GtkWidget *subject_entry;
-static GtkWidget *body_entry;
-static GtkWidget *case_checkbtn;
-static GtkWidget *backward_checkbtn;
-static GtkWidget *all_checkbtn;
-static GtkWidget *search_btn;
-static GtkWidget *clear_btn;
-static GtkWidget *close_btn;
-
-static void summary_search_create(SummaryView *summaryview);
-static void summary_search_execute(GtkButton *button, gpointer data);
-static void summary_search_clear(GtkButton *button, gpointer data);
-static void from_activated(void);
-static void to_activated(void);
-static void subject_activated(void);
-static void body_activated(void);
-static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data);
 
 void summary_search(SummaryView *summaryview)
 {
-       if (!window)
-               summary_search_create(summaryview);
+       if (!search_window.window)
+               summary_search_create();
        else
-               gtk_widget_hide(window);
+               gtk_widget_hide(search_window.window);
+
+       search_window.summaryview = summaryview;
 
-       gtk_widget_grab_focus(search_btn);
-       gtk_widget_grab_focus(subject_entry);
-       gtk_widget_show(window);
+       gtk_widget_grab_focus(search_window.next_btn);
+       gtk_widget_grab_focus(search_window.subject_entry);
+       gtk_widget_show(search_window.window);
 }
 
-static void summary_search_create(SummaryView *summaryview)
+static void summary_search_create(void)
 {
+       GtkWidget *window;
        GtkWidget *vbox1;
+       GtkWidget *bool_hbox;
+       GtkWidget *bool_optmenu;
+       GtkWidget *bool_menu;
+       GtkWidget *menuitem;
+       GtkWidget *clear_btn;
+
        GtkWidget *table1;
        GtkWidget *from_label;
+       GtkWidget *from_entry;
        GtkWidget *to_label;
+       GtkWidget *to_entry;
        GtkWidget *subject_label;
+       GtkWidget *subject_entry;
        GtkWidget *body_label;
+       GtkWidget *body_entry;
+       GtkWidget *adv_condition_label;
+       GtkWidget *adv_condition_entry;
+       GtkWidget *adv_condition_btn;
+
        GtkWidget *checkbtn_hbox;
+       GtkWidget *adv_search_checkbtn;
+       GtkWidget *case_checkbtn;
+
        GtkWidget *confirm_area;
+       GtkWidget *all_btn;
+       GtkWidget *prev_btn;
+       GtkWidget *next_btn;
+       GtkWidget *close_btn;
+       GtkWidget *stop_btn;
 
-       window = gtk_window_new (GTK_WINDOW_DIALOG);
-       gtk_window_set_title (GTK_WINDOW (window), _("Search messages"));
-       gtk_widget_set_usize (window, 450, -1);
+       gboolean is_searching = FALSE;
+
+       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       gtk_window_set_title(GTK_WINDOW (window), _("Search messages"));
        gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
-       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-       gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-                          GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete), NULL);
-       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                          GTK_SIGNAL_FUNC(key_pressed), NULL);
-       gtk_signal_connect(GTK_OBJECT(window), "focus_in_event",
-                          GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
-       gtk_signal_connect(GTK_OBJECT(window), "focus_out_event",
-                          GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+       gtk_container_set_border_width(GTK_CONTAINER (window), 8);
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(gtk_widget_hide_on_delete), NULL);
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(key_pressed), NULL);
+       MANAGE_WINDOW_SIGNALS_CONNECT(window);
 
        vbox1 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox1);
        gtk_container_add (GTK_CONTAINER (window), vbox1);
 
-       table1 = gtk_table_new (4, 3, FALSE);
+       bool_hbox = gtk_hbox_new(FALSE, 4);
+       gtk_widget_show(bool_hbox);
+       gtk_box_pack_start(GTK_BOX(vbox1), bool_hbox, FALSE, FALSE, 0);
+
+       bool_optmenu = gtk_option_menu_new();
+       gtk_widget_show(bool_optmenu);
+       gtk_box_pack_start(GTK_BOX(bool_hbox), bool_optmenu, FALSE, FALSE, 0);
+
+       bool_menu = gtk_menu_new();
+       MENUITEM_ADD(bool_menu, menuitem, _("Match any of the following"), 0);
+       MENUITEM_ADD(bool_menu, menuitem, _("Match all of the following"), 1);
+       gtk_option_menu_set_menu(GTK_OPTION_MENU(bool_optmenu), bool_menu);
+
+       clear_btn = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
+       gtk_widget_show(clear_btn);
+       gtk_box_pack_end(GTK_BOX(bool_hbox), clear_btn, FALSE, FALSE, 0);
+
+       table1 = gtk_table_new (5, 3, FALSE);
        gtk_widget_show (table1);
        gtk_box_pack_start (GTK_BOX (vbox1), table1, TRUE, TRUE, 0);
        gtk_container_set_border_width (GTK_CONTAINER (table1), 4);
@@ -123,29 +208,43 @@ static void summary_search_create(SummaryView *summaryview)
        gtk_widget_show (from_entry);
        gtk_table_attach (GTK_TABLE (table1), from_entry, 1, 3, 0, 1,
                          GTK_EXPAND|GTK_FILL, 0, 0, 0);
-       gtk_signal_connect(GTK_OBJECT(from_entry), "activate",
-                          GTK_SIGNAL_FUNC(from_activated), summaryview);
+       g_signal_connect(G_OBJECT(from_entry), "activate",
+                        G_CALLBACK(from_activated), NULL);
 
        to_entry = gtk_entry_new ();
        gtk_widget_show (to_entry);
        gtk_table_attach (GTK_TABLE (table1), to_entry, 1, 3, 1, 2,
                          GTK_EXPAND|GTK_FILL, 0, 0, 0);
-       gtk_signal_connect(GTK_OBJECT(to_entry), "activate",
-                          GTK_SIGNAL_FUNC(to_activated), summaryview);
+       g_signal_connect(G_OBJECT(to_entry), "activate",
+                        G_CALLBACK(to_activated), NULL);
 
        subject_entry = gtk_entry_new ();
        gtk_widget_show (subject_entry);
        gtk_table_attach (GTK_TABLE (table1), subject_entry, 1, 3, 2, 3,
                          GTK_EXPAND|GTK_FILL, 0, 0, 0);
-       gtk_signal_connect(GTK_OBJECT(subject_entry), "activate",
-                          GTK_SIGNAL_FUNC(subject_activated), summaryview);
+       g_signal_connect(G_OBJECT(subject_entry), "activate",
+                        G_CALLBACK(subject_activated), NULL);
 
        body_entry = gtk_entry_new ();
        gtk_widget_show (body_entry);
        gtk_table_attach (GTK_TABLE (table1), body_entry, 1, 3, 3, 4,
                          GTK_EXPAND|GTK_FILL, 0, 0, 0);
-       gtk_signal_connect(GTK_OBJECT(body_entry), "activate",
-                          GTK_SIGNAL_FUNC(body_activated), summaryview);
+       g_signal_connect(G_OBJECT(body_entry), "activate",
+                        G_CALLBACK(body_activated), NULL);
+
+       adv_condition_entry = gtk_entry_new ();
+       gtk_widget_show (adv_condition_entry);
+       gtk_table_attach (GTK_TABLE (table1), adv_condition_entry, 1, 2, 4, 5,
+                         GTK_EXPAND|GTK_FILL, 0, 0, 0);
+       g_signal_connect(G_OBJECT(adv_condition_entry), "activate",
+                        G_CALLBACK(adv_condition_activated), NULL);
+
+       adv_condition_btn = gtk_button_new_with_label (_(" ... "));
+       gtk_widget_show (adv_condition_btn);
+       gtk_table_attach (GTK_TABLE (table1), adv_condition_btn, 2, 3, 4, 5,
+                         GTK_FILL, 0, 0, 0);
+       g_signal_connect(G_OBJECT (adv_condition_btn), "clicked",
+                        G_CALLBACK(adv_condition_btn_clicked), search_window.window);
 
        from_label = gtk_label_new (_("From:"));
        gtk_widget_show (from_label);
@@ -175,6 +274,13 @@ static void summary_search_create(SummaryView *summaryview)
        gtk_label_set_justify (GTK_LABEL (body_label), GTK_JUSTIFY_RIGHT);
        gtk_misc_set_alignment (GTK_MISC (body_label), 1, 0.5);
 
+       adv_condition_label = gtk_label_new (_("Condition:"));
+       gtk_widget_show (adv_condition_label);
+       gtk_table_attach (GTK_TABLE (table1), adv_condition_label, 0, 1, 4, 5,
+                         GTK_FILL, 0, 0, 0);
+       gtk_label_set_justify (GTK_LABEL (adv_condition_label), GTK_JUSTIFY_RIGHT);
+       gtk_misc_set_alignment (GTK_MISC (adv_condition_label), 1, 0.5);
+
        checkbtn_hbox = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (checkbtn_hbox);
        gtk_box_pack_start (GTK_BOX (vbox1), checkbtn_hbox, TRUE, TRUE, 0);
@@ -185,103 +291,187 @@ static void summary_search_create(SummaryView *summaryview)
        gtk_box_pack_start (GTK_BOX (checkbtn_hbox), case_checkbtn,
                            FALSE, FALSE, 0);
 
-       backward_checkbtn =
-               gtk_check_button_new_with_label (_("Backward search"));
-       gtk_widget_show (backward_checkbtn);
-       gtk_box_pack_start (GTK_BOX (checkbtn_hbox), backward_checkbtn,
-                           FALSE, FALSE, 0);
-
-       all_checkbtn =
-               gtk_check_button_new_with_label (_("Select all matched"));
-       gtk_widget_show (all_checkbtn);
-       gtk_box_pack_start (GTK_BOX (checkbtn_hbox), all_checkbtn,
+       adv_search_checkbtn = gtk_check_button_new_with_label (_("Advanced search"));
+       gtk_widget_show (adv_search_checkbtn);
+       gtk_box_pack_start (GTK_BOX (checkbtn_hbox), adv_search_checkbtn,
                            FALSE, FALSE, 0);
 
-       gtkut_button_set_create(&confirm_area,
-                               &search_btn, _("Search"),
-                               &clear_btn,  _("Clear"),
-                               &close_btn,  _("Close"));
+       confirm_area = gtk_hbutton_box_new();
        gtk_widget_show (confirm_area);
+       gtk_button_box_set_layout(GTK_BUTTON_BOX(confirm_area),
+                                 GTK_BUTTONBOX_END);
+       gtk_box_set_spacing(GTK_BOX(confirm_area), 5);
+
+       all_btn = gtk_button_new_with_mnemonic(_("Find _all"));
+       GTK_WIDGET_SET_FLAGS(all_btn, GTK_CAN_DEFAULT);
+       gtk_box_pack_start(GTK_BOX(confirm_area), all_btn, TRUE, TRUE, 0);
+       gtk_widget_show(all_btn);
+
+       prev_btn = gtk_button_new_from_stock(GTK_STOCK_GO_BACK);
+       GTK_WIDGET_SET_FLAGS(prev_btn, GTK_CAN_DEFAULT);
+       gtk_box_pack_start(GTK_BOX(confirm_area), prev_btn, TRUE, TRUE, 0);
+       gtk_widget_show(prev_btn);
+
+       next_btn = gtk_button_new_from_stock(GTK_STOCK_GO_FORWARD);
+       GTK_WIDGET_SET_FLAGS(next_btn, GTK_CAN_DEFAULT);
+       gtk_box_pack_start(GTK_BOX(confirm_area), next_btn, TRUE, TRUE, 0);
+       gtk_widget_show(next_btn);
+
+       close_btn = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+       GTK_WIDGET_SET_FLAGS(close_btn, GTK_CAN_DEFAULT);
+       gtk_box_pack_start(GTK_BOX(confirm_area), close_btn, TRUE, TRUE, 0);
+       gtk_widget_show(close_btn);
+
+       /* stop button hidden */
+       stop_btn = gtk_button_new_from_stock(GTK_STOCK_STOP);
+       GTK_WIDGET_SET_FLAGS(stop_btn, GTK_CAN_DEFAULT);
+       gtk_box_pack_start(GTK_BOX(confirm_area), stop_btn, TRUE, TRUE, 0);
+
        gtk_box_pack_start (GTK_BOX (vbox1), confirm_area, FALSE, FALSE, 0);
-       gtk_widget_grab_default(search_btn);
-
-       gtk_signal_connect(GTK_OBJECT(search_btn), "clicked",
-                          GTK_SIGNAL_FUNC(summary_search_execute),
-                          summaryview);
-       gtk_signal_connect(GTK_OBJECT(clear_btn), "clicked",
-                          GTK_SIGNAL_FUNC(summary_search_clear),
-                          summaryview);
-       gtk_signal_connect_object(GTK_OBJECT(close_btn), "clicked",
-                                 GTK_SIGNAL_FUNC(gtk_widget_hide),
-                                 GTK_OBJECT(window));
+       gtk_widget_grab_default(next_btn);
+
+       SET_TOGGLE_SENSITIVITY_REVERSE(adv_search_checkbtn, bool_menu)
+       SET_TOGGLE_SENSITIVITY_REVERSE(adv_search_checkbtn, from_entry)
+       SET_TOGGLE_SENSITIVITY_REVERSE(adv_search_checkbtn, to_entry)
+       SET_TOGGLE_SENSITIVITY_REVERSE(adv_search_checkbtn, subject_entry)
+       SET_TOGGLE_SENSITIVITY_REVERSE(adv_search_checkbtn, body_entry)
+       SET_TOGGLE_SENSITIVITY(adv_search_checkbtn, adv_condition_label)
+       SET_TOGGLE_SENSITIVITY(adv_search_checkbtn, adv_condition_entry)
+       SET_TOGGLE_SENSITIVITY(adv_search_checkbtn, adv_condition_btn)
+       SET_TOGGLE_SENSITIVITY_REVERSE(adv_search_checkbtn, case_checkbtn)
+
+       g_signal_connect(G_OBJECT(clear_btn), "clicked",
+                        G_CALLBACK(summary_search_clear), NULL);
+       g_signal_connect(G_OBJECT(all_btn), "clicked",
+                        G_CALLBACK(summary_search_all_clicked), NULL);
+       g_signal_connect(G_OBJECT(prev_btn), "clicked",
+                        G_CALLBACK(summary_search_prev_clicked), NULL);
+       g_signal_connect(G_OBJECT(next_btn), "clicked",
+                        G_CALLBACK(summary_search_next_clicked), NULL);
+       g_signal_connect_closure
+               (G_OBJECT(close_btn), "clicked",
+                g_cclosure_new_swap(G_CALLBACK(gtk_widget_hide),
+            window, NULL), FALSE);
+       g_signal_connect(G_OBJECT(stop_btn), "clicked",
+                        G_CALLBACK(summary_search_stop_clicked), NULL);
+
+       search_window.window = window;
+       search_window.bool_optmenu = bool_optmenu;
+       search_window.from_entry = from_entry;
+       search_window.to_entry = to_entry;
+       search_window.subject_entry = subject_entry;
+       search_window.body_entry = body_entry;
+       search_window.adv_condition_entry = adv_condition_entry;
+       search_window.adv_condition_btn = adv_condition_btn;
+       search_window.case_checkbtn = case_checkbtn;
+       search_window.adv_search_checkbtn = adv_search_checkbtn;
+       search_window.clear_btn = clear_btn;
+       search_window.all_btn = all_btn;
+       search_window.prev_btn = prev_btn;
+       search_window.next_btn = next_btn;
+       search_window.close_btn = close_btn;
+       search_window.stop_btn = stop_btn;
+       search_window.matcher_list = NULL;
+       search_window.is_searching = is_searching;
 }
 
-static void summary_search_execute(GtkButton *button, gpointer data)
+static void summary_search_execute(gboolean backward, gboolean search_all)
 {
-       SummaryView *summaryview = data;
+       SummaryView *summaryview = search_window.summaryview;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCTreeNode *node;
        MsgInfo *msginfo;
-       gboolean case_sens;
-       gboolean backward;
-       gboolean search_all;
+       gboolean adv_search;
+       gboolean bool_and = FALSE;
+       gboolean case_sens = FALSE;
        gboolean all_searched = FALSE;
-       gboolean from_matched;
-       gboolean   to_matched;
-       gboolean subj_matched;
-       gboolean body_matched;
-       gchar *body_str;
-       wchar_t *wcs_hs, *fromwcs, *towcs, *subjwcs;
-       wchar_t *(* WCSFindFunc) (const wchar_t *haystack,
-                                 const wchar_t *needle);
-
-       case_sens = gtk_toggle_button_get_active
-               (GTK_TOGGLE_BUTTON(case_checkbtn));
-       backward = gtk_toggle_button_get_active
-               (GTK_TOGGLE_BUTTON(backward_checkbtn));
-       search_all = gtk_toggle_button_get_active
-               (GTK_TOGGLE_BUTTON(all_checkbtn));
-
-       if (case_sens)
-#if HAVE_WCSSTR
-               WCSFindFunc = wcsstr;
-#else
-#if HAVE_WCSWCS
-               WCSFindFunc = wcswcs;
-#else
-               WCSFindFunc = wcscasestr;
-#endif
-#endif /* HAVE_WCSSTR */
-       else
-               WCSFindFunc = wcscasestr;
+       gboolean matched = FALSE;
+       gboolean body_matched = FALSE;
+       const gchar *from_str = NULL, *to_str = NULL, *subject_str = NULL;
+       const gchar *body_str = NULL, *adv_condition = NULL;
+       StrFindFunc str_find_func = NULL;
+
+       if (summary_is_locked(summaryview)) return;
+       summary_lock(summaryview);
+
+       adv_search = gtk_toggle_button_get_active
+               (GTK_TOGGLE_BUTTON(search_window.adv_search_checkbtn));
+
+       if (adv_search) {
+               if (search_window.matcher_list != NULL) {
+                       matcherlist_free(search_window.matcher_list);
+                       search_window.matcher_list = NULL;
+               }
+               adv_condition = gtk_entry_get_text(GTK_ENTRY(search_window.adv_condition_entry));
+               if (adv_condition[0] != '\0') {
+                       search_window.matcher_list = matcher_parser_get_cond((gchar*)adv_condition);
+                       /* TODO: check for condition parsing error and show an error dialog */
+               } else {
+                       /* TODO: warn if no search condition? (or make buttons enabled only when
+                               at least one search condition has been set */
+                       summary_unlock(summaryview);
+                       return;
+               }
+       } else {
+               bool_and = GPOINTER_TO_INT
+                       (menu_get_option_menu_active_user_data
+                               (GTK_OPTION_MENU(search_window.bool_optmenu)));
+               case_sens = gtk_toggle_button_get_active
+                       (GTK_TOGGLE_BUTTON(search_window.case_checkbtn));
+
+               if (case_sens)
+                       str_find_func = str_find;
+               else
+                       str_find_func = str_case_find;
+
+               from_str    = gtk_entry_get_text(GTK_ENTRY(search_window.from_entry));
+               to_str      = gtk_entry_get_text(GTK_ENTRY(search_window.to_entry));
+               subject_str = gtk_entry_get_text(GTK_ENTRY(search_window.subject_entry));
+               body_str    = gtk_entry_get_text(GTK_ENTRY(search_window.body_entry));
+
+               if (    (from_str[0] == '\0') &&
+                               (to_str[0] == '\0') &&
+                               (subject_str[0] == '\0') &&
+                               (body_str[0] == '\0')) {
+                       /* TODO: warn if no search criteria? (or make buttons enabled only when
+                               at least one search criteria has been set */
+                       summary_unlock(summaryview);
+                       return;
+               }
+       }
 
-       fromwcs = (wchar_t *)GTK_ENTRY(from_entry)->text;
-       towcs   = (wchar_t *)GTK_ENTRY(to_entry)->text;
-       subjwcs = (wchar_t *)GTK_ENTRY(subject_entry)->text;
-       body_str = gtk_entry_get_text(GTK_ENTRY(body_entry));
+       search_window.is_searching = TRUE;
+       main_window_cursor_wait(summaryview->mainwin);
+       gtk_widget_hide(search_window.close_btn);
+       gtk_widget_show(search_window.stop_btn);
 
        if (search_all) {
                gtk_clist_freeze(GTK_CLIST(ctree));
                gtk_clist_unselect_all(GTK_CLIST(ctree));
                node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+               backward = FALSE;
        } else if (!summaryview->selected) {
                if (backward)
                        node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
                else
                        node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
 
-               if (!node) return;
+               if (!node) {
+                       search_window.is_searching = FALSE;
+                       main_window_cursor_normal(summaryview->mainwin);
+                       summary_unlock(summaryview);
+                       return;
+               }
        } else {
                if (backward)
-                       node = GTK_CTREE_NODE_PREV(summaryview->selected);
+                       node = gtkut_ctree_node_prev
+                               (ctree, summaryview->selected);
                else
-                       node = GTK_CTREE_NODE_NEXT(summaryview->selected);
+                       node = gtkut_ctree_node_next
+                               (ctree, summaryview->selected);
        }
 
-       if (*body_str)
-               main_window_cursor_wait(summaryview->mainwin);
-
-       for (;;) {
+       for (; search_window.is_searching;) {
                if (!node) {
                        gchar *str;
                        AlertValue val;
@@ -292,9 +482,10 @@ static void summary_search_execute(GtkButton *button, gpointer data)
                        }
 
                        if (all_searched) {
-                               alertpanel_message
-                                       (_("Search failed"),
-                                        _("Search string not found."));
+                               alertpanel_full(_("Search failed"),
+                                               _("Search string not found."),
+                                               GTK_STOCK_CLOSE, NULL, NULL, FALSE,
+                                               NULL, ALERT_WARNING, G_ALERTDEFAULT);
                                break;
                        }
 
@@ -304,8 +495,8 @@ static void summary_search_execute(GtkButton *button, gpointer data)
                                str = _("End of list reached; continue from beginning?");
 
                        val = alertpanel(_("Search finished"), str,
-                                        _("Yes"), _("No"), NULL);
-                       if (G_ALERTDEFAULT == val) {
+                                        GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+                       if (G_ALERTALTERNATE == val) {
                                if (backward)
                                        node = GTK_CTREE_NODE
                                                (GTK_CLIST(ctree)->row_list_end);
@@ -315,45 +506,78 @@ static void summary_search_execute(GtkButton *button, gpointer data)
 
                                all_searched = TRUE;
 
-                               manage_window_focus_in(window, NULL, NULL);
+                               manage_window_focus_in(search_window.window, NULL, NULL);
                        } else
                                break;
                }
 
-               from_matched = to_matched = subj_matched = body_matched = FALSE;
-
                msginfo = gtk_ctree_node_get_row_data(ctree, node);
-
-               if (*fromwcs && msginfo->from) {
-                       wcs_hs = strdup_mbstowcs(msginfo->from);
-                       if (wcs_hs && WCSFindFunc(wcs_hs, fromwcs) != NULL)
-                               from_matched = TRUE;
-                       g_free(wcs_hs);
-               }
-               if (*towcs && msginfo->to) {
-                       wcs_hs = strdup_mbstowcs(msginfo->to);
-                       if (wcs_hs && WCSFindFunc(wcs_hs, towcs) != NULL)
-                               to_matched = TRUE;
-                       g_free(wcs_hs);
-               }
-               if (*subjwcs && msginfo->subject) {
-                       wcs_hs = strdup_mbstowcs(msginfo->subject);
-                       if (wcs_hs && WCSFindFunc(wcs_hs, subjwcs) != NULL)
-                               subj_matched = TRUE;
-                       g_free(wcs_hs);
-               }
-               if (*body_str) {
-                       if (procmime_find_string(msginfo, body_str, case_sens))
-                               body_matched = TRUE;
+               body_matched = FALSE;
+
+               if (adv_search) {
+                       matched = matcherlist_match(search_window.matcher_list, msginfo);
+               } else {
+                       if (bool_and) {
+                               matched = TRUE;
+                               if (*from_str) {
+                                       if (!msginfo->from ||
+                                       !str_find_func(msginfo->from, from_str))
+                                               matched = FALSE;
+                               }
+                               if (matched && *to_str) {
+                                       if (!msginfo->to ||
+                                       !str_find_func(msginfo->to, to_str))
+                                               matched = FALSE;
+                               }
+                               if (matched && *subject_str) {
+                                       if (!msginfo->subject ||
+                                       !str_find_func(msginfo->subject, subject_str))
+                                               matched = FALSE;
+                               }
+                               if (matched && *body_str) {
+                                       if (procmime_find_string(msginfo, body_str,
+                                                                str_find_func))
+                                               body_matched = TRUE;
+                                       else
+                                               matched = FALSE;
+                               }
+                               if (matched && !*from_str && !*to_str &&
+                               !*subject_str && !*body_str)
+                                       matched = FALSE;
+                       } else {
+                               matched = FALSE;
+                               if (*from_str && msginfo->from) {
+                                       if (str_find_func(msginfo->from, from_str))
+                                               matched = TRUE;
+                               }
+                               if (!matched && *to_str && msginfo->to) {
+                                       if (str_find_func(msginfo->to, to_str))
+                                               matched = TRUE;
+                               }
+                               if (!matched && *subject_str && msginfo->subject) {
+                                       if (str_find_func(msginfo->subject, subject_str))
+                                               matched = TRUE;
+                               }
+                               if (!matched && *body_str) {
+                                       if (procmime_find_string(msginfo, body_str,
+                                                                str_find_func)) {
+                                               matched = TRUE;
+                                               body_matched = TRUE;
+                                       }
+                               }
+                       }
                }
 
-               if (from_matched || to_matched || subj_matched || body_matched) {
+               if (matched) {
                        if (search_all)
                                gtk_ctree_select(ctree, node);
                        else {
-                               if (summaryview->msg_is_toggled_on) {
+                               if (messageview_is_visible
+                                       (summaryview->messageview)) {
+                                       summary_unlock(summaryview);
                                        summary_select_node
-                                               (summaryview, node, TRUE, FALSE);
+                                               (summaryview, node, TRUE, TRUE);
+                                       summary_lock(summaryview);
                                        if (body_matched) {
                                                messageview_search_string
                                                        (summaryview->messageview,
@@ -361,50 +585,145 @@ static void summary_search_execute(GtkButton *button, gpointer data)
                                        }
                                } else {
                                        summary_select_node
-                                               (summaryview, node, FALSE, FALSE);
+                                               (summaryview, node, FALSE, TRUE);
                                }
                                break;
                        }
                }
 
-               node = backward ? GTK_CTREE_NODE_PREV(node)
-                               : GTK_CTREE_NODE_NEXT(node);
+               node = backward ? gtkut_ctree_node_prev(ctree, node)
+                               : gtkut_ctree_node_next(ctree, node);
+
+               GTK_EVENTS_FLUSH();
        }
 
-       if (*body_str)
-               main_window_cursor_normal(summaryview->mainwin);
+       search_window.is_searching = FALSE;
+       gtk_widget_hide(search_window.stop_btn);
+       gtk_widget_show(search_window.close_btn);
+       main_window_cursor_normal(summaryview->mainwin);
+       summary_unlock(summaryview);
 }
 
 static void summary_search_clear(GtkButton *button, gpointer data)
 {
-       gtk_editable_delete_text(GTK_EDITABLE(from_entry),    0, -1);
-       gtk_editable_delete_text(GTK_EDITABLE(to_entry),      0, -1);
-       gtk_editable_delete_text(GTK_EDITABLE(subject_entry), 0, -1);
-       gtk_editable_delete_text(GTK_EDITABLE(body_entry),    0, -1);
+       if (gtk_toggle_button_get_active
+               (GTK_TOGGLE_BUTTON(search_window.adv_search_checkbtn))) {
+               gtk_editable_delete_text(GTK_EDITABLE(search_window.adv_condition_entry),
+                                        0, -1);
+       } else {
+               gtk_editable_delete_text(GTK_EDITABLE(search_window.from_entry),
+                                        0, -1);
+               gtk_editable_delete_text(GTK_EDITABLE(search_window.to_entry),
+                                        0, -1);
+               gtk_editable_delete_text(GTK_EDITABLE(search_window.subject_entry),
+                                        0, -1);
+               gtk_editable_delete_text(GTK_EDITABLE(search_window.body_entry),
+                                        0, -1);
+       }
+       /* stop searching */
+       if (search_window.is_searching) {
+               search_window.is_searching = FALSE;
+       }
+}
+
+static void summary_search_prev_clicked(GtkButton *button, gpointer data)
+{
+       summary_search_execute(TRUE, FALSE);
+}
+
+static void summary_search_next_clicked(GtkButton *button, gpointer data)
+{
+       summary_search_execute(FALSE, FALSE);
+}
+
+static void summary_search_all_clicked(GtkButton *button, gpointer data)
+{
+       summary_search_execute(FALSE, TRUE);
+}
+
+static void adv_condition_btn_done(MatcherList * matchers)
+{
+       gchar *str;
+
+       g_return_if_fail(
+                       mainwindow_get_mainwindow()->summaryview->quicksearch != NULL);
+
+       if (matchers == NULL)
+               return;
+
+       str = matcherlist_to_string(matchers);
+
+       if (str != NULL) {
+               gtk_entry_set_text(
+                       GTK_ENTRY(search_window.adv_condition_entry), str);
+               g_free(str);
+       }
+}
+
+static void summary_search_stop_clicked(GtkButton *button, gpointer data)
+{
+       search_window.is_searching = FALSE;
 }
 
+static void adv_condition_btn_clicked(GtkButton *button, gpointer data)
+{
+       const gchar * cond_str;
+       MatcherList * matchers = NULL;
+
+       g_return_if_fail( search_window.window != NULL );
+
+       /* re-use it the current quicksearch value if it's a condition expression,
+          otherwise ignore it silently */
+       cond_str = gtk_entry_get_text(
+                       GTK_ENTRY(search_window.adv_condition_entry));
+       if (*cond_str != '\0') {
+               matchers = matcher_parser_get_cond((gchar*)cond_str);
+       }
+
+       prefs_matcher_open(matchers, adv_condition_btn_done);
+
+       if (matchers != NULL)
+               matcherlist_free(matchers);
+};
+               
 static void from_activated(void)
 {
-       gtk_widget_grab_focus(to_entry);
+       gtk_widget_grab_focus(search_window.to_entry);
 }
 
 static void to_activated(void)
 {
-       gtk_widget_grab_focus(subject_entry);
+       gtk_widget_grab_focus(search_window.subject_entry);
 }
 
 static void subject_activated(void)
 {
-       gtk_button_clicked(GTK_BUTTON(search_btn));
+       gtk_button_clicked(GTK_BUTTON(search_window.next_btn));
 }
 
 static void body_activated(void)
 {
-       gtk_button_clicked(GTK_BUTTON(search_btn));
+       gtk_button_clicked(GTK_BUTTON(search_window.next_btn));
 }
 
-static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static void adv_condition_activated(void)
 {
-       if (event && event->keyval == GDK_Escape)
-               gtk_widget_hide(window);
+       gtk_button_clicked(GTK_BUTTON(search_window.next_btn));
+}
+
+static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
+                           gpointer data)
+{
+       if (event && event->keyval == GDK_Escape) {
+               /* ESC key will:
+                       - stop a running search
+                       - close the search window if no search is running
+               */
+               if (!search_window.is_searching) {
+                       gtk_widget_hide(search_window.window);
+               } else {
+                       search_window.is_searching = FALSE;
+               }
+       }
+       return FALSE;
 }