diff options
Diffstat (limited to 'gtk/hostlist_table.c')
| -rw-r--r-- | gtk/hostlist_table.c | 136 |
1 files changed, 23 insertions, 113 deletions
diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c index 6287cc7f82..3894054cd0 100644 --- a/gtk/hostlist_table.c +++ b/gtk/hostlist_table.c @@ -44,10 +44,9 @@ #include "../color.h" #include "gtk/hostlist_table.h" -#include "gtk/find_dlg.h" -#include "gtk/color_dlg.h" +#include "gtk/filter_utils.h" #include "gtk/gtkglobals.h" -#include "gtk/main.h" + #include "gtk/gui_utils.h" #include "gtk/dlg_utils.h" #include "gtk/help_dlg.h" @@ -56,8 +55,6 @@ #include "image/clist_descend.xpm" -#define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a)) - #define NUM_COLS 8 #define HOST_PTR_KEY "hostlist-pointer" #define NB_PAGES_KEY "notebook-pages" @@ -312,49 +309,14 @@ hostlist_click_column_cb(GtkCList *clist, gint column, gpointer data) gtk_clist_freeze(clist); } - -/* Filter actions */ -#define ACTION_MATCH 0 -#define ACTION_PREPARE 1 -#define ACTION_FIND_FRAME 2 -#define ACTION_FIND_NEXT 3 -#define ACTION_FIND_PREVIOUS 4 -#define ACTION_COLORIZE 5 - -/* Action type - says what to do with the filter */ -#define ACTYPE_SELECTED 0 -#define ACTYPE_NOT_SELECTED 1 -#define ACTYPE_AND_SELECTED 2 -#define ACTYPE_OR_SELECTED 3 -#define ACTYPE_AND_NOT_SELECTED 4 -#define ACTYPE_OR_NOT_SELECTED 5 - -/* Encoded callback arguments */ -#define CALLBACK_MATCH(type) ((ACTION_MATCH<<8) | (type)) -#define CALLBACK_PREPARE(type) ((ACTION_PREPARE<<8) | (type)) -#define CALLBACK_FIND_FRAME(type) ((ACTION_FIND_FRAME<<8) | (type)) -#define CALLBACK_FIND_NEXT(type) ((ACTION_FIND_NEXT<<8) | (type)) -#define CALLBACK_FIND_PREVIOUS(type) ((ACTION_FIND_PREVIOUS<<8) | (type)) -#define CALLBACK_COLORIZE(type) ((ACTION_COLORIZE<<8) | (type)) - -/* Extract components of callback argument */ -#define FILTER_ACTION(cb_arg) (((cb_arg)>>8) & 0xff) -#define FILTER_ACTYPE(cb_arg) ((cb_arg) & 0xff) - static void hostlist_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callback_action) { - int action, type; int selection; hostlist_table *hl=(hostlist_table *)callback_data; - char dirstr[128]; - char str[256]; - const char *current_filter; + char *str = NULL; char *sport; - action = FILTER_ACTION(callback_action); - type = FILTER_ACTYPE(callback_action); - selection=GPOINTER_TO_INT(g_list_nth_data(GTK_CLIST(hl->table)->selection, 0)); if(selection>=(int)hl->num_hosts){ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "No hostlist selected"); @@ -365,7 +327,7 @@ hostlist_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint c sport=hostlist_port_to_str(hl->hosts[selection].port_type, hl->hosts[selection].port); - g_snprintf(dirstr, 127, "%s==%s%s%s%s%s", + str = g_strdup_printf("%s==%s%s%s%s%s", hostlist_get_filter_name(&hl->hosts[selection].address, hl->hosts[selection].sat, hl->hosts[selection].port_type, FN_ANY_ADDRESS), address_to_str(&hl->hosts[selection].address), @@ -374,62 +336,9 @@ hostlist_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint c sport?"==":"", sport?sport:""); - current_filter=gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget)); - switch(type){ - case ACTYPE_SELECTED: - g_snprintf(str, 255, "%s", dirstr); - break; - case ACTYPE_NOT_SELECTED: - g_snprintf(str, 255, "!(%s)", dirstr); - break; - case ACTYPE_AND_SELECTED: - if ((!current_filter) || (0 == strlen(current_filter))) - g_snprintf(str, 255, "%s", dirstr); - else - g_snprintf(str, 255, "(%s) && (%s)", current_filter, dirstr); - break; - case ACTYPE_OR_SELECTED: - if ((!current_filter) || (0 == strlen(current_filter))) - g_snprintf(str, 255, "%s", dirstr); - else - g_snprintf(str, 255, "(%s) || (%s)", current_filter, dirstr); - break; - case ACTYPE_AND_NOT_SELECTED: - if ((!current_filter) || (0 == strlen(current_filter))) - g_snprintf(str, 255, "!(%s)", dirstr); - else - g_snprintf(str, 255, "(%s) && !(%s)", current_filter, dirstr); - break; - case ACTYPE_OR_NOT_SELECTED: - if ((!current_filter) || (0 == strlen(current_filter))) - g_snprintf(str, 255, "!(%s)", dirstr); - else - g_snprintf(str, 255, "(%s) || !(%s)", current_filter, dirstr); - break; - } + apply_selected_filter (callback_action, str); - switch(action){ - case ACTION_MATCH: - gtk_entry_set_text(GTK_ENTRY(main_display_filter_widget), str); - main_filter_packets(&cfile, str, FALSE); - gdk_window_raise(top_level->window); - break; - case ACTION_PREPARE: - gtk_entry_set_text(GTK_ENTRY(main_display_filter_widget), str); - break; - case ACTION_FIND_FRAME: - find_frame_with_filter(str); - break; - case ACTION_FIND_NEXT: - find_previous_next_frame_with_filter(str, FALSE); - break; - case ACTION_FIND_PREVIOUS: - find_previous_next_frame_with_filter(str, TRUE); - break; - case ACTION_COLORIZE: - color_display_with_filter(str); - break; - } + g_free (str); } static gint hostlist_show_popup_menu_cb(void *widg _U_, GdkEvent *event, hostlist_table *et) @@ -462,46 +371,47 @@ static GtkItemFactoryEntry hostlist_list_menu_items[] = /* Match */ {"/Apply as Filter", NULL, NULL, 0, "<Branch>", NULL,}, {"/Apply as Filter/Selected", NULL, - GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED), NULL, NULL,}, + GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_SELECTED, 0), NULL, NULL,}, {"/Apply as Filter/Not Selected", NULL, - GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED), NULL, NULL,}, + GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_NOT_SELECTED, 0), NULL, NULL,}, {"/Apply as Filter/... and Selected", NULL, - GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED), NULL, NULL,}, + GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_SELECTED, 0), NULL, NULL,}, {"/Apply as Filter/... or Selected", NULL, - GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED), NULL, NULL,}, + GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_SELECTED, 0), NULL, NULL,}, {"/Apply as Filter/... and not Selected", NULL, - GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED), NULL, NULL,}, + GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, 0), NULL, NULL,}, {"/Apply as Filter/... or not Selected", NULL, - GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED), NULL, NULL,}, + GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, 0), NULL, NULL,}, /* Prepare */ {"/Prepare a Filter", NULL, NULL, 0, "<Branch>", NULL,}, {"/Prepare a Filter/Selected", NULL, - GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED), NULL, NULL,}, + GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_SELECTED, 0), NULL, NULL,}, {"/Prepare a Filter/Not Selected", NULL, - GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED), NULL, NULL,}, + GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, 0), NULL, NULL,}, {"/Prepare a Filter/... and Selected", NULL, - GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED), NULL, NULL,}, + GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_SELECTED, 0), NULL, NULL,}, {"/Prepare a Filter/... or Selected", NULL, - GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED), NULL, NULL,}, + GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_SELECTED, 0), NULL, NULL,}, {"/Prepare a Filter/... and not Selected", NULL, - GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED), NULL, NULL,}, + GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, 0), NULL, NULL,}, {"/Prepare a Filter/... or not Selected", NULL, - GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED), NULL, NULL,}, + GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, 0), NULL, NULL,}, /* Find Frame */ {"/Find Frame", NULL, NULL, 0, "<Branch>", NULL,}, {"/Find Frame/Find Frame", NULL, - GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED), NULL, NULL,}, + GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_FIND_FRAME(ACTYPE_SELECTED, 0), NULL, NULL,}, /* Find Next */ {"/Find Frame/Find Next", NULL, - GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED), NULL, NULL,}, + GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_FIND_NEXT(ACTYPE_SELECTED, 0), NULL, NULL,}, /* Find Previous */ {"/Find Frame/Find Previous", NULL, - GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED), NULL, NULL,}, + GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, 0), NULL, NULL,}, + /* Colorize Host Traffic */ {"/Colorize Host Traffic", NULL, - GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED), NULL, NULL,} + GTK_MENU_FUNC(hostlist_select_filter_cb), CALLBACK_COLORIZE(ACTYPE_SELECTED, 0), NULL, NULL,} }; |