2006-10-18 [colin] 2.5.5cvs16

	* src/prefs_common.c
	* src/prefs_common.h
	* src/summaryview.c
	* src/gtk/quicksearch.c
	* src/gtk/quicksearch.h
		Add a type-ahead option for fast searches
		Patch by Fabien Vantard

diff --git a/ChangeLog b/ChangeLog
index b40aea10f044bef0626f1a496d65b2fd5e0dded6..cbc2ecf905c1a75e4675dcec5e0c38aee0364de0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-10-18 [colin]     2.5.5cvs16
+
+       * src/prefs_common.c
+       * src/prefs_common.h
+       * src/summaryview.c
+       * src/gtk/quicksearch.c
+       * src/gtk/quicksearch.h
+               Add a type-ahead option for fast searches
+               Patch by Fabien Vantard
+
 2006-10-18 [colin]     2.5.5cvs15
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 8710376c178c4a52b8d3bc33d68e4eb421cbf5cc..ecd65bcb6f39754181d7da1ce6c146a860136ec3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2001,3 +2001,4 @@
 ( cvs diff -u -r 1.17.2.34 -r 1.17.2.35 src/send_message.c;  ) > 2.5.5cvs13.patchset
 ( cvs diff -u -r 1.382.2.316 -r 1.382.2.317 src/compose.c;  ) > 2.5.5cvs14.patchset
 ( cvs diff -u -r 1.382.2.317 -r 1.382.2.318 src/compose.c;  cvs diff -u -r 1.50.2.27 -r 1.50.2.28 src/compose.h;  ) > 2.5.5cvs15.patchset
+( cvs diff -u -r 1.204.2.105 -r 1.204.2.106 src/prefs_common.c;  cvs diff -u -r 1.103.2.63 -r 1.103.2.64 src/prefs_common.h;  cvs diff -u -r 1.395.2.263 -r 1.395.2.264 src/summaryview.c;  cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/quicksearch.h;  ) > 2.5.5cvs16.patchset

diff --git a/configure.ac b/configure.ac
index 0625d844a2b0abc7f12050033200967a64f23f18..e62a61f83a8867f1576ceeb0a6f4dbda484fff59 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=15
+EXTRA_VERSION=16
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 2d53c14474efd9b6120cecca1de6bef5313f8ec0..30121ffc17599699ccafaf6538121881a709f29c 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -63,6 +63,8 @@ struct _QuickSearch
        gboolean                         deferred_free;
        FolderItem                      *root_folder_item;
        gboolean                         is_fast;
+       gboolean                         in_typing;
+       guint                            press_timeout_id;
 };
 
 static void quicksearch_set_running(QuickSearch *quicksearch, gboolean run);
@@ -110,6 +112,7 @@ static void prepare_matcher(QuickSearch *quicksearch)
                        return;
                }
        } else {
+               quicksearch->is_fast = TRUE;
                g_free(quicksearch->search_string);
                quicksearch->search_string = g_strdup(search_string);
        }
@@ -134,10 +137,18 @@ static void update_extended_buttons (QuickSearch *quicksearch)
        }
 }
 
-static gboolean searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
-                                 QuickSearch *quicksearch)
+static gboolean searchbar_focus_evt_in(GtkWidget *widget, GdkEventFocus *event,
+                                 QuickSearch *qs)
+{
+       qs->has_focus = TRUE;
+       return FALSE;
+}
+
+static gboolean searchbar_focus_evt_out(GtkWidget *widget, GdkEventFocus *event,
+                                 QuickSearch *qs)
 {
-       quicksearch->has_focus = (event && event->in);
+       qs->has_focus = FALSE;
+       qs->in_typing = FALSE;
        return FALSE;
 }
 
@@ -146,37 +157,86 @@ gboolean quicksearch_has_focus(QuickSearch *quicksearch)
        return quicksearch->has_focus;
 }
 
-static void searchbar_run(QuickSearch *quicksearch)
+static void searchbar_run(QuickSearch *quicksearch, gboolean run_only_if_fast)
 {
        const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
 
-       if (search_string && strlen(search_string) != 0) {
-               prefs_common.summary_quicksearch_history =
-                       add_history(prefs_common.summary_quicksearch_history,
-                                       search_string);
-               gtk_combo_set_popdown_strings(GTK_COMBO(quicksearch->search_string_entry),
-                       prefs_common.summary_quicksearch_history);
+       /* add to history */
+       if (!quicksearch->in_typing && search_string && strlen(search_string) != 0) {
+               /* only if there's no syntax error */
+               if (quicksearch->matcher_list != NULL ||
+                   prefs_common.summary_quicksearch_type != QUICK_SEARCH_EXTENDED) {
+                       prefs_common.summary_quicksearch_history =
+                               add_history(prefs_common.summary_quicksearch_history,
+                                               search_string);
+                       gtk_combo_set_popdown_strings(GTK_COMBO(quicksearch->search_string_entry),
+                               prefs_common.summary_quicksearch_history);
+               }
        }
 
        prepare_matcher(quicksearch);
-
+       if (run_only_if_fast && !quicksearch->is_fast)
+               return;
+       if (quicksearch->matcher_list == NULL && 
+           prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED)
+               return;
        quicksearch_set_running(quicksearch, TRUE);
        if (quicksearch->callback != NULL)
                quicksearch->callback(quicksearch, quicksearch->callback_data);
        quicksearch_set_running(quicksearch, FALSE);
 }
 
+static int searchbar_changed_timeout(void *data)
+{
+       QuickSearch *qs = (QuickSearch *)data;
+       if (qs && prefs_common.summary_quicksearch_dynamic) {
+               qs->in_typing = TRUE;
+               searchbar_run(qs, TRUE);
+       }
+       return FALSE;
+}
+
+static gboolean searchbar_changed_cb(GtkWidget *widget, QuickSearch *qs)
+{
+       if (prefs_common.summary_quicksearch_dynamic) {
+               if (qs->press_timeout_id != -1) {
+                       gtk_timeout_remove(qs->press_timeout_id);
+               }
+               qs->press_timeout_id = gtk_timeout_add(500,
+                               searchbar_changed_timeout, qs);
+       }
+
+       return FALSE;
+}
+
 static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
                                  QuickSearch *quicksearch)
 {
        if (event != NULL && event->keyval == GDK_Escape) {
-               quicksearch_set(quicksearch, prefs_common.summary_quicksearch_type, "");
+
+               const gchar *str;
+
+               quicksearch->in_typing = FALSE;
+
+               str = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
+               g_return_val_if_fail(str != NULL, TRUE);
+
+               /* If the string entry is empty -> hide quicksearch bar. If not -> empty it */
+               if (!*str) {
+                       quicksearch_hide(quicksearch);
+               } else {
+                       quicksearch_set(quicksearch, prefs_common.summary_quicksearch_type, "");
+                       gtk_widget_grab_focus(
+                                       GTK_WIDGET(GTK_COMBO(quicksearch->search_string_entry)->entry));
+               }
+
                return TRUE;
        }
 
        if (event != NULL && event->keyval == GDK_Return) {
+               quicksearch->in_typing = FALSE;
                /* add expression to history list and exec quicksearch */
-               searchbar_run(quicksearch);
+               searchbar_run(quicksearch, FALSE);
 
                g_signal_stop_emission_by_name(G_OBJECT(widget), "key_press_event");
                return TRUE;
@@ -249,6 +309,20 @@ static gboolean searchtype_sticky_changed(GtkMenuItem *widget, gpointer data)
        return TRUE;
 }
 
+static gboolean searchtype_dynamic_changed(GtkMenuItem *widget, gpointer data)
+{
+       QuickSearch *quicksearch = (QuickSearch *)data;
+       gboolean checked = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
+
+       prefs_common.summary_quicksearch_dynamic = checked;
+
+       /* reselect the search type */
+       gtk_option_menu_set_history(GTK_OPTION_MENU(quicksearch->search_type_opt),
+                                   prefs_common.summary_quicksearch_type);
+
+       return TRUE;
+}
+
 /*
  * Strings describing how to use Extended Search
  *
@@ -347,7 +421,7 @@ static void search_condition_expr_done(MatcherList * matchers)
                g_free(str);
 
                /* add expression to history list and exec quicksearch */
-               searchbar_run(mainwindow_get_mainwindow()->summaryview->quicksearch);
+               searchbar_run(mainwindow_get_mainwindow()->summaryview->quicksearch, FALSE);
        }
 }
 
@@ -441,6 +515,16 @@ QuickSearch *quicksearch_new()
                         G_CALLBACK(searchtype_sticky_changed),
                         quicksearch);
 
+       menuitem = gtk_check_menu_item_new_with_label(_("Type-ahead"));
+       gtk_menu_shell_append(GTK_MENU_SHELL(search_type), menuitem);
+
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+                                       prefs_common.summary_quicksearch_dynamic);
+
+       g_signal_connect(G_OBJECT(menuitem), "activate",
+                        G_CALLBACK(searchtype_dynamic_changed),
+                        quicksearch);
+
        gtk_option_menu_set_menu(GTK_OPTION_MENU(search_type_opt), search_type);
 
        gtk_option_menu_set_history(GTK_OPTION_MENU(search_type_opt), prefs_common.summary_quicksearch_type);
@@ -504,13 +588,19 @@ QuickSearch *quicksearch_new()
                           "key_press_event",
                           G_CALLBACK(searchbar_pressed),
                           quicksearch);
+
+       g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry),
+                        "changed",
+                        G_CALLBACK(searchbar_changed_cb),
+                        quicksearch);
+
        g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry),
                         "focus_in_event",
-                        G_CALLBACK(searchbar_focus_evt),
+                        G_CALLBACK(searchbar_focus_evt_in),
                         quicksearch);
        g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry),
                         "focus_out_event",
-                        G_CALLBACK(searchbar_focus_evt),
+                        G_CALLBACK(searchbar_focus_evt_out),
                         quicksearch);
 
        quicksearch->hbox_search = hbox_search;
@@ -523,6 +613,8 @@ QuickSearch *quicksearch_new()
        quicksearch->active = FALSE;
        quicksearch->running = FALSE;
        quicksearch->clear_search = clear_search;
+       quicksearch->in_typing = FALSE;
+       quicksearch->press_timeout_id = -1;
 
        update_extended_buttons(quicksearch);
 
@@ -555,8 +647,14 @@ void quicksearch_set(QuickSearch *quicksearch, QuickSearchType type,
 {
        gtk_option_menu_set_history(GTK_OPTION_MENU(quicksearch->search_type_opt),
                                    type);
+
+       g_signal_handlers_block_by_func(G_OBJECT(GTK_COMBO(quicksearch->search_string_entry)->entry),
+                       G_CALLBACK(searchbar_changed_cb), quicksearch);
        gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry),
                           matchstring);
+       g_signal_handlers_unblock_by_func(G_OBJECT(GTK_COMBO(quicksearch->search_string_entry)->entry),
+                       G_CALLBACK(searchbar_changed_cb), quicksearch);
+
        prefs_common.summary_quicksearch_type = type;
 
        prepare_matcher(quicksearch);
@@ -954,7 +1052,8 @@ void quicksearch_search_subfolders(QuickSearch *quicksearch,
        FolderItem *cur = NULL;
        GNode *node = folder_item->node->children;
 
-       if (!prefs_common.summary_quicksearch_recurse)
+       if (!prefs_common.summary_quicksearch_recurse
+       ||  quicksearch->in_typing == TRUE)
                return;
 
        for (; node != NULL; node = node->next) {
@@ -998,3 +1097,8 @@ void quicksearch_reset_cur_folder_item(QuickSearch *quicksearch)
 
        quicksearch->root_folder_item = NULL;
 }
+
+gboolean quicksearch_is_in_typing(QuickSearch *quicksearch)
+{
+       return quicksearch->in_typing;
+}

diff --git a/src/gtk/quicksearch.h b/src/gtk/quicksearch.h
index 973e25e8ef19588b8b94f2f46b14f2f4fcbdfba0..55679b62a4977131aa063ff20060a4848c82dbce 100644 (file)
--- a/src/gtk/quicksearch.h
+++ b/src/gtk/quicksearch.h
@@ -52,5 +52,6 @@ void quicksearch_search_subfolders(QuickSearch *quicksearch,
                                   FolderView  *folderview,
                                   FolderItem  *folder_item);
 gboolean quicksearch_is_fast(QuickSearch *quicksearch);
+gboolean quicksearch_is_in_typing(QuickSearch *quicksearch);
 
 #endif /* QUICKSEARCH_H */

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 7a2172014f9243b776976ff4eb6e609ce8f09118..d560ba9f614a3b0603af5187598f7477fbbd962c 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -800,6 +800,8 @@ static PrefParam param[] = {
        P_INT, NULL, NULL, NULL },
        {"summary_quicksearch_sticky", "1", &prefs_common.summary_quicksearch_sticky, P_INT,
         NULL, NULL, NULL},
+       {"summary_quicksearch_dynamic", "0", &prefs_common.summary_quicksearch_dynamic, P_INT,
+        NULL, NULL, NULL},
        {"statusbar_update_step", "10", &prefs_common.statusbar_update_step, P_INT,
         NULL, NULL, NULL},
        {"compose_no_markup", "FALSE", &prefs_common.compose_no_markup, P_BOOL,

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 5a1861bb2066a40d2e76ea85e48102534dcad134..5a6b6a28ac6d1ab1df7d93d2e1724e8520462df6 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -352,6 +352,7 @@ struct _PrefsCommon
        gint summary_quicksearch_type;
        gint summary_quicksearch_sticky;
        gint summary_quicksearch_recurse;
+       gint summary_quicksearch_dynamic;
        gulong color_new;
        
        GList *summary_quicksearch_history;

diff --git a/src/summaryview.c b/src/summaryview.c
index a8e1e551a8ae0b506eae4234ff82ae4d620ef54a..74e7700163d75a76c70d77099833c6443efb84bd 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -912,7 +912,7 @@ static gboolean summary_check_consistency(FolderItem *item, GSList *mlist)
 gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCTreeNode *node = NULL;
        GSList *mlist = NULL;
        gchar *buf;
        gboolean is_refresh;
@@ -1143,28 +1143,39 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        }
 
        if (is_refresh) {
-               summaryview->last_displayed = summaryview->displayed;
-               summaryview->displayed =
-                       summary_find_msg_by_msgnum(summaryview,
-                                                  displayed_msgnum);
-               if (!summaryview->displayed)
-                       messageview_clear(summaryview->messageview);
-               summary_unlock(summaryview);
-               summary_select_by_msgnum(summaryview, selected_msgnum);
-               summary_lock(summaryview);
-               if (!summaryview->selected) {
-                       /* no selected message - select first unread
-                          message, but do not display it */
-                       node = summary_find_next_flagged_msg(summaryview, NULL,
-                                                            MSG_UNREAD, FALSE);
-                       if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
+               if (!quicksearch_is_in_typing(summaryview->quicksearch)) {
+                       summaryview->last_displayed = summaryview->displayed;
+                       summaryview->displayed =
+                               summary_find_msg_by_msgnum(summaryview,
+                                                          displayed_msgnum);
+                       if (!summaryview->displayed)
+                               messageview_clear(summaryview->messageview);
+                       summary_unlock(summaryview);
+                       summary_select_by_msgnum(summaryview, selected_msgnum);
+                       summary_lock(summaryview);
+                       if (!summaryview->selected) {
+                               /* no selected message - select first unread
+                                  message, but do not display it */
+                               node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                                    MSG_UNREAD, FALSE);
+                               if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
+                                       node = gtk_ctree_node_nth
+                                               (ctree,
+                                                item->sort_type == SORT_DESCENDING
+                                                ? 0 : GTK_CLIST(ctree)->rows - 1);
+                               summary_unlock(summaryview);
+                               summary_select_node(summaryview, node, FALSE, TRUE);
+                               summary_lock(summaryview);
+                       }
+               } else {
+                       /* just select first/last */
+                       if (GTK_CLIST(ctree)->row_list != NULL)
                                node = gtk_ctree_node_nth
                                        (ctree,
                                         item->sort_type == SORT_DESCENDING
                                         ? 0 : GTK_CLIST(ctree)->rows - 1);
-                       summary_unlock(summaryview);
-                       summary_select_node(summaryview, node, FALSE, TRUE);
-                       summary_lock(summaryview);
+                       gtk_sctree_select(GTK_SCTREE(ctree), node);
+                       gtk_ctree_node_moveto(ctree, node, 0, 0.5, 0);
                }
        } else {
                switch (prefs_common.select_on_entry) {