/* gtktreemodelsort.c
- * Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
+ * Copyright (C) 2000,2001 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
+ * Copyright (C) 2001,2002 Kristian Rietveld <kris@gtk.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* iter->user_data2 = SortElt
*/
+/* WARNING: this code is dangerous, can cause sleepless nights,
+ * can cause your dog to die among other bad things
+ *
+ * we warned you and we're not liable for any head injuries.
+ */
+
#include "gtktreemodelsort.h"
#include "gtktreesortable.h"
#include "gtktreestore.h"
#include "gtksignal.h"
#include "gtktreedatalist.h"
#include <string.h>
+#include "gtkintl.h"
typedef struct _SortElt SortElt;
typedef struct _SortLevel SortLevel;
struct _SortData
{
GtkTreeModelSort *tree_model_sort;
- GtkTreePath *parent_a;
- GtkTreePath *parent_b;
+ GtkTreePath *parent_path;
+ gint parent_path_depth;
+ gint *parent_path_indices;
+ GtkTreeIterCompareFunc sort_func;
+ gpointer sort_data;
};
struct _SortTuple
{
SortElt *elt;
- SortLevel *level;
- SortLevel *children;
- gint offset;
+ gint offset;
+};
+
+/* Properties */
+enum {
+ PROP_0,
+ /* Construct args */
+ PROP_MODEL
};
+
+
#define GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS(tree_model_sort) \
(((GtkTreeModelSort *)tree_model_sort)->child_flags>K_TREE_MODEL_ITERS_PERSIST)
#define SORT_ELT(sort_elt) ((SortElt *)sort_elt)
#define GET_CHILD_ITER(tree_model_sort,child_iter,sort_iter) gtk_tree_model_sort_convert_iter_to_child_iter(GTK_TREE_MODEL_SORT (tree_model_sort), child_iter, sort_iter);
+#define NO_SORT_FUNC ((GtkTreeIterCompareFunc) 0x1)
+
+/* general (object/interface init, etc) */
static void gtk_tree_model_sort_init (GtkTreeModelSort *tree_model_sort);
static void gtk_tree_model_sort_class_init (GtkTreeModelSortClass *tree_model_sort_class);
static void gtk_tree_model_sort_tree_model_init (GtkTreeModelIface *iface);
static void gtk_tree_model_sort_tree_sortable_init (GtkTreeSortableIface *iface);
static void gtk_tree_model_sort_finalize (GObject *object);
-static void gtk_tree_model_sort_row_changed (GtkTreeModel *model,
- GtkTreePath *start_path,
- GtkTreeIter *start_iter,
- gpointer data);
-static void gtk_tree_model_sort_row_inserted (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer data);
-static void gtk_tree_model_sort_row_has_child_toggled (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer data);
-static void gtk_tree_model_sort_row_deleted (GtkTreeModel *model,
- GtkTreePath *path,
- gpointer data);
-static void gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
- GtkTreePath *s_path,
- GtkTreeIter *s_iter,
- gint *new_order,
- gpointer data);
-
+static void gtk_tree_model_sort_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_tree_model_sort_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+/* our signal handlers */
static void gtk_tree_model_sort_row_changed (GtkTreeModel *model,
GtkTreePath *start_path,
GtkTreeIter *start_iter,
GtkTreeIter *child);
static void gtk_tree_model_sort_ref_node (GtkTreeModel *tree_model,
GtkTreeIter *iter);
+static void gtk_tree_model_sort_real_unref_node (GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ gboolean propagate_unref);
static void gtk_tree_model_sort_unref_node (GtkTreeModel *tree_model,
GtkTreeIter *iter);
GtkDestroyNotify destroy);
static gboolean gtk_tree_model_sort_has_default_sort_func (GtkTreeSortable *sortable);
-/* Private functions */
+/* Private functions (sort funcs, level handling and other utils) */
static void gtk_tree_model_sort_build_level (GtkTreeModelSort *tree_model_sort,
SortLevel *parent_level,
SortElt *parent_elt);
GtkTreeIter *s_iter);
static GtkTreePath *gtk_tree_model_sort_elt_get_path (SortLevel *level,
SortElt *elt);
-static void get_child_iter_from_elt_no_cache (GtkTreeModelSort *tree_model_sort,
- GtkTreeIter *child_iter,
- SortLevel *level,
- SortElt *elt);
-static void get_child_iter_from_elt (GtkTreeModelSort *tree_model_sort,
- GtkTreeIter *child_iter,
- SortLevel *level,
- SortElt *elt);
static void gtk_tree_model_sort_set_model (GtkTreeModelSort *tree_model_sort,
GtkTreeModel *child_model);
static GtkTreePath *gtk_real_tree_model_sort_convert_child_path_to_path (GtkTreeModelSort *tree_model_sort,
GtkTreePath *child_path,
gboolean build_levels);
+static GObjectClass *parent_class = NULL;
GType
gtk_tree_model_sort_get_type (void)
{
static GType tree_model_sort_type = 0;
-
+
if (!tree_model_sort_type)
{
static const GTypeInfo tree_model_sort_info =
g_type_add_interface_static (tree_model_sort_type,
GTK_TYPE_TREE_MODEL,
&tree_model_info);
-
+
g_type_add_interface_static (tree_model_sort_type,
GTK_TYPE_TREE_SORTABLE,
&sortable_info);
GObjectClass *object_class;
object_class = (GObjectClass *) class;
+ parent_class = g_type_class_peek_parent (class);
+
+ object_class->set_property = gtk_tree_model_sort_set_property;
+ object_class->get_property = gtk_tree_model_sort_get_property;
object_class->finalize = gtk_tree_model_sort_finalize;
+
+ /* Properties */
+ g_object_class_install_property (object_class,
+ PROP_MODEL,
+ g_param_spec_object ("model",
+ _("TreeModelSort Model"),
+ _("The model for the TreeModelSort to sort"),
+ GTK_TYPE_TREE_MODEL,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
}
static void
_gtk_tree_data_list_header_free (tree_model_sort->sort_list);
tree_model_sort->sort_list = NULL;
}
+
+ /* must chain up */
+ parent_class->finalize (object);
+}
+
+static void
+gtk_tree_model_sort_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (object);
+
+ switch (prop_id)
+ {
+ case PROP_MODEL:
+ gtk_tree_model_sort_set_model (tree_model_sort, g_value_get_object (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+gtk_tree_model_sort_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (object);
+
+ switch (prop_id)
+ {
+ case PROP_MODEL:
+ g_value_set_object (value, gtk_tree_model_sort_get_model(tree_model_sort));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
}
static void
GtkTreePath *path = NULL;
GtkTreeIter iter;
GtkTreeIter tmpiter;
-
+
SortElt tmp;
SortElt *elt;
SortLevel *level;
start_s_path = gtk_tree_model_get_path (s_model, start_s_iter);
}
- path = gtk_tree_model_sort_convert_child_path_to_path (tree_model_sort,
- start_s_path);
+ path = gtk_real_tree_model_sort_convert_child_path_to_path (tree_model_sort,
+ start_s_path,
+ FALSE);
if (!path)
{
if (free_s_path)
}
gtk_tree_model_get_iter (GTK_TREE_MODEL (data), &iter, path);
-
+
level = iter.user_data;
elt = iter.user_data2;
-
- if (level->array->len < 2 || tree_model_sort->sort_column_id == -1)
+
+ if (level->array->len < 2 ||
+ (tree_model_sort->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID &&
+ tree_model_sort->default_sort_func == NO_SORT_FUNC))
{
if (free_s_path)
gtk_tree_path_free (start_s_path);
-
+
gtk_tree_model_row_changed (GTK_TREE_MODEL (data), path, &iter);
-
+
gtk_tree_path_free (path);
-
+
return;
}
gtk_tree_model_get_iter (tree_model_sort->child_model,
&tmpiter, start_s_path);
}
-
+
offset = elt->offset;
for (i = 0; i < level->array->len; i++)
if (elt->offset == g_array_index (level->array, SortElt, i).offset)
index = i;
-
+
memcpy (&tmp, elt, sizeof (SortElt));
g_array_remove_index (level->array, index);
-
+
if (GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS (tree_model_sort))
index = gtk_tree_model_sort_level_find_insert (tree_model_sort,
level,
level,
&tmpiter,
TRUE);
-
- g_array_insert_val (level->array, index, tmp);
- gtk_tree_model_sort_increment_stamp (tree_model_sort);
+ g_array_insert_val (level->array, index, tmp);
- if (path)
- gtk_tree_path_free (path);
+ for (i = 0; i < level->array->len; i++)
+ if (g_array_index (level->array, SortElt, i).children)
+ g_array_index (level->array, SortElt, i).children->parent_elt = &g_array_index (level->array, SortElt, i);
- path = gtk_tree_model_sort_elt_get_path (level, &g_array_index (level->array, SortElt, index));
- g_return_if_fail (path != NULL);
+ gtk_tree_path_up (path);
+ gtk_tree_path_append_index (path, index);
+ gtk_tree_model_sort_increment_stamp (tree_model_sort);
gtk_tree_model_get_iter (GTK_TREE_MODEL (data), &iter, path);
-
+
gtk_tree_model_row_changed (GTK_TREE_MODEL (data), path, &iter);
gtk_tree_path_free (path);
parent_level = level = SORT_LEVEL (tree_model_sort->root);
g_return_if_fail (s_path != NULL || s_iter != NULL);
-
+
if (!s_path)
{
s_path = gtk_tree_model_get_path (s_model, s_iter);
free_s_path = TRUE;
}
-
+
if (!s_iter)
gtk_tree_model_get_iter (s_model, &real_s_iter, s_path);
else
/* the build level already put the inserted iter in the level,
so no need to handle this signal anymore */
-
+
goto done_and_submit;
}
-
+
/* find the parent level */
while (i < gtk_tree_path_get_depth (s_path) - 1)
{
"before the parent was inserted.");
goto done;
}
-
+
elt = NULL;
for (j = 0; j < level->array->len; j++)
if (g_array_index (level->array, SortElt, j).offset == gtk_tree_path_get_indices (s_path)[i])
if (!elt->children)
{
- /* FIXME: emit has_child_toggled here? like the treeview? */
-
GtkTreePath *tmppath;
GtkTreeIter tmpiter;
-
+
tmppath = gtk_tree_model_sort_elt_get_path (level, elt);
if (tmppath)
{
parent_level = level;
i++;
}
-
+
if (!parent_level)
- {
- goto done;
- }
-
+ goto done;
+
if (!gtk_tree_model_sort_insert_value (tree_model_sort,
parent_level,
s_path,
&real_s_iter))
goto done;
-
+
done_and_submit:
- path = gtk_tree_model_sort_convert_child_path_to_path (tree_model_sort,
- s_path);
-
+ path = gtk_real_tree_model_sort_convert_child_path_to_path (tree_model_sort,
+ s_path,
+ FALSE);
+
if (!path)
return;
gtk_tree_model_sort_increment_stamp (tree_model_sort);
-
+
gtk_tree_model_get_iter (GTK_TREE_MODEL (data), &iter, path);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (data), path, &iter);
gtk_tree_path_free (path);
done:
-
if (free_s_path)
gtk_tree_path_free (s_path);
-
+
return;
}
path = gtk_real_tree_model_sort_convert_child_path_to_path (tree_model_sort, s_path, FALSE);
if (path == NULL)
return;
-
+
gtk_tree_model_get_iter (GTK_TREE_MODEL (data), &iter, path);
gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (data), path, &iter);
gtk_tree_path_free (path);
}
+/* FIXME: I still have doubts if this works */
static void
gtk_tree_model_sort_row_deleted (GtkTreeModel *s_model,
GtkTreePath *s_path,
GtkTreeIter iter;
gint offset;
gint i;
-
+
g_return_if_fail (s_path != NULL);
path = gtk_real_tree_model_sort_convert_child_path_to_path (tree_model_sort, s_path, FALSE);
elt = SORT_ELT (iter.user_data2);
offset = elt->offset;
+ /* we _need_ to emit ::row_deleted before we start unreffing the node
+ * itself. This is because of the row refs, which start unreffing nodes
+ * when we emit ::row_deleted
+ */
+ gtk_tree_model_row_deleted (GTK_TREE_MODEL (data), path);
+
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (data), &iter, path);
+
while (elt->ref_count > 0)
- gtk_tree_model_sort_unref_node (GTK_TREE_MODEL (data), &iter);
+ gtk_tree_model_sort_real_unref_node (GTK_TREE_MODEL (data), &iter, FALSE);
- if (level->ref_count == 0)
+ if (level->ref_count == 0 && level != tree_model_sort->root)
{
/* This will prune the level, so I can just emit the signal and not worry
* about cleaning this level up. */
gtk_tree_model_sort_increment_stamp (tree_model_sort);
- gtk_tree_model_row_deleted (GTK_TREE_MODEL (data), path);
-
gtk_tree_path_free (path);
return;
}
+ gtk_tree_model_sort_increment_stamp (tree_model_sort);
+
/* Remove the row */
for (i = 0; i < level->array->len; i++)
if (elt->offset == g_array_index (level->array, SortElt, i).offset)
break;
g_array_remove_index (level->array, i);
-
+
/* update all offsets */
for (i = 0; i < level->array->len; i++)
{
elt = & (g_array_index (level->array, SortElt, i));
if (elt->offset > offset)
elt->offset--;
+ if (elt->children)
+ elt->children->parent_elt = elt;
}
- gtk_tree_model_sort_increment_stamp (tree_model_sort);
- gtk_tree_model_row_deleted (GTK_TREE_MODEL (data), path);
-
gtk_tree_path_free (path);
}
SortLevel *level;
GtkTreeIter iter;
gint *tmp_array;
- int i;
+ int i, j;
GtkTreePath *path;
GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
-
+
g_return_if_fail (new_order != NULL);
if (s_path == NULL || gtk_tree_path_get_indices (s_path) == NULL)
tmp_array = g_new (int, level->array->len);
for (i = 0; i < level->array->len; i++)
- tmp_array[new_order[i]] = g_array_index (level->array, SortElt, i).offset;
+ {
+ for (j = 0; j < level->array->len; j++)
+ {
+ if (g_array_index (level->array, SortElt, i).offset == new_order[j])
+ tmp_array[i] = j;
+ }
+ }
+
for (i = 0; i < level->array->len; i++)
g_array_index (level->array, SortElt, i).offset = tmp_array[i];
g_free (tmp_array);
-
- if (tree_model_sort->sort_column_id == -1 &&
- tree_model_sort->default_sort_func == (GtkTreeIterCompareFunc) 0x1)
+
+ if (tree_model_sort->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID &&
+ tree_model_sort->default_sort_func == NO_SORT_FUNC)
{
-
+
gtk_tree_model_sort_sort_level (tree_model_sort, level,
FALSE, FALSE);
gtk_tree_model_sort_increment_stamp (tree_model_sort);
-
+
if (gtk_tree_path_get_depth (path))
{
gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_model_sort),
iter->user_data = ((SortElt *)parent->user_data2)->children;
iter->user_data2 = ((SortLevel *)iter->user_data)->array->data;
}
-
+
return TRUE;
}
GtkTreeIter *iter)
{
GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
+ GtkTreeIter child_iter;
SortLevel *level;
SortElt *elt;
g_return_if_fail (GTK_TREE_MODEL_SORT (tree_model)->child_model != NULL);
g_return_if_fail (GTK_TREE_MODEL_SORT (tree_model)->stamp == iter->stamp);
+ GET_CHILD_ITER (tree_model, &child_iter, iter);
+
+ gtk_tree_model_ref_node (GTK_TREE_MODEL_SORT (tree_model)->child_model, &child_iter);
+
level = iter->user_data;
elt = iter->user_data2;
parent_elt->zero_ref_count--;
else
tree_model_sort->zero_ref_count--;
-
+
if (parent_level)
{
parent_elt = parent_level->parent_elt;
}
static void
-gtk_tree_model_sort_unref_node (GtkTreeModel *tree_model,
- GtkTreeIter *iter)
+gtk_tree_model_sort_real_unref_node (GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ gboolean propagate_unref)
{
GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
+ GtkTreeIter child_iter;
SortLevel *level;
SortElt *elt;
g_return_if_fail (GTK_TREE_MODEL_SORT (tree_model)->child_model != NULL);
g_return_if_fail (GTK_TREE_MODEL_SORT (tree_model)->stamp == iter->stamp);
+ GET_CHILD_ITER (tree_model, &child_iter, iter);
+
+ if (propagate_unref)
+ gtk_tree_model_unref_node (GTK_TREE_MODEL_SORT (tree_model)->child_model, &child_iter);
+
level = iter->user_data;
elt = iter->user_data2;
SortLevel *parent_level = level->parent_level;
SortElt *parent_elt = level->parent_elt;
- /* We were at zero -- time to decrement the zero_ref_count val */
+ /* We are at zero -- time to increment the zero_ref_count val */
while (parent_level)
{
parent_elt->zero_ref_count++;
-
+
parent_elt = parent_level->parent_elt;
parent_level = parent_level->parent_level;
}
}
}
+static void
+gtk_tree_model_sort_unref_node (GtkTreeModel *tree_model,
+ GtkTreeIter *iter)
+{
+ gtk_tree_model_sort_real_unref_node (tree_model, iter, TRUE);
+}
+
/* Sortable interface */
static gboolean
gtk_tree_model_sort_get_sort_column_id (GtkTreeSortable *sortable,
GtkSortType order)
{
GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *)sortable;
-
+
g_return_if_fail (GTK_IS_TREE_MODEL_SORT (sortable));
-
+
if (sort_column_id != GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
{
GtkTreeDataSortHeader *header = NULL;
-
+
header = _gtk_tree_data_list_get_header (tree_model_sort->sort_list,
sort_column_id);
g_return_if_fail (header->func != NULL);
}
else
- {
- g_return_if_fail (tree_model_sort->default_sort_func != NULL);
- }
+ g_return_if_fail (tree_model_sort->default_sort_func != NULL);
if (tree_model_sort->sort_column_id == sort_column_id)
{
for (list = tree_model_sort->sort_list; list; list = list->next)
{
header = (GtkTreeDataSortHeader *) list->data;
-
+
if (header->sort_column_id == sort_column_id)
break;
}
}
if (header->destroy)
- (* header->destroy) (header->data);
+ {
+ GtkDestroyNotify d = header->destroy;
+
+ header->destroy = NULL;
+ d (header->data);
+ }
header->func = func;
header->data = data;
GtkDestroyNotify destroy)
{
GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *)sortable;
-
+
g_return_if_fail (GTK_IS_TREE_MODEL_SORT (sortable));
-
+
if (tree_model_sort->default_sort_destroy)
- (* tree_model_sort->default_sort_destroy) (tree_model_sort->default_sort_data);
+ {
+ GtkDestroyNotify d = tree_model_sort->default_sort_destroy;
+
+ tree_model_sort->default_sort_destroy = NULL;
+ d (tree_model_sort->default_sort_data);
+ }
tree_model_sort->default_sort_func = func;
tree_model_sort->default_sort_data = data;
gconstpointer b,
gpointer user_data)
{
- gint retval;
-
- SortElt *sa = ((SortTuple *)a)->elt;
- SortElt *sb = ((SortTuple *)b)->elt;
-
- GtkTreeIter iter_a, iter_b;
-
SortData *data = (SortData *)user_data;
GtkTreeModelSort *tree_model_sort = data->tree_model_sort;
+ SortTuple *sa = (SortTuple *)a;
+ SortTuple *sb = (SortTuple *)b;
- GtkTreeIterCompareFunc func;
- gpointer f_data;
+ GtkTreeIter iter_a, iter_b;
+ gint retval;
- if (tree_model_sort->sort_column_id != GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
- {
- GtkTreeDataSortHeader *header = NULL;
+ /* shortcut, if we've the same offsets here, they should be equal */
+ if (sa->offset == sb->offset)
+ return 0;
- header =
- _gtk_tree_data_list_get_header (tree_model_sort->sort_list,
- tree_model_sort->sort_column_id);
-
- g_return_val_if_fail (header != NULL, 0);
- g_return_val_if_fail (header->func != NULL, 0);
-
- func = header->func;
- f_data = header->data;
+ if (GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS (tree_model_sort))
+ {
+ iter_a = sa->elt->iter;
+ iter_b = sb->elt->iter;
}
else
{
- /* absolutely SHOULD NOT happen: */
- g_return_val_if_fail (tree_model_sort->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, 0);
- g_return_val_if_fail (tree_model_sort->default_sort_func != (GtkTreeIterCompareFunc) 0x1, 0);
- g_return_val_if_fail (tree_model_sort->default_sort_func != NULL, 0);
-
- func = tree_model_sort->default_sort_func;
- f_data = tree_model_sort->default_sort_data;
+ data->parent_path_indices [data->parent_path_depth-1] = sa->elt->offset;
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_model_sort->child_model), &iter_a, data->parent_path);
+ data->parent_path_indices [data->parent_path_depth-1] = sb->elt->offset;
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_model_sort->child_model), &iter_b, data->parent_path);
}
- /* shortcut, if we've the same offsets here, they should be equal */
- if (sa->offset == sb->offset)
- return 0;
-
- get_child_iter_from_elt (tree_model_sort, &iter_a, ((SortTuple *)a)->level, sa);
- get_child_iter_from_elt (tree_model_sort, &iter_b, ((SortTuple *)b)->level, sb);
-
- retval = (* func) (GTK_TREE_MODEL (tree_model_sort->child_model),
- &iter_a, &iter_b, f_data);
+ retval = (* data->sort_func) (GTK_TREE_MODEL (tree_model_sort->child_model),
+ &iter_a, &iter_b,
+ data->sort_data);
if (tree_model_sort->order == GTK_SORT_DESCENDING)
{
{
gint retval;
- SortElt *sa = ((SortTuple *)a)->elt;
- SortElt *sb = ((SortTuple *)b)->elt;
+ SortTuple *sa = (SortTuple *)a;
+ SortTuple *sb = (SortTuple *)b;
SortData *data = (SortData *)user_data;
- if (sa->offset < sb->offset)
+ if (sa->elt->offset < sb->elt->offset)
retval = -1;
- else if (sa->offset > sb->offset)
+ else if (sa->elt->offset > sb->elt->offset)
retval = 1;
else
retval = 0;
GtkTreeIter iter;
GtkTreePath *path;
-
- SortData *data;
+
+ SortData data;
g_return_if_fail (GTK_IS_TREE_MODEL_SORT (tree_model_sort));
g_return_if_fail (level != NULL);
-
+
if (level->array->len < 1 && !((SortElt *)level->array->data)->children)
return;
-
- data = g_new0 (SortData, 1);
+ /* Set up data */
+ data.tree_model_sort = tree_model_sort;
if (level->parent_elt)
{
- data->parent_a = gtk_tree_model_sort_elt_get_path (level->parent_level,
- level->parent_elt);
- data->parent_b = gtk_tree_path_copy (data->parent_a);
+ data.parent_path = gtk_tree_model_sort_elt_get_path (level->parent_level,
+ level->parent_elt);
+ gtk_tree_path_append_index (data.parent_path, 0);
}
else
{
- data->parent_a = gtk_tree_path_new ();
- data->parent_b = gtk_tree_path_new ();
+ data.parent_path = gtk_tree_path_new_first ();
}
+ data.parent_path_depth = gtk_tree_path_get_depth (data.parent_path);
+ data.parent_path_indices = gtk_tree_path_get_indices (data.parent_path);
- data->tree_model_sort = tree_model_sort;
-
+ /* make the array to be sorted */
sort_array = g_array_sized_new (FALSE, FALSE, sizeof (SortTuple), level->array->len);
-
for (i = 0; i < level->array->len; i++)
{
SortTuple tuple;
tuple.elt = &g_array_index (level->array, SortElt, i);
- tuple.level = level;
- tuple.children = tuple.elt->children;
- tuple.offset = tuple.elt->offset;
+ tuple.offset = i;
g_array_append_val (sort_array, tuple);
}
- if (tree_model_sort->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
+ if (tree_model_sort->sort_column_id != GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
+ {
+ GtkTreeDataSortHeader *header = NULL;
+
+ header = _gtk_tree_data_list_get_header (tree_model_sort->sort_list,
+ tree_model_sort->sort_column_id);
+
+ g_return_if_fail (header != NULL);
+ g_return_if_fail (header->func != NULL);
+
+ data.sort_func = header->func;
+ data.sort_data = header->data;
+ }
+ else
+ {
+ /* absolutely SHOULD NOT happen: */
+ g_return_if_fail (tree_model_sort->default_sort_func != NULL);
+
+ data.sort_func = tree_model_sort->default_sort_func;
+ data.sort_data = tree_model_sort->default_sort_data;
+ }
+
+ if (data.sort_func == NO_SORT_FUNC)
g_array_sort_with_data (sort_array,
gtk_tree_model_sort_offset_compare_func,
- data);
+ &data);
else
g_array_sort_with_data (sort_array,
gtk_tree_model_sort_compare_func,
- data);
+ &data);
- gtk_tree_path_free (data->parent_a);
- gtk_tree_path_free (data->parent_b);
- g_free (data);
+ gtk_tree_path_free (data.parent_path);
- /* let the world know about our absolutely great new order */
new_array = g_array_sized_new (FALSE, FALSE, sizeof (SortElt), level->array->len);
- g_array_set_size (new_array, level->array->len);
new_order = g_new (gint, level->array->len);
for (i = 0; i < level->array->len; i++)
{
- SortElt *elt1;
- SortElt *elt2;
- gint j;
-
- elt1 = &g_array_index (level->array, SortElt, i);
-
- for (j = 0; j < sort_array->len; j++)
- if (elt1->offset == g_array_index (sort_array, SortTuple, j).offset)
- break;
-
- if (j >= level->array->len)
- /* isn't supposed to happen */
- break;
-
- new_order[j] = i;
+ SortElt *elt;
- /* copy ... */
- memcpy (&g_array_index (new_array, SortElt, j), elt1, sizeof (SortElt));
- elt2 = &g_array_index (new_array, SortElt, j);
+ elt = g_array_index (sort_array, SortTuple, i).elt;
+ new_order[i] = g_array_index (sort_array, SortTuple, i).offset;
- /* point children to correct parent */
- if (elt2->children)
- {
- elt2->children->parent_elt = elt2;
- elt2->children->parent_level = level;
- }
+ g_array_append_val (new_array, *elt);
+ elt = &g_array_index (new_array, SortElt, i);
+ if (elt->children)
+ elt->children->parent_elt = elt;
}
g_array_free (level->array, TRUE);
level->array = new_array;
-
g_array_free (sort_array, TRUE);
- /* recurse, if possible */
- if (recurse)
- {
- for (i = 0; i < level->array->len; i++)
- {
- SortElt *elt = &g_array_index (level->array, SortElt, i);
-
- if (elt->children)
- gtk_tree_model_sort_sort_level (tree_model_sort,
- elt->children,
- TRUE, emit_reordered);
- }
- }
-
if (emit_reordered)
{
- /* gtk_tree_model_sort_increment_stamp (tree_model_sort); */
-
if (level->parent_elt)
{
iter.stamp = tree_model_sort->stamp;
gtk_tree_path_free (path);
}
-
+
+ /* recurse, if possible */
+ if (recurse)
+ {
+ for (i = 0; i < level->array->len; i++)
+ {
+ SortElt *elt = &g_array_index (level->array, SortElt, i);
+
+ if (elt->children)
+ gtk_tree_model_sort_sort_level (tree_model_sort,
+ elt->children,
+ TRUE, emit_reordered);
+ }
+ }
+
g_free (new_order);
}
gtk_tree_model_sort_sort (GtkTreeModelSort *tree_model_sort)
{
g_return_if_fail (GTK_IS_TREE_MODEL_SORT (tree_model_sort));
-
+
if (!tree_model_sort->root)
- {
- return;
- }
+ return;
if (tree_model_sort->sort_column_id != GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
{
g_return_if_fail (header->func != NULL);
}
else
- {
- g_return_if_fail (tree_model_sort->default_sort_func != NULL);
- }
+ g_return_if_fail (tree_model_sort->default_sort_func != NULL);
gtk_tree_model_sort_sort_level (tree_model_sort, tree_model_sort->root,
TRUE, TRUE);
GtkTreeIterCompareFunc func;
gpointer data;
- if (tree_model_sort->sort_column_id == -1)
- return level->array->len;
-
- {
- GtkTreeDataSortHeader *header;
-
- header = _gtk_tree_data_list_get_header (tree_model_sort->sort_list,
- tree_model_sort->sort_column_id);
-
- g_return_val_if_fail (header != NULL, 0);
- g_return_val_if_fail (header->func != NULL, 0);
-
- func = header->func;
- data = header->data;
- }
-
+ GtkTreePath *path;
+
+ if (tree_model_sort->sort_column_id != GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
+ {
+ GtkTreeDataSortHeader *header;
+
+ header = _gtk_tree_data_list_get_header (tree_model_sort->sort_list,
+ tree_model_sort->sort_column_id);
+
+ g_return_val_if_fail (header != NULL, 0);
+
+ func = header->func;
+ data = header->data;
+ }
+ else
+ {
+ func = tree_model_sort->default_sort_func;
+ data = tree_model_sort->default_sort_data;
+
+ g_return_val_if_fail (func != NO_SORT_FUNC, 0);
+ }
+
+ g_return_val_if_fail (func != NULL, 0);
+
for (middle = 0; middle < level->array->len; middle++)
{
tmp_elt = &(g_array_index (level->array, SortElt, middle));
- if (!skip_sort_elt && SORT_ELT (iter) == tmp_elt)
+ if (!skip_sort_elt && SORT_ELT (iter->user_data2) == tmp_elt)
continue;
- get_child_iter_from_elt (tree_model_sort, &tmp_iter,
- level, tmp_elt);
+ path = gtk_tree_model_sort_elt_get_path (level, tmp_elt);
+ gtk_tree_model_get_iter (tree_model_sort->child_model,
+ &tmp_iter, path);
+ gtk_tree_path_free (path);
if (tree_model_sort->order == GTK_SORT_ASCENDING)
cmp = (* func) (GTK_TREE_MODEL (tree_model_sort->child_model),
else
cmp = (* func) (GTK_TREE_MODEL (tree_model_sort->child_model),
iter, &tmp_iter, data);
-
+
if (cmp > 0)
break;
}
-
+
return middle;
}
GtkTreeIter *s_iter)
{
gint offset, index, i;
-
+
SortElt elt;
SortElt *tmp_elt;
offset = gtk_tree_path_get_indices (s_path)[gtk_tree_path_get_depth (s_path) - 1];
-
+
if (GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS (tree_model_sort))
elt.iter = *s_iter;
elt.offset = offset;
elt.ref_count = 0;
elt.children = NULL;
- if (GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS (tree_model_sort))
- index = gtk_tree_model_sort_level_find_insert (tree_model_sort,
- level,
- &elt.iter,
- FALSE);
- else
- {
- GtkTreeIter tmpiter;
-
- gtk_tree_model_get_iter (tree_model_sort->child_model,
- &tmpiter, s_path);
+ /* update all larger offsets */
+ tmp_elt = SORT_ELT (level->array->data);
+ for (i = 0; i < level->array->len; i++, tmp_elt++)
+ if (tmp_elt->offset >= offset)
+ tmp_elt->offset++;
- index = gtk_tree_model_sort_level_find_insert (tree_model_sort,
- level,
- &tmpiter,
- FALSE);
- }
+ if (tree_model_sort->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID &&
+ tree_model_sort->default_sort_func == NO_SORT_FUNC)
+ index = offset;
+ else
+ index = gtk_tree_model_sort_level_find_insert (tree_model_sort,
+ level, s_iter,
+ FALSE);
g_array_insert_vals (level->array, index, &elt, 1);
-
- /* update all larger offsets */
tmp_elt = SORT_ELT (level->array->data);
for (i = 0; i < level->array->len; i++, tmp_elt++)
- if ((tmp_elt->offset >= offset) && i != index)
- tmp_elt->offset++;
+ if (tmp_elt->children)
+ tmp_elt->children->parent_elt = tmp_elt;
return TRUE;
}
gtk_tree_model_sort_elt_get_path (SortLevel *level,
SortElt *elt)
{
- gchar *str = NULL;
- GList *i;
- GList *offsets = NULL;
SortLevel *walker = level;
SortElt *walker2 = elt;
GtkTreePath *path;
-
+
g_return_val_if_fail (level != NULL, NULL);
g_return_val_if_fail (elt != NULL, NULL);
-
- while (walker && walker2)
- {
- offsets = g_list_prepend (offsets,
- g_strdup_printf ("%d", walker2->offset));
- walker2 = walker->parent_elt;
- walker = walker->parent_level;
- }
-
- g_return_val_if_fail (g_list_length (offsets) > 0, NULL);
-
- for (i = offsets; i; i = i->next)
- {
- gchar *copy = str;
-
- if (str)
- str = g_strconcat (copy, ":", i->data, NULL);
- else
- str = g_strdup (i->data);
-
- if (copy)
- g_free (copy);
-
- g_free (i->data);
- }
-
- g_list_free (offsets);
-
- path = gtk_tree_path_new_from_string (str);
- g_free (str);
-
- return path;
-}
-
-static void
-get_child_iter_from_elt_no_cache (GtkTreeModelSort *tree_model_sort,
- GtkTreeIter *child_iter,
- SortLevel *level,
- SortElt *elt)
-{
- GtkTreePath *path;
- SortElt *elt_i = elt;
- SortLevel *level_i = level;
-
path = gtk_tree_path_new ();
-
- while (level_i)
- {
- gtk_tree_path_prepend_index (path, elt_i->offset);
-
- elt_i = level_i->parent_elt;
- level_i = level_i->parent_level;
- }
-
- gtk_tree_model_get_iter (tree_model_sort->child_model, child_iter, path);
- gtk_tree_path_free (path);
-}
-static void
-get_child_iter_from_elt (GtkTreeModelSort *tree_model_sort,
- GtkTreeIter *child_iter,
- SortLevel *level,
- SortElt *elt)
-{
- if (GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS (tree_model_sort))
- *child_iter = elt->iter;
- else
+ while (walker)
{
- GtkTreeIter tmp;
- GtkTreePath *path = gtk_tree_model_sort_elt_get_path (level, elt);
- gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_model_sort), &tmp, path);
- gtk_tree_path_free (path);
+ gtk_tree_path_prepend_index (path, walker2->offset);
- GET_CHILD_ITER (tree_model_sort, child_iter, &tmp);
+ walker2 = walker->parent_elt;
+ walker = walker->parent_level;
}
+
+ return path;
}
/**
tree_model_sort->reordered_id);
/* reset our state */
- gtk_tree_model_sort_free_level (tree_model_sort, tree_model_sort->root);
+ if (tree_model_sort->root)
+ gtk_tree_model_sort_free_level (tree_model_sort, tree_model_sort->root);
tree_model_sort->root = NULL;
_gtk_tree_data_list_header_free (tree_model_sort->sort_list);
tree_model_sort->sort_list = NULL;
tree_model_sort->sort_list = _gtk_tree_data_list_header_new (n_columns, types);
g_free (types);
- tree_model_sort->default_sort_func = (GtkTreeIterCompareFunc)0x1;
+ tree_model_sort->default_sort_func = NO_SORT_FUNC;
tree_model_sort->stamp = g_random_int ();
}
}
if (tree_model_sort->root == NULL && build_levels)
gtk_tree_model_sort_build_level (tree_model_sort, NULL, NULL);
level = SORT_LEVEL (tree_model_sort->root);
-
+
for (i = 0; i < gtk_tree_path_get_depth (child_path); i++)
{
gint j;
{
gtk_tree_path_append_index (retval, j);
if (g_array_index (level->array, SortElt, j).children == NULL && build_levels)
- gtk_tree_model_sort_build_level (tree_model_sort, level, &g_array_index (level->array, SortElt, j));
+ {
+ gtk_tree_model_sort_build_level (tree_model_sort, level, &g_array_index (level->array, SortElt, j));
+ }
level = g_array_index (level->array, SortElt, j).children;
found_child = TRUE;
break;
* is, @sort_path points ot a location in @tree_model_sort. The returned path
* will point to the same location in the model not being sorted. If @path does not point to a
*
- * Return value: A newly allocated #GtkTreePath, or %NULLL
+ * Return value: A newly allocated #GtkTreePath, or %NULL
**/
GtkTreePath *
gtk_tree_model_sort_convert_path_to_child_path (GtkTreeModelSort *tree_model_sort,
if (g_array_index (level->array, SortElt, sorted_indices[i]).children == NULL)
gtk_tree_model_sort_build_level (tree_model_sort, level, &g_array_index (level->array, SortElt, sorted_indices[i]));
if (level == NULL)
-
+
gtk_tree_path_append_index (retval, g_array_index (level->array, SortElt, i).offset);
}
-
+
return retval;
}
* @child_iter: An uninitialized #GtkTreeIter
* @sorted_iter: A valid #GtkTreeIter pointing to a row on @tree_model_sort.
*
- * Sets @child_iter to point to the row pointed to by *sorted_iter.
+ * Sets @child_iter to point to the row pointed to by @sorted_iter.
**/
void
gtk_tree_model_sort_convert_iter_to_child_iter (GtkTreeModelSort *tree_model_sort,
else
{
GtkTreePath *path;
- SortElt *elt;
- SortLevel *level;
-
- path = gtk_tree_path_new ();
- elt = SORT_ELT (sorted_iter->user_data2);
- level = SORT_LEVEL (sorted_iter->user_data);
-
- while (level)
- {
- gtk_tree_path_prepend_index (path, elt->offset);
-
- elt = level->parent_elt;
- level = level->parent_level;
- }
+ path = gtk_tree_model_sort_elt_get_path (sorted_iter->user_data,
+ sorted_iter->user_data2);
gtk_tree_model_get_iter (tree_model_sort->child_model, child_iter, path);
gtk_tree_path_free (path);
}
if (parent_level == NULL)
{
- if (gtk_tree_model_get_iter_root (tree_model_sort->child_model, &iter) == FALSE)
+ if (gtk_tree_model_get_iter_first (tree_model_sort->child_model, &iter) == FALSE)
return;
length = gtk_tree_model_iter_n_children (tree_model_sort->child_model, NULL);
}
&iter,
&child_parent_iter) == FALSE)
return;
+
+ /* stamp may have changed */
+ gtk_tree_model_sort_convert_iter_to_child_iter (tree_model_sort,
+ &child_parent_iter,
+ &parent_iter);
+
length = gtk_tree_model_iter_n_children (tree_model_sort->child_model, &child_parent_iter);
}
tree_model_sort->root = new_level;
/* increase the count of zero ref_counts.*/
- do
+ while (parent_level)
{
- if (parent_elt)
- parent_elt->zero_ref_count++;
- else
- tree_model_sort->zero_ref_count++;
+ parent_elt->zero_ref_count++;
- if (parent_level)
- {
- parent_elt = parent_level->parent_elt;
- parent_level = parent_level->parent_level;
- }
+ parent_elt = parent_level->parent_elt;
+ parent_level = parent_level->parent_level;
}
- while (parent_level);
+ if (new_level != tree_model_sort->root)
+ tree_model_sort->zero_ref_count++;
for (i = 0; i < length; i++)
{
do
{
if (parent_elt)
- parent_elt->zero_ref_count++;
+ parent_elt->zero_ref_count--;
else
- tree_model_sort->zero_ref_count++;
-
+ tree_model_sort->zero_ref_count--;
+
if (parent_level)
{
parent_elt = parent_level->parent_elt;
{
if (g_array_index (sort_level->array, SortElt, i).children)
gtk_tree_model_sort_free_level (tree_model_sort,
- (SortLevel *)&g_array_index (sort_level->array, SortElt, i).children);
+ SORT_LEVEL(g_array_index (sort_level->array, SortElt, i).children));
}
if (sort_level->parent_elt)
- {
- sort_level->parent_elt->children = NULL;
- }
+ sort_level->parent_elt->children = NULL;
else
- {
- tree_model_sort->root = NULL;
- }
+ tree_model_sort->root = NULL;
+
g_array_free (sort_level->array, TRUE);
+ sort_level->array = NULL;
+
g_free (sort_level);
+ sort_level = NULL;
}
static void
gtk_tree_model_sort_increment_stamp (GtkTreeModelSort *tree_model_sort)
{
- while (tree_model_sort->stamp == 0) tree_model_sort->stamp++;
+ do
+ {
+ tree_model_sort->stamp++;
+ }
+ while (tree_model_sort->stamp == 0);
gtk_tree_model_sort_clear_cache (tree_model_sort);
}
}
if (level->ref_count == 0 && level != tree_model_sort->root)
- {
- gtk_tree_model_sort_free_level (tree_model_sort, level);
- return;
- }
+ gtk_tree_model_sort_free_level (tree_model_sort, level);
}
/**
g_return_if_fail (GTK_IS_TREE_MODEL_SORT (tree_model_sort));
if (tree_model_sort->default_sort_destroy)
- (* tree_model_sort->default_sort_destroy) (tree_model_sort->default_sort_data);
+ {
+ GtkDestroyNotify d = tree_model_sort->default_sort_destroy;
+
+ tree_model_sort->default_sort_destroy = NULL;
+ d (tree_model_sort->default_sort_data);
+ }
- tree_model_sort->default_sort_func = (GtkTreeIterCompareFunc) 0x1;
+ tree_model_sort->default_sort_func = NO_SORT_FUNC;
tree_model_sort->default_sort_data = NULL;
tree_model_sort->default_sort_destroy = NULL;
tree_model_sort->sort_column_id = GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID;
projects / ~andy / gtk / blobdiff