#include <gdk/gdkkeysyms.h>
#include "utils.h"
+#include "combobox.h"
#include "menu.h"
#include "prefs_common.h"
#include "description_window.h"
gtk_option_menu_set_history(GTK_OPTION_MENU(quicksearch->search_type_opt), index);
}
+static gchar *quicksearch_get_text(QuickSearch * quicksearch)
+{
+ gchar *search_string = gtk_editable_get_chars(GTK_EDITABLE(GTK_BIN(quicksearch->search_string_entry)->child), 0, -1);
+
+ g_strstrip(search_string);
+ return search_string;
+}
+
static void prepare_matcher(QuickSearch *quicksearch)
{
- const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
+ gchar *search_string = quicksearch_get_text(quicksearch);
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;
}
} 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) {
quicksearch->matcher_list = matcher_parser_get_cond(newstr, &quicksearch->is_fast);
g_free(newstr);
g_free(quicksearch->search_string);
- quicksearch->search_string = g_strdup(search_string);
+ quicksearch->search_string = g_utf8_casefold(search_string, -1);
} else {
quicksearch->is_fast = TRUE;
g_free(quicksearch->search_string);
- quicksearch->search_string = g_strdup(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)
{
- const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
+ gchar *search_string = quicksearch_get_text(quicksearch);
/* add to history */
if (!quicksearch->in_typing && search_string && strlen(search_string) != 0) {
+ combobox_unset_popdown_strings(GTK_COMBO_BOX(quicksearch->search_string_entry));
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),
+ combobox_set_popdown_strings(GTK_COMBO_BOX(quicksearch->search_string_entry),
prefs_common.summary_quicksearch_history);
}
prepare_matcher(quicksearch);
- if (run_only_if_fast && !quicksearch->is_fast)
+ if (run_only_if_fast && !quicksearch->is_fast) {
+ g_free(search_string);
return;
+ }
if (quicksearch->matcher_list == NULL &&
prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED &&
- search_string && strlen(search_string) != 0)
+ search_string && strlen(search_string) != 0) {
+ g_free(search_string);
return;
+ }
quicksearch_set_running(quicksearch, TRUE);
if (quicksearch->callback != NULL)
quicksearch->callback(quicksearch, quicksearch->callback_data);
quicksearch_set_running(quicksearch, FALSE);
+ g_free(search_string);
}
static int searchbar_changed_timeout(void *data)
return FALSE;
}
-static gboolean searchbar_changed_cb(GtkWidget *widget, QuickSearch *qs)
+static void searchbar_changed_cb(GtkWidget *widget, QuickSearch *qs)
{
if (!qs->has_focus && prefs_common.summary_quicksearch_autorun) {
gtk_widget_grab_focus(qs->search_string_entry);
searchbar_run(qs, TRUE);
- return FALSE;
+ return;
}
if (prefs_common.summary_quicksearch_dynamic) {
searchbar_changed_timeout, qs);
}
- return FALSE;
+ if (!qs->has_focus)
+ gtk_widget_grab_focus(qs->search_string_entry);
}
static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
QuickSearch *quicksearch)
{
- if (event != NULL && event->keyval == GDK_Escape) {
-
- const gchar *str;
+ if (event && (event->keyval == GDK_Escape)) {
+ gchar *str;
quicksearch->in_typing = FALSE;
- str = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
+ str = quicksearch_get_text(quicksearch);
g_return_val_if_fail(str != NULL, TRUE);
/* If the string entry is empty -> hide quicksearch bar. If not -> empty it */
gtk_widget_grab_focus(
mainwindow_get_mainwindow()->summaryview->ctree);
}
-
+ g_free(str);
return TRUE;
}
- if (event != NULL && event->keyval == GDK_Return) {
+ if (event != NULL && (event->keyval == GDK_Return || event->keyval == GDK_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)) {
+ combobox_set_value_from_arrow_key(
+ GTK_COMBO_BOX(quicksearch->search_string_entry),
+ event->keyval);
+ return TRUE;
+ }
+
return FALSE;
}
static gboolean searchtype_changed(GtkMenuItem *widget, gpointer data)
{
QuickSearch *quicksearch = (QuickSearch *)data;
- const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
+ gchar *search_string = quicksearch_get_text(quicksearch);
prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(g_object_get_data(
G_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
/* Show extended search description button, only when Extended is selected */
update_extended_buttons(quicksearch);
- if (!search_string || strlen(search_string) == 0) {
+ if (!search_string || *(search_string) == 0) {
+ g_free(search_string);
return TRUE;
}
if (quicksearch->callback != NULL)
quicksearch->callback(quicksearch, quicksearch->callback_data);
quicksearch_set_running(quicksearch, FALSE);
+ g_free(search_string);
return TRUE;
}
{
QuickSearch *quicksearch = (QuickSearch *)data;
gboolean checked = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
- const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
+ gchar *search_string = quicksearch_get_text(quicksearch);
prefs_common.summary_quicksearch_recurse = checked;
/* reselect the search type */
quicksearch_set_type(quicksearch, prefs_common.summary_quicksearch_type);
- if (!search_string || strlen(search_string) == 0) {
+ if (!search_string || *(search_string) == 0) {
+ g_free(search_string);
return TRUE;
}
if (quicksearch->callback != NULL)
quicksearch->callback(quicksearch, quicksearch->callback_data);
quicksearch_set_running(quicksearch, FALSE);
+ g_free(search_string);
return TRUE;
}
2,
N_("Extended Search"),
N_("Extended Search allows the user to define criteria that messages must "
- "have in order to match and be displayed in the message list.\n\n"
+ "have in order to match and be displayed in the message list.\n"
"The following symbols can be used:"),
search_descr_strings
};
static gboolean search_condition_expr(GtkMenuItem *widget, gpointer data)
{
- const gchar * cond_str;
+ gchar * cond_str;
MatcherList * matchers = NULL;
g_return_val_if_fail(
mainwindow_get_mainwindow()->summaryview->quicksearch != NULL,
FALSE);
- /* re-use it the current quicksearch value if it's a condition expression,
+ /* re-use the current quicksearch value if it's a condition expression,
otherwise ignore it silently */
- cond_str = gtk_entry_get_text(
- GTK_ENTRY(GTK_COMBO(mainwindow_get_mainwindow()->summaryview->quicksearch->
- search_string_entry)->entry));
+ cond_str = quicksearch_get_text(mainwindow_get_mainwindow()->summaryview->quicksearch);
+
if (*cond_str != '\0') {
matchers = matcher_parser_get_cond((gchar*)cond_str, NULL);
}
if (matchers != NULL)
matcherlist_free(matchers);
+ g_free(cond_str);
+
return TRUE;
};
GtkWidget *search_condition_expression;
GtkWidget *menuitem;
GtkTooltips *tips = gtk_tooltips_new();
+ GtkWidget *vbox;
quicksearch = g_new0(QuickSearch, 1);
gtk_widget_show(search_type);
- search_string_entry = gtk_combo_new();
- gtk_box_pack_start(GTK_BOX(hbox_search), search_string_entry, FALSE, FALSE, 2);
- gtk_combo_set_value_in_list(GTK_COMBO(search_string_entry), FALSE, TRUE);
- gtk_combo_set_case_sensitive(GTK_COMBO(search_string_entry), TRUE);
+ search_string_entry = gtk_combo_box_entry_new_text ();
+ gtk_combo_box_set_active(GTK_COMBO_BOX(search_string_entry), -1);
if (prefs_common.summary_quicksearch_history)
- gtk_combo_set_popdown_strings(GTK_COMBO(search_string_entry),
+ combobox_set_popdown_strings(GTK_COMBO_BOX(search_string_entry),
prefs_common.summary_quicksearch_history);
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(search_string_entry)->entry), "");
+
+ vbox = gtk_vbox_new(TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), search_string_entry, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox_search), vbox, FALSE, FALSE, 4);
+
+ gtk_widget_show(vbox);
gtk_widget_show(search_string_entry);
search_hbox = gtk_hbox_new(FALSE, 5);
gtk_box_pack_start(GTK_BOX(hbox_search), search_hbox, FALSE, FALSE, 2);
gtk_widget_show(search_hbox);
- g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry),
+ g_signal_connect(G_OBJECT(GTK_BIN(search_string_entry)->child),
"key_press_event",
G_CALLBACK(searchbar_pressed),
quicksearch);
- g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry),
+ g_signal_connect(G_OBJECT(GTK_BIN(search_string_entry)->child),
"changed",
G_CALLBACK(searchbar_changed_cb),
quicksearch);
- g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry),
+ g_signal_connect(G_OBJECT(GTK_BIN(search_string_entry)->child),
"focus_in_event",
G_CALLBACK(searchbar_focus_evt_in),
quicksearch);
- g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry),
+ g_signal_connect(G_OBJECT(GTK_BIN(search_string_entry)->child),
"focus_out_event",
G_CALLBACK(searchbar_focus_evt_out),
quicksearch);
gtk_widget_show(quicksearch->hbox_search);
update_extended_buttons(quicksearch);
gtk_widget_grab_focus(
- GTK_WIDGET(GTK_COMBO(quicksearch->search_string_entry)->entry));
+ GTK_WIDGET(GTK_BIN(quicksearch->search_string_entry)->child));
GTK_EVENTS_FLUSH();
if (!matchstring || !(*matchstring))
quicksearch->in_typing = FALSE;
- g_signal_handlers_block_by_func(G_OBJECT(GTK_COMBO(quicksearch->search_string_entry)->entry),
+ g_signal_handlers_block_by_func(G_OBJECT(GTK_BIN(quicksearch->search_string_entry)->child),
G_CALLBACK(searchbar_changed_cb), quicksearch);
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry),
+ gtk_entry_set_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child),
matchstring);
- g_signal_handlers_unblock_by_func(G_OBJECT(GTK_COMBO(quicksearch->search_string_entry)->entry),
+ g_signal_handlers_unblock_by_func(G_OBJECT(GTK_BIN(quicksearch->search_string_entry)->child),
G_CALLBACK(searchbar_changed_cb), quicksearch);
prefs_common.summary_quicksearch_type = type;
gtk_widget_set_sensitive(quicksearch->clear_search, TRUE);
if (colors_initialised) {
gtk_widget_modify_base(
- GTK_COMBO(quicksearch->search_string_entry)->entry,
+ GTK_BIN(quicksearch->search_string_entry)->child,
GTK_STATE_NORMAL, error ? &red : &yellow);
gtk_widget_modify_text(
- GTK_COMBO(quicksearch->search_string_entry)->entry,
+ GTK_BIN(quicksearch->search_string_entry)->child,
GTK_STATE_NORMAL, &black);
}
} else {
gtk_widget_set_sensitive(quicksearch->clear_search, FALSE);
if (colors_initialised) {
gtk_widget_modify_base(
- GTK_COMBO(quicksearch->search_string_entry)->entry,
+ GTK_BIN(quicksearch->search_string_entry)->child,
GTK_STATE_NORMAL, NULL);
gtk_widget_modify_text(
- GTK_COMBO(quicksearch->search_string_entry)->entry,
+ GTK_BIN(quicksearch->search_string_entry)->child,
GTK_STATE_NORMAL, NULL);
}
}
{
gchar *searched_header = NULL;
gboolean result = FALSE;
+ gchar *to = NULL, *from = NULL, *subject = NULL;
if (!quicksearch->active)
return TRUE;
switch (prefs_common.summary_quicksearch_type) {
case QUICK_SEARCH_SUBJECT:
- searched_header = msginfo->subject;
+ if (msginfo->subject)
+ searched_header = g_utf8_casefold(msginfo->subject, -1);
+ else
+ return FALSE;
break;
case QUICK_SEARCH_FROM:
- searched_header = msginfo->from;
+ if (msginfo->from)
+ searched_header = g_utf8_casefold(msginfo->from, -1);
+ else
+ return FALSE;
break;
case QUICK_SEARCH_TO:
- searched_header = msginfo->to;
+ if (msginfo->to)
+ searched_header = g_utf8_casefold(msginfo->to, -1);
+ else
+ return FALSE;
break;
case QUICK_SEARCH_MIXED:
+ if (msginfo->to)
+ to = g_utf8_casefold(msginfo->to, -1);
+ if (msginfo->from)
+ from = g_utf8_casefold(msginfo->from, -1);
+ if (msginfo->subject)
+ subject = g_utf8_casefold(msginfo->subject, -1);
break;
case QUICK_SEARCH_EXTENDED:
break;
debug_print("unknown search type (%d)\n", prefs_common.summary_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 &&
quicksearch->search_string &&
- searched_header && strcasestr(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 &&
quicksearch->search_string && (
- (msginfo->to && strcasestr(msginfo->to, quicksearch->search_string) != NULL) ||
- (msginfo->from && strcasestr(msginfo->from, quicksearch->search_string) != NULL) ||
- (msginfo->subject && strcasestr(msginfo->subject, quicksearch->search_string) != NULL) ||
+ (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)) ))
result = TRUE;
prepare_matcher(quicksearch);
}
+ g_free(to);
+ g_free(from);
+ g_free(subject);
+ g_free(searched_header);
+
return result;
}
newstr = g_realloc(newstr,o_len+n_len+1);
strcpy(newstr+o_len, "|tag regexpcase \"");
strcpy(newstr+o_len+(s_len-1), words[i]);
- strcpy(newstr+o_len+s_len, "\"");
+ strcpy(newstr+o_len+(n_len-1), "\"");
}
i++;
}
void quicksearch_pass_key(QuickSearch *quicksearch, guint val, GdkModifierType mod)
{
- GtkEntry *entry = GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry);
+ GtkEntry *entry = GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child);
glong curpos = gtk_editable_get_position(GTK_EDITABLE(entry));
guint32 c;
char *str = g_strdup(gtk_entry_get_text(entry));
projects / claws.git / blobdiff