varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2025-12-31 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to use new tree view API.

Browse Source 
2007-08-04  Soren Sandmann <sandmann@daimi.au.dk>

        * sysprof.c: Update to use new tree view API.

        * treeviewutils.c: Do customized sorting to get default sort
        orders on columns. Workaround GTK+ bug 333791.



svn path=/trunk/; revision=364
This commit is contained in:
Soren Sandmann
2007-08-04 19:54:17 +00:00
committed by Søren Sandmann Pedersen
parent 6d96c33032
commit bf65f08594
4 changed files with 146 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-08-04 Soren Sandmann <sandmann@daimi.au.dk>
* sysprof.c: Update to use new tree view API.
* treeviewutils.c: Do customized sorting to get default sort
orders on columns. Workaround GTK+ bug 333791.
2007-03-24 Soren Sandmann <sandmann@daimi.au.dk> 2007-03-24 Soren Sandmann <sandmann@daimi.au.dk>
* elfparser.c (elf_parser_get_crc32): madvise() * elfparser.c (elf_parser_get_crc32): madvise()

58
sysprof.c
View File

@ -442,8 +442,6 @@ fill_main_list (Application *app)
if (profile) if (profile)
{ {
gpointer sort_state;
list_store = gtk_list_store_new (4, list_store = gtk_list_store_new (4,
G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_DOUBLE, G_TYPE_DOUBLE,
@ -468,21 +466,9 @@ fill_main_list (Application *app)
} }
g_list_foreach (objects, (GFunc)g_free, NULL); g_list_foreach (objects, (GFunc)g_free, NULL);
g_list_free (objects); g_list_free (objects);
sort_state = save_sort_state (app->object_view); tree_view_set_model_with_default_sort (app->object_view, GTK_TREE_MODEL (list_store),
OBJECT_TOTAL, GTK_SORT_DESCENDING);
gtk_tree_view_set_model (app->object_view, GTK_TREE_MODEL (list_store));
if (sort_state)
{
restore_sort_state (app->object_view, sort_state);
}
else
{
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (list_store),
OBJECT_TOTAL,
GTK_SORT_DESCENDING);
}
g_object_unref (G_OBJECT (list_store)); g_object_unref (G_OBJECT (list_store));
} }
@ -518,9 +504,6 @@ static void
fill_descendants_tree (Application *app) fill_descendants_tree (Application *app)
{ {
GtkTreeStore *tree_store; GtkTreeStore *tree_store;
gpointer sort_state;
sort_state = save_sort_state (app->descendants_view);
if (app->descendants) if (app->descendants)
{ {
@ -547,22 +530,11 @@ fill_descendants_tree (Application *app)
} }
} }
gtk_tree_view_set_model ( tree_view_set_model_with_default_sort (app->descendants_view, GTK_TREE_MODEL (tree_store),
app->descendants_view, GTK_TREE_MODEL (tree_store)); DESCENDANTS_NON_RECURSE, GTK_SORT_DESCENDING);
g_object_unref (G_OBJECT (tree_store)); g_object_unref (G_OBJECT (tree_store));
if (!sort_state)
{
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (tree_store),
DESCENDANTS_NON_RECURSE,
GTK_SORT_DESCENDING);
}
else
{
restore_sort_state (app->descendants_view, sort_state);
}
gtk_tree_view_columns_autosize (app->descendants_view); gtk_tree_view_columns_autosize (app->descendants_view);
} }
@ -599,9 +571,6 @@ static void
fill_callers_list (Application *app) fill_callers_list (Application *app)
{ {
GtkListStore *list_store; GtkListStore *list_store;
gpointer sort_state;
sort_state = save_sort_state (app->descendants_view);
if (app->callers) if (app->callers)
{ {
@ -626,22 +595,11 @@ fill_callers_list (Application *app)
} }
} }
gtk_tree_view_set_model ( tree_view_set_model_with_default_sort (app->callers_view, GTK_TREE_MODEL (list_store),
app->callers_view, GTK_TREE_MODEL (list_store)); CALLERS_TOTAL, GTK_SORT_DESCENDING);
g_object_unref (G_OBJECT (list_store)); g_object_unref (G_OBJECT (list_store));
if (!sort_state)
{
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (list_store),
CALLERS_TOTAL,
GTK_SORT_DESCENDING);
}
else
{
restore_sort_state (app->callers_view, sort_state);
}
gtk_tree_view_columns_autosize (app->callers_view); gtk_tree_view_columns_autosize (app->callers_view);
} }

204
treeviewutils.c
View File

@ -25,56 +25,114 @@
#include "treeviewutils.h" #include "treeviewutils.h"
void static void on_column_clicked (GtkTreeViewColumn *column,
column_set_sort_id (GtkTreeViewColumn *column, gpointer data);
int column_id) typedef struct
{ {
g_object_set_data (G_OBJECT (column), int model_column;
"mi-saved-sort-column", GINT_TO_POINTER (column_id)); GtkSortType default_order;
gtk_tree_view_column_set_sort_column_id (column, column_id); } SortInfo;
static void
set_sort_info (GtkTreeView *view,
GtkTreeViewColumn *column,
int model_column,
GtkSortType default_order)
{
SortInfo *info;
info = g_new0 (SortInfo, 1);
info->model_column = model_column;
info->default_order = default_order;
gtk_tree_view_column_set_clickable (column, TRUE);
g_object_set_data (G_OBJECT (column), "column_info", info);
g_signal_connect (column, "clicked", G_CALLBACK (on_column_clicked), view);
} }
void static SortInfo *
tree_view_unset_sort_ids (GtkTreeView *tree_view) get_sort_info (GtkTreeViewColumn *column)
{ {
GList *columns = gtk_tree_view_get_columns (tree_view); return g_object_get_data (G_OBJECT (column), "column_info");
GList *l; }
for (l = columns; l; l = l->next) { static GtkTreeViewColumn *
gtk_tree_view_column_set_sort_column_id (l->data, -1); find_column_by_model_column (GtkTreeView *view, int model_column)
{
GList *columns = gtk_tree_view_get_columns (view);
GList *list;
GtkTreeViewColumn *result = NULL;
for (list = columns; list != NULL; list = list->next)
{
GtkTreeViewColumn *column = list->data;
SortInfo *info = get_sort_info (column);
if (info->model_column == model_column)
result = column;
} }
g_list_free (columns);
}
void
tree_view_set_sort_ids (GtkTreeView *tree_view)
{
GList *columns = gtk_tree_view_get_columns (tree_view);
GList *l;
for (l = columns; l; l = l->next) {
int column_id = GPOINTER_TO_INT (g_object_get_data (l->data, "mi-saved-sort-column"));
gtk_tree_view_column_set_sort_column_id (l->data, column_id);
}
g_list_free (columns); g_list_free (columns);
}
int
list_iter_get_index (GtkTreeModel *model,
GtkTreeIter *iter)
{
GtkTreePath *path = gtk_tree_model_get_path (model,iter);
int result;
g_assert (path);
g_assert (gtk_tree_path_get_depth (path) == 1);
result = gtk_tree_path_get_indices (path)[0];
gtk_tree_path_free (path);
return result; return result;
}
void
tree_view_set_sort_column (GtkTreeView *view,
int model_column,
int sort_type)
{
GList *columns, *list;
GtkTreeSortable *sortable;
GtkTreeViewColumn *column = find_column_by_model_column (view, model_column);
SortInfo *info = get_sort_info (column);
/* For each column in the view, unset the sort indicator */
columns = gtk_tree_view_get_columns (view);
for (list = columns; list != NULL; list = list->next)
{
GtkTreeViewColumn *col = GTK_TREE_VIEW_COLUMN (list->data);
gtk_tree_view_column_set_sort_indicator (col, FALSE);
}
/* Set the sort indicator for this column */
gtk_tree_view_column_set_sort_indicator (column, TRUE);
gtk_tree_view_column_set_sort_order (column, sort_type);
/* And sort the column */
sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (view));
gtk_tree_sortable_set_sort_column_id (sortable,
info->model_column,
sort_type);
}
static void
on_column_clicked (GtkTreeViewColumn *column,
gpointer data)
{
GtkTreeView *view = data;
GtkSortType sort_type;
SortInfo *info = get_sort_info (column);
/* Find out what our current sort indicator is. If it is NONE, then
* select the default for the column, otherwise, select the opposite
*/
if (!gtk_tree_view_column_get_sort_indicator (column))
{
sort_type = info->default_order;
}
else
{
if (gtk_tree_view_column_get_sort_order (column) == GTK_SORT_ASCENDING)
sort_type = GTK_SORT_DESCENDING;
else
sort_type = GTK_SORT_ASCENDING;
}
tree_view_set_sort_column (view, info->model_column, sort_type);
} }
GtkTreeViewColumn * GtkTreeViewColumn *
@ -90,7 +148,8 @@ add_plain_text_column (GtkTreeView *view, const gchar *title, gint model_column)
NULL); NULL);
gtk_tree_view_column_set_resizable (column, TRUE); gtk_tree_view_column_set_resizable (column, TRUE);
gtk_tree_view_append_column (view, column); gtk_tree_view_append_column (view, column);
column_set_sort_id (column, model_column);
set_sort_info (view, column, model_column, GTK_SORT_ASCENDING);
return column; return column;
} }
@ -162,7 +221,8 @@ add_double_format_column (GtkTreeView *view, const gchar *title, gint model_colu
double_to_text, column_info, free_column_info); double_to_text, column_info, free_column_info);
gtk_tree_view_append_column (view, column); gtk_tree_view_append_column (view, column);
column_set_sort_id (column, model_column);
set_sort_info (view, column, model_column, GTK_SORT_DESCENDING);
return column; return column;
} }
@ -184,54 +244,38 @@ add_pointer_column (GtkTreeView *view, const gchar *title, gint model_column)
pointer_to_text, GINT_TO_POINTER (model_column), NULL); pointer_to_text, GINT_TO_POINTER (model_column), NULL);
gtk_tree_view_append_column (view, column); gtk_tree_view_append_column (view, column);
column_set_sort_id (column, model_column);
return column; return column;
} }
typedef struct
{
gboolean is_sorted;
int sort_column;
GtkSortType sort_type;
} SortState;
gpointer
save_sort_state (GtkTreeView *view)
{
SortState *state = NULL;
GtkTreeModel *model = gtk_tree_view_get_model (view);
if (model && GTK_IS_TREE_SORTABLE (model)) {
state = g_new (SortState, 1);
state->is_sorted = gtk_tree_sortable_get_sort_column_id (
GTK_TREE_SORTABLE (model),
&(state->sort_column),
&(state->sort_type));
}
return state;
}
void void
restore_sort_state (GtkTreeView *view, gpointer st) tree_view_set_model_with_default_sort (GtkTreeView *view,
GtkTreeModel *model,
int model_column,
GtkSortType default_sort)
{ {
SortState *state = st; gboolean was_sorted = FALSE;
GtkTreeModel *model = gtk_tree_view_get_model (view); int old_column;
GtkSortType old_type;
if (state) { GtkTreeSortable *old_model;
if (state->is_sorted && model && GTK_IS_TREE_SORTABLE (model)) {
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model), old_model = GTK_TREE_SORTABLE (gtk_tree_view_get_model (view));
state->sort_column,
state->sort_type); if (old_model)
} {
g_free (state); was_sorted = gtk_tree_sortable_get_sort_column_id (
GTK_TREE_SORTABLE (gtk_tree_view_get_model (view)),
&old_column, &old_type);
} }
gtk_tree_sortable_sort_column_changed (GTK_TREE_SORTABLE (model)); gtk_tree_view_set_model (view, model);
if (was_sorted)
tree_view_set_sort_column (view, old_column, old_type);
else
tree_view_set_sort_column (view, model_column, default_sort);
} }
static void static void
process_iter (GtkTreeView *view, process_iter (GtkTreeView *view,
GtkTreeIter *iter, GtkTreeIter *iter,

18
treeviewutils.h
View File

@ -22,14 +22,6 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
void column_set_sort_id (GtkTreeViewColumn *column,
int column_id);
void tree_view_unset_sort_ids (GtkTreeView *tree_view);
void tree_view_set_sort_ids (GtkTreeView *tree_view);
int list_iter_get_index (GtkTreeModel *model,
GtkTreeIter *iter);
GtkTreeViewColumn *add_plain_text_column (GtkTreeView *view, GtkTreeViewColumn *add_plain_text_column (GtkTreeView *view,
const char *title, const char *title,
gint model_column); gint model_column);
@ -40,9 +32,13 @@ GtkTreeViewColumn *add_double_format_column (GtkTreeView *view,
GtkTreeViewColumn *add_pointer_column (GtkTreeView *view, GtkTreeViewColumn *add_pointer_column (GtkTreeView *view,
const char *title, const char *title,
int model_column); int model_column);
gpointer save_sort_state (GtkTreeView *view); void tree_view_set_model_with_default_sort (GtkTreeView *view,
void restore_sort_state (GtkTreeView *view, GtkTreeModel *model,
gpointer state); int model_column,
GtkSortType default_sort);
void tree_view_set_sort_column (GtkTreeView *view,
int model_column,
int sort_type);
typedef void (* VisibleCallback) (GtkTreeView *view, typedef void (* VisibleCallback) (GtkTreeView *view,
GtkTreePath *path, GtkTreePath *path,