#include "config.h"
#endif
-#ifdef NEW_PACKET_LIST
-
#include "string.h"
#include <stdio.h>
#include "../ui_util.h"
#include "../progress_dlg.h"
#include "../simple_dialog.h"
+#include "../main_statusbar.h"
#include "epan/emem.h"
#include "globals.h"
#include "gtk/gtkglobals.h"
#include "gtk/font_utils.h"
#include "gtk/packet_history.h"
#include "epan/column.h"
+#include "epan/strutil.h"
#include "gtk/recent.h"
#include "gtk/keys.h"
#include "gtk/menus.h"
#include "color_filters.h"
#include "gtk/color_utils.h"
#include "gtk/capture_file_dlg.h"
-#include "gtk/main_statusbar.h"
#include "gtk/packet_win.h"
#include "gtk/main.h"
#include "gtk/prefs_column.h"
#include "gtk/prefs_dlg.h"
#include "gtk/dlg_utils.h"
+#include "gtk/filter_dlg.h"
+#include "gtk/filter_autocomplete.h"
+
+#include "gtk/old-gtk-compat.h"
#define COLUMN_WIDTH_MIN 40
+#define COL_EDIT_COLUMN "column"
+#define COL_EDIT_FORMAT_CMB "format_cmb"
+#define COL_EDIT_TITLE_TE "title_te"
+#define COL_EDIT_FIELD_LB "field_lb"
+#define COL_EDIT_FIELD_TE "field_te"
+#define COL_EDIT_OCCURRENCE_LB "occurrence_lb"
+#define COL_EDIT_OCCURRENCE_TE "occurrente_te"
+
static PacketList *packetlist;
static gboolean last_at_end = FALSE;
static gboolean enable_color;
+static gulong column_changed_handler_id;
static GtkWidget *create_view_and_model(void);
static void scroll_to_and_select_iter(GtkTreeModel *model, GtkTreeSelection *selection, GtkTreeIter *iter);
static void new_packet_list_select_cb(GtkTreeView *tree_view, gpointer data _U_);
static void new_packet_list_double_click_cb(GtkTreeView *treeview,
- GtkTreePath *path,
+ GtkTreePath *path _U_,
GtkTreeViewColumn *col _U_,
gpointer userdata _U_);
static void show_cell_data_func(GtkTreeViewColumn *col,
GtkTreeIter *iter,
gpointer data);
static gint row_number_from_iter(GtkTreeIter *iter);
+static void scroll_to_current(void);
void new_packet_list_set_sel_browse(gboolean val, gboolean force_set);
return scrollwin;
}
-/* XXX - implement a smarter solution for recreating the packet list */
+/** @todo XXX - implement a smarter solution for recreating the packet list */
void
new_packet_list_recreate(void)
{
+ g_signal_handler_block(packetlist->view, column_changed_handler_id);
gtk_widget_destroy(pkt_scrollw);
prefs.num_cols = g_list_length(prefs.col_list);
/* fdata should be filled with the stuff we need
* strings are built at display time.
*/
-
+ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(packetlist->view));
+ guint visible_pos = packet_list_append_record(packetlist, fdata);
+ if(model)
+ /* If the model is connected there is no packetsbar_update from "thaw */
+ packets_bar_update();
/* Return the _visible_ position */
- return packet_list_append_record(packetlist, fdata);
+
+ return visible_pos;
}
static gboolean
case COL_NUMBER:
case COL_PACKET_LENGTH:
case COL_CUMULATIVE_BYTES:
+ case COL_DCE_CALL:
+ case COL_DSCP_VALUE:
right_justify = TRUE;
break;
case COL_CUSTOM:
hfi = proto_registrar_get_byname(cfile.cinfo.col_custom_field[col]);
/* Check if this is a valid field and we have no strings lookup table */
- if ((hfi != NULL) && (hfi->strings == NULL)) {
+ if ((hfi != NULL) && ((hfi->strings == NULL) || !get_column_resolved(col))) {
/* Check for bool, framenum and decimal/octal integer types */
if ((hfi->type == FT_BOOLEAN) || (hfi->type == FT_FRAMENUM) ||
(((hfi->display == BASE_DEC) || (hfi->display == BASE_OCT)) &&
return right_justify;
}
+static gboolean
+resolve_column (gint col)
+{
+ header_field_info *hfi;
+ gboolean resolve = FALSE;
+
+ switch (cfile.cinfo.col_fmt[col]) {
+
+ case COL_CUSTOM:
+ hfi = proto_registrar_get_byname(cfile.cinfo.col_custom_field[col]);
+ /* Check if this is a valid field */
+ if (hfi != NULL) {
+ /* Check if we have an OID or a strings table with integer values */
+ if ((hfi->type == FT_OID) ||
+ ((hfi->strings != NULL) &&
+ ((hfi->type == FT_BOOLEAN) || (hfi->type == FT_FRAMENUM) ||
+ IS_FT_INT(hfi->type) || IS_FT_UINT(hfi->type)))) {
+ resolve = TRUE;
+ }
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ return resolve;
+}
+
static void
col_title_change_ok (GtkWidget *w, gpointer parent_w)
{
- GtkTreeViewColumn *col = g_object_get_data (G_OBJECT(w), "column");
- gint col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(col), E_MPACKET_LIST_COL_KEY));
- GtkWidget *entry = g_object_get_data (G_OBJECT(w), "entry");
- const gchar *title = gtk_entry_get_text(GTK_ENTRY(entry));
- gint col_width;
+ GtkTreeViewColumn *col;
+ const gchar *title, *name, *occurrence_text;
+ gint col_id, cur_fmt, occurrence, col_width;
+ gchar *escaped_title;
+ gboolean recreate = FALSE;
+
+ col = g_object_get_data (G_OBJECT(w), COL_EDIT_COLUMN);
+ col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(col), E_MPACKET_LIST_COL_KEY));
+
+ title = gtk_entry_get_text(GTK_ENTRY(g_object_get_data (G_OBJECT(w), COL_EDIT_TITLE_TE)));
+ name = gtk_entry_get_text(GTK_ENTRY(g_object_get_data (G_OBJECT(w), COL_EDIT_FIELD_TE)));
+ cur_fmt = gtk_combo_box_get_active(GTK_COMBO_BOX(g_object_get_data (G_OBJECT(w), COL_EDIT_FORMAT_CMB)));
+ occurrence_text = gtk_entry_get_text(GTK_ENTRY(g_object_get_data (G_OBJECT(w), COL_EDIT_OCCURRENCE_TE)));
+ occurrence = (gint)strtol(occurrence_text, NULL, 10);
+
+ escaped_title = ws_strdup_escape_char(title, '_');
+ gtk_tree_view_column_set_title(col, escaped_title);
+ g_free(escaped_title);
+
+ if (strcmp (title, get_column_title(col_id)) != 0) {
+ set_column_title (col_id, title);
+ }
- gtk_tree_view_column_set_title(col, title);
- column_prefs_rename(col_id, title);
+ if (cur_fmt != get_column_format(col_id)) {
+ set_column_format (col_id, cur_fmt);
+ recreate = TRUE;
+ }
+
+ if (cur_fmt == COL_CUSTOM) {
+ if (strcmp (name, get_column_custom_field(col_id)) != 0) {
+ set_column_custom_field (col_id, name);
+ recreate = TRUE;
+ }
+
+ if (occurrence != get_column_custom_occurrence(col_id)) {
+ set_column_custom_occurrence (col_id, occurrence);
+ recreate = TRUE;
+ }
+ }
col_width = get_default_col_size (packetlist->view, title);
gtk_tree_view_column_set_min_width(col, col_width);
- new_packet_list_resize_column (col_id);
if (!prefs.gui_use_pref_save) {
prefs_main_write();
}
+ rebuild_visible_columns_menu ();
+
+ if (recreate) {
+ new_packet_list_recreate();
+ }
+
+ new_packet_list_resize_column (col_id);
window_destroy(GTK_WIDGET(parent_w));
}
window_destroy(GTK_WIDGET(parent_w));
}
-static void
-col_title_edit_dlg (GtkTreeViewColumn *col)
+static void
+col_details_format_changed_cb(GtkWidget *w, gpointer data _U_)
+{
+ GtkWidget *field_lb, *field_te, *occurrence_lb, *occurrence_te;
+ gint cur_fmt;
+
+ field_lb = g_object_get_data (G_OBJECT(w), COL_EDIT_FIELD_LB);
+ field_te = g_object_get_data (G_OBJECT(w), COL_EDIT_FIELD_TE);
+ occurrence_lb = g_object_get_data (G_OBJECT(w), COL_EDIT_OCCURRENCE_LB);
+ occurrence_te = g_object_get_data (G_OBJECT(w), COL_EDIT_OCCURRENCE_TE);
+
+ cur_fmt = gtk_combo_box_get_active(GTK_COMBO_BOX(w));
+
+ if (cur_fmt == COL_CUSTOM) {
+ /* Changing to custom */
+ gtk_widget_set_sensitive(field_lb, TRUE);
+ gtk_widget_set_sensitive(field_te, TRUE);
+ gtk_widget_set_sensitive(occurrence_lb, TRUE);
+ gtk_widget_set_sensitive(occurrence_te, TRUE);
+ } else {
+ /* Changing to non-custom */
+ gtk_widget_set_sensitive(field_lb, FALSE);
+ gtk_widget_set_sensitive(field_te, FALSE);
+ gtk_widget_set_sensitive(occurrence_lb, FALSE);
+ gtk_widget_set_sensitive(occurrence_te, FALSE);
+ }
+}
+
+static void
+col_details_edit_dlg (gint col_id, GtkTreeViewColumn *col)
{
- const gchar *value = gtk_tree_view_column_get_title(col);
+ const gchar *title = gtk_tree_view_column_get_title(col);
+ gchar *unescaped_title = ws_strdup_unescape_char(title, '_');
+ GtkWidget *label, *field_lb, *occurrence_lb;
+ GtkWidget *title_te, *format_cmb, *field_te, *occurrence_te;
GtkWidget *win, *main_tb, *main_vb, *bbox, *cancel_bt, *ok_bt;
- GtkWidget *entry, *label;
+ char custom_occurrence_str[8];
+ gint cur_fmt, i;
- win = dlg_window_new("Column Title");
+ win = dlg_window_new("Wireshark: Edit Column Details");
gtk_window_set_resizable(GTK_WINDOW(win),FALSE);
gtk_window_resize(GTK_WINDOW(win), 400, 100);
- main_vb = gtk_vbox_new(FALSE, 5);
+ main_vb = gtk_vbox_new(FALSE, 6);
gtk_container_add(GTK_CONTAINER(win), main_vb);
gtk_container_set_border_width(GTK_CONTAINER(main_vb), 6);
- main_tb = gtk_table_new(2, 2, FALSE);
+ main_tb = gtk_table_new(2, 4, FALSE);
gtk_box_pack_start(GTK_BOX(main_vb), main_tb, FALSE, FALSE, 0);
gtk_table_set_col_spacings(GTK_TABLE(main_tb), 10);
+ gtk_table_set_row_spacings(GTK_TABLE(main_tb), 5);
label = gtk_label_new(ep_strdup_printf("Title:"));
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), label, 0, 1, 0, 1);
+ gtk_misc_set_alignment(GTK_MISC(label), 1.0f, 0.5f);
+ gtk_widget_set_tooltip_text(label, "Packet list column title.");
+
+ title_te = gtk_entry_new();
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), title_te, 1, 2, 0, 1);
+ gtk_entry_set_text(GTK_ENTRY(title_te), unescaped_title);
+ g_free(unescaped_title);
+ gtk_widget_set_tooltip_text(title_te, "Packet list column title.");
+
+ label = gtk_label_new(ep_strdup_printf("Field type:"));
gtk_table_attach_defaults(GTK_TABLE(main_tb), label, 0, 1, 1, 2);
gtk_misc_set_alignment(GTK_MISC(label), 1.0f, 0.5f);
+ gtk_widget_set_tooltip_text(label, "Select which packet information to present in the column.");
- entry = gtk_entry_new();
- gtk_table_attach_defaults(GTK_TABLE(main_tb), entry, 1, 2, 1, 2);
- gtk_entry_set_text(GTK_ENTRY(entry), value);
+ format_cmb = gtk_combo_box_text_new();
+ for (i = 0; i < NUM_COL_FMTS; i++) {
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(format_cmb), col_format_desc(i));
+ }
+ g_signal_connect(format_cmb, "changed", G_CALLBACK(col_details_format_changed_cb), NULL);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), format_cmb, 1, 2, 1, 2);
+ gtk_widget_set_tooltip_text(format_cmb, "Select which packet information to present in the column.");
+
+ field_lb = gtk_label_new(ep_strdup_printf("Field name:"));
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), field_lb, 0, 1, 2, 3);
+ gtk_misc_set_alignment(GTK_MISC(field_lb), 1.0f, 0.5f);
+ gtk_widget_set_tooltip_text(field_lb,
+ "Field name used when field type is \"Custom\". "
+ "This string has the same syntax as a display filter string.");
+ field_te = gtk_entry_new();
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), field_te, 1, 2, 2, 3);
+ g_object_set_data (G_OBJECT(field_te), E_FILT_FIELD_NAME_ONLY_KEY, "");
+ g_signal_connect(field_te, "changed", G_CALLBACK(filter_te_syntax_check_cb), NULL);
+ g_signal_connect(field_te, "key-press-event", G_CALLBACK (filter_string_te_key_pressed_cb), NULL);
+ g_signal_connect(win, "key-press-event", G_CALLBACK (filter_parent_dlg_key_pressed_cb), NULL);
+ gtk_widget_set_tooltip_text(field_te,
+ "Field name used when field type is \"Custom\". "
+ "This string has the same syntax as a display filter string.");
+
+ occurrence_lb = gtk_label_new(ep_strdup_printf("Occurrence:"));
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), occurrence_lb, 0, 1, 3, 4);
+ gtk_misc_set_alignment(GTK_MISC(occurrence_lb), 1.0f, 0.5f);
+ gtk_widget_set_tooltip_text (occurrence_lb,
+ "Field occurence to use. "
+ "0=all (default), 1=first, 2=second, ..., -1=last.");
+
+ occurrence_te = gtk_entry_new();
+ gtk_entry_set_max_length (GTK_ENTRY(occurrence_te), 4);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), occurrence_te, 1, 2, 3, 4);
+ gtk_widget_set_tooltip_text (occurrence_te,
+ "Field occurence to use. "
+ "0=all (default), 1=first, 2=second, ..., -1=last.");
bbox = dlg_button_row_new(GTK_STOCK_CANCEL,GTK_STOCK_OK, NULL);
gtk_box_pack_end(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK);
- g_object_set_data (G_OBJECT(ok_bt), "column", col);
- g_object_set_data (G_OBJECT(ok_bt), "entry", entry);
+ g_object_set_data (G_OBJECT(ok_bt), COL_EDIT_COLUMN, col);
+ g_object_set_data (G_OBJECT(ok_bt), COL_EDIT_FORMAT_CMB, format_cmb);
+ g_object_set_data (G_OBJECT(ok_bt), COL_EDIT_TITLE_TE, title_te);
+ g_object_set_data (G_OBJECT(ok_bt), COL_EDIT_FIELD_TE, field_te);
+ g_object_set_data (G_OBJECT(ok_bt), COL_EDIT_OCCURRENCE_TE, occurrence_te);
+ g_object_set_data (G_OBJECT(format_cmb), COL_EDIT_FIELD_LB, field_lb);
+ g_object_set_data (G_OBJECT(format_cmb), COL_EDIT_FIELD_TE, field_te);
+ g_object_set_data (G_OBJECT(format_cmb), COL_EDIT_OCCURRENCE_LB, occurrence_lb);
+ g_object_set_data (G_OBJECT(format_cmb), COL_EDIT_OCCURRENCE_TE, occurrence_te);
g_signal_connect(ok_bt, "clicked", G_CALLBACK(col_title_change_ok), win);
- dlg_set_activate(entry, ok_bt);
+ cur_fmt = get_column_format (col_id);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(format_cmb), cur_fmt);
+ if (cur_fmt == COL_CUSTOM) {
+ gtk_entry_set_text(GTK_ENTRY(field_te), get_column_custom_field(col_id));
+ g_snprintf(custom_occurrence_str, sizeof(custom_occurrence_str), "%d", get_column_custom_occurrence(col_id));
+ gtk_entry_set_text(GTK_ENTRY(occurrence_te), custom_occurrence_str);
+ }
+
+ dlg_set_activate(title_te, ok_bt);
+ dlg_set_activate(field_te, ok_bt);
+ dlg_set_activate(occurrence_te, ok_bt);
cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
g_signal_connect(cancel_bt, "clicked", G_CALLBACK(col_title_change_cancel), win);
gtk_widget_show_all(win);
}
+/* Process sort request;
+ * order: GTK_SORT_ASCENDING or GTK_SORT_DESCENDING
+ * sort_indicator: TRUE: set sort_indicator on column; FALSE: don't set ....
+ *
+ * If necessary, columns are first "columnized" for all rows in the packet-list; If this
+ * is not completed (i.e., stopped), then the sort request is aborted.
+ */
static void
-new_packet_list_sort_column (gint col_id, GtkTreeViewColumn *col, GtkSortType order)
+new_packet_list_sort_column (gint col_id, GtkTreeViewColumn *col, GtkSortType order, gboolean sort_indicator)
{
- GtkTreeViewColumn *prev_col = (GtkTreeViewColumn *)
+ GtkTreeViewColumn *prev_col;
+
+ if (col == NULL) {
+ col = gtk_tree_view_get_column(GTK_TREE_VIEW(packetlist->view), col_id);
+ }
+ g_assert(col);
+
+ if (!packet_list_do_packet_list_dissect_and_cache_all(packetlist, col_id)) {
+ return; /* "stopped": do not try to sort */
+ }
+
+ prev_col = (GtkTreeViewColumn *)
g_object_get_data(G_OBJECT(packetlist->view), E_MPACKET_LIST_PREV_COLUMN_KEY);
if (prev_col) {
gtk_tree_view_column_set_sort_indicator(prev_col, FALSE);
}
- gtk_tree_view_column_set_sort_indicator(col, TRUE);
+ gtk_tree_view_column_set_sort_indicator(col, sort_indicator);
gtk_tree_view_column_set_sort_order (col, order);
g_object_set_data(G_OBJECT(packetlist->view), E_MPACKET_LIST_PREV_COLUMN_KEY, col);
- gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), col_id, order);
+ gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), col_id, order); /* triggers sort callback */
+
+ scroll_to_current ();
}
-/*
+/*
* We have our own functionality to toggle sort order on a column to avoid
* having empty sorting arrow widgets in the column header.
*/
GtkSortType order = gtk_tree_view_column_get_sort_order (col);
gint col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(col), E_MPACKET_LIST_COL_KEY));
+ if (cfile.state == FILE_READ_IN_PROGRESS)
+ return;
+
if (!gtk_tree_view_column_get_sort_indicator(col)) {
- new_packet_list_sort_column (col_id, col, GTK_SORT_ASCENDING);
+ new_packet_list_sort_column (col_id, col, GTK_SORT_ASCENDING, TRUE);
} else if (order == GTK_SORT_ASCENDING) {
- new_packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING);
+ new_packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING, TRUE);
} else {
- gtk_tree_view_column_set_sort_indicator(col, FALSE);
- gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), 0, GTK_SORT_ASCENDING);
+ new_packet_list_sort_column (0, NULL, GTK_SORT_ASCENDING, FALSE);
}
}
static void
new_packet_list_xalign_column (gint col_id, GtkTreeViewColumn *col, gchar xalign)
{
-#if GTK_CHECK_VERSION(2,18,0)
GList *renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT(col));
-#else
- GList *renderers = gtk_tree_view_column_get_cell_renderers (col);
-#endif
gboolean right_justify = right_justify_column(col_id);
gdouble value = get_xalign_value (xalign, right_justify);
GList *entry;
gtk_widget_queue_draw (packetlist->view);
}
+static void
+new_packet_list_set_visible_column (gint col_id, GtkTreeViewColumn *col, gboolean visible)
+{
+ gtk_tree_view_column_set_visible(col, visible);
+ set_column_visible(col_id, visible);
+
+ if (!prefs.gui_use_pref_save) {
+ prefs_main_write();
+ }
+
+ rebuild_visible_columns_menu ();
+ gtk_widget_queue_draw (packetlist->view);
+}
+
+void
+new_packet_list_toggle_visible_column (gint col_id)
+{
+ GtkTreeViewColumn *col =
+ gtk_tree_view_get_column(GTK_TREE_VIEW(packetlist->view), col_id);
+
+ new_packet_list_set_visible_column (col_id, col, get_column_visible(col_id) ? FALSE : TRUE);
+}
+
+void
+new_packet_list_set_all_columns_visible (void)
+{
+ GtkTreeViewColumn *col;
+ int col_id;
+
+ for (col_id = 0; col_id < cfile.cinfo.num_cols; col_id++) {
+ col = gtk_tree_view_get_column(GTK_TREE_VIEW(packetlist->view), col_id);
+ gtk_tree_view_column_set_visible(col, TRUE);
+ set_column_visible(col_id, TRUE);
+ }
+
+ if (!prefs.gui_use_pref_save) {
+ prefs_main_write();
+ }
+
+ rebuild_visible_columns_menu ();
+ gtk_widget_queue_draw (packetlist->view);
+}
+
static void
new_packet_list_remove_column (gint col_id, GtkTreeViewColumn *col _U_)
{
new_packet_list_recreate();
}
+static void
+new_packet_list_toggle_resolved (GtkWidget *w, gint col_id)
+{
+ /* We have to check for skip-update because we get an emit in menus_set_column_resolved() */
+ if (g_object_get_data(G_OBJECT(w), "skip-update") == NULL) {
+ set_column_resolved (col_id, get_column_resolved (col_id) ? FALSE : TRUE);
+
+ if (!prefs.gui_use_pref_save) {
+ prefs_main_write();
+ }
+
+ new_packet_list_recreate();
+ }
+}
+
void
-new_packet_list_column_menu_cb (GtkWidget *w _U_, gpointer user_data _U_, COLUMN_SELECTED_E action)
+new_packet_list_column_menu_cb (GtkWidget *w, gpointer user_data _U_, COLUMN_SELECTED_E action)
{
GtkTreeViewColumn *col = (GtkTreeViewColumn *)
g_object_get_data(G_OBJECT(packetlist->view), E_MPACKET_LIST_COLUMN_KEY);
switch (action) {
case COLUMN_SELECTED_SORT_ASCENDING:
- new_packet_list_sort_column (col_id, col, GTK_SORT_ASCENDING);
+ new_packet_list_sort_column (col_id, col, GTK_SORT_ASCENDING, TRUE);
break;
case COLUMN_SELECTED_SORT_DESCENDING:
- new_packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING);
+ new_packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING, TRUE);
break;
case COLUMN_SELECTED_SORT_NONE:
- gtk_tree_view_column_set_sort_indicator(col, FALSE);
- gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist), 0, GTK_SORT_ASCENDING);
+ new_packet_list_sort_column (0, NULL, GTK_SORT_ASCENDING, FALSE);
+ break;
+ case COLUMN_SELECTED_TOGGLE_RESOLVED:
+ new_packet_list_toggle_resolved (w, col_id);
break;
case COLUMN_SELECTED_ALIGN_LEFT:
new_packet_list_xalign_column (col_id, col, COLUMN_XALIGN_LEFT);
case COLUMN_SELECTED_RESIZE:
new_packet_list_resize_column (col_id);
break;
- case COLUMN_SELECTED_RENAME:
- col_title_edit_dlg (col);
+ case COLUMN_SELECTED_CHANGE:
+ col_details_edit_dlg (col_id, col);
+ break;
+ case COLUMN_SELECTED_HIDE:
+ new_packet_list_set_visible_column (col_id, col, FALSE);
break;
case COLUMN_SELECTED_REMOVE:
new_packet_list_remove_column (col_id, col);
}
}
-static void
+static gboolean
new_packet_list_column_button_pressed_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
{
GtkWidget *col = (GtkWidget *) data;
gboolean right_justify = right_justify_column (col_id);
menus_set_column_align_default (right_justify);
+ menus_set_column_resolved (get_column_resolved (col_id), resolve_column (col_id));
g_object_set_data(G_OBJECT(packetlist->view), E_MPACKET_LIST_COLUMN_KEY, col);
- popup_menu_handler (widget, event, menu);
+ return popup_menu_handler (widget, event, menu);
+}
+
+static void
+column_dnd_changed_cb(GtkTreeView *tree_view, gpointer data _U_)
+{
+ GtkTreeViewColumn *column;
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ GList *columns, *list, *clp, *new_col_list = NULL;
+ gint old_col_id, new_col_id = 0;
+ fmt_data *cfmt;
+
+ selection = gtk_tree_view_get_selection(tree_view);
+ if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+ return;
+
+ list = columns = gtk_tree_view_get_columns(tree_view);
+ while (columns) {
+ column = columns->data;
+ old_col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), E_MPACKET_LIST_COL_KEY));
+
+ clp = g_list_nth (prefs.col_list, old_col_id);
+ cfmt = (fmt_data *) clp->data;
+ new_col_list = g_list_append (new_col_list, cfmt);
+ columns = g_list_next (columns);
+ new_col_id++;
+ }
+ g_list_free (list);
+ g_list_free (prefs.col_list);
+
+ prefs.col_list = new_col_list;
+
+ if (!prefs.gui_use_pref_save) {
+ prefs_main_write();
+ }
+
+ new_packet_list_recreate();
}
static GtkWidget *
gchar *tooltip_text;
header_field_info *hfi;
gint col_min_width;
- GtkTooltips *tooltips = gtk_tooltips_new ();
+ gchar *escaped_title;
packetlist = new_packet_list_new();
packetlist->view = tree_view_new(GTK_TREE_MODEL(packetlist));
-#if GTK_CHECK_VERSION(2,6,0)
gtk_tree_view_set_fixed_height_mode(GTK_TREE_VIEW(packetlist->view),
TRUE);
-#endif
g_signal_connect(packetlist->view, "cursor-changed",
G_CALLBACK(new_packet_list_select_cb), NULL);
g_signal_connect(packetlist->view, "row-activated",
- G_CALLBACK(new_packet_list_double_click_cb),
- g_object_get_data(G_OBJECT(popup_menu_object),
- PM_PACKET_LIST_KEY));
+ G_CALLBACK(new_packet_list_double_click_cb), NULL);
g_signal_connect(packetlist->view, "button_press_event", G_CALLBACK(popup_menu_handler),
g_object_get_data(G_OBJECT(popup_menu_object), PM_PACKET_LIST_KEY));
+ column_changed_handler_id = g_signal_connect(packetlist->view, "columns-changed", G_CALLBACK(column_dnd_changed_cb), NULL);
g_object_set_data(G_OBJECT(popup_menu_object), E_MPACKET_LIST_KEY, packetlist);
/* g_object_unref(packetlist); */ /* Destroy automatically with view for now */ /* XXX - Messes up freezing & thawing */
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_widget_override_font(packetlist->view, user_font_get_regular());
+#else
gtk_widget_modify_font(packetlist->view, user_font_get_regular());
-
+#endif
/* We need one extra column to store the entire PacketListRecord */
for(i = 0; i < cfile.cinfo.num_cols; i++) {
col = gtk_tree_view_column_new();
gtk_tree_view_column_pack_start(col, renderer, TRUE);
value = get_xalign_value(recent_get_column_xalign(i), right_justify_column(i));
- g_object_set(G_OBJECT(renderer),
- "xalign", value,
+ g_object_set(G_OBJECT(renderer),
+ "xalign", value,
NULL);
g_object_set(renderer,
"ypad", 0,
if (hfi != NULL) {
if (hfi->parent != -1) {
/* Prefix with protocol name */
- tooltip_text = g_strdup_printf("%s\n%s (%s)", proto_get_protocol_name(hfi->parent), hfi->name, hfi->abbrev);
+ if (cfile.cinfo.col_custom_occurrence[i] != 0) {
+ tooltip_text = g_strdup_printf("%s\n%s (%s#%d)", proto_get_protocol_name(hfi->parent), hfi->name, hfi->abbrev, cfile.cinfo.col_custom_occurrence[i]);
+ } else {
+ tooltip_text = g_strdup_printf("%s\n%s (%s)", proto_get_protocol_name(hfi->parent), hfi->name, hfi->abbrev);
+ }
} else {
tooltip_text = g_strdup_printf("%s (%s)", hfi->name, hfi->abbrev);
}
- } else {
- tooltip_text = g_strdup_printf("Unknown Field: %s", cfile.cinfo.col_custom_field[i]);
- }
+ } else {
+ tooltip_text = g_strdup_printf("Unknown Field: %s", get_column_custom_field(i));
+ }
} else {
tooltip_text = g_strdup(col_format_desc(cfile.cinfo.col_fmt[i]));
}
- gtk_tree_view_column_set_title(col, cfile.cinfo.col_title[i]);
+ escaped_title = ws_strdup_escape_char(cfile.cinfo.col_title[i], '_');
+ gtk_tree_view_column_set_title(col, escaped_title);
+ g_free (escaped_title);
gtk_tree_view_column_set_clickable(col, TRUE);
gtk_tree_view_column_set_resizable(col, TRUE);
+ gtk_tree_view_column_set_visible(col, get_column_visible(i));
gtk_tree_view_column_set_sizing(col,GTK_TREE_VIEW_COLUMN_FIXED);
gtk_tree_view_column_set_reorderable(col, TRUE); /* XXX - Should this be saved in the prefs? */
g_object_set_data(G_OBJECT(col), E_MPACKET_LIST_COL_KEY, GINT_TO_POINTER(i));
g_signal_connect(col, "clicked", G_CALLBACK(new_packet_list_column_clicked_cb), NULL);
- /*
+ /*
* The column can't be adjusted to a size smaller than this
* XXX The minimum size will be the size of the title
* should that be limited for long titles?
}else{
gtk_tree_view_column_set_fixed_width(col, col_width);
}
+
gtk_tree_view_append_column(GTK_TREE_VIEW(packetlist->view), col);
- /* XXX Breaks the GTK+ API, but this is the only way to attach a signal to
- * a GtkTreeView column header. See GTK bug #141937.
- */
- gtk_tooltips_set_tip(tooltips, col->button, tooltip_text, NULL);
+ gtk_widget_set_tooltip_text(gtk_tree_view_column_get_button(col), tooltip_text);
g_free(tooltip_text);
- g_signal_connect(col->button, "button_press_event",
+ g_signal_connect(gtk_tree_view_column_get_button(col), "button_press_event",
G_CALLBACK(new_packet_list_column_button_pressed_cb), col);
if (i == 0) { /* Default sort on first column */
}
}
+ rebuild_visible_columns_menu ();
+
return packetlist->view;
}
/* XXX is this correct in all cases?
* Reset the sort column, use packetlist as model in case the list is frozen.
*/
- gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(packetlist),
- 0, GTK_SORT_ASCENDING);
-
+ new_packet_list_sort_column(0, NULL, GTK_SORT_ASCENDING, FALSE);
}
void
void
new_packet_list_thaw(void)
{
- GtkTreePath *path;
- GtkTreeSelection *selection;
- GtkTreeIter iter;
-
/* Apply model */
gtk_tree_view_set_model( GTK_TREE_VIEW(packetlist->view), GTK_TREE_MODEL(packetlist));
/* Remove extra reference added by new_packet_list_freeze() */
g_object_unref(packetlist);
- /* Selection may have been lost, reselect the current row */
- if (cfile.current_row!=0){
- path = gtk_tree_path_new_from_indices(cfile.current_row-1, -1);
-
- if (gtk_tree_model_get_iter(gtk_tree_view_get_model(GTK_TREE_VIEW(packetlist->view)), &iter, path)){
- /* Select the row */
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(packetlist->view));
- gtk_tree_selection_select_iter (selection, &iter);
- }
- }
-
packets_bar_update();
}
void
new_packet_list_recreate_visible_rows(void)
{
-
packet_list_recreate_visible_rows(packetlist);
-
}
void new_packet_list_resize_column(gint col)
new_packet_list_resize_columns();
}
+static void
+scroll_to_current(void)
+{
+ GtkTreeSelection *selection;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ GtkWidget *focus = gtk_window_get_focus(GTK_WINDOW(top_level));
+
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(packetlist->view));
+ /* model is filled with the current model as a convenience. */
+ if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+ return;
+
+ scroll_to_and_select_iter(model, selection, &iter);
+
+ /* Set the focus back where it was */
+ if (focus)
+ gtk_window_set_focus(GTK_WINDOW(top_level), focus);
+}
+
void
new_packet_list_next(void)
{
TRUE, /* use_align */
0.5, /* row_align determines where the row is placed, 0.5 means center */
0); /* The horizontal alignment of the column */
+
+ /* "cursor-changed" signal triggers new_packet_list_select_cb() */
+ /* which will update the middle and bottom panes. */
gtk_tree_view_set_cursor(GTK_TREE_VIEW(packetlist->view),
path,
NULL,
FALSE); /* start_editing */
- /* Needed to get the middle and bottom panes updated */
- new_packet_list_select_cb(GTK_TREE_VIEW(packetlist->view), NULL);
-
gtk_tree_path_free(path);
}
gboolean at_end = FALSE;
GtkAdjustment *adj;
+#if GTK_CHECK_VERSION(3,0,0)
+ adj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (packetlist->view));
+#else
adj = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(packetlist->view));
+#endif
g_return_val_if_fail(adj != NULL, FALSE);
- if (adj->value >= adj->upper - adj->page_size) {
+ if (gtk_adjustment_get_value(adj) >= gtk_adjustment_get_upper(adj) - gtk_adjustment_get_page_size(adj)) {
at_end = TRUE;
}
#ifdef HAVE_LIBPCAP
- if (adj->value > 0 && at_end != last_at_end && at_end != auto_scroll_live) {
+ if (gtk_adjustment_get_value(adj) > 0 && at_end != last_at_end && at_end != auto_scroll_live) {
menu_auto_scroll_live_changed(at_end);
}
#endif
return at_end;
}
-gint
-new_packet_list_find_row_from_data(gpointer data, gboolean select)
+/*
+ * Given a frame_data structure, scroll to and select the row in the
+ * packet list corresponding to that frame. If there is no such
+ * row, return FALSE, otherwise return TRUE.
+ */
+gboolean
+new_packet_list_select_row_from_data(frame_data *fdata_needle)
{
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(packetlist->view));
GtkTreeIter iter;
- frame_data *fdata_needle = data;
/* Initializes iter with the first iterator in the tree (the one at the path "0")
* and returns TRUE. Returns FALSE if the tree is empty
*/
if(!gtk_tree_model_get_iter_first(model, &iter))
- return -1;
+ return FALSE;
do {
PacketListRecord *record;
fdata = record->fdata;
if(fdata == fdata_needle) {
- if(select)
- scroll_to_and_select_iter(model, NULL, &iter);
+ scroll_to_and_select_iter(model, NULL, &iter);
- return fdata->num;
+ return TRUE;
}
} while (gtk_tree_model_iter_next(model, &iter));
- return -1;
+ return FALSE;
}
void
/* Select the row */
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(packetlist->view));
gtk_tree_selection_select_iter (selection, &iter);
+
+ /* "cursor-changed" signal triggers new_packet_list_select_cb() */
+ /* which will update the middle and bottom panes. */
gtk_tree_view_set_cursor(GTK_TREE_VIEW(packetlist->view),
path,
NULL,
FALSE); /* start_editing */
- /* Needed to get the middle and bottom panes updated */
- new_packet_list_select_cb(GTK_TREE_VIEW(packetlist->view), NULL);
-
gtk_tree_path_free(path);
}
row = row_number_from_iter(&iter);
- /* Check if already selected
+ /* Check if already selected
*/
if (cfile.current_frame && cfile.current_row == row)
return;
/* Remove the hex display tab pages */
- while(gtk_notebook_get_nth_page(GTK_NOTEBOOK(byte_nb_ptr), 0))
- gtk_notebook_remove_page(GTK_NOTEBOOK(byte_nb_ptr), 0);
+ while(gtk_notebook_get_nth_page(GTK_NOTEBOOK(byte_nb_ptr_gbl), 0))
+ gtk_notebook_remove_page(GTK_NOTEBOOK(byte_nb_ptr_gbl), 0);
cf_select_packet(&cfile, row);
- gtk_widget_grab_focus(packetlist->view);
+ /* If searching the tree, set the focus there; otherwise, focus on the packet list */
+ if (cfile.search_in_progress && (cfile.decode_data || cfile.decode_data)) {
+ gtk_widget_grab_focus(tree_view_gbl);
+ } else {
+ gtk_widget_grab_focus(packetlist->view);
+ }
/* Add newly selected frame to packet history (breadcrumbs) */
packet_history_add(row);
static void
new_packet_list_double_click_cb(GtkTreeView *treeview, GtkTreePath *path _U_,
- GtkTreeViewColumn *col _U_, gpointer userdata _U_)
+ GtkTreeViewColumn *col _U_, gpointer userdata _U_)
{
- new_window_cb(GTK_WIDGET(treeview));
+ new_packet_window(GTK_WIDGET(treeview), FALSE);
}
gboolean
new_packet_list_get_event_row_column(GdkEventButton *event_button,
- gint *physical_row, gint *row, gint *column)
+ gint *physical_row, gint *row, gint *column)
{
GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(packetlist->view));
GtkTreePath *path;
GtkTreeViewColumn *view_column;
if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(packetlist->view),
- (gint) event_button->x,
- (gint) event_button->y,
- &path, &view_column, NULL, NULL)) {
+ (gint) event_button->x,
+ (gint) event_button->y,
+ &path, &view_column, NULL, NULL)) {
GtkTreeIter iter;
GList *cols;
gint *indices;
!record->colorized);
}
- g_assert(fdata->col_text);
+ g_assert(record->col_text);
if (col_based_on_frame_data(&cfile.cinfo, col_num)) {
col_fill_in_frame_data(fdata, &cfile.cinfo, col_num, FALSE);
cell_text = cfile.cinfo.col_data[col_num];
}else
- cell_text = fdata->col_text[col_num];
+ cell_text = record->col_text[col_num];
g_assert(cell_text);
gtk_widget_queue_draw (packetlist->view);
}
+/* Redraw the packet list *and* currently-selected detail */
void
new_packet_list_queue_draw(void)
{
+ GtkTreeSelection *selection;
+ GtkTreeIter iter;
+ gint row;
+
gtk_widget_queue_draw (packetlist->view);
+
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(packetlist->view));
+ if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
+ return;
+ row = row_number_from_iter(&iter);
+ cf_select_packet(&cfile, row);
+}
+
+/* Set the selection mode of the packet list window. */
+void
+new_packet_list_set_sel_browse(gboolean val, gboolean force_set)
+{
+ GtkSelectionMode new_mode;
+ /* initialize with a mode we don't use, so that the mode == new_mode
+ * test will fail the first time */
+ static GtkSelectionMode mode = GTK_SELECTION_MULTIPLE;
+
+ /* Yeah, GTK uses "browse" in the case where we do not, but oh well. I
+ * think "browse" in Wireshark makes more sense than "SINGLE" in GTK+ */
+ new_mode = val ? GTK_SELECTION_SINGLE : GTK_SELECTION_BROWSE;
+
+ if ((mode == new_mode) && !force_set) {
+ /*
+ * The mode isn't changing, so don't do anything.
+ * In particular, don't gratuitiously unselect the
+ * current packet.
+ *
+ * XXX - Copied code from "old" packet list
+ * - I don't know if the comment below is still true...
+ * XXX - why do we have to unselect the current packet
+ * ourselves? The documentation for the GtkCList at
+ *
+ * http://developer.gnome.org/doc/API/gtk/gtkclist.html
+ *
+ * says "Note that setting the widget's selection mode to
+ * one of GTK_SELECTION_BROWSE or GTK_SELECTION_SINGLE will
+ * cause all the items in the GtkCList to become deselected."
+ */
+ return;
+ }
+
+ if (cfile.finfo_selected)
+ cf_unselect_field(&cfile);
+
+ mode = new_mode;
+ gtk_tree_selection_set_mode (gtk_tree_view_get_selection(GTK_TREE_VIEW(packetlist->view)), mode);
}
+void
+new_packet_list_set_font(PangoFontDescription *font)
+{
+#if GTK_CHECK_VERSION(3,0,0)
+ gtk_widget_override_font(packetlist->view, font);
+#else
+ gtk_widget_modify_font(packetlist->view, font);
+#endif
+}
+
+
/* call this after last set_frame_mark is done */
-static void mark_frames_ready(void)
+static void
+mark_frames_ready(void)
{
file_save_update_dynamics();
packets_bar_update();
+ new_packet_list_queue_draw();
}
static void
cf_unmark_frame(&cfile, fdata);
}
-static void
-set_frame_ignore(gboolean set, frame_data *fdata)
+void
+new_packet_list_mark_frame_cb(GtkWidget *w _U_, gpointer data _U_)
{
- if (set)
- cf_ignore_frame(&cfile, fdata);
- else
- cf_unignore_frame(&cfile, fdata);
+ GtkTreeModel *model;
+ GtkTreeSelection *selection;
+ GtkTreeIter iter;
+ PacketListRecord *record;
+
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(packetlist->view));
+ /* model is filled with the current model as a convenience. */
+ if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+ return;
+
+ record = new_packet_list_get_record(model, &iter);
+
+ set_frame_mark(!record->fdata->flags.marked, record->fdata);
+ mark_frames_ready();
}
-static void mark_all_frames(gboolean set)
+static void
+mark_all_displayed_frames(gboolean set)
{
- frame_data *fdata;
-
/* XXX: we might need a progressbar here */
- for (fdata = cfile.plist_start; fdata != NULL; fdata = fdata->next) {
- if( fdata->flags.passed_dfilter )
- set_frame_mark(set, fdata);
+ guint32 framenum;
+ frame_data *fdata;
+ for (framenum = 1; framenum <= cfile.count; framenum++) {
+ fdata = frame_data_sequence_find(cfile.frames, framenum);
+ if( fdata->flags.passed_dfilter )
+ set_frame_mark(set, fdata);
}
+}
+
+void
+new_packet_list_mark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_)
+{
+ mark_all_displayed_frames(TRUE);
mark_frames_ready();
- new_packet_list_queue_draw();
}
-void new_packet_list_mark_all_frames_cb(GtkWidget *w _U_, gpointer data _U_)
+void
+new_packet_list_unmark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_)
{
- mark_all_frames(TRUE);
+ mark_all_displayed_frames(FALSE);
+ mark_frames_ready();
}
-void new_packet_list_unmark_all_frames_cb(GtkWidget *w _U_, gpointer data _U_)
+static void
+toggle_mark_all_displayed_frames(void)
{
- mark_all_frames(FALSE);
+ /* XXX: we might need a progressbar here */
+ guint32 framenum;
+ frame_data *fdata;
+ for (framenum = 1; framenum <= cfile.count; framenum++) {
+ fdata = frame_data_sequence_find(cfile.frames, framenum);
+ if( fdata->flags.passed_dfilter )
+ set_frame_mark(!fdata->flags.marked, fdata);
+ }
}
-/* Set the selection mode of the packet list window. */
void
-new_packet_list_set_sel_browse(gboolean val, gboolean force_set)
+new_packet_list_toggle_mark_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_)
{
- GtkSelectionMode new_mode;
- /* initialize with a mode we don't use, so that the mode == new_mode
- * test will fail the first time */
- static GtkSelectionMode mode = GTK_SELECTION_MULTIPLE;
-
- /* Yeah, GTK uses "browse" in the case where we do not, but oh well. I
- * think "browse" in Wireshark makes more sense than "SINGLE" in GTK+ */
- new_mode = val ? GTK_SELECTION_SINGLE : GTK_SELECTION_BROWSE;
-
- if ((mode == new_mode) && !force_set) {
- /*
- * The mode isn't changing, so don't do anything.
- * In particular, don't gratuitiously unselect the
- * current packet.
- *
- * XXX - Copied code from "old" packet list
- * - I don't know if the comment below is still true...
- * XXX - why do we have to unselect the current packet
- * ourselves? The documentation for the GtkCList at
- *
- * http://developer.gnome.org/doc/API/gtk/gtkclist.html
- *
- * says "Note that setting the widget's selection mode to
- * one of GTK_SELECTION_BROWSE or GTK_SELECTION_SINGLE will
- * cause all the items in the GtkCList to become deselected."
- */
- return;
- }
-
- if (cfile.finfo_selected)
- cf_unselect_field(&cfile);
-
- mode = new_mode;
- gtk_tree_selection_set_mode (gtk_tree_view_get_selection(GTK_TREE_VIEW(packetlist->view)), mode);
+ toggle_mark_all_displayed_frames();
+ mark_frames_ready();
}
-void
-new_packet_list_set_font(PangoFontDescription *font)
+
+static void
+set_frame_ignore(gboolean set, frame_data *fdata)
{
- gtk_widget_modify_font(packetlist->view, font);
+ if (set)
+ cf_ignore_frame(&cfile, fdata);
+ else
+ cf_unignore_frame(&cfile, fdata);
}
-void new_packet_list_mark_frame_cb(GtkWidget *w _U_, gpointer data _U_)
+void
+new_packet_list_ignore_frame_cb(GtkWidget *w _U_, gpointer data _U_)
{
GtkTreeModel *model;
GtkTreeSelection *selection;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(packetlist->view));
/* model is filled with the current model as a convenience. */
- gtk_tree_selection_get_selected(selection, &model, &iter);
- record = new_packet_list_get_record(model, &iter);
+ if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+ return;
- set_frame_mark(!record->fdata->flags.marked, record->fdata);
- mark_frames_ready();
+ record = new_packet_list_get_record(model, &iter);
+ set_frame_ignore(!record->fdata->flags.ignored, record->fdata);
+ redissect_packets();
}
-void new_packet_list_ignore_frame_cb(GtkWidget *w _U_, gpointer data _U_)
+static void
+ignore_all_displayed_frames(gboolean set)
{
- GtkTreeModel *model;
- GtkTreeSelection *selection;
- GtkTreeIter iter;
- PacketListRecord *record;
-
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(packetlist->view));
- /* model is filled with the current model as a convenience. */
- gtk_tree_selection_get_selected(selection, &model, &iter);
- record = new_packet_list_get_record(model, &iter);
+ guint32 framenum;
+ frame_data *fdata;
- set_frame_ignore(!record->fdata->flags.ignored, record->fdata);
+ /* XXX: we might need a progressbar here */
+ for (framenum = 1; framenum <= cfile.count; framenum++) {
+ fdata = frame_data_sequence_find(cfile.frames, framenum);
+ if( fdata->flags.passed_dfilter )
+ set_frame_ignore(set, fdata);
+ }
redissect_packets();
}
-static void ignore_all_frames(gboolean set)
+void
+new_packet_list_ignore_all_displayed_frames_cb(GtkWidget *w _U_, gpointer data _U_)
{
+ if(cfile.displayed_count < cfile.count){
+ frame_data *fdata;
+ /* Due to performance impact with large captures, don't check the filtered list for
+ an ignored frame; just check the first. If a ignored frame exists but isn't first and
+ the user wants to unignore all the displayed frames, they will just re-exec the shortcut. */
+ fdata = frame_data_sequence_find(cfile.frames, cfile.first_displayed);
+ if (fdata->flags.ignored==TRUE) {
+ ignore_all_displayed_frames(FALSE);
+ } else {
+ ignore_all_displayed_frames(TRUE);
+ }
+ }
+}
+
+static void
+unignore_all_frames(void)
+{
+ guint32 framenum;
frame_data *fdata;
/* XXX: we might need a progressbar here */
- for (fdata = cfile.plist_start; fdata != NULL; fdata = fdata->next) {
- if( fdata->flags.passed_dfilter )
- set_frame_ignore(set, fdata);
+ for (framenum = 1; framenum <= cfile.count; framenum++) {
+ fdata = frame_data_sequence_find(cfile.frames, framenum);
+ set_frame_ignore(FALSE, fdata);
}
redissect_packets();
}
-void new_packet_list_ignore_all_frames_cb(GtkWidget *w _U_, gpointer data _U_)
+void
+new_packet_list_unignore_all_frames_cb(GtkWidget *w _U_, gpointer data _U_)
+{
+ unignore_all_frames();
+}
+
+
+static void
+untime_reference_all_frames(void)
{
- ignore_all_frames(TRUE);
+ /* XXX: we might need a progressbar here */
+ guint32 framenum;
+ frame_data *fdata;
+ for (framenum = 1; framenum <= cfile.count && cfile.ref_time_count > 0; framenum++) {
+ fdata = frame_data_sequence_find(cfile.frames, framenum);
+ if (fdata->flags.ref_time == 1) {
+ set_frame_reftime(FALSE, fdata, cfile.current_row);
+ }
+ }
}
-void new_packet_list_unignore_all_frames_cb(GtkWidget *w _U_, gpointer data _U_)
+void
+new_packet_list_untime_reference_all_frames_cb(GtkWidget *w _U_, gpointer data _U_)
{
- ignore_all_frames(FALSE);
+ untime_reference_all_frames();
}
+guint
+new_packet_list_get_column_id (gint col_num)
+{
+ GtkTreeViewColumn *column = gtk_tree_view_get_column (GTK_TREE_VIEW(packetlist->view), col_num);
+ gint col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), E_MPACKET_LIST_COL_KEY));
+
+ return col_id;
+}
+
static gboolean
-get_col_text_from_record( PacketListRecord *record, gint col_num, gchar** cell_text){
+get_col_text_from_record( PacketListRecord *record, gint col_num, gchar** cell_text)
+{
+ gint col_id = new_packet_list_get_column_id (col_num);
- if (col_based_on_frame_data(&cfile.cinfo, col_num)) {
- col_fill_in_frame_data(record->fdata, &cfile.cinfo, col_num, FALSE);
- *cell_text = g_strdup(cfile.cinfo.col_data[col_num]);
+ if (col_based_on_frame_data(&cfile.cinfo, col_id)) {
+ col_fill_in_frame_data(record->fdata, &cfile.cinfo, col_id, FALSE);
+ *cell_text = g_strdup(cfile.cinfo.col_data[col_id]);
}else
- *cell_text = g_strdup(record->fdata->col_text[col_num]);
+ *cell_text = g_strdup(record->col_text[col_id]);
return TRUE;
}
void
-new_packet_list_copy_summary_cb(GtkWidget * w _U_, gpointer data _U_, copy_summary_type copy_type)
+new_packet_list_copy_summary_cb(gpointer data _U_, copy_summary_type copy_type)
{
gint col;
gchar *celltext;
if (cfile.current_frame) {
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(packetlist->view));
/* model is filled with the current model as a convenience. */
- gtk_tree_selection_get_selected(selection, &model, &iter);
+ if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+ return;
+
record = new_packet_list_get_record(model, &iter);
for(col = 0; col < cfile.cinfo.num_cols; ++col) {
if(col != 0) {
} else {
fprintf (rf, " %s,", col_format_to_string(col_fmt));
}
- tree_column = gtk_tree_view_get_column(GTK_TREE_VIEW(GTK_TREE_VIEW(packetlist->view)), col);
+ tree_column = gtk_tree_view_get_column(GTK_TREE_VIEW(packetlist->view), col);
width = gtk_tree_view_column_get_width(tree_column);
xalign = recent_get_column_xalign (col);
if (width == 0) {
return packetlist->view;
}
-void new_packet_list_colorize_packets(void)
+void
+new_packet_list_colorize_packets(void)
{
packet_list_reset_colorized(packetlist);
gtk_widget_queue_draw (packetlist->view);
}
-
-#endif /* NEW_PACKET_LIST */
-
git.samba.org / obnox / wireshark / wip.git / blobdiff