*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
# include "config.h"
#endif
+#include <stdio.h>
+#include <string.h>
+
#include <gtk/gtk.h>
-#include "proto_hier_stats.h"
-#include "proto_hier_stats_dlg.h"
-#include "dlg_utils.h"
-#include "gui_utils.h"
-#include "main.h"
-#include "compat_macros.h"
-#include "help_dlg.h"
-
-#if GTK_MAJOR_VERSION < 2
-#define NUM_STAT_COLUMNS 8
-#else
+#include "../proto_hier_stats.h"
+#include "../simple_dialog.h"
+
+#include "gtk/proto_hier_stats_dlg.h"
+#include "gtk/dlg_utils.h"
+#include "gtk/gui_utils.h"
+#include "gtk/filter_utils.h"
+#include "gtk/gtkglobals.h"
+#include "gtk/help_dlg.h"
+#include "gtk/utf8_entities.h"
+
+
enum {
PROTOCOL_COLUMN,
PRCT_PKTS_COLUMN,
PKTS_COLUMN,
+ PRCT_BYTES_COLUMN,
BYTES_COLUMN,
BANDWIDTH_COLUMN,
END_PKTS_COLUMN,
END_BYTES_COLUMN,
END_BANDWIDTH_COLUMN,
+ FILTER_NAME,
+ PRCT_PKTS_VALUE_COLUMN,
+ PRCT_BYTES_VALUE_COLUMN,
NUM_STAT_COLUMNS /* must be the last */
};
-#endif
typedef struct {
-#if GTK_MAJOR_VERSION < 2
- GtkCTree *tree;
- GtkCTreeNode *parent;
-#else
- GtkTreeView *tree_view;
- GtkTreeIter *iter;
-#endif
- ph_stats_t *ps;
+ GtkTreeView *tree_view;
+ GtkTreeIter *iter;
+ ph_stats_t *ps;
} draw_info_t;
+static GtkWidget *tree;
#define PCT(x,y) (100.0 * (float)(x) / (float)(y))
-#define BANDWITDH(bytes,secs) ((bytes) * 8.0 / ((secs) * 1000.0 * 1000.0))
+#define BANDWIDTH(bytes,secs) ((bytes) * 8.0 / ((secs) * 1000.0 * 1000.0))
+
+static void
+proto_hier_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data _U_, guint callback_action)
+{
+ char *str = NULL;
+ const char *filter = NULL;
+ GtkTreeSelection *sel;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(tree));
+ gtk_tree_selection_get_selected (sel, &model, &iter);
+ gtk_tree_model_get (model, &iter, FILTER_NAME, &filter, -1);
+ if (filter && 0 != strlen(filter)) {
+ str = g_strdup_printf("%s", filter);
+ } else {
+ simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not acquire information to build a filter!\nTry expanding or choosing another item.");
+ return;
+ }
+
+ apply_selected_filter (callback_action, str);
+
+ g_free (str);
+}
+
+
+/* Action callbacks */
+static void
+apply_as_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_SELECTED, 0));
+}
+static void
+apply_as_not_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, 0));
+}
+static void
+apply_as_and_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_SELECTED, 0));
+}
+static void
+apply_as_or_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_SELECTED, 0));
+}
+static void
+apply_as_and_not_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, 0));
+}
+static void
+apply_as_or_not_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, 0));
+}
+
+static void
+prep_as_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_SELECTED, 0));
+}
+static void
+prep_as_not_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, 0));
+}
+static void
+prep_as_and_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, 0));
+}
+static void
+prep_as_or_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, 0));
+}
+static void
+prep_as_and_not_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, 0));
+}
+static void
+prep_as_or_not_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, 0));
+}
+
+static void
+find_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, 0));
+}
+static void
+find_not_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_NOT_SELECTED, 0));
+}
+static void
+find_prev_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, 0));
+}
+static void
+find_prev_not_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_NOT_SELECTED, 0));
+}
+static void
+find_next_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, 0));
+}
+static void
+find_next_not_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_NOT_SELECTED, 0));
+}
+static void
+color_selected_cb(GtkWidget *widget, gpointer user_data)
+{
+ proto_hier_select_filter_cb( widget , user_data, CALLBACK_COLORIZE(ACTYPE_SELECTED, 0));
+}
+
+
+static const char *ui_desc_proto_hier_stats_filter_popup =
+"<ui>\n"
+" <popup name='ProtoHierStatsFilterPopup'>\n"
+" <menu action='/Apply as Filter'>\n"
+" <menuitem action='/Apply as Filter/Selected'/>\n"
+" <menuitem action='/Apply as Filter/Not Selected'/>\n"
+" <menuitem action='/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected'/>\n"
+" <menuitem action='/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected'/>\n"
+" <menuitem action='/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected'/>\n"
+" <menuitem action='/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected'/>\n"
+" </menu>\n"
+" <menu action='/Prepare a Filter'>\n"
+" <menuitem action='/Prepare a Filter/Selected'/>\n"
+" <menuitem action='/Prepare a Filter/Not Selected'/>\n"
+" <menuitem action='/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected'/>\n"
+" <menuitem action='/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected'/>\n"
+" <menuitem action='/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected'/>\n"
+" <menuitem action='/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected'/>\n"
+" </menu>\n"
+" <menu action='/Find Frame'>\n"
+" <menu action='/Find Frame/Find Frame'>\n"
+" <menuitem action='/Find Frame/Selected'/>\n"
+" <menuitem action='/Find Frame/Not Selected'/>\n"
+" </menu>\n"
+" <menu action='/Find Frame/Find Next'>\n"
+" <menuitem action='/Find Next/Selected'/>\n"
+" <menuitem action='/Find Next/Not Selected'/>\n"
+" </menu>\n"
+" <menu action='/Find Frame/Find Previous'>\n"
+" <menuitem action='/Find Previous/Selected'/>\n"
+" <menuitem action='/Find Previous/Not Selected'/>\n"
+" </menu>\n"
+" </menu>\n"
+" <menu action='/Colorize Procedure'>\n"
+" <menuitem action='/Colorize Procedure/Colorize Protocol'/>\n"
+" </menu>\n"
+" </popup>\n"
+"</ui>\n";
+
+/*
+ * GtkActionEntry
+ * typedef struct {
+ * const gchar *name;
+ * const gchar *stock_id;
+ * const gchar *label;
+ * const gchar *accelerator;
+ * const gchar *tooltip;
+ * GCallback callback;
+ * } GtkActionEntry;
+ * const gchar *name; The name of the action.
+ * const gchar *stock_id; The stock id for the action, or the name of an icon from the icon theme.
+ * const gchar *label; The label for the action. This field should typically be marked for translation,
+ * see gtk_action_group_set_translation_domain().
+ * If label is NULL, the label of the stock item with id stock_id is used.
+ * const gchar *accelerator; The accelerator for the action, in the format understood by gtk_accelerator_parse().
+ * const gchar *tooltip; The tooltip for the action. This field should typically be marked for translation,
+ * see gtk_action_group_set_translation_domain().
+ * GCallback callback; The function to call when the action is activated.
+ *
+ */
+static const GtkActionEntry proto_hier_stats_popup_entries[] = {
+ { "/Apply as Filter", NULL, "Apply as Filter", NULL, NULL, NULL },
+ { "/Prepare a Filter", NULL, "Prepare a Filter", NULL, NULL, NULL },
+ { "/Find Frame", NULL, "Find Frame", NULL, NULL, NULL },
+ { "/Find Frame/Find Frame", NULL, "Find Frame", NULL, NULL, NULL },
+ { "/Find Frame/Find Next", NULL, "Find Next" , NULL, NULL, NULL },
+ { "/Find Frame/Find Previous", NULL, "Find Previous", NULL, NULL, NULL },
+ { "/Colorize Procedure", NULL, "Colorize Procedure", NULL, NULL, NULL },
+ { "/Apply as Filter/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(apply_as_selected_cb) },
+ { "/Apply as Filter/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(apply_as_not_selected_cb) },
+ { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(apply_as_and_selected_cb) },
+ { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(apply_as_or_selected_cb) },
+ { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(apply_as_and_not_selected_cb) },
+ { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(apply_as_or_not_selected_cb) },
+ { "/Prepare a Filter/Selected", NULL, "Selected", NULL, "selcted", G_CALLBACK(prep_as_selected_cb) },
+ { "/Prepare a Filter/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(prep_as_not_selected_cb) },
+ { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", G_CALLBACK(prep_as_and_selected_cb) },
+ { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", G_CALLBACK(prep_as_or_selected_cb) },
+ { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", G_CALLBACK(prep_as_and_not_selected_cb) },
+ { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", G_CALLBACK(prep_as_or_not_selected_cb) },
+ { "/Find Frame/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_selected_cb) },
+ { "/Find Frame/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_not_selected_cb) },
+ { "/Find Previous/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_prev_selected_cb) },
+ { "/Find Previous/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_prev_not_selected_cb) },
+ { "/Find Next/Selected", NULL, "Selected", NULL, "Selected", G_CALLBACK(find_next_selected_cb) },
+ { "/Find Next/Not Selected", NULL, "Not Selected", NULL, "Not Selected", G_CALLBACK(find_next_not_selected_cb) },
+ { "/Colorize Procedure/Colorize Protocol", NULL, "Colorize Protocol", NULL, "Colorize Protocol", G_CALLBACK(color_selected_cb) },
+};
static void
fill_in_tree_node(GNode *node, gpointer data)
ph_stats_node_t *stats = node->data;
draw_info_t *di = data;
ph_stats_t *ps = di->ps;
- gboolean is_leaf;
draw_info_t child_di;
double seconds;
gchar *text[NUM_STAT_COLUMNS];
-#if GTK_MAJOR_VERSION < 2
- GtkCTree *tree = di->tree;
- GtkCTreeNode *parent = di->parent;
- GtkCTreeNode *new_node;
-#else
+ float percent_packets, percent_bytes;
GtkTreeView *tree_view = di->tree_view;
GtkTreeIter *iter = di->iter;
GtkTreeStore *store;
GtkTreeIter new_iter;
-#endif
-
- if (g_node_n_children(node) > 0) {
- is_leaf = FALSE;
- }
- else {
- is_leaf = TRUE;
- }
seconds = ps->last_time - ps->first_time;
- text[0] = (gchar *) (stats->hfinfo->name);
- text[1] = g_strdup_printf("%6.2f%%",
- PCT(stats->num_pkts_total, ps->tot_packets));
- text[2] = g_strdup_printf("%u", stats->num_pkts_total);
- text[3] = g_strdup_printf("%u", stats->num_bytes_total);
+ percent_packets = (float) PCT(stats->num_pkts_total, ps->tot_packets);
+ percent_bytes = (float) PCT(stats->num_bytes_total, ps->tot_bytes);
+ text[PROTOCOL_COLUMN] = (gchar *) (stats->hfinfo->name);
+ text[PRCT_PKTS_COLUMN] = g_strdup_printf("%.2f %%", percent_packets);
+ text[PKTS_COLUMN] = g_strdup_printf("%u", stats->num_pkts_total);
+ text[PRCT_BYTES_COLUMN] = g_strdup_printf("%.2f %%", percent_bytes);
+ text[BYTES_COLUMN] = g_strdup_printf("%u", stats->num_bytes_total);
if (seconds > 0.0) {
- text[4] = g_strdup_printf("%.3f",
- BANDWITDH(stats->num_bytes_total, seconds));
+ text[BANDWIDTH_COLUMN] = g_strdup_printf("%.3f",
+ BANDWIDTH(stats->num_bytes_total, seconds));
} else {
- text[4] = "n.c.";
+ text[BANDWIDTH_COLUMN] = "n.c.";
}
- text[5] = g_strdup_printf("%u", stats->num_pkts_last);
- text[6] = g_strdup_printf("%u", stats->num_bytes_last);
+ text[END_PKTS_COLUMN] = g_strdup_printf("%u", stats->num_pkts_last);
+ text[END_BYTES_COLUMN] = g_strdup_printf("%u", stats->num_bytes_last);
if (seconds > 0.0) {
- text[7] = g_strdup_printf("%.3f",
- BANDWITDH(stats->num_bytes_last, seconds));
+ text[END_BANDWIDTH_COLUMN] = g_strdup_printf("%.3f",
+ BANDWIDTH(stats->num_bytes_last, seconds));
} else {
- text[7] = "n.c.";
+ text[END_BANDWIDTH_COLUMN] = "n.c.";
}
-#if GTK_MAJOR_VERSION < 2
- new_node = gtk_ctree_insert_node(tree, parent, NULL, text,
- 7, NULL, NULL, NULL, NULL,
- is_leaf, TRUE);
-#else
store = GTK_TREE_STORE(gtk_tree_view_get_model(tree_view));
gtk_tree_store_append(store, &new_iter, iter);
gtk_tree_store_set(store, &new_iter,
- PROTOCOL_COLUMN, text[0],
- PRCT_PKTS_COLUMN, text[1],
- PKTS_COLUMN, text[2],
- BYTES_COLUMN, text[3],
- BANDWIDTH_COLUMN, text[4],
- END_PKTS_COLUMN, text[5],
- END_BYTES_COLUMN, text[6],
- END_BANDWIDTH_COLUMN, text[7],
+ PROTOCOL_COLUMN, text[PROTOCOL_COLUMN],
+ PRCT_PKTS_COLUMN, text[PRCT_PKTS_COLUMN],
+ PKTS_COLUMN, text[PKTS_COLUMN],
+ PRCT_BYTES_COLUMN, text[PRCT_BYTES_COLUMN],
+ BYTES_COLUMN, text[BYTES_COLUMN],
+ BANDWIDTH_COLUMN, text[BANDWIDTH_COLUMN],
+ END_PKTS_COLUMN, text[END_PKTS_COLUMN],
+ END_BYTES_COLUMN, text[END_BYTES_COLUMN],
+ END_BANDWIDTH_COLUMN, text[END_BANDWIDTH_COLUMN],
+ FILTER_NAME, stats->hfinfo->abbrev,
+ PRCT_PKTS_VALUE_COLUMN, percent_packets,
+ PRCT_BYTES_VALUE_COLUMN, percent_bytes,
-1);
-#endif
- g_free(text[1]);
- g_free(text[2]);
- g_free(text[3]);
- if (seconds > 0.0) g_free(text[4]);
- g_free(text[5]);
- g_free(text[6]);
- if (seconds > 0.0) g_free(text[7]);
-
-#if GTK_MAJOR_VERSION < 2
- child_di.tree = tree;
- child_di.parent = new_node;
-#else
+ g_free(text[PRCT_PKTS_COLUMN]);
+ g_free(text[PKTS_COLUMN]);
+ g_free(text[PRCT_BYTES_COLUMN]);
+ g_free(text[BYTES_COLUMN]);
+ if (seconds > 0.0) g_free(text[BANDWIDTH_COLUMN]);
+ g_free(text[END_PKTS_COLUMN]);
+ g_free(text[END_BYTES_COLUMN]);
+ if (seconds > 0.0) g_free(text[END_BANDWIDTH_COLUMN]);
+
child_di.tree_view = tree_view;
child_di.iter = &new_iter;
-#endif
child_di.ps = ps;
g_node_children_foreach(node, G_TRAVERSE_ALL,
}
static void
-fill_in_tree(GtkWidget *tree, ph_stats_t *ps)
+fill_in_tree(GtkWidget *tree_lcl, ph_stats_t *ps)
+{
+ draw_info_t di;
+
+ di.tree_view = GTK_TREE_VIEW(tree_lcl);
+ di.iter = NULL;
+ di.ps = ps;
+
+ g_node_children_foreach(ps->stats_tree, G_TRAVERSE_ALL,
+ fill_in_tree_node, &di);
+}
+
+
+static gboolean
+proto_hier_show_popup_menu_cb(GtkWidget *widget _U_, GdkEvent *event, GtkWidget *popup_menu_object)
+{
+ GdkEventButton *bevent = (GdkEventButton *)event;
+
+ if (event->type==GDK_BUTTON_PRESS && bevent->button==3) {
+ /* If this is a right click on one of our columns, popup the context menu */
+ gtk_menu_popup(GTK_MENU(popup_menu_object), NULL, NULL, NULL, NULL, bevent->button, bevent->time);
+ }
+
+ return FALSE;
+}
+
+static void
+proto_hier_create_popup_menu(void)
{
- draw_info_t di;
-
-#if GTK_MAJOR_VERSION < 2
- di.tree = GTK_CTREE(tree);
- di.parent = NULL;
-#else
- di.tree_view = GTK_TREE_VIEW(tree);
- di.iter = NULL;
-#endif
- di.ps = ps;
- g_node_children_foreach(ps->stats_tree, G_TRAVERSE_ALL,
- fill_in_tree_node, &di);
+ GtkUIManager *ui_manager;
+ GtkActionGroup *action_group;
+ GError *error = NULL;
+ GtkWidget *popup_menu_object;
+
+ action_group = gtk_action_group_new ("ProtoHierStatsTFilterPopupActionGroup");
+ gtk_action_group_add_actions (action_group, /* the action group */
+ (gpointer)proto_hier_stats_popup_entries, /* an array of action descriptions */
+ G_N_ELEMENTS(proto_hier_stats_popup_entries), /* the number of entries */
+ NULL); /* data to pass to the action callbacks */
+
+ ui_manager = gtk_ui_manager_new ();
+ gtk_ui_manager_insert_action_group (ui_manager,
+ action_group,
+ 0); /* the position at which the group will be inserted */
+ gtk_ui_manager_add_ui_from_string (ui_manager,ui_desc_proto_hier_stats_filter_popup, -1, &error);
+ if (error != NULL)
+ {
+ fprintf (stderr, "Warning: building proto hier ststs filter popup failed: %s\n",
+ error->message);
+ g_error_free (error);
+ error = NULL;
+ }
+ popup_menu_object = gtk_ui_manager_get_widget(ui_manager, "/ProtoHierStatsFilterPopup");
+ g_signal_connect(tree, "button_press_event", G_CALLBACK(proto_hier_show_popup_menu_cb), popup_menu_object);
+
}
#define MAX_DLG_HEIGHT 450
static void
create_tree(GtkWidget *container, ph_stats_t *ps)
{
- GtkWidget *sw, *tree;
-#if GTK_MAJOR_VERSION < 2
- int i, height;
- gchar *column_titles[NUM_STAT_COLUMNS] = {
- "Protocol",
- "% Packets",
- "Packets",
- "Bytes",
- "Mbit/s",
- "End Packets",
- "End Bytes",
- "End Mbit/s"
- };
-#else
+ GtkWidget *sw;
GtkTreeView *tree_view;
GtkTreeStore *store;
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
-#endif
/* Scrolled Window */
sw = scrolled_window_new(NULL, NULL);
-#if GTK_MAJOR_VERSION >= 2
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
- GTK_SHADOW_IN);
-#endif
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
+ GTK_SHADOW_IN);
gtk_container_add(GTK_CONTAINER(container), sw);
-#if GTK_MAJOR_VERSION < 2
- tree = ctree_new_with_titles(NUM_STAT_COLUMNS, 0, column_titles);
-
- /* XXX - get 'pos' to set vertical scroll-bar placement. */
-
- /* The title bars do nothing. */
- gtk_clist_column_titles_passive(GTK_CLIST(tree));
-
- /* Auto Resize all columns */
- for (i = 0; i < NUM_STAT_COLUMNS; i++) {
- gtk_clist_set_column_auto_resize(GTK_CLIST(tree), i, TRUE);
- }
-
-
- /* Right justify numeric columns */
- for (i = 1; i < NUM_STAT_COLUMNS; i++) {
- gtk_clist_set_column_justification(GTK_CLIST(tree), i,
- GTK_JUSTIFY_RIGHT);
- }
-#else
- store = gtk_tree_store_new(NUM_STAT_COLUMNS, G_TYPE_STRING,
+ store = gtk_tree_store_new(NUM_STAT_COLUMNS, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
- G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
- G_TYPE_STRING);
+ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_FLOAT,
+ G_TYPE_FLOAT);
tree = tree_view_new(GTK_TREE_MODEL(store));
+ g_object_unref(G_OBJECT(store));
tree_view = GTK_TREE_VIEW(tree);
gtk_tree_view_set_headers_visible(tree_view, TRUE);
gtk_tree_view_set_headers_clickable(tree_view, FALSE);
NULL);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_append_column(tree_view, column);
- renderer = gtk_cell_renderer_text_new();
+ renderer = gtk_cell_renderer_progress_new();
column = gtk_tree_view_column_new_with_attributes("% Packets", renderer,
"text", PRCT_PKTS_COLUMN,
+ "value", PRCT_PKTS_VALUE_COLUMN,
NULL);
- g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
+ gtk_tree_view_column_set_expand(column, TRUE);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_append_column(tree_view, column);
renderer = gtk_cell_renderer_text_new();
g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_append_column(tree_view, column);
+ renderer = gtk_cell_renderer_progress_new();
+ column = gtk_tree_view_column_new_with_attributes("% Bytes", renderer,
+ "text", PRCT_BYTES_COLUMN,
+ "value", PRCT_BYTES_VALUE_COLUMN,
+ NULL);
+ gtk_tree_view_column_set_expand(column, TRUE);
+ gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+ gtk_tree_view_append_column(tree_view, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes("Bytes", renderer,
"text", BYTES_COLUMN,
gtk_tree_view_append_column(tree_view, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes("Mbit/s", renderer,
- "text",
- BANDWIDTH_COLUMN,
+ "text", BANDWIDTH_COLUMN,
NULL);
g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_append_column(tree_view, column);
renderer = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes("End Packets",
- renderer, "text",
- END_PKTS_COLUMN, NULL);
+ column = gtk_tree_view_column_new_with_attributes("End Packets", renderer,
+ "text", END_PKTS_COLUMN,
+ NULL);
g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_append_column(tree_view, column);
gtk_tree_view_append_column(tree_view, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes("End Mbit/s", renderer,
- "text",
- END_BANDWIDTH_COLUMN,
+ "text", END_BANDWIDTH_COLUMN,
NULL);
g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_append_column(tree_view, column);
-#endif
/* Fill in the data. */
fill_in_tree(tree, ps);
-#if GTK_MAJOR_VERSION < 2
- height = GTK_CLIST(tree)->rows * (GTK_CLIST(tree)->row_height + 5);
- height = MIN(height, MAX_DLG_HEIGHT);
- WIDGET_SET_SIZE(tree, DEF_DLG_WIDTH, height);
-#else
- WIDGET_SET_SIZE(tree, DEF_DLG_WIDTH, MAX_DLG_HEIGHT);
+ gtk_widget_set_size_request(tree, DEF_DLG_WIDTH, MAX_DLG_HEIGHT);
gtk_tree_view_expand_all(tree_view);
-#endif
+
+ proto_hier_create_popup_menu ();
gtk_container_add(GTK_CONTAINER(sw), tree);
}
void
proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_)
{
- ph_stats_t *ps;
- GtkWidget *dlg, *ok_bt, *help_bt, *vbox, *bbox;
-
- /* Get the statistics. */
- ps = ph_stats_new();
- if (ps == NULL) {
- /* The user gave up before we finished; don't pop up
- a statistics window. */
- return;
- }
-
- dlg = window_new(GTK_WINDOW_TOPLEVEL, "Ethereal: Protocol Hierarchy Statistics");
+ ph_stats_t *ps;
+ GtkWidget *dlg, *close_bt, *help_bt, *vbox, *bbox;
+ GtkWidget *label;
+ char title[256];
+ const char *current_filter;
+
+ /* Get the statistics. */
+ ps = ph_stats_new();
+ if (ps == NULL) {
+ /* The user gave up before we finished; don't pop up
+ a statistics window. */
+ return;
+ }
- vbox = gtk_vbox_new(FALSE, 5);
- gtk_container_border_width(GTK_CONTAINER(vbox), 5);
- gtk_container_add(GTK_CONTAINER(dlg), vbox);
+ dlg = window_new(GTK_WINDOW_TOPLEVEL, "Wireshark: Protocol Hierarchy Statistics");
- /* Data section */
- create_tree(vbox, ps);
+ vbox = gtk_vbox_new(FALSE, 5);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
+ gtk_container_add(GTK_CONTAINER(dlg), vbox);
- ph_stats_free(ps);
+ current_filter=gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget));
- /* Button row. */
- if(topic_available(HELP_STATS_PROTO_HIERARCHY_DIALOG)) {
- bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_HELP, NULL);
+ if (current_filter && strlen(current_filter) != 0) {
+ g_snprintf(title, sizeof(title), "Display filter: %s", current_filter);
} else {
- bbox = dlg_button_row_new(GTK_STOCK_OK, NULL);
+ g_strlcpy(title, "Display filter: none", sizeof(title));
}
- gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
- gtk_widget_show(bbox);
+ label = gtk_label_new(title);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
- ok_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_OK);
- window_set_cancel_button(dlg, ok_bt, window_cancel_button_cb);
+ /* Data section */
+ create_tree(vbox, ps);
- if(topic_available(HELP_STATS_PROTO_HIERARCHY_DIALOG)) {
- help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP);
- SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_PROTO_HIERARCHY_DIALOG);
- }
+ ph_stats_free(ps);
+
+ /* Button row. */
+ bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
+ gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
+ gtk_widget_show(bbox);
+
+ close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
+ window_set_cancel_button(dlg, close_bt, window_cancel_button_cb);
- SIGNAL_CONNECT(dlg, "delete_event", window_delete_event_cb, NULL);
+ help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+ g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_PROTO_HIERARCHY_DIALOG);
- gtk_widget_show_all(dlg);
+ g_signal_connect(dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
+
+ gtk_widget_show_all(dlg);
window_present(dlg);
}
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=4 tabstop=8 expandtab
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
git.samba.org / obnox / wireshark / wip.git / blobdiff