osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Didier Gautheron: 

Expert info clean up.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3971

svn path=/trunk/; revision=29663
This commit is contained in:
Anders Broman 2009-09-02 05:48:38 +00:00
parent 5dd678f0a7
commit 8035954712
2 changed files with 120 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
gtk/expert_comp_table.c
View File

@ -54,43 +54,7 @@
#include "gtk/gtkglobals.h"
#include "gtk/webbrowser.h"
#define SORT_ALPHABETICAL 0
static gint
sort_iter_compare_func (GtkTreeModel *model,
GtkTreeIter *a,
GtkTreeIter *b,
gpointer userdata)
{
gint sortcol = GPOINTER_TO_INT(userdata);
gint ret = 0;
switch (sortcol)
{
case SORT_ALPHABETICAL:
{
gchar *name1, *name2;
gtk_tree_model_get(model, a, 0, &name1, -1);
gtk_tree_model_get(model, b, 0, &name2, -1);
if (name1 == NULL || name2 == NULL)
{
if (name1 == NULL && name2 == NULL)
break; /* both equal => ret = 0 */
ret = (name1 == NULL) ? -1 : 1;
}
else
{
ret = g_ascii_strcasecmp(name1,name2);
}
g_free(name1);
g_free(name2);
}
break;
default:
g_return_val_if_reached(0);
}
return ret;
}
const char *packet = "Packet:";
enum
{
@ -101,6 +65,77 @@ enum
N_COLUMNS
};
static void
proto_data_func (GtkTreeViewColumn *column _U_,
GtkCellRenderer *renderer,
GtkTreeModel *model,
GtkTreeIter *iter,
gpointer user_data)
{
gchar *str = NULL;
gchar *grp = NULL; /* type pointer, don't free */
/* The col to get data from is in userdata */
gint data_column = GPOINTER_TO_INT(user_data);
gtk_tree_model_get(model, iter, data_column, &str, -1);
gtk_tree_model_get(model, iter, GROUP_COLUMN, &grp, -1);
/* XXX should we check that str is non NULL and print a warning or do assert? */
g_object_set(renderer, "text", str, NULL);
if (grp == packet) {
/* it's a number right align */
g_object_set(renderer, "xalign", 1.0, NULL);
}
else {
g_object_set(renderer, "xalign", 0.0, NULL);
}
g_free(str);
}
static gint
proto_sort_func(GtkTreeModel *model,
GtkTreeIter *a,
GtkTreeIter *b,
gpointer user_data)
{
gchar *str_a = NULL;
gchar *str_b = NULL;
gchar *grp = NULL; /* type pointer, don't free */
gint ret = 0;
/* The col to get data from is in userdata */
gint data_column = GPOINTER_TO_INT(user_data);
gtk_tree_model_get(model, a, data_column, &str_a, -1);
gtk_tree_model_get(model, b, data_column, &str_b, -1);
gtk_tree_model_get(model, a, GROUP_COLUMN, &grp, -1);
if (str_a == str_b) {
ret = 0;
}
else if (str_a == NULL || str_b == NULL) {
ret = (str_a == NULL) ? -1 : 1;
}
else {
if (grp == packet) {
gint a = atoi(str_a);
gint b = atoi(str_b);
if (a == b)
ret = 0;
else if (a < b)
ret = -1;
else
ret = 1;
}
else
ret = g_ascii_strcasecmp(str_a,str_b);
}
g_free(str_a);
g_free(str_b);
return ret;
}
static gint find_summary_data(error_equiv_table *err, const expert_info_t *expert_data)
{
guint i;
@ -146,15 +181,12 @@ error_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint call
SUMMARY_COLUMN, &expert_data.summary,
-1);
if (strcmp(grp, "Packet:")==0) {
if (strcmp(grp, packet)==0) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "You cannot filter or search for packet number. Click on a valid item header.");
g_free(grp);
g_free(expert_data.summary);
return;
}
g_free(grp);
/* XXX: find_summary_data doesn't (currently) reference expert_data.group. */
/* If "group" is required, then the message from GROUP_COLUMN will need */
/* to be translated to the group number (or the actual group number */
@ -417,11 +449,10 @@ expert_goto_pkt_cb (GtkTreeSelection *selection, gpointer data _U_)
GROUP_COLUMN, &grp,
-1);
if (strcmp(grp, "Packet:")==0) {
if (strcmp(grp, packet)==0) {
cf_goto_frame(&cfile, atoi(pkt));
}
g_free (pkt);
g_free (grp);
}
}
@ -455,15 +486,9 @@ init_error_table(error_equiv_table *err, guint num_procs, GtkWidget *vbox)
/* Create the store */
store = gtk_tree_store_new (4, /* Total number of columns */
#if 0
G_TYPE_POINTER, /* Group */
G_TYPE_POINTER, /* Protocol */
G_TYPE_POINTER, /* Summary */
#else
G_TYPE_STRING, /* Group */
G_TYPE_STRING, /* Protocol */
G_TYPE_STRING, /* Summary */
#endif
G_TYPE_INT); /* Count */
/* Create a view */
@ -473,14 +498,9 @@ init_error_table(error_equiv_table *err, guint num_procs, GtkWidget *vbox)
#if GTK_CHECK_VERSION(2,6,0)
/* Speed up the list display */
gtk_tree_view_set_fixed_height_mode(err->tree_view, TRUE);
gtk_tree_view_set_fixed_height_mode(err->tree_view, TRUE);
#endif
/* Setup the sortable columns */
gtk_tree_sortable_set_default_sort_func(sortable, sort_iter_compare_func, GINT_TO_POINTER(SORT_ALPHABETICAL), NULL);
gtk_tree_sortable_set_sort_column_id(sortable, GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING);
gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW (tree), FALSE);
/* The view now holds a reference. We can get rid of our own reference */
@ -491,9 +511,15 @@ gtk_tree_sortable_set_sort_column_id(sortable, GTK_TREE_SORTABLE_DEFAULT_SORT_CO
/* Create the first column, associating the "text" attribute of the
* cell_renderer to the first column of the model */
column = gtk_tree_view_column_new_with_attributes ("Group", renderer, "text", GROUP_COLUMN, NULL);
column = gtk_tree_view_column_new_with_attributes ("Group", renderer, NULL);
gtk_tree_view_column_set_sort_column_id(column, GROUP_COLUMN);
gtk_tree_view_column_set_resizable(column, TRUE);
gtk_tree_view_column_set_cell_data_func(column, renderer, str_ptr_data_func,
GINT_TO_POINTER(GROUP_COLUMN), NULL);
gtk_tree_sortable_set_sort_func(sortable, GROUP_COLUMN, str_ptr_sort_func,
GINT_TO_POINTER(GROUP_COLUMN), NULL);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
gtk_tree_view_column_set_min_width(column, 80);
/* Add the column to the view. */
@ -504,6 +530,12 @@ gtk_tree_sortable_set_sort_column_id(sortable, GTK_TREE_SORTABLE_DEFAULT_SORT_CO
column = gtk_tree_view_column_new_with_attributes ("Protocol", renderer, "text", PROTOCOL_COLUMN, NULL);
gtk_tree_view_column_set_sort_column_id(column, PROTOCOL_COLUMN);
gtk_tree_view_column_set_resizable(column, TRUE);
gtk_tree_view_column_set_cell_data_func(column, renderer, proto_data_func,
GINT_TO_POINTER(PROTOCOL_COLUMN), NULL);
gtk_tree_sortable_set_sort_func(sortable, PROTOCOL_COLUMN, proto_sort_func,
GINT_TO_POINTER(PROTOCOL_COLUMN), NULL);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
gtk_tree_view_column_set_min_width(column, 40);
gtk_tree_view_column_set_fixed_width(column, 100);
@ -520,6 +552,9 @@ gtk_tree_sortable_set_sort_column_id(sortable, GTK_TREE_SORTABLE_DEFAULT_SORT_CO
gtk_tree_view_append_column (GTK_TREE_VIEW (err->tree_view), column);
/* Last column.. Count. */
renderer = gtk_cell_renderer_text_new ();
/* right align */
g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
column = gtk_tree_view_column_new_with_attributes ("Count", renderer, "text", COUNT_COLUMN, NULL);
gtk_tree_view_column_set_sort_column_id(column, COUNT_COLUMN);
gtk_tree_view_column_set_resizable(column, TRUE);
@ -582,8 +617,9 @@ init_error_table_row(error_equiv_table *err, const expert_info_t *expert_data)
store = GTK_TREE_STORE(gtk_tree_view_get_model(err->tree_view)); /* Get store */
gtk_tree_store_append (store, &procedure->iter, NULL); /* Acquire an iterator */
/* match_strval return a static constant or null */
gtk_tree_store_set (store, &procedure->iter,
GROUP_COLUMN, val_to_str(expert_data->group, expert_group_vals,"Unknown group (%u)"),
GROUP_COLUMN, match_strval(expert_data->group, expert_group_vals),
PROTOCOL_COLUMN, procedure->entries[0],
SUMMARY_COLUMN, procedure->entries[1], -1);
@ -627,7 +663,7 @@ if GTK_CHECK_VERSION(2,10,0)
if (procedure->count > 1000) {
/* If there's more than 1000 sub rows give up and prepend new rows, at least
it will end in a reasonable time. Anyway with so many rows it's not
very useful. Too bad sorting doesn't work well on num packet, use alpha sort
very useful and if sorted the right order is restored.
*/
gtk_tree_store_prepend(store, &new_iter, &procedure->iter);
}
@ -636,7 +672,7 @@ if GTK_CHECK_VERSION(2,10,0)
}
gtk_tree_store_set(store, &new_iter,
#endif
GROUP_COLUMN, "Packet:",
GROUP_COLUMN, packet,
PROTOCOL_COLUMN, num,
COUNT_COLUMN, 1,
-1);

33
gtk/expert_dlg.c
View File

@ -185,7 +185,8 @@ expert_dlg_draw(void *data)
packet_no = ei->packet_num;
}
/* severity */
/* match_strval return a static string or NULL
severity */
severity_str = match_strval(ei->severity, expert_severity_vals);
/* group */
group_str = match_strval(ei->group, expert_group_vals);
@ -293,8 +294,8 @@ expert_dlg_init_table(expert_tapdata_t * etd, GtkWidget *vbox)
G_TYPE_UINT, /* No */
G_TYPE_POINTER, /* Severity */
G_TYPE_POINTER, /* Group */
G_TYPE_STRING, /* Protocol */
G_TYPE_STRING, /* Summary */
G_TYPE_POINTER, /* Protocol */
G_TYPE_POINTER, /* Summary */
G_TYPE_STRING, /* forground */
G_TYPE_STRING); /* Background */
@ -303,7 +304,6 @@ expert_dlg_init_table(expert_tapdata_t * etd, GtkWidget *vbox)
etd->tree_view = GTK_TREE_VIEW(tree);
sortable = GTK_TREE_SORTABLE(store);
#if GTK_CHECK_VERSION(2,6,0)
/* Speed up the list display */
gtk_tree_view_set_fixed_height_mode(etd->tree_view, TRUE);
@ -315,8 +315,12 @@ expert_dlg_init_table(expert_tapdata_t * etd, GtkWidget *vbox)
/* The view now holds a reference. We can get rid of our own reference */
g_object_unref (G_OBJECT (store));
gtk_widget_modify_font(GTK_WIDGET (etd->tree_view), user_font_get_regular());
/* Create a cell renderer */
renderer = gtk_cell_renderer_text_new ();
g_object_set(renderer, "ypad", 0, NULL);
g_object_set(renderer, "xalign", 1.0, NULL);
/* Create the first column, associating the "text" attribute of the
* cell_renderer to the first column of the model */
@ -334,8 +338,9 @@ expert_dlg_init_table(expert_tapdata_t * etd, GtkWidget *vbox)
/* Severity */
renderer = gtk_cell_renderer_text_new ();
g_object_set(renderer, "ypad", 0, NULL);
column = gtk_tree_view_column_new_with_attributes ("Severity", renderer,
"text", SEVERITY_COLUMN,
"foreground", FOREGROUND_COLOR_COL,
"background", BACKGROUND_COLOR_COL,
NULL);
@ -355,8 +360,8 @@ expert_dlg_init_table(expert_tapdata_t * etd, GtkWidget *vbox)
/* Group */
renderer = gtk_cell_renderer_text_new ();
g_object_set(renderer, "ypad", 0, NULL);
column = gtk_tree_view_column_new_with_attributes ("Group", renderer,
"text", GROUP_COLUMN,
"foreground", FOREGROUND_COLOR_COL,
"background", BACKGROUND_COLOR_COL,
NULL);
@ -376,11 +381,17 @@ expert_dlg_init_table(expert_tapdata_t * etd, GtkWidget *vbox)
/* Protocol. */
renderer = gtk_cell_renderer_text_new ();
g_object_set(renderer, "ypad", 0, NULL);
column = gtk_tree_view_column_new_with_attributes ("Protocol", renderer,
"text", PROTOCOL_COLUMN,
"foreground", FOREGROUND_COLOR_COL,
"background", BACKGROUND_COLOR_COL,
NULL);
gtk_tree_view_column_set_cell_data_func(column, renderer, str_ptr_data_func,
GINT_TO_POINTER(PROTOCOL_COLUMN), NULL);
gtk_tree_sortable_set_sort_func(sortable, PROTOCOL_COLUMN, str_ptr_sort_func,
GINT_TO_POINTER(PROTOCOL_COLUMN), NULL);
gtk_tree_view_column_set_sort_column_id(column, PROTOCOL_COLUMN);
gtk_tree_view_column_set_resizable(column, TRUE);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
@ -389,11 +400,17 @@ expert_dlg_init_table(expert_tapdata_t * etd, GtkWidget *vbox)
/* Summary. */
renderer = gtk_cell_renderer_text_new ();
g_object_set(renderer, "ypad", 0, NULL);
column = gtk_tree_view_column_new_with_attributes ("Summary", renderer,
"text", SUMMARY_COLUMN,
"foreground", FOREGROUND_COLOR_COL,
"background", BACKGROUND_COLOR_COL,
NULL);
gtk_tree_view_column_set_cell_data_func(column, renderer, str_ptr_data_func,
GINT_TO_POINTER(SUMMARY_COLUMN), NULL);
gtk_tree_sortable_set_sort_func(sortable, SUMMARY_COLUMN, str_ptr_sort_func,
GINT_TO_POINTER(SUMMARY_COLUMN), NULL);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
gtk_tree_view_column_set_min_width(column, 90);
gtk_tree_view_column_set_sort_column_id(column, SUMMARY_COLUMN);