/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Colin Leroy <colin@colino.net>
+ * Copyright (C) 1999-2011 Colin Leroy <colin@colino.net>
* and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
+#if !GTK_CHECK_VERSION(3, 0, 0)
#include "gtkcmoptionmenu.h"
+#endif
#include "utils.h"
#include "combobox.h"
#include "menu.h"
#include "claws.h"
#include "statusbar.h"
+struct _QuickSearchRequest
+{
+ QuickSearchType type;
+ gchar *matchstring;
+ FolderItem *folderItem;
+ gboolean recursive;
+};
+typedef struct _QuickSearchRequest QuickSearchRequest;
+
struct _QuickSearch
{
GtkWidget *hbox_search;
GtkWidget *search_type;
+#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget *search_type_opt;
+#endif
GtkWidget *search_string_entry;
GtkWidget *search_condition_expression;
GtkWidget *search_description;
gchar *search_string;
MatcherList *matcher_list;
+ QuickSearchRequest *request;
QuickSearchExecuteCallback callback;
gpointer callback_data;
gboolean running;
/* dynamic and autorun qs settings are exclusive*/
GtkWidget *dynamic_menuitem;
GtkWidget *autorun_menuitem;
+
+ gboolean gui;
};
static void quicksearch_set_running(QuickSearch *quicksearch, gboolean run);
+static void quicksearch_set_matchstring(QuickSearch *quicksearch, const gchar *matchstring);
static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active);
static void quicksearch_reset_folder_items(QuickSearch *quicksearch, FolderItem *folder_item);
static gchar *expand_search_string(const gchar *str);
static gchar *expand_tag_search_string(const gchar *str);
+static gboolean quicksearch_from_gui(QuickSearch *quicksearch)
+{
+ return quicksearch->gui;
+}
+
gboolean quicksearch_is_fast(QuickSearch *quicksearch)
{
return quicksearch->is_fast;
}
+void quicksearch_set_recursive(QuickSearch *quicksearch, gboolean recursive)
+{
+ quicksearch->request->recursive = recursive;
+}
+
static void quicksearch_set_type(QuickSearch *quicksearch, gint type)
{
+#if !GTK_CHECK_VERSION(3, 0, 0)
gint index;
+ quicksearch->request->type = type;
+ if (quicksearch->gui == FALSE)
+ return;
index = menu_find_option_menu_index(GTK_CMOPTION_MENU(quicksearch->search_type_opt),
GINT_TO_POINTER(type),
NULL);
gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(quicksearch->search_type_opt), index);
+#endif
}
static gchar *quicksearch_get_text(QuickSearch * quicksearch)
static void prepare_matcher(QuickSearch *quicksearch)
{
- gchar *search_string = quicksearch_get_text(quicksearch);
+ /* param search_string is "matchstring" */
+ const gchar *search_string;
+ QuickSearchType quicksearch_type;
+
+ if (quicksearch == NULL)
+ return;
+
+ /* When called from the GUI, reset type and matchstring */
+ if (quicksearch_from_gui(quicksearch)) {
+ gchar *s = quicksearch_get_text(quicksearch);
+ quicksearch_set_matchstring(quicksearch, s);
+ g_free(s);
+ quicksearch->request->type = prefs_common.summary_quicksearch_type;
+ }
+ quicksearch_type = quicksearch->request->type;
+ search_string = quicksearch->request->matchstring;
if (search_string == NULL || search_string[0] == '\0') {
quicksearch_set_active(quicksearch, FALSE);
if (quicksearch->matcher_list != NULL) {
if (quicksearch->matching) {
quicksearch->deferred_free = TRUE;
- g_free(search_string);
return;
}
quicksearch->deferred_free = FALSE;
}
if (search_string == NULL || search_string[0] == '\0') {
- g_free(search_string);
return;
}
-
- if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED) {
+ if (quicksearch_type == QUICK_SEARCH_EXTENDED) {
char *newstr = NULL;
newstr = expand_search_string(search_string);
} else {
quicksearch->matcher_list = NULL;
quicksearch_set_active(quicksearch, FALSE);
- g_free(search_string);
return;
}
- } else if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_TAG) {
+ } else if (quicksearch_type == QUICK_SEARCH_TAG) {
char *newstr = expand_tag_search_string(search_string);
quicksearch->matcher_list = matcher_parser_get_cond(newstr, &quicksearch->is_fast);
g_free(newstr);
- } else if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_MIXED) {
+ } else if (quicksearch_type == QUICK_SEARCH_MIXED) {
char *newstr = expand_tag_search_string(search_string);
quicksearch->matcher_list = matcher_parser_get_cond(newstr, &quicksearch->is_fast);
g_free(newstr);
g_free(quicksearch->search_string);
quicksearch->search_string = g_utf8_casefold(search_string, -1);
}
-
- g_free(search_string);
quicksearch_set_active(quicksearch, TRUE);
}
static void searchbar_run(QuickSearch *quicksearch, gboolean run_only_if_fast)
{
gchar *search_string = quicksearch_get_text(quicksearch);
-
+ quicksearch_set_matchstring(quicksearch, search_string);
prepare_matcher(quicksearch);
/* add to history, for extended search add only correct matching rules */
if (quicksearch->matcher_list) {
quicksearch->extended_search_strings =
add_history(quicksearch->extended_search_strings,
- search_string);
+ g_strdup(search_string));
prefs_common.summary_quicksearch_history =
add_history(prefs_common.summary_quicksearch_history,
- search_string);
+ g_strdup(search_string));
}
break;
default:
quicksearch->normal_search_strings =
add_history(quicksearch->normal_search_strings,
- search_string);
+ g_strdup(search_string));
prefs_common.summary_quicksearch_history =
add_history(prefs_common.summary_quicksearch_history,
- search_string);
+ g_strdup(search_string));
break;
}
static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
QuickSearch *quicksearch)
{
- if (event && (event->keyval == GDK_Escape)) {
+ if (event && (event->keyval == GDK_KEY_Escape)) {
gchar *str;
quicksearch->in_typing = FALSE;
return TRUE;
}
- if (event != NULL && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)) {
+ if (event != NULL && (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter)) {
if (quicksearch->press_timeout_id != -1) {
g_source_remove(quicksearch->press_timeout_id);
quicksearch->press_timeout_id = -1;
return TRUE;
}
- if (event && (event->keyval == GDK_Down || event->keyval == GDK_Up)) {
+ if (event && (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_Up)) {
combobox_set_value_from_arrow_key(
GTK_COMBO_BOX(quicksearch->search_string_entry),
event->keyval);
{
QuickSearch *quicksearch = (QuickSearch *)data;
gchar *search_string = quicksearch_get_text(quicksearch);
+ quicksearch_set_matchstring(quicksearch, search_string);
prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(g_object_get_data(
G_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
QuickSearch *quicksearch = (QuickSearch *)data;
gboolean checked = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
gchar *search_string = quicksearch_get_text(quicksearch);
+ /* not needed to quicksearch_set_matchstring(search_string);
+ wait for prepare_matcher() */
prefs_common.summary_quicksearch_recurse = checked;
+ quicksearch_set_recursive(quicksearch, checked);
/* reselect the search type */
quicksearch_set_type(quicksearch, prefs_common.summary_quicksearch_type);
gtk_widget_show_all(box);
}
+/*
+ * Builds a new QuickSearchRequest
+ */
+static QuickSearchRequest *quicksearchrequest_new(void)
+{
+ QuickSearchRequest *request;
+ request = g_new0(QuickSearchRequest, 1);
+ return request;
+}
+
+/*
+ * Builds a new QuickSearch object independent from the GUI
+ */
+QuickSearch *quicksearch_new_nogui(void)
+{
+ QuickSearch *quicksearch;
+ QuickSearchRequest *request;
+
+ request = quicksearchrequest_new();
+ quicksearch = g_new0(QuickSearch, 1);
+ quicksearch->request = request;
+ quicksearch->gui = FALSE;
+
+ /* init. values initally found in quicksearch_new().
+ There's no need to init. all pointers to NULL since we use g_new0
+ */
+ quicksearch->matcher_list = NULL;
+ quicksearch->active = FALSE;
+ quicksearch->running = FALSE;
+ quicksearch->in_typing = FALSE;
+ quicksearch->press_timeout_id = -1;
+ quicksearch->normal_search_strings = NULL;
+ quicksearch->extended_search_strings = NULL;
+
+ return quicksearch;
+}
+
QuickSearch *quicksearch_new()
{
QuickSearch *quicksearch;
GtkWidget *hbox_search;
+#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget *search_type_opt;
+#endif
GtkWidget *search_type;
GtkWidget *search_string_entry;
GtkWidget *search_hbox;
CLAWS_TIP_DECL();
GtkWidget *vbox;
- quicksearch = g_new0(QuickSearch, 1);
+ quicksearch = quicksearch_new_nogui();
+ quicksearch->gui = TRUE;
/* quick search */
hbox_search = gtk_hbox_new(FALSE, 0);
+#if !GTK_CHECK_VERSION(3, 0, 0)
search_type_opt = gtk_cmoption_menu_new();
gtk_widget_show(search_type_opt);
gtk_box_pack_start(GTK_BOX(hbox_search), search_type_opt, FALSE, FALSE, 0);
+#endif
search_type = gtk_menu_new();
MENUITEM_ADD (search_type, menuitem,
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
prefs_common.summary_quicksearch_recurse);
-
+ quicksearch_set_recursive(quicksearch, prefs_common.summary_quicksearch_recurse);
g_signal_connect(G_OBJECT(menuitem), "activate",
G_CALLBACK(searchtype_recursive_changed),
quicksearch);
G_CALLBACK(searchtype_autorun_changed),
quicksearch);
+#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_cmoption_menu_set_menu(GTK_CMOPTION_MENU(search_type_opt), search_type);
quicksearch->search_type_opt = search_type_opt;
+#endif
quicksearch_set_type(quicksearch, prefs_common.summary_quicksearch_type);
gtk_widget_show(search_type);
gtk_widget_show(search_string_entry);
search_hbox = gtk_hbox_new(FALSE, 5);
-
clear_search = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
gtk_box_pack_start(GTK_BOX(search_hbox), clear_search,
FALSE, FALSE, 0);
quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO, _("_Information"));
quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, _("_Edit"));
- quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR, _("_Clear"));
+ quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR, _("C_lear"));
update_extended_buttons(quicksearch);
case WIDE_MSGLIST_LAYOUT:
quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO, _("_Information"));
quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, _("_Edit"));
- quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR, _("_Clear"));
+ quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR, _("C_lear"));
break;
+ case SMALL_LAYOUT:
case VERTICAL_LAYOUT:
quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO, "");
quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, "");
gtk_widget_hide(quicksearch->hbox_search);
}
+/*
+ *\brief Sets the matchstring.
+ *
+ *\param quicksearch quicksearch to set
+ *\param matchstring the match string; it is duplicated, not stored
+ */
+static void quicksearch_set_matchstring(QuickSearch *quicksearch,
+ const gchar *matchstring)
+{
+ g_free(quicksearch->request->matchstring);
+ quicksearch->request->matchstring = g_strdup(matchstring);
+}
+
void quicksearch_set(QuickSearch *quicksearch, QuickSearchType type,
const gchar *matchstring)
{
if (!matchstring || !(*matchstring))
quicksearch->in_typing = FALSE;
+ quicksearch_set_matchstring(quicksearch, matchstring);
+
+ if (!quicksearch_from_gui(quicksearch)) {
+ prepare_matcher(quicksearch);
+ /* no callback */
+ return;
+ }
+
g_signal_handlers_block_by_func(G_OBJECT(gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry)))),
- G_CALLBACK(searchbar_changed_cb), quicksearch);
+ G_CALLBACK(searchbar_changed_cb), quicksearch);
gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry)))),
matchstring);
g_signal_handlers_unblock_by_func(G_OBJECT(gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry)))),
- G_CALLBACK(searchbar_changed_cb), quicksearch);
+ G_CALLBACK(searchbar_changed_cb), quicksearch);
prefs_common.summary_quicksearch_type = type;
static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active)
{
+#if !GTK_CHECK_VERSION(3, 0, 0)
static GdkColor yellow;
static GdkColor red;
static GdkColor black;
static gboolean colors_initialised = FALSE;
+#else
+ static GdkColor yellow = { (guint32)0, (guint16)0xf5, (guint16)0xf6, (guint16)0xbe };
+ static GdkColor red = { (guint32)0, (guint16)0xff, (guint16)0x70, (guint16)0x70 };
+ static GdkColor black = { (guint32)0, (guint16)0x0, (guint16)0x0, (guint16)0x0 };
+#endif
gboolean error = FALSE;
+
+ quicksearch->active = active;
+ if (quicksearch->gui == FALSE)
+ return;
+
+#if !GTK_CHECK_VERSION(3, 0, 0)
if (!colors_initialised) {
gdk_color_parse("#f5f6be", &yellow);
gdk_color_parse("#000000", &black);
colors_initialised &= gdk_colormap_alloc_color(
gdk_colormap_get_system(), &red, FALSE, TRUE);
}
-
- quicksearch->active = active;
+#endif
if (active &&
(prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED
if (active) {
gtk_widget_set_sensitive(quicksearch->clear_search, TRUE);
+#if !GTK_CHECK_VERSION(3, 0, 0)
if (colors_initialised) {
+#endif
gtk_widget_modify_base(
gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry))),
GTK_STATE_NORMAL, error ? &red : &yellow);
gtk_widget_modify_text(
gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry))),
GTK_STATE_NORMAL, &black);
+#if !GTK_CHECK_VERSION(3, 0, 0)
}
+#endif
} else {
gtk_widget_set_sensitive(quicksearch->clear_search, FALSE);
if (colors_initialised) {
gtk_widget_modify_text(
gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry))),
GTK_STATE_NORMAL, NULL);
+#if !GTK_CHECK_VERSION(3, 0, 0)
}
+#endif
}
if (!active) {
gchar *searched_header = NULL;
gboolean result = FALSE;
gchar *to = NULL, *from = NULL, *subject = NULL;
+ QuickSearchType quicksearch_type;
if (!quicksearch->active)
return TRUE;
- switch (prefs_common.summary_quicksearch_type) {
+ quicksearch_type = quicksearch->request->type;
+
+ switch (quicksearch_type) {
case QUICK_SEARCH_SUBJECT:
if (msginfo->subject)
searched_header = g_utf8_casefold(msginfo->subject, -1);
case QUICK_SEARCH_EXTENDED:
break;
default:
- debug_print("unknown search type (%d)\n", prefs_common.summary_quicksearch_type);
+ debug_print("unknown search type (%d)\n", quicksearch_type);
break;
}
quicksearch->matching = TRUE;
- if (prefs_common.summary_quicksearch_type != QUICK_SEARCH_EXTENDED &&
- prefs_common.summary_quicksearch_type != QUICK_SEARCH_MIXED &&
- prefs_common.summary_quicksearch_type != QUICK_SEARCH_TAG &&
+ if (quicksearch_type != QUICK_SEARCH_EXTENDED &&
+ quicksearch_type != QUICK_SEARCH_MIXED &&
+ quicksearch_type != QUICK_SEARCH_TAG &&
quicksearch->search_string &&
- searched_header && strstr(searched_header, quicksearch->search_string) != NULL)
+ searched_header && strstr(searched_header, quicksearch->search_string) != NULL)
result = TRUE;
- else if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_MIXED &&
+ else if (quicksearch_type == QUICK_SEARCH_MIXED &&
quicksearch->search_string && (
(to && strstr(to, quicksearch->search_string) != NULL) ||
(from && strstr(from, quicksearch->search_string) != NULL) ||
(subject && strstr(subject, quicksearch->search_string) != NULL) ||
((quicksearch->matcher_list != NULL) &&
- matcherlist_match(quicksearch->matcher_list, msginfo)) ))
+ matcherlist_match(quicksearch->matcher_list, msginfo)) ))
result = TRUE;
else if ((quicksearch->matcher_list != NULL) &&
- matcherlist_match(quicksearch->matcher_list, msginfo))
+ matcherlist_match(quicksearch->matcher_list, msginfo))
result = TRUE;
quicksearch->matching = FALSE;
- if (quicksearch->deferred_free) {
+ if (quicksearch_from_gui(quicksearch)==TRUE && quicksearch->deferred_free) {
+ /* Ref. http://lists.claws-mail.org/pipermail/users/2010-August/003063.html
+ See also 2.0.0cvs140 ChangeLog entry
+ and comment in search_msgs_in_folder() */
prepare_matcher(quicksearch);
}
quicksearch->normal_search_strings =
g_list_append(
quicksearch->normal_search_strings,
- strings->data);
+ g_strdup(strings->data));
g_free(newstr);
continue;
}
quicksearch_set_popdown_strings(quicksearch);
}
+
+/*
+ * Searches in the supplied folderItem the messages (MessageInfo) matching a
+ * QuickSearchType + search string (ex.: QUICK_SEARCH_FROM and "foo@bar.com").
+ *
+ * Found messages are appended to the array 'messages' and their ref.counts
+ * are incremented by 1 --so they need to be released (procmsg_msginfo_free())
+ * before the array 'messages' is freed.
+ */
+void search_msgs_in_folder(GSList **messages, QuickSearch* quicksearch,
+ FolderItem* folderItem)
+{
+ /* from quicksearch_match_subfolder */
+ GSList *msglist = NULL;
+ GSList *cur;
+
+ /* The list is built w/ MsgInfo items whose ref.counts are incremented,
+ but they are decremented when the list is freed by
+ procmsg_msg_list_free(): we'll ask for a new ref., below
+ */
+ msglist = folder_item_get_msg_list(folderItem);
+
+ for (cur = msglist; cur != NULL; cur = cur->next) {
+ MsgInfo *msg = (MsgInfo *)cur->data;
+ if (quicksearch_match(quicksearch, msg)) {
+ /*debug_print("found: %s from:%s\n",procmsg_get_message_file_path(msg),msg->from);*/
+ *messages = g_slist_prepend(*messages, procmsg_msginfo_new_ref(msg));
+ }
+ /* See 2.0.0cvs140 ChangeLog entry for details
+ see also comments in quicksearch_match() */
+ if (quicksearch_from_gui(quicksearch)==TRUE
+ && !quicksearch_is_active(quicksearch))
+ break;
+ }
+ procmsg_msg_list_free(msglist);
+}
+
+/*
+ * Searches within the folderItem and its sub-folders (if recursive is TRUE)
+ * the messages matching the search request.
+ *
+ * NB: search within a Folder can be done this way:
+ * search_msg_in_folders(messages, quicksearch, searchType,
+ * FOLDER_ITEM(folder->node->data), TRUE);
+ */
+void search_msgs_in_folders(GSList **messages, QuickSearch* quicksearch,
+ FolderItem* folderItem)
+{
+ FolderItem *cur = NULL;
+
+ search_msgs_in_folder(messages, quicksearch, folderItem);
+ if (quicksearch->request->recursive == FALSE)
+ return;
+
+ GNode *node = folderItem->node->children;
+ for (; node != NULL; node = node->next) {
+ cur = FOLDER_ITEM(node->data);
+ debug_print("in: %s\n",cur->path);
+ if (cur->node->children)
+ search_msgs_in_folders(messages, quicksearch, cur);
+ else
+ search_msgs_in_folder(messages, quicksearch, cur);
+ }
+ *messages = g_slist_reverse(*messages);
+}
+
+ /*
+ * Returns the QuickSearchType associated to the supplied string.
+ */
+QuickSearchType quicksearch_type(const gchar* type)
+{
+ QuickSearchType searchType = QUICK_SEARCH_EXTENDED;
+ if (!type)
+ return searchType;
+ switch(toupper(*type)) {
+ case 'S':
+ searchType = QUICK_SEARCH_SUBJECT;
+ break;
+ case 'F':
+ searchType = QUICK_SEARCH_FROM;
+ break;
+ case 'T':
+ searchType = QUICK_SEARCH_TO;
+ break;
+ case 'E':
+ searchType = QUICK_SEARCH_EXTENDED;
+ break;
+ case 'M':
+ searchType = QUICK_SEARCH_MIXED;
+ break;
+ case 'G':
+ searchType = QUICK_SEARCH_TAG;
+ break;
+ }
+ return searchType;
+}
projects / claws.git / blobdiff