#include "gtk/prefs_column.h"
#include "gtk/gtkglobals.h"
#include "gtk/gui_utils.h"
-#ifdef NEW_PACKET_LIST
#include "gtk/new_packet_list.h"
-#else
-#include "gtk/main_packet_list.h"
-#endif
#include "gtk/filter_dlg.h"
#include "gtk/filter_autocomplete.h"
+#include "gtk/old-gtk-compat.h"
-
-static GtkWidget *remove_bt, *field_te, *field_lb, *fmt_cmb;
+static GtkWidget *remove_bt, *field_te, *field_lb, *occurrence_te, *occurrence_lb, *fmt_cmb;
static gulong column_menu_changed_handler_id;
static gulong column_field_changed_handler_id;
+static gulong column_occurrence_changed_handler_id;
static gulong column_row_deleted_handler_id;
static void column_list_new_cb(GtkWidget *, gpointer);
static void column_list_select_cb(GtkTreeSelection *, gpointer);
static void column_menu_changed_cb(GtkWidget *, gpointer);
static void column_field_changed_cb(GtkEditable *, gpointer);
+static void column_occurrence_changed_cb(GtkEditable *, gpointer);
static void column_dnd_row_deleted_cb(GtkTreeModel *, GtkTreePath *, gpointer);
static gboolean column_title_changed_cb(GtkCellRendererText *, const gchar *, const gchar *, gpointer);
+static char custom_occurrence_str[8] = "";
+
enum {
-#ifdef NEW_PACKET_LIST
VISIBLE_COLUMN,
-#endif
TITLE_COLUMN,
FORMAT_COLUMN,
DATA_COLUMN,
N_COLUMN /* The number of columns */
};
-#ifdef NEW_PACKET_LIST
/* Visible toggled */
static void
visible_toggled(GtkCellRendererToggle *cell _U_, gchar *path_str, gpointer data)
gtk_tree_path_free(path);
} /* visible_toggled */
-#endif
/*
* Create and display the column selection widgets.
gint i;
gchar *fmt;
gint cur_fmt;
-#ifdef NEW_PACKET_LIST
- const gchar *column_titles[] = {"Visible", "Title", "Field type"};
-#else
- const gchar *column_titles[] = {"Title", "Field type"};
-#endif
+ const gchar *column_titles[] = {"Displayed", "Title", "Field type"};
GtkListStore *store;
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
GtkTreeIter first_iter;
gint first_row = TRUE;
- GtkTooltips *tooltips = gtk_tooltips_new();
-
/* Container for each row of widgets */
main_vb = gtk_vbox_new(FALSE, 5);
gtk_container_set_border_width(GTK_CONTAINER(main_vb), 5);
gtk_widget_show(list_sc);
store = gtk_list_store_new(N_COLUMN,
-#ifdef NEW_PACKET_LIST
G_TYPE_BOOLEAN,
-#endif
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
- column_row_deleted_handler_id =
+ column_row_deleted_handler_id =
g_signal_connect(GTK_TREE_MODEL(store), "row-deleted", G_CALLBACK(column_dnd_row_deleted_cb), NULL);
column_l = tree_view_new(GTK_TREE_MODEL(store));
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(column_l), TRUE);
gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(column_l), FALSE);
gtk_tree_view_set_reorderable(GTK_TREE_VIEW(column_l), TRUE);
- gtk_tooltips_set_tip (tooltips, column_l,
- "Click on a title to change its name.\nDrag an item to change its order.", NULL);
+ gtk_widget_set_tooltip_text(column_l, "Click on a title to change its name.\nDrag an item to change its order.");
-#ifdef NEW_PACKET_LIST
renderer = gtk_cell_renderer_toggle_new();
g_signal_connect(renderer, "toggled", G_CALLBACK(visible_toggled), store);
column = gtk_tree_view_column_new_with_attributes(column_titles[VISIBLE_COLUMN], renderer, "active", VISIBLE_COLUMN, NULL);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_append_column(GTK_TREE_VIEW(column_l), column);
-#endif
renderer = gtk_cell_renderer_text_new();
g_object_set(G_OBJECT(renderer), "editable", TRUE, NULL);
cfmt = (fmt_data *) clp->data;
cur_fmt = get_column_format_from_str(cfmt->fmt);
if (cur_fmt == COL_CUSTOM) {
- fmt = g_strdup_printf("%s (%s)", col_format_desc(cur_fmt), cfmt->custom_field);
+ if (cfmt->custom_occurrence) {
+ fmt = g_strdup_printf("%s (%s#%d)", col_format_desc(cur_fmt), cfmt->custom_field, cfmt->custom_occurrence);
+ } else {
+ fmt = g_strdup_printf("%s (%s)", col_format_desc(cur_fmt), cfmt->custom_field);
+ }
} else {
if (cfmt->custom_field) {
/* Delete custom_field from previous changes */
g_free (cfmt->custom_field);
cfmt->custom_field = NULL;
+ cfmt->custom_occurrence = 0;
}
fmt = g_strdup_printf("%s", col_format_desc(cur_fmt));
}
-#if GTK_CHECK_VERSION(2,6,0)
gtk_list_store_insert_with_values(store, &iter, G_MAXINT,
-#else
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
-#endif
-#ifdef NEW_PACKET_LIST
VISIBLE_COLUMN, cfmt->visible,
-#endif
TITLE_COLUMN, cfmt->title, FORMAT_COLUMN, fmt, DATA_COLUMN, clp, -1);
if (first_row) {
add_bt = gtk_button_new_from_stock(GTK_STOCK_ADD);
g_signal_connect(add_bt, "clicked", G_CALLBACK(column_list_new_cb), column_l);
gtk_box_pack_start (GTK_BOX (add_remove_vb), add_bt, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, add_bt,
- "Add a new column at the end of the list.", NULL);
+ gtk_widget_set_tooltip_text(add_bt, "Add a new column at the end of the list.");
gtk_widget_show(add_bt);
remove_bt = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
gtk_widget_set_sensitive(remove_bt, FALSE);
g_signal_connect(remove_bt, "clicked", G_CALLBACK(column_list_delete_cb), column_l);
gtk_box_pack_start (GTK_BOX (add_remove_vb), remove_bt, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, remove_bt,
- "Remove the selected column.", NULL);
+ gtk_widget_set_tooltip_text(remove_bt, "Remove the selected column.");
gtk_widget_show(remove_bt);
-
+
/* properties frame */
props_fr = gtk_frame_new("Properties");
gtk_box_pack_start (GTK_BOX (bottom_hb), props_fr, TRUE, TRUE, 0);
gtk_widget_show(props_fr);
/* Column name entry and format selection */
- tb = gtk_table_new(2, 2, FALSE);
+ tb = gtk_table_new(2, 4, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(tb), 5);
gtk_container_add(GTK_CONTAINER(props_fr), tb);
gtk_table_set_row_spacings(GTK_TABLE(tb), 10);
gtk_widget_show(tb);
lb = gtk_label_new("Field type:");
- gtk_misc_set_alignment(GTK_MISC(lb), 1.0f, 0.5f);
+ gtk_misc_set_alignment(GTK_MISC(lb), 0.0f, 0.5f);
gtk_table_attach_defaults(GTK_TABLE(tb), lb, 0, 1, 0, 1);
- gtk_tooltips_set_tip (tooltips, lb,
- "Select which packet information to present in the column.", NULL);
+ gtk_widget_set_tooltip_text(lb, "Select which packet information to present in the column.");
gtk_widget_show(lb);
props_hb = gtk_hbox_new(FALSE, 5);
gtk_table_attach(GTK_TABLE(tb), props_hb, 1, 2, 0, 1, GTK_FILL, GTK_SHRINK, 0, 0);
- gtk_tooltips_set_tip (tooltips, props_hb,
- "Select which packet information to present in the column.", NULL);
+ gtk_widget_set_tooltip_text(props_hb, "Select which packet information to present in the column.");
gtk_widget_show(props_hb);
field_lb = gtk_label_new("Field name:");
- gtk_misc_set_alignment(GTK_MISC(field_lb), 1.0f, 0.5f);
+ gtk_misc_set_alignment(GTK_MISC(field_lb), 0.0f, 0.5f);
gtk_table_attach_defaults(GTK_TABLE(tb), field_lb, 0, 1, 1, 2);
gtk_widget_set_sensitive(field_lb, FALSE);
- gtk_tooltips_set_tip (tooltips, field_lb,
+ 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.", NULL);
+ "This string has the same syntax as a display filter string.");
gtk_widget_show(field_lb);
field_te = gtk_entry_new();
/* XXX: column_field_changed_cb will be called for every character entered in the entry box. */
/* Consider Changing logic so that the field is "accepted" only when a return is entered ?? */
/* Also: entry shouldn't be accepted if it's not a valid filter ? */
- column_field_changed_handler_id =
+ column_field_changed_handler_id =
g_signal_connect(field_te, "changed", G_CALLBACK(column_field_changed_cb), column_l);
g_object_set_data(G_OBJECT(main_vb), E_FILT_AUTOCOMP_PTR_KEY, NULL);
colorize_filter_te_as_empty(field_te);
gtk_table_attach_defaults(GTK_TABLE(tb), field_te, 1, 2, 1, 2);
gtk_widget_set_sensitive(field_te, FALSE);
- gtk_tooltips_set_tip (tooltips, field_te,
+ 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.", NULL);
+ "This string has the same syntax as a display filter string.");
gtk_widget_show(field_te);
- fmt_cmb = gtk_combo_box_new_text();
+ occurrence_lb = gtk_label_new("Field occurrence:");
+ gtk_misc_set_alignment(GTK_MISC(occurrence_lb), 0.0f, 0.5f);
+ gtk_table_attach_defaults(GTK_TABLE(tb), occurrence_lb, 2, 3, 1, 2);
+ gtk_widget_set_sensitive(occurrence_lb, FALSE);
+ gtk_widget_set_tooltip_text(occurrence_lb,
+ "Field occurence to use. "
+ "0=all (default), 1=first, 2=second, ..., -1=last.");
+ gtk_widget_show(occurrence_lb);
+
+ occurrence_te = gtk_entry_new();
+ gtk_entry_set_max_length (GTK_ENTRY(occurrence_te),4);
+ g_object_set_data (G_OBJECT(occurrence_te), "occurrence", "");
+
+ /* XXX: column_occurrence_changed_cb will be called for every character entered in the entry box. */
+ /* Consider Changing logic so that the field is "accepted" only when a return is entered ?? */
+ column_occurrence_changed_handler_id =
+ g_signal_connect(occurrence_te, "changed", G_CALLBACK(column_occurrence_changed_cb), column_l);
+
+ gtk_table_attach_defaults(GTK_TABLE(tb), occurrence_te, 3, 4, 1, 2);
+ gtk_widget_set_sensitive(occurrence_te, FALSE);
+ gtk_widget_set_tooltip_text(occurrence_te,
+ "Field occurence to use. "
+ "0=all (default), 1=first, 2=second, ..., -1=last.");
+ gtk_widget_show(occurrence_te);
+
+ fmt_cmb = gtk_combo_box_text_new();
for (i = 0; i < NUM_COL_FMTS; i++)
- gtk_combo_box_append_text(GTK_COMBO_BOX(fmt_cmb), col_format_desc(i));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(fmt_cmb), col_format_desc(i));
column_menu_changed_handler_id = g_signal_connect(fmt_cmb, "changed", G_CALLBACK(column_menu_changed_cb), column_l);
}
void
-column_prefs_add_custom(gint fmt, const gchar *title, const gchar *custom_field)
+column_prefs_add_custom(gint fmt, const gchar *title, const gchar *custom_field, gint custom_occurrence)
{
GList *clp;
fmt_data *cfmt, *last_cfmt;
cfmt->title = g_strdup(title);
cfmt->fmt = g_strdup(col_format_to_string(fmt));
cfmt->custom_field = g_strdup(custom_field);
+ cfmt->custom_occurrence = custom_occurrence;
+ cfmt->resolved = TRUE;
if (custom_field) {
+ cfmt->visible = TRUE;
clp = g_list_last(prefs.col_list);
last_cfmt = (fmt_data *) clp->data;
if (strcmp(last_cfmt->fmt, "%i") == 0) {
prefs.col_list = g_list_append(prefs.col_list, cfmt);
}
} else {
+ cfmt->visible = FALSE; /* Will be set to TRUE in visible_toggled() when added to list */
prefs.col_list = g_list_append(prefs.col_list, cfmt);
}
}
-void
-column_prefs_rename(gint col, const gchar *title)
-{
- GList *clp = g_list_nth(prefs.col_list, col);
- fmt_data *cfmt = (fmt_data *) clp->data;
-
- g_free (cfmt->title);
- cfmt->title = g_strdup(title);
-}
-
void
column_prefs_remove(gint col)
{
GtkTreeViewColumn *title_column;
cur_fmt = COL_NUMBER; /* Set the default new column type */
- column_prefs_add_custom (cur_fmt, title, NULL);
+ column_prefs_add_custom (cur_fmt, title, NULL, 0);
model = gtk_tree_view_get_model(column_l);
-#if GTK_CHECK_VERSION(2,6,0)
gtk_list_store_insert_with_values(GTK_LIST_STORE(model), &iter, G_MAXINT,
-#else
- gtk_list_store_append(GTK_LIST_STORE(model), &iter);
- gtk_list_store_set(GTK_LIST_STORE(model), &iter,
-#endif
-#ifdef NEW_PACKET_LIST
VISIBLE_COLUMN, TRUE,
-#endif
TITLE_COLUMN, title,
FORMAT_COLUMN, col_format_desc(cur_fmt),
DATA_COLUMN, g_list_last(prefs.col_list),
GtkTreePath *path = gtk_tree_path_new_from_string (str_path);
GtkTreeIter iter;
- gtk_tree_model_get_iter(model, &iter, path);
-
+ gtk_tree_model_get_iter(model, &iter, path);
+
gtk_list_store_set(GTK_LIST_STORE(model), &iter, TITLE_COLUMN, new_title, -1);
gtk_tree_model_get(model, &iter, DATA_COLUMN, &clp, -1);
- if (clp) {
+ if (clp) {
cfmt = (fmt_data *) clp->data;
g_free(cfmt->title);
cfmt->title = g_strdup(new_title);
}
gtk_tree_path_free (path);
- cfile.cinfo.columns_changed = TRUE;
- return TRUE;
+ cfile.cinfo.columns_changed = TRUE;
+ return TRUE;
}
/*
g_signal_handler_unblock(fmt_cmb, column_menu_changed_handler_id);
g_signal_handler_block (field_te, column_field_changed_handler_id);
+ g_signal_handler_block (occurrence_te, column_occurrence_changed_handler_id);
if (cur_fmt == COL_CUSTOM) {
gtk_entry_set_text(GTK_ENTRY(field_te), cfmt->custom_field);
gtk_widget_set_sensitive(field_lb, TRUE);
gtk_widget_set_sensitive(field_te, TRUE);
+ g_snprintf(custom_occurrence_str, sizeof(custom_occurrence_str), "%d", cfmt->custom_occurrence);
+ gtk_entry_set_text(GTK_ENTRY(occurrence_te), custom_occurrence_str);
+ gtk_widget_set_sensitive(occurrence_lb, TRUE);
+ gtk_widget_set_sensitive(occurrence_te, TRUE);
} else {
gtk_editable_delete_text(GTK_EDITABLE(field_te), 0, -1);
gtk_widget_set_sensitive(field_lb, FALSE);
gtk_widget_set_sensitive(field_te, FALSE);
+ gtk_editable_delete_text(GTK_EDITABLE(occurrence_te), 0, -1);
+ gtk_widget_set_sensitive(occurrence_lb, FALSE);
+ gtk_widget_set_sensitive(occurrence_te, FALSE);
}
+ g_signal_handler_unblock(occurrence_te, column_occurrence_changed_handler_id);
g_signal_handler_unblock(field_te, column_field_changed_handler_id);
gtk_widget_set_sensitive(remove_bt, TRUE);
else
{
gtk_editable_delete_text(GTK_EDITABLE(field_te), 0, -1);
+ gtk_editable_delete_text(GTK_EDITABLE(occurrence_te), 0, -1);
gtk_widget_set_sensitive(remove_bt, FALSE);
gtk_widget_set_sensitive(field_te, FALSE);
+ gtk_widget_set_sensitive(occurrence_te, FALSE);
gtk_widget_set_sensitive(fmt_cmb, FALSE);
}
}
/* Update field widgets, list_store, column format array */
/* entry as appropriate. */
g_signal_handler_block (field_te, column_field_changed_handler_id);
+ g_signal_handler_block (occurrence_te, column_occurrence_changed_handler_id);
if (cur_fmt == COL_CUSTOM) {
/* Changing from custom to non-custom */
gtk_editable_delete_text(GTK_EDITABLE(field_te), 0, -1);
+ gtk_editable_delete_text(GTK_EDITABLE(occurrence_te), 0, -1);
fmt = g_strdup_printf("%s", col_format_desc(cur_cb_fmt));
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);
} else if (cur_cb_fmt == COL_CUSTOM) {
/* Changing from non-custom to custom */
cfmt->custom_field = g_strdup("");
/* The following doesn't trigger a call to menu_field_changed_cb() */
gtk_entry_set_text(GTK_ENTRY(field_te), cfmt->custom_field);
- fmt = g_strdup_printf("%s (%s)", col_format_desc(cur_cb_fmt), cfmt->custom_field);
+ g_snprintf(custom_occurrence_str, sizeof(custom_occurrence_str), "%d", cfmt->custom_occurrence);
+ gtk_entry_set_text(GTK_ENTRY(occurrence_te), custom_occurrence_str);
+
+ if (cfmt->custom_occurrence) {
+ fmt = g_strdup_printf("%s (%s#%d)", col_format_desc(cur_cb_fmt), cfmt->custom_field, cfmt->custom_occurrence);
+ } else {
+ fmt = g_strdup_printf("%s (%s)", col_format_desc(cur_cb_fmt), cfmt->custom_field);
+ }
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 from non-custom to non-custom */
fmt = g_strdup_printf("%s", col_format_desc(cur_cb_fmt));
}
+ g_signal_handler_unblock(occurrence_te, column_occurrence_changed_handler_id);
g_signal_handler_unblock(field_te, column_field_changed_handler_id);
gtk_list_store_set(GTK_LIST_STORE(model), &iter, FORMAT_COLUMN, fmt, -1);
return; /* no action req'd */
}
- /* The user has entered a new value in the field entry box: make the req'd changes */
+ /* The user has entered a new value in the field entry box: make the req'd changes */
cur_fmt = get_column_format_from_str(cfmt->fmt);
- fmt = g_strdup_printf("%s (%s)", col_format_desc(cur_fmt), field);
+ if (cfmt->custom_occurrence) {
+ fmt = g_strdup_printf("%s (%s#%d)", col_format_desc(cur_fmt), field, cfmt->custom_occurrence);
+ } else {
+ fmt = g_strdup_printf("%s (%s)", col_format_desc(cur_fmt), field);
+ }
gtk_list_store_set(GTK_LIST_STORE(model), &iter, FORMAT_COLUMN, fmt, -1);
g_free(fmt);
}
+/*
+ * The user changed the custom field occurrence entry box or
+ * the field occurrece entry box has been updated because a new
+ * column row with custom format has been selected.
+ * If the current field entry matches that of the current
+ * column row, this is just an update because a new
+ * column row has been selected. Do nothing.
+ * If the two are different, then update the column row & etc.
+ */
+static void
+column_occurrence_changed_cb(GtkEditable *te, gpointer data) {
+ fmt_data *cfmt;
+ gint cur_fmt;
+ gint occurrence;
+ GList *clp;
+ gchar *fmt;
+ GtkTreeView *tree = (GtkTreeView *)data;
+ GtkTreeSelection *sel;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ sel = gtk_tree_view_get_selection(tree);
+ if ( ! (gtk_tree_selection_get_selected(sel, &model, &iter))) {
+ return;
+ }
+
+ occurrence = (gint)strtol(gtk_editable_get_chars(te, 0, -1), NULL, 10);
+ gtk_tree_model_get(model, &iter, DATA_COLUMN, &clp, -1);
+ cfmt = (fmt_data *) clp->data;
+ if (cfmt->custom_occurrence == occurrence) {
+ return; /* no action req'd */
+ }
+
+ /* The user has entered a new value in the field occurrence entry box: make the req'd changes */
+ cur_fmt = get_column_format_from_str(cfmt->fmt);
+ if (occurrence) {
+ fmt = g_strdup_printf("%s (%s#%d)", col_format_desc(cur_fmt), cfmt->custom_field, occurrence);
+ } else {
+ fmt = g_strdup_printf("%s (%s)", col_format_desc(cur_fmt), cfmt->custom_field);
+ }
+
+ gtk_list_store_set(GTK_LIST_STORE(model), &iter, FORMAT_COLUMN, fmt, -1);
+ g_free(fmt);
+ cfmt->custom_occurrence = occurrence;
+ cfile.cinfo.columns_changed = TRUE;
+}
+
+
/*
* Callback for the "row-deleted" signal emitted when a list item is dragged.
* http://library.gnome.org/devel/gtk/stable/GtkTreeModel.html#GtkTreeModel-rows-reordered
- * says that DND deletes, THEN inserts the row.
+ * says that DND deletes, THEN inserts the row.
*
* XXX: For the record: For Gtk+ 2.16.0 testing shows the actual sequence for drag-and-drop to be as follows:
* 1. Insert a new, empty row at the destination;
* 4. Delete the source row;
* 5. Emit a "row-deleted" signal; invoke any row-deleted callbacks & etc.
*
- * The code below (invoked as a consequence of a "row-deleted" signal) rebuilds
+ * The code below (invoked as a consequence of a "row-deleted" signal) rebuilds
* prefs.col_list by iterating over the (re-ordered) tree model.
*/
static void
{
/* Redraw the packet list if the columns were changed */
if(cfile.cinfo.columns_changed) {
-#ifdef NEW_PACKET_LIST
new_packet_list_recreate();
-#else
- packet_list_recreate();
-#endif
cfile.cinfo.columns_changed = FALSE; /* Reset value */
}
}
git.samba.org / obnox / wireshark / wip.git / blobdiff