#include <gobject/gvaluecollector.h>
#define G_NODE(node) ((GNode *)node)
+#define GTK_TREE_STORE_IS_SORTED(tree) (GTK_TREE_STORE (tree)->sort_column_id != -2)
+#define VALID_ITER(iter, tree_store) (iter!= NULL && iter->user_data != NULL && tree_store->stamp == iter->stamp)
static void gtk_tree_store_init (GtkTreeStore *tree_store);
static void gtk_tree_store_class_init (GtkTreeStoreClass *tree_store_class);
static void gtk_tree_store_tree_model_init (GtkTreeModelIface *iface);
static void gtk_tree_store_drag_source_init(GtkTreeDragSourceIface *iface);
static void gtk_tree_store_drag_dest_init (GtkTreeDragDestIface *iface);
+static void gtk_tree_store_sortable_init (GtkTreeSortableIface *iface);
+static void gtk_tree_store_finalize (GObject *object);
static guint gtk_tree_store_get_flags (GtkTreeModel *tree_model);
static gint gtk_tree_store_get_n_columns (GtkTreeModel *tree_model);
static GType gtk_tree_store_get_column_type (GtkTreeModel *tree_model,
gint index);
+static gboolean gtk_tree_store_get_iter (GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ GtkTreePath *path);
static GtkTreePath *gtk_tree_store_get_path (GtkTreeModel *tree_model,
GtkTreeIter *iter);
static void gtk_tree_store_get_value (GtkTreeModel *tree_model,
GtkTreeIter *child);
+static void gtk_tree_store_set_n_columns (GtkTreeStore *tree_store,
+ gint n_columns);
+static void gtk_tree_store_set_column_type (GtkTreeStore *tree_store,
+ gint column,
+ GType type);
+
+
+/* DND interfaces */
static gboolean gtk_tree_store_drag_data_delete (GtkTreeDragSource *drag_source,
- GtkTreePath *path);
+ GtkTreePath *path);
static gboolean gtk_tree_store_drag_data_get (GtkTreeDragSource *drag_source,
- GtkTreePath *path,
- GtkSelectionData *selection_data);
+ GtkTreePath *path,
+ GtkSelectionData *selection_data);
static gboolean gtk_tree_store_drag_data_received (GtkTreeDragDest *drag_dest,
- GtkTreePath *dest,
- GtkSelectionData *selection_data);
+ GtkTreePath *dest,
+ GtkSelectionData *selection_data);
static gboolean gtk_tree_store_row_drop_possible (GtkTreeDragDest *drag_dest,
- GtkTreeModel *src_model,
- GtkTreePath *src_path,
- GtkTreePath *dest_path);
+ GtkTreeModel *src_model,
+ GtkTreePath *src_path,
+ GtkTreePath *dest_path);
+
+/* Sortable Interfaces */
+
+static void gtk_tree_store_sort (GtkTreeStore *tree_store);
+static void gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store,
+ GtkTreeIter *iter,
+ gint column);
+static gboolean gtk_tree_store_get_sort_column_id (GtkTreeSortable *sortable,
+ gint *sort_column_id,
+ GtkSortType *order);
+static void gtk_tree_store_set_sort_column_id (GtkTreeSortable *sortable,
+ gint sort_column_id,
+ GtkSortType order);
+static void gtk_tree_store_set_sort_func (GtkTreeSortable *sortable,
+ gint sort_column_id,
+ GtkTreeIterCompareFunc func,
+ gpointer data,
+ GtkDestroyNotify destroy);
+static void gtk_tree_store_set_default_sort_func (GtkTreeSortable *sortable,
+ GtkTreeIterCompareFunc func,
+ gpointer data,
+ GtkDestroyNotify destroy);
+static gboolean gtk_tree_store_has_default_sort_func (GtkTreeSortable *sortable);
+
+static void validate_gnode (GNode *node);
+
+
+static GObjectClass *parent_class = NULL;
-static void validate_gnode (GNode *node);
static inline void
validate_tree (GtkTreeStore *tree_store)
if (gtk_debug_flags & GTK_DEBUG_TREE)
{
g_assert (G_NODE (tree_store->root)->parent == NULL);
-
+
validate_gnode (G_NODE (tree_store->root));
}
}
NULL,
NULL
};
-
+
+ static const GInterfaceInfo sortable_info =
+ {
+ (GInterfaceInitFunc) gtk_tree_store_sortable_init,
+ NULL,
+ NULL
+ };
+
tree_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkTreeStore", &tree_store_info, 0);
g_type_add_interface_static (tree_store_type,
GTK_TYPE_TREE_MODEL,
&tree_model_info);
-
g_type_add_interface_static (tree_store_type,
GTK_TYPE_TREE_DRAG_SOURCE,
&drag_source_info);
g_type_add_interface_static (tree_store_type,
GTK_TYPE_TREE_DRAG_DEST,
&drag_dest_info);
+ g_type_add_interface_static (tree_store_type,
+ GTK_TYPE_TREE_SORTABLE,
+ &sortable_info);
-
}
return tree_store_type;
}
static void
-gtk_tree_store_class_init (GtkTreeStoreClass *tree_store_class)
+gtk_tree_store_class_init (GtkTreeStoreClass *class)
{
GObjectClass *object_class;
- object_class = (GObjectClass *) tree_store_class;
+ parent_class = g_type_class_peek_parent (class);
+ object_class = (GObjectClass *) class;
+ object_class->finalize = gtk_tree_store_finalize;
}
static void
iface->get_flags = gtk_tree_store_get_flags;
iface->get_n_columns = gtk_tree_store_get_n_columns;
iface->get_column_type = gtk_tree_store_get_column_type;
+ iface->get_iter = gtk_tree_store_get_iter;
iface->get_path = gtk_tree_store_get_path;
iface->get_value = gtk_tree_store_get_value;
iface->iter_next = gtk_tree_store_iter_next;
}
static void
-gtk_tree_store_drag_dest_init (GtkTreeDragDestIface *iface)
+gtk_tree_store_drag_dest_init (GtkTreeDragDestIface *iface)
{
iface->drag_data_received = gtk_tree_store_drag_data_received;
iface->row_drop_possible = gtk_tree_store_row_drop_possible;
}
static void
-gtk_tree_store_init (GtkTreeStore *tree_store)
+gtk_tree_store_sortable_init (GtkTreeSortableIface *iface)
{
- tree_store->root = g_node_new (NULL);
- tree_store->stamp = g_random_int ();
+ iface->get_sort_column_id = gtk_tree_store_get_sort_column_id;
+ iface->set_sort_column_id = gtk_tree_store_set_sort_column_id;
+ iface->set_sort_func = gtk_tree_store_set_sort_func;
+ iface->set_default_sort_func = gtk_tree_store_set_default_sort_func;
+ iface->has_default_sort_func = gtk_tree_store_has_default_sort_func;
}
-GtkTreeStore *
-gtk_tree_store_new (void)
+static void
+gtk_tree_store_init (GtkTreeStore *tree_store)
{
- return GTK_TREE_STORE (g_object_new (gtk_tree_store_get_type (), NULL));
+ tree_store->root = g_node_new (NULL);
+ do
+ {
+ tree_store->stamp = g_random_int ();
+ }
+ while (tree_store->stamp == 0);
+ tree_store->sort_list = NULL;
+ tree_store->sort_column_id = -2;
}
+/**
+ * gtk_tree_store_new:
+ * @n_columns: number of columns in the tree store
+ * @Varargs: all #GType types for the columns, from first to last
+ *
+ * Creates a new tree store as with @n_columns columns each of the types passed
+ * in. As an example, gtk_tree_store_new (3, G_TYPE_INT, G_TYPE_STRING,
+ * GDK_TYPE_PIXBUF); will create a new GtkTreeStore with three columns, of type
+ * int, string and GDkPixbuf respectively.
+ *
+ * Return value: a new #GtkTreeStore
+ **/
GtkTreeStore *
-gtk_tree_store_new_with_types (gint n_columns,
+gtk_tree_store_new (gint n_columns,
...)
{
GtkTreeStore *retval;
g_return_val_if_fail (n_columns > 0, NULL);
- retval = gtk_tree_store_new ();
+ retval = GTK_TREE_STORE (g_object_new (GTK_TYPE_TREE_STORE, NULL));
gtk_tree_store_set_n_columns (retval, n_columns);
va_start (args, n_columns);
return retval;
}
+/**
+ * gtk_tree_store_newv:
+ * @n_columns: number of columns in the tree store
+ * @types: an array of #GType types for the columns, from first to last
+ *
+ * Non vararg creation function. Used primarily by language bindings.
+ *
+ * Return value: a new #GtkTreeStore
+ **/
+GtkTreeStore *
+gtk_tree_store_newv (gint n_columns,
+ GType *types)
+{
+ GtkTreeStore *retval;
+ gint i;
+
+ g_return_val_if_fail (n_columns > 0, NULL);
+
+ retval = GTK_TREE_STORE (g_object_new (GTK_TYPE_TREE_STORE, NULL));
+ gtk_tree_store_set_n_columns (retval, n_columns);
+
+ for (i = 0; i < n_columns; i++)
+ {
+ if (! _gtk_tree_data_list_check_type (types[i]))
+ {
+ g_warning ("%s: Invalid type %s passed to gtk_tree_store_new_with_types\n", G_STRLOC, g_type_name (types[i]));
+ g_object_unref (G_OBJECT (retval));
+ return NULL;
+ }
+ gtk_tree_store_set_column_type (retval, i, types[i]);
+ }
+
+ return retval;
+}
-void
+static void
gtk_tree_store_set_n_columns (GtkTreeStore *tree_store,
gint n_columns)
{
GType *new_columns;
- g_return_if_fail (tree_store != NULL);
g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
if (tree_store->n_columns == n_columns)
g_free (tree_store->column_headers);
}
+ if (tree_store->sort_list)
+ _gtk_tree_data_list_header_free (tree_store->sort_list);
+
+ tree_store->sort_list = _gtk_tree_data_list_header_new (n_columns, tree_store->column_headers);
+
tree_store->column_headers = new_columns;
tree_store->n_columns = n_columns;
}
* @tree_store: a #GtkTreeStore
* @column: column number
* @type: type of the data to be stored in @column
- *
+ *
* Supported types include: %G_TYPE_UINT, %G_TYPE_INT, %G_TYPE_UCHAR,
* %G_TYPE_CHAR, %G_TYPE_BOOLEAN, %G_TYPE_POINTER, %G_TYPE_FLOAT,
* %G_TYPE_DOUBLE, %G_TYPE_STRING, %G_TYPE_OBJECT, and %G_TYPE_BOXED, along with
* subclasses of those types such as %GDK_TYPE_PIXBUF.
- *
+ *
**/
-void
+static void
gtk_tree_store_set_column_type (GtkTreeStore *tree_store,
gint column,
GType type)
{
- g_return_if_fail (tree_store != NULL);
g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
g_return_if_fail (column >=0 && column < tree_store->n_columns);
if (!_gtk_tree_data_list_check_type (type))
tree_store->column_headers[column] = type;
}
+static void
+node_free (GNode *node, gpointer data)
+{
+ _gtk_tree_data_list_free (node->data, (GType*)data);
+}
+
+static void
+gtk_tree_store_finalize (GObject *object)
+{
+ GtkTreeStore *tree_store = GTK_TREE_STORE (object);
+
+ g_node_children_foreach (tree_store->root, G_TRAVERSE_LEAFS, node_free, tree_store->column_headers);
+ _gtk_tree_data_list_header_free (tree_store->sort_list);
+ g_free (tree_store->column_headers);
+
+ if (tree_store->default_sort_destroy)
+ {
+ (* tree_store->default_sort_destroy) (tree_store->default_sort_data);
+ tree_store->default_sort_destroy = NULL;
+ tree_store->default_sort_data = NULL;
+ }
+
+ (* parent_class->finalize) (object);
+}
+
/* fulfill the GtkTreeModel requirements */
/* NOTE: GtkTreeStore::root is a GNode, that acts as the parent node. However,
* it is not visible to the tree or to the user., and the path "0" refers to the
return GTK_TREE_STORE (tree_model)->column_headers[index];
}
+static gboolean
+gtk_tree_store_get_iter (GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ GtkTreePath *path)
+{
+ GtkTreeStore *tree_store = (GtkTreeStore *) tree_model;
+ GtkTreeIter parent;
+ gint *indices;
+ gint depth, i;
+
+ g_return_val_if_fail (GTK_IS_TREE_STORE (tree_store), FALSE);
+
+ indices = gtk_tree_path_get_indices (path);
+ depth = gtk_tree_path_get_depth (path);
+
+ g_return_val_if_fail (depth > 0, FALSE);
+
+ parent.stamp = tree_store->stamp;
+ parent.user_data = tree_store->root;
+
+ if (! gtk_tree_model_iter_nth_child (tree_model, iter, &parent, indices[0]))
+ return FALSE;
+
+ for (i = 1; i < depth; i++)
+ {
+ parent = *iter;
+ if (! gtk_tree_model_iter_nth_child (tree_model, iter, &parent, indices[i]))
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
static GtkTreePath *
gtk_tree_store_get_path (GtkTreeModel *tree_model,
GtkTreeIter *iter)
GtkTreePath *retval;
GNode *tmp_node;
gint i = 0;
-
- g_return_val_if_fail (tree_model != NULL, NULL);
+
g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), NULL);
g_return_val_if_fail (iter != NULL, NULL);
g_return_val_if_fail (iter->user_data != NULL, NULL);
+ g_return_val_if_fail (iter->stamp == GTK_TREE_STORE (tree_model)->stamp, NULL);
validate_tree ((GtkTreeStore*)tree_model);
+ if (G_NODE (iter->user_data)->parent == NULL &&
+ G_NODE (iter->user_data) == GTK_TREE_STORE (tree_model)->root)
+ return gtk_tree_path_new ();
g_assert (G_NODE (iter->user_data)->parent != NULL);
-
+
if (G_NODE (iter->user_data)->parent == G_NODE (GTK_TREE_STORE (tree_model)->root))
{
retval = gtk_tree_path_new ();
else
{
GtkTreeIter tmp_iter = *iter;
-
+
tmp_iter.user_data = G_NODE (iter->user_data)->parent;
retval = gtk_tree_store_get_path (tree_model,
GtkTreeDataList *list;
gint tmp_column = column;
- g_return_if_fail (tree_model != NULL);
g_return_if_fail (GTK_IS_TREE_STORE (tree_model));
g_return_if_fail (iter != NULL);
g_return_if_fail (column < GTK_TREE_STORE (tree_model)->n_columns);
GtkTreeIter *iter)
{
g_return_val_if_fail (iter->user_data != NULL, FALSE);
-
+
if (G_NODE (iter->user_data)->next)
{
iter->user_data = G_NODE (iter->user_data)->next;
GNode *children;
g_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE);
-
+
if (parent)
children = G_NODE (parent->user_data)->children;
else
gtk_tree_store_iter_has_child (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
- g_return_val_if_fail (tree_model != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), FALSE);
- g_return_val_if_fail (iter != NULL, FALSE);
+ g_return_val_if_fail (iter->stamp == GTK_TREE_STORE (tree_model)->stamp, FALSE);
g_return_val_if_fail (iter->user_data != NULL, FALSE);
return G_NODE (iter->user_data)->children != NULL;
GNode *node;
gint i = 0;
- g_return_val_if_fail (tree_model != NULL, 0);
g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0);
- g_return_val_if_fail (iter != NULL, FALSE);
- g_return_val_if_fail (iter->user_data != NULL, FALSE);
-
+ g_return_val_if_fail (iter == NULL || iter->user_data != NULL, FALSE);
+
if (iter == NULL)
node = G_NODE (GTK_TREE_STORE (tree_model)->root)->children;
else
GNode *parent_node;
GNode *child;
- g_return_val_if_fail (tree_model != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), FALSE);
g_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE);
GtkTreeIter *child)
{
GNode *parent;
-
+
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (iter->user_data != NULL, FALSE);
parent = G_NODE (child->user_data)->parent;
- g_assert (parent != NULL);
+ g_assert (parent != NULL);
if (parent != GTK_TREE_STORE (tree_model)->root)
{
return FALSE;
}
-/*
- * This is a somewhat inelegant function that does a lot of list
- * manipulations on it's own.
- */
-void
-gtk_tree_store_set_cell (GtkTreeStore *tree_store,
- GtkTreeIter *iter,
- gint column,
- GValue *value)
+
+/* Does not emit a signal */
+static gboolean
+gtk_tree_store_real_set_value (GtkTreeStore *tree_store,
+ GtkTreeIter *iter,
+ gint column,
+ GValue *value)
{
GtkTreeDataList *list;
GtkTreeDataList *prev;
GtkTreePath *path = NULL;
GValue real_value = {0, };
gboolean converted = FALSE;
+ gint orig_column = column;
+ gboolean retval = FALSE;
- g_return_if_fail (tree_store != NULL);
- g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
- g_return_if_fail (column >= 0 && column < tree_store->n_columns);
- g_return_if_fail (value != NULL);
-
- if (! g_type_is_a (G_VALUE_TYPE (value), column->type))
+ if (! g_type_is_a (G_VALUE_TYPE (value), tree_store->column_headers[column]))
{
- if (! (g_value_type_compatible (G_VALUE_TYPE (value), column->type) &&
- g_value_type_compatible (column->type, G_VALUE_TYPE (value))))
+ if (! (g_value_type_compatible (G_VALUE_TYPE (value), tree_store->column_headers[column]) &&
+ g_value_type_compatible (tree_store->column_headers[column], G_VALUE_TYPE (value))))
{
g_warning ("%s: Unable to convert from %s to %s\n",
G_STRLOC,
g_type_name (G_VALUE_TYPE (value)),
- g_type_name (column->type));
- return;
+ g_type_name (tree_store->column_headers[column]));
+ return retval;
}
if (!g_value_transform (value, &real_value))
{
g_warning ("%s: Unable to make conversion from %s to %s\n",
G_STRLOC,
g_type_name (G_VALUE_TYPE (value)),
- g_type_name (column->type));
+ g_type_name (tree_store->column_headers[column]));
g_value_unset (&real_value);
- return;
+ return retval;
}
converted = TRUE;
}
_gtk_tree_data_list_value_to_node (list, &real_value);
else
_gtk_tree_data_list_value_to_node (list, value);
- gtk_tree_model_changed (GTK_TREE_MODEL (tree_store), path, iter);
+ retval = TRUE;
gtk_tree_path_free (path);
if (converted)
g_value_unset (&real_value);
- return;
+ return retval;
}
column--;
column --;
}
if (converted)
- _gtk_tree_data_list_value_to_node (list, real_value);
+ _gtk_tree_data_list_value_to_node (list, &real_value);
else
_gtk_tree_data_list_value_to_node (list, value);
- gtk_tree_model_changed (GTK_TREE_MODEL (tree_store), path, iter);
+
gtk_tree_path_free (path);
if (converted)
g_value_unset (&real_value);
+
+ if (GTK_TREE_STORE_IS_SORTED (tree_store))
+ gtk_tree_store_sort_iter_changed (tree_store, iter, orig_column);
+
+ return retval;
}
/**
- * gtk_tree_store_set_valist:
+ * gtk_tree_store_set_value:
* @tree_store: a #GtkTreeStore
- * @iter: row to set data for
+ * @iter: A valid #GtkTreeIter for the row being modified
+ * @column: column number to modify
+ * @value: new value for the cell
+ *
+ * Sets the data in the cell specified by @iter and @column.
+ * The type of @value must be convertible to the type of the
+ * column.
+ *
+ **/
+void
+gtk_tree_store_set_value (GtkTreeStore *tree_store,
+ GtkTreeIter *iter,
+ gint column,
+ GValue *value)
+{
+ g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+ g_return_if_fail (VALID_ITER (iter, tree_store));
+ g_return_if_fail (column >= 0 && column < tree_store->n_columns);
+ g_return_if_fail (G_IS_VALUE (value));
+
+ if (gtk_tree_store_real_set_value (tree_store, iter, column, value))
+ {
+ GtkTreePath *path;
+
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), iter);
+ gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_store), path, iter);
+ gtk_tree_path_free (path);
+ }
+}
+
+/**
+ * gtk_tree_store_set_valist:
+ * @tree_store: A #GtkTreeStore
+ * @iter: A valid #GtkTreeIter for the row being modified
* @var_args: va_list of column/value pairs
*
- * See gtk_tree_store_set(); this version takes a va_list for
+ * See @gtk_tree_store_set; this version takes a va_list for
* use by language bindings.
- *
+ *
**/
void
gtk_tree_store_set_valist (GtkTreeStore *tree_store,
va_list var_args)
{
gint column;
+ gboolean emit_signal = FALSE;
g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+ g_return_if_fail (VALID_ITER (iter, tree_store));
column = va_arg (var_args, gint);
break;
}
- gtk_tree_store_set_cell (tree_store,
- iter,
- column,
- &value);
+ emit_signal = gtk_tree_store_real_set_value (tree_store,
+ iter,
+ column,
+ &value) || emit_signal;
g_value_unset (&value);
column = va_arg (var_args, gint);
}
+ if (emit_signal)
+ {
+ GtkTreePath *path;
+
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), iter);
+ gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_store), path, iter);
+ gtk_tree_path_free (path);
+ }
}
/**
* gtk_tree_store_set:
- * @tree_store: a #GtkTreeStore
- * @iter: row iterator
+ * @tree_store: A #GtkTreeStore
+ * @iter: A valid #GtkTreeIter for the row being modified
* @Varargs: pairs of column number and value, terminated with -1
- *
+ *
* Sets the value of one or more cells in the row referenced by @iter.
* The variable argument list should contain integer column numbers,
* each column number followed by the value to be set. For example,
va_list var_args;
g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+ g_return_if_fail (VALID_ITER (iter, tree_store));
va_start (var_args, iter);
gtk_tree_store_set_valist (tree_store, iter, var_args);
va_end (var_args);
}
+/**
+ * gtk_tree_store_remove:
+ * @tree_store: A #GtkTreeStore
+ * @iter: A valid #GtkTreeIter
+ *
+ * Removes @iter from @tree_store. After being removed, @iter is set to the
+ * next valid row at that level, or invalidated if it previeously pointed to the
+ * last one.
+ **/
void
-gtk_tree_store_remove (GtkTreeStore *model,
+gtk_tree_store_remove (GtkTreeStore *tree_store,
GtkTreeIter *iter)
{
GtkTreePath *path;
GtkTreeIter new_iter = {0,};
GNode *parent;
+ GNode *next_node;
- g_return_if_fail (model != NULL);
- g_return_if_fail (GTK_IS_TREE_STORE (model));
+ g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+ g_return_if_fail (VALID_ITER (iter, tree_store));
parent = G_NODE (iter->user_data)->parent;
g_assert (parent != NULL);
-
+ next_node = G_NODE (iter->user_data)->next;
+
if (G_NODE (iter->user_data)->data)
_gtk_tree_data_list_free ((GtkTreeDataList *) G_NODE (iter->user_data)->data,
- model->column_headers);
+ tree_store->column_headers);
- path = gtk_tree_store_get_path (GTK_TREE_MODEL (model), iter);
+ path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
g_node_destroy (G_NODE (iter->user_data));
- model->stamp++;
- gtk_tree_model_deleted (GTK_TREE_MODEL (model), path);
+ gtk_tree_model_row_deleted (GTK_TREE_MODEL (tree_store), path);
- if (parent != G_NODE (model->root) && parent->children == NULL)
+ if (parent != G_NODE (tree_store->root))
{
- gtk_tree_path_up (path);
+ /* child_toggled */
+ if (parent->children == NULL)
+ {
+ gtk_tree_path_up (path);
- new_iter.stamp = model->stamp;
- new_iter.user_data = parent;
- gtk_tree_model_has_child_toggled (GTK_TREE_MODEL (model), path, &new_iter);
+ new_iter.stamp = tree_store->stamp;
+ new_iter.user_data = parent;
+ gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, &new_iter);
+ }
}
gtk_tree_path_free (path);
+
+ /* revalidate iter */
+ if (next_node != NULL)
+ {
+ iter->stamp = tree_store->stamp;
+ iter->user_data = next_node;
+ }
+ else
+ {
+ iter->stamp = 0;
+ iter->user_data = NULL;
+ }
}
+/**
+ * gtk_tree_store_insert:
+ * @tree_store: A #GtkListStore
+ * @iter: An unset #GtkTreeIter to set to the new row
+ * @parent: A valid #GtkTreeIter, or %NULL
+ * @position: position to insert the new row
+ *
+ * Creates a new row at @position. If parent is non-NULL, then the row will be
+ * made a child of @parent. Otherwise, the row will be created at the toplevel.
+ * If @position is larger than the number of rows at that level, then the new
+ * row will be inserted to the end of the list. @iter will be changed to point
+ * to this new row. The row will be empty before this function is called. To
+ * fill in values, you need to call @gtk_list_store_set or
+ * @gtk_list_store_set_value.
+ *
+ **/
void
-gtk_tree_store_insert (GtkTreeStore *model,
+gtk_tree_store_insert (GtkTreeStore *tree_store,
GtkTreeIter *iter,
GtkTreeIter *parent,
gint position)
{
GtkTreePath *path;
GNode *parent_node;
-
- g_return_if_fail (model != NULL);
- g_return_if_fail (GTK_IS_TREE_STORE (model));
+
+ g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+ if (parent)
+ g_return_if_fail (VALID_ITER (parent, tree_store));
if (parent)
parent_node = parent->user_data;
else
- parent_node = model->root;
+ parent_node = tree_store->root;
- iter->stamp = model->stamp;
+ iter->stamp = tree_store->stamp;
iter->user_data = g_node_new (NULL);
g_node_insert (parent_node, position, G_NODE (iter->user_data));
-
- path = gtk_tree_store_get_path (GTK_TREE_MODEL (model), iter);
- gtk_tree_model_inserted (GTK_TREE_MODEL (model), path, iter);
+
+ path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
- validate_tree ((GtkTreeStore*)model);
+ validate_tree ((GtkTreeStore*)tree_store);
}
+/**
+ * gtk_tree_store_insert_before:
+ * @tree_store: A #GtkTreeStore
+ * @iter: An unset #GtkTreeIter to set to the new row
+ * @parent: A valid #GtkTreeIter, or %NULL
+ * @sibling: A valid #GtkTreeIter, or %NULL
+ *
+ * Inserts a new row before @sibling. If @sibling is %NULL, then the row will
+ * be appended to the beginning of the @parent 's children. If @parent and
+ * @sibling are %NULL, then the row will be appended to the toplevel. If both
+ * @sibling and @parent are set, then @parent must be the parent of @sibling.
+ * When @sibling is set, @parent is optional.
+ *
+ * @iter will be changed to point to this new row. The row will be empty after
+ * this function is called. To fill in values, you need to call
+ * @gtk_tree_store_set or @gtk_tree_store_set_value.
+ *
+ **/
void
-gtk_tree_store_insert_before (GtkTreeStore *model,
+gtk_tree_store_insert_before (GtkTreeStore *tree_store,
GtkTreeIter *iter,
GtkTreeIter *parent,
GtkTreeIter *sibling)
GtkTreePath *path;
GNode *parent_node = NULL;
GNode *new_node;
-
- g_return_if_fail (model != NULL);
- g_return_if_fail (GTK_IS_TREE_STORE (model));
+
+ g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
g_return_if_fail (iter != NULL);
+ if (parent != NULL)
+ g_return_if_fail (VALID_ITER (parent, tree_store));
+ if (sibling != NULL)
+ g_return_if_fail (VALID_ITER (sibling, tree_store));
- new_node = g_node_new (NULL);
+ new_node = g_node_new (NULL);
if (parent == NULL && sibling == NULL)
- parent_node = model->root;
+ parent_node = tree_store->root;
else if (parent == NULL)
parent_node = G_NODE (sibling->user_data)->parent;
else if (sibling == NULL)
parent_node = G_NODE (parent->user_data);
else
{
- g_return_if_fail (G_NODE (sibling->user_data)->parent ==
- G_NODE (parent->user_data));
+ g_return_if_fail (G_NODE (sibling->user_data)->parent == G_NODE (parent->user_data));
parent_node = G_NODE (parent->user_data);
}
sibling ? G_NODE (sibling->user_data) : NULL,
new_node);
- iter->stamp = model->stamp;
+ iter->stamp = tree_store->stamp;
iter->user_data = new_node;
-
- path = gtk_tree_store_get_path (GTK_TREE_MODEL (model), iter);
- gtk_tree_model_inserted (GTK_TREE_MODEL (model), path, iter);
+
+ path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
- validate_tree ((GtkTreeStore*)model);
+ validate_tree ((GtkTreeStore*)tree_store);
}
+/**
+ * gtk_tree_store_insert_after:
+ * @tree_store: A #GtkTreeStore
+ * @iter: An unset #GtkTreeIter to set to the new row
+ * @parent: A valid #GtkTreeIter, or %NULL
+ * @sibling: A valid #GtkTreeIter, or %NULL
+ *
+ * Inserts a new row after @sibling. If @sibling is %NULL, then the row will be
+ * prepended to the beginning of the @parent 's children. If @parent and
+ * @sibling are %NULL, then the row will be prepended to the toplevel. If both
+ * @sibling and @parent are set, then @parent must be the parent of @sibling.
+ * When @sibling is set, @parent is optional.
+ *
+ * @iter will be changed to point to this new row. The row will be empty after
+ * this function is called. To fill in values, you need to call
+ * @gtk_tree_store_set or @gtk_tree_store_set_value.
+ *
+ **/
void
-gtk_tree_store_insert_after (GtkTreeStore *model,
+gtk_tree_store_insert_after (GtkTreeStore *tree_store,
GtkTreeIter *iter,
GtkTreeIter *parent,
GtkTreeIter *sibling)
GtkTreePath *path;
GNode *parent_node;
GNode *new_node;
-
- g_return_if_fail (model != NULL);
- g_return_if_fail (GTK_IS_TREE_STORE (model));
+
+ g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
g_return_if_fail (iter != NULL);
+ if (parent != NULL)
+ g_return_if_fail (VALID_ITER (parent, tree_store));
+ if (sibling != NULL)
+ g_return_if_fail (VALID_ITER (sibling, tree_store));
new_node = g_node_new (NULL);
if (parent == NULL && sibling == NULL)
- parent_node = model->root;
+ parent_node = tree_store->root;
else if (parent == NULL)
parent_node = G_NODE (sibling->user_data)->parent;
else if (sibling == NULL)
parent_node = G_NODE (parent->user_data);
}
-
+
g_node_insert_after (parent_node,
sibling ? G_NODE (sibling->user_data) : NULL,
new_node);
-
- iter->stamp = model->stamp;
+
+ iter->stamp = tree_store->stamp;
iter->user_data = new_node;
-
- path = gtk_tree_store_get_path (GTK_TREE_MODEL (model), iter);
- gtk_tree_model_inserted (GTK_TREE_MODEL (model), path, iter);
+
+ path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
- validate_tree ((GtkTreeStore*)model);
+ validate_tree ((GtkTreeStore*)tree_store);
}
+/**
+ * gtk_tree_store_prepend:
+ * @tree_store: A #GtkTreeStore
+ * @iter: An unset #GtkTreeIter to set to the prepended row
+ * @parent: A valid #GtkTreeIter, or %NULL
+ *
+ * Prepends a new row to @tree_store. If @parent is non-NULL, then it will prepend
+ * the new row before the first child of @parent, otherwise it will prepend a row
+ * to the top level. @iter will be changed to point to this new row. The row
+ * will be empty after this function is called. To fill in values, you need to
+ * call @gtk_tree_store_set or @gtk_tree_store_set_value.
+ **/
void
-gtk_tree_store_prepend (GtkTreeStore *model,
+gtk_tree_store_prepend (GtkTreeStore *tree_store,
GtkTreeIter *iter,
GtkTreeIter *parent)
{
GNode *parent_node;
-
- g_return_if_fail (model != NULL);
- g_return_if_fail (GTK_IS_TREE_STORE (model));
+
+ g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
g_return_if_fail (iter != NULL);
+ if (parent != NULL)
+ g_return_if_fail (VALID_ITER (parent, tree_store));
if (parent == NULL)
- parent_node = model->root;
+ parent_node = tree_store->root;
else
parent_node = parent->user_data;
-
+
if (parent_node->children == NULL)
{
GtkTreePath *path;
- iter->stamp = model->stamp;
+ iter->stamp = tree_store->stamp;
iter->user_data = g_node_new (NULL);
-
+
g_node_prepend (parent_node, iter->user_data);
-
- if (parent_node != model->root)
- {
- path = gtk_tree_store_get_path (GTK_TREE_MODEL (model), parent);
- gtk_tree_model_has_child_toggled (GTK_TREE_MODEL (model), path, parent);
- gtk_tree_path_append_index (path, 0);
- }
- else
+
+ path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
+
+ if (parent_node != tree_store->root)
{
- path = gtk_tree_store_get_path (GTK_TREE_MODEL (model), iter);
+ gtk_tree_path_up (path);
+ gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent);
}
- gtk_tree_model_inserted (GTK_TREE_MODEL (model), path, iter);
gtk_tree_path_free (path);
}
else
{
- gtk_tree_store_insert_after (model, iter, parent, NULL);
+ gtk_tree_store_insert_after (tree_store, iter, parent, NULL);
}
- validate_tree ((GtkTreeStore*)model);
+ validate_tree ((GtkTreeStore*)tree_store);
}
+/**
+ * gtk_tree_store_append:
+ * @tree_store: A #GtkTreeStore
+ * @iter: An unset #GtkTreeIter to set to the appended row
+ * @parent: A valid #GtkTreeIter, or %NULL
+ *
+ * Appends a new row to @tree_store. If @parent is non-NULL, then it will append the
+ * new row after the last child of @parent, otherwise it will append a row to
+ * the top level. @iter will be changed to point to this new row. The row will
+ * be empty after this function is called. To fill in values, you need to call
+ * @gtk_tree_store_set or @gtk_tree_store_set_value.
+ **/
void
-gtk_tree_store_append (GtkTreeStore *model,
+gtk_tree_store_append (GtkTreeStore *tree_store,
GtkTreeIter *iter,
GtkTreeIter *parent)
{
GNode *parent_node;
- g_return_if_fail (model != NULL);
- g_return_if_fail (GTK_IS_TREE_STORE (model));
+ g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
g_return_if_fail (iter != NULL);
-
+
+ if (parent != NULL)
+ g_return_if_fail (VALID_ITER (parent, tree_store));
+
if (parent == NULL)
- parent_node = model->root;
+ parent_node = tree_store->root;
else
parent_node = parent->user_data;
{
GtkTreePath *path;
- iter->stamp = model->stamp;
+ iter->stamp = tree_store->stamp;
iter->user_data = g_node_new (NULL);
-
+
g_node_append (parent_node, G_NODE (iter->user_data));
- if (parent_node != model->root)
- {
- path = gtk_tree_store_get_path (GTK_TREE_MODEL (model), parent);
- gtk_tree_model_has_child_toggled (GTK_TREE_MODEL (model), path, parent);
- gtk_tree_path_append_index (path, 0);
- }
- else
+ path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
+
+ if (parent_node != tree_store->root)
{
- path = gtk_tree_store_get_path (GTK_TREE_MODEL (model), iter);
+ gtk_tree_path_up (path);
+ gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent);
}
-
- gtk_tree_model_inserted (GTK_TREE_MODEL (model), path, iter);
gtk_tree_path_free (path);
}
else
{
- gtk_tree_store_insert_before (model, iter, parent, NULL);
+ gtk_tree_store_insert_before (tree_store, iter, parent, NULL);
}
- validate_tree ((GtkTreeStore*)model);
+ validate_tree ((GtkTreeStore*)tree_store);
}
+/**
+ * gtk_tree_store_is_ancestor:
+ * @tree_store: A #GtkTreeStore
+ * @iter: A valid #GtkTreeIter
+ * @descendant: A valid #GtkTreeIter
+ *
+ * Returns %TRUE if @iter is an ancestor of @descendant. That is, @iter is the
+ * parent (or grandparent or great-grandparent) of @descendant.
+ *
+ * Return value: %TRUE, if @iter is an ancestor of @descendant
+ **/
gboolean
-gtk_tree_store_is_ancestor (GtkTreeStore *model,
+gtk_tree_store_is_ancestor (GtkTreeStore *tree_store,
GtkTreeIter *iter,
GtkTreeIter *descendant)
{
- g_return_val_if_fail (model != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_TREE_STORE (model), FALSE);
- g_return_val_if_fail (iter != NULL, FALSE);
- g_return_val_if_fail (descendant != NULL, FALSE);
+ g_return_val_if_fail (GTK_IS_TREE_STORE (tree_store), FALSE);
+ g_return_val_if_fail (VALID_ITER (iter, tree_store), FALSE);
+ g_return_val_if_fail (VALID_ITER (descendant, tree_store), FALSE);
return g_node_is_ancestor (G_NODE (iter->user_data),
G_NODE (descendant->user_data));
}
+/**
+ * gtk_tree_store_iter_depth:
+ * @tree_store: A #GtkTreeStore
+ * @iter: A valid #GtkTreeIter
+ *
+ * Returns the depth of @iter. This will be 0 for anything on the root level, 1
+ * for anything down a level, etc.
+ *
+ * Return value: The depth of @iter
+ **/
gint
-gtk_tree_store_iter_depth (GtkTreeStore *model,
+gtk_tree_store_iter_depth (GtkTreeStore *tree_store,
GtkTreeIter *iter)
{
- g_return_val_if_fail (model != NULL, 0);
- g_return_val_if_fail (GTK_IS_TREE_STORE (model), 0);
- g_return_val_if_fail (iter != NULL, 0);
+ g_return_val_if_fail (GTK_IS_TREE_STORE (tree_store), 0);
+ g_return_val_if_fail (VALID_ITER (iter, tree_store), 0);
- return g_node_depth (G_NODE (iter->user_data)) - 1;
+ return g_node_depth (G_NODE (iter->user_data)) - 2;
}
-/* DND */
+/**
+ * gtk_tree_store_clear:
+ * @tree_store: @ #GtkTreeStore
+ *
+ * Removes all rows from @tree_store
+ **/
+void
+gtk_tree_store_clear (GtkTreeStore *tree_store)
+{
+ GtkTreeIter iter;
+
+ g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
+
+ while (G_NODE (tree_store->root)->children)
+ {
+ iter.stamp = tree_store->stamp;
+ iter.user_data = G_NODE (tree_store->root)->children;
+ gtk_tree_store_remove (tree_store, &iter);
+ }
+}
+/* DND */
static gboolean
GtkTreeIter iter;
g_return_val_if_fail (GTK_IS_TREE_STORE (drag_source), FALSE);
-
+
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_source),
&iter,
path))
GtkTreeDataList *copy_iter = NULL;
GtkTreePath *path;
gint col;
-
+
col = 0;
while (dl)
{
G_NODE (dest_iter->user_data)->data = copy_head;
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), dest_iter);
- gtk_tree_model_changed (GTK_TREE_MODEL (tree_store), path, dest_iter);
+ gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_store), path, dest_iter);
gtk_tree_path_free (path);
}
GtkTreeModel *model;
model = GTK_TREE_MODEL (tree_store);
-
+
copy_node_data (tree_store, src_iter, dest_iter);
if (gtk_tree_model_iter_children (model,
gtk_tree_store_append (tree_store,
©,
dest_iter);
-
+
recursive_node_copy (tree_store, &child, ©);
}
while (gtk_tree_model_iter_next (model, &child));
GtkTreeModel *src_model = NULL;
GtkTreePath *src_path = NULL;
gboolean retval = FALSE;
-
+
g_return_val_if_fail (GTK_IS_TREE_STORE (drag_dest), FALSE);
tree_model = GTK_TREE_MODEL (drag_dest);
tree_store = GTK_TREE_STORE (drag_dest);
validate_tree (tree_store);
-
+
if (gtk_selection_data_get_tree_row (selection_data,
&src_model,
&src_path) &&
GtkTreeIter src_iter;
GtkTreeIter dest_iter;
GtkTreePath *prev;
-
+
if (!gtk_tree_model_get_iter (src_model,
&src_iter,
src_path))
/* Get the path to insert _after_ (dest is the path to insert _before_) */
prev = gtk_tree_path_copy (dest);
-
+
if (!gtk_tree_path_prev (prev))
{
GtkTreeIter dest_parent;
GtkTreePath *parent;
GtkTreeIter *dest_parent_p;
-
+
/* dest was the first spot at the current depth; which means
* we are supposed to prepend.
*/
-
+
/* Get the parent, NULL if parent is the root */
dest_parent_p = NULL;
parent = gtk_tree_path_copy (dest);
}
gtk_tree_path_free (parent);
parent = NULL;
-
+
gtk_tree_store_prepend (GTK_TREE_STORE (tree_model),
&dest_iter,
dest_parent_p);
-
+
retval = TRUE;
}
else
}
gtk_tree_path_free (prev);
-
+
/* If we succeeded in creating dest_iter, walk src_iter tree branch,
* duplicating it below dest_iter.
*/
-
+
if (retval)
{
recursive_node_copy (tree_store,
}
out:
-
+
if (src_path)
gtk_tree_path_free (src_path);
-
- return retval;
+
+ return retval;
}
static gboolean
/* can only drag to ourselves */
if (src_model != GTK_TREE_MODEL (drag_dest))
return FALSE;
-
+
/* Can't drop into ourself. */
if (gtk_tree_path_is_ancestor (src_path,
dest_path))
return FALSE;
}
}
-
+
if (tmp)
gtk_tree_path_free (tmp);
}
-
+
/* Can otherwise drop anywhere. */
return TRUE;
}
-
+
+/* Sorting */
+typedef struct _SortTuple
+{
+ gint offset;
+ GNode *node;
+} SortTuple;
+
+static gint
+gtk_tree_store_compare_func (gconstpointer a,
+ gconstpointer b,
+ gpointer user_data)
+{
+ GtkTreeStore *tree_store = user_data;
+ GNode *node_a;
+ GNode *node_b;
+ GtkTreeIterCompareFunc func;
+ gpointer data;
+
+ GtkTreeIter iter_a;
+ GtkTreeIter iter_b;
+ gint retval;
+
+ if (tree_store->sort_column_id != -1)
+ {
+ GtkTreeDataSortHeader *header;
+
+ header = _gtk_tree_data_list_get_header (tree_store->sort_list,
+ tree_store->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;
+ }
+ else
+ {
+ g_return_val_if_fail (tree_store->default_sort_func != NULL, 0);
+ func = tree_store->default_sort_func;
+ data = tree_store->default_sort_data;
+ }
+
+ node_a = ((SortTuple *) a)->node;
+ node_b = ((SortTuple *) b)->node;
+
+ iter_a.stamp = tree_store->stamp;
+ iter_a.user_data = node_a;
+ iter_b.stamp = tree_store->stamp;
+ iter_b.user_data = node_b;
+
+ retval = (* func) (GTK_TREE_MODEL (user_data), &iter_a, &iter_b, data);
+
+ if (tree_store->order == GTK_SORT_DESCENDING)
+ {
+ if (retval > 0)
+ retval = -1;
+ else if (retval < 0)
+ retval = 1;
+ }
+ return retval;
+}
+
+static void
+gtk_tree_store_sort_helper (GtkTreeStore *tree_store,
+ GNode *parent,
+ gboolean recurse)
+{
+ GtkTreeIter iter;
+ GArray *sort_array;
+ GNode *node;
+ GNode *tmp_node;
+ gint list_length;
+ gint i;
+ gint *new_order;
+ GtkTreePath *path;
+
+ node = parent->children;
+ if (node == NULL || node->next == NULL)
+ return;
+
+ g_assert (GTK_TREE_STORE_IS_SORTED (tree_store));
+
+ list_length = 0;
+ for (tmp_node = node; tmp_node; tmp_node = tmp_node->next)
+ list_length++;
+
+ sort_array = g_array_sized_new (FALSE, FALSE, sizeof (SortTuple), list_length);
+
+ i = 0;
+ for (tmp_node = node; tmp_node; tmp_node = tmp_node->next)
+ {
+ SortTuple tuple;
+
+ tuple.offset = i;
+ tuple.node = tmp_node;
+ g_array_append_val (sort_array, tuple);
+ i++;
+ }
+
+ g_array_sort_with_data (sort_array, gtk_tree_store_compare_func, tree_store);
+
+ for (i = 0; i < list_length - 1; i++)
+ {
+ g_array_index (sort_array, SortTuple, i).node->next =
+ g_array_index (sort_array, SortTuple, i + 1).node;
+ g_array_index (sort_array, SortTuple, i + 1).node->prev =
+ g_array_index (sort_array, SortTuple, i).node;
+ }
+ g_array_index (sort_array, SortTuple, list_length - 1).node->next = NULL;
+ g_array_index (sort_array, SortTuple, 0).node->prev = NULL;
+ parent->children = g_array_index (sort_array, SortTuple, 0).node;
+
+ /* Let the world know about our new order */
+ new_order = g_new (gint, list_length);
+ for (i = 0; i < list_length; i++)
+ new_order[i] = g_array_index (sort_array, SortTuple, i).offset;
+
+ iter.stamp = tree_store->stamp;
+ iter.user_data = parent;
+ path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), &iter);
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store),
+ path, &iter, new_order);
+ gtk_tree_path_free (path);
+ g_free (new_order);
+ g_array_free (sort_array, TRUE);
+
+ if (recurse)
+ {
+ for (tmp_node = parent->children; tmp_node; tmp_node = tmp_node->next)
+ {
+ if (tmp_node->children)
+ gtk_tree_store_sort_helper (tree_store, tmp_node, TRUE);
+ }
+ }
+}
+
+static void
+gtk_tree_store_sort (GtkTreeStore *tree_store)
+{
+ if (tree_store->sort_column_id != -1)
+ {
+ GtkTreeDataSortHeader *header = NULL;
+
+ header = _gtk_tree_data_list_get_header (tree_store->sort_list, tree_store->sort_column_id);
+
+ /* We want to make sure that we have a function */
+ g_return_if_fail (header != NULL);
+ g_return_if_fail (header->func != NULL);
+ }
+ else
+ {
+ g_return_if_fail (tree_store->default_sort_func != NULL);
+ }
+
+ gtk_tree_store_sort_helper (tree_store, G_NODE (tree_store->root), TRUE);
+}
+
+static void
+gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store,
+ GtkTreeIter *iter,
+ gint column)
+{
+ GNode *prev = NULL;
+ GNode *next = NULL;
+ GNode *node;
+ GtkTreePath *tmp_path;
+ GtkTreeIter tmp_iter;
+ gint cmp_a = 0;
+ gint cmp_b = 0;
+ gint i;
+ gint old_location;
+ gint new_location;
+ gint *new_order;
+ gint length;
+ GtkTreeIterCompareFunc func;
+ gpointer data;
+
+ g_return_if_fail (G_NODE (iter->user_data)->parent != NULL);
+
+ tmp_iter.stamp = tree_store->stamp;
+ if (tree_store->sort_column_id != -1)
+ {
+ GtkTreeDataSortHeader *header;
+ header = _gtk_tree_data_list_get_header (tree_store->sort_list,
+ tree_store->sort_column_id);
+ g_return_if_fail (header != NULL);
+ g_return_if_fail (header->func != NULL);
+ func = header->func;
+ data = header->data;
+ }
+ else
+ {
+ g_return_if_fail (tree_store->default_sort_func != NULL);
+ func = tree_store->default_sort_func;
+ data = tree_store->default_sort_data;
+ }
+
+ /* If it's the built in function, we don't sort. */
+ if (func == gtk_tree_data_list_compare_func &&
+ tree_store->sort_column_id != column)
+ return;
+
+ old_location = 0;
+ node = G_NODE (iter->user_data)->parent->children;
+ /* First we find the iter, its prev, and its next */
+ while (node)
+ {
+ if (node == G_NODE (iter->user_data))
+ break;
+ old_location++;
+ node = node->next;
+ }
+ g_assert (node != NULL);
+
+ prev = node->prev;
+ next = node->next;
+
+ /* Check the common case, where we don't need to sort it moved. */
+ if (prev != NULL)
+ {
+ tmp_iter.user_data = prev;
+ cmp_a = (* func) (GTK_TREE_MODEL (tree_store), &tmp_iter, iter, data);
+ }
+
+ if (next != NULL)
+ {
+ tmp_iter.user_data = next;
+ cmp_b = (* func) (GTK_TREE_MODEL (tree_store), iter, &tmp_iter, data);
+ }
+
+
+ if (tree_store->order == GTK_SORT_DESCENDING)
+ {
+ if (cmp_a < 0)
+ cmp_a = 1;
+ else if (cmp_a > 0)
+ cmp_a = -1;
+
+ if (cmp_b < 0)
+ cmp_b = 1;
+ else if (cmp_b > 0)
+ cmp_b = -1;
+ }
+
+ if (prev == NULL && cmp_b <= 0)
+ return;
+ else if (next == NULL && cmp_a <= 0)
+ return;
+ else if (prev != NULL && next != NULL &&
+ cmp_a <= 0 && cmp_b <= 0)
+ return;
+
+ /* We actually need to sort it */
+ /* First, remove the old link. */
+
+ if (prev)
+ prev->next = next;
+ else
+ node->parent->children = next;
+ if (next)
+ next->prev = prev;
+
+ node->prev = NULL;
+ node->next = NULL;
+
+ /* FIXME: as an optimization, we can potentially start at next */
+ prev = NULL;
+ node = node->parent->children;
+ new_location = 0;
+ tmp_iter.user_data = node;
+ if (tree_store->order == GTK_SORT_DESCENDING)
+ cmp_a = (* func) (GTK_TREE_MODEL (tree_store), &tmp_iter, iter, data);
+ else
+ cmp_a = (* func) (GTK_TREE_MODEL (tree_store), iter, &tmp_iter, data);
+
+ while ((node->next) && (cmp_a > 0))
+ {
+ prev = node;
+ node = node->next;
+ new_location++;
+ tmp_iter.user_data = node;
+ if (tree_store->order == GTK_SORT_DESCENDING)
+ cmp_a = (* func) (GTK_TREE_MODEL (tree_store), &tmp_iter, iter, data);
+ else
+ cmp_a = (* func) (GTK_TREE_MODEL (tree_store), iter, &tmp_iter, data);
+ }
+
+ if ((!node->next) && (cmp_a > 0))
+ {
+ node->next = G_NODE (iter->user_data);
+ node->next->prev = node;
+ }
+ else if (prev)
+ {
+ prev->next = G_NODE (iter->user_data);
+ prev->next->prev = prev;
+ G_NODE (iter->user_data)->next = node;
+ G_NODE (iter->user_data)->next->prev = G_NODE (iter->user_data);
+ }
+ else
+ {
+ G_NODE (iter->user_data)->next = G_NODE (iter->user_data)->parent->children;
+ G_NODE (iter->user_data)->parent->children = G_NODE (iter->user_data);
+ }
+
+ /* Emit the reordered signal. */
+ length = g_node_n_children (node->parent);
+ new_order = g_new (int, length);
+ if (old_location < new_location)
+ for (i = 0; i < length; i++)
+ {
+ if (i < old_location ||
+ i > new_location)
+ new_order[i] = i;
+ else if (i >= old_location &&
+ i < new_location)
+ new_order[i] = i + 1;
+ else if (i == new_location)
+ new_order[i] = old_location;
+ }
+ else
+ for (i = 0; i < length; i++)
+ {
+ if (i < new_location ||
+ i > old_location)
+ new_order[i] = i;
+ else if (i > new_location &&
+ i <= old_location)
+ new_order[i] = i - 1;
+ else if (i == new_location)
+ new_order[i] = old_location;
+ }
+
+ tmp_iter.user_data = node->parent;
+ tmp_path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), &tmp_iter);
+
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store),
+ tmp_path, &tmp_iter,
+ new_order);
+
+ gtk_tree_path_free (tmp_path);
+ g_free (new_order);
+}
+
+
+static gboolean
+gtk_tree_store_get_sort_column_id (GtkTreeSortable *sortable,
+ gint *sort_column_id,
+ GtkSortType *order)
+{
+ GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
+
+ g_return_val_if_fail (GTK_IS_TREE_STORE (sortable), FALSE);
+
+ if (tree_store->sort_column_id == -1)
+ return FALSE;
+
+ if (sort_column_id)
+ * sort_column_id = tree_store->sort_column_id;
+ if (order)
+ * order = tree_store->order;
+ return TRUE;
+
+}
+
+static void
+gtk_tree_store_set_sort_column_id (GtkTreeSortable *sortable,
+ gint sort_column_id,
+ GtkSortType order)
+{
+ GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
+
+ g_return_if_fail (GTK_IS_TREE_STORE (sortable));
+
+
+ if ((tree_store->sort_column_id == sort_column_id) &&
+ (tree_store->order == order))
+ return;
+
+ if (sort_column_id != -1)
+ {
+ GtkTreeDataSortHeader *header = NULL;
+
+ header = _gtk_tree_data_list_get_header (tree_store->sort_list, sort_column_id);
+
+ /* We want to make sure that we have a function */
+ g_return_if_fail (header != NULL);
+ g_return_if_fail (header->func != NULL);
+ }
+ else
+ {
+ g_return_if_fail (tree_store->default_sort_func != NULL);
+ }
+
+ tree_store->sort_column_id = sort_column_id;
+ tree_store->order = order;
+
+ gtk_tree_store_sort (tree_store);
+
+ gtk_tree_sortable_sort_column_changed (sortable);
+}
+
+static void
+gtk_tree_store_set_sort_func (GtkTreeSortable *sortable,
+ gint sort_column_id,
+ GtkTreeIterCompareFunc func,
+ gpointer data,
+ GtkDestroyNotify destroy)
+{
+ GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
+ GtkTreeDataSortHeader *header = NULL;
+ GList *list;
+
+ g_return_if_fail (GTK_IS_TREE_STORE (sortable));
+ g_return_if_fail (func != NULL);
+
+ for (list = tree_store->sort_list; list; list = list->next)
+ {
+ header = (GtkTreeDataSortHeader*) list->data;
+ if (header->sort_column_id == sort_column_id)
+ break;
+ }
+
+ if (header == NULL)
+ {
+ header = g_new0 (GtkTreeDataSortHeader, 1);
+ header->sort_column_id = sort_column_id;
+ tree_store->sort_list = g_list_append (tree_store->sort_list, header);
+ }
+
+ if (header->destroy)
+ (* header->destroy) (header->data);
+
+ header->func = func;
+ header->data = data;
+ header->destroy = destroy;
+
+}
+
+static void
+gtk_tree_store_set_default_sort_func (GtkTreeSortable *sortable,
+ GtkTreeIterCompareFunc func,
+ gpointer data,
+ GtkDestroyNotify destroy)
+{
+ GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
+
+ g_return_if_fail (GTK_IS_TREE_STORE (sortable));
+
+ if (tree_store->default_sort_destroy)
+ (* tree_store->default_sort_destroy) (tree_store->default_sort_data);
+
+ tree_store->default_sort_func = func;
+ tree_store->default_sort_data = data;
+ tree_store->default_sort_destroy = destroy;
+}
+
+static gboolean
+gtk_tree_store_has_default_sort_func (GtkTreeSortable *sortable)
+{
+ GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
+
+ g_return_val_if_fail (GTK_IS_TREE_STORE (sortable), FALSE);
+
+ return (tree_store->default_sort_func != NULL);
+}
+
static void
validate_gnode (GNode* node)
{
GNode *iter;
-
+
iter = node->children;
while (iter != NULL)
{
}
+
projects / ~andy / gtk / blobdiff