*/
#include <string.h>
+#include <gobject/gvaluecollector.h>
#include "gtktreemodel.h"
#include "gtkliststore.h"
#include "gtktreedatalist.h"
-#include "gtksignal.h"
#include "gtktreednd.h"
-#include <gobject/gvaluecollector.h>
#define G_SLIST(x) ((GSList *) x)
-#define GTK_LIST_STORE_IS_SORTED(list) (GTK_LIST_STORE (list)->sort_column_id != -1)
+#define GTK_LIST_STORE_IS_SORTED(list) (GTK_LIST_STORE (list)->sort_column_id != -2)
+#define VALID_ITER(iter, list_store) (iter!= NULL && iter->user_data != NULL && list_store->stamp == iter->stamp)
static void gtk_list_store_init (GtkListStore *list_store);
static void gtk_list_store_class_init (GtkListStoreClass *class);
static void gtk_list_store_drag_source_init(GtkTreeDragSourceIface *iface);
static void gtk_list_store_drag_dest_init (GtkTreeDragDestIface *iface);
static void gtk_list_store_sortable_init (GtkTreeSortableIface *iface);
-static guint gtk_list_store_get_flags (GtkTreeModel *tree_model);
+static void gtk_list_store_finalize (GObject *object);
+static GtkTreeModelFlags gtk_list_store_get_flags (GtkTreeModel *tree_model);
static gint gtk_list_store_get_n_columns (GtkTreeModel *tree_model);
static GType gtk_list_store_get_column_type (GtkTreeModel *tree_model,
gint index);
GtkTreeIter *child);
+static void gtk_list_store_set_n_columns (GtkListStore *list_store,
+ gint n_columns);
+static void gtk_list_store_set_column_type (GtkListStore *list_store,
+ gint column,
+ GType type);
+
+
/* Drag and Drop */
static gboolean gtk_list_store_drag_data_delete (GtkTreeDragSource *drag_source,
GtkTreePath *path);
GtkTreePath *dest,
GtkSelectionData *selection_data);
static gboolean gtk_list_store_row_drop_possible (GtkTreeDragDest *drag_dest,
- GtkTreeModel *src_model,
- GtkTreePath *src_path,
- GtkTreePath *dest_path);
+ GtkTreePath *dest_path,
+ GtkSelectionData *selection_data);
/* sortable */
-static void gtk_list_store_sort (GtkListStore *list_store);
-static void gtk_list_store_sort_iter_changed (GtkListStore *list_store,
- GtkTreeIter *iter,
- gint column);
-static gboolean gtk_list_store_get_sort_column_id (GtkTreeSortable *sortable,
- gint *sort_column_id,
- GtkTreeSortOrder *order);
-static void gtk_list_store_set_sort_column_id (GtkTreeSortable *sortable,
- gint sort_column_id,
- GtkTreeSortOrder order);
-static void gtk_list_store_set_sort_func (GtkTreeSortable *sortable,
- gint sort_column_id,
- GtkTreeIterCompareFunc func,
- gpointer data,
- GtkDestroyNotify destroy);
+static void gtk_list_store_sort (GtkListStore *list_store);
+static void gtk_list_store_sort_iter_changed (GtkListStore *list_store,
+ GtkTreeIter *iter,
+ gint column);
+static gboolean gtk_list_store_get_sort_column_id (GtkTreeSortable *sortable,
+ gint *sort_column_id,
+ GtkSortType *order);
+static void gtk_list_store_set_sort_column_id (GtkTreeSortable *sortable,
+ gint sort_column_id,
+ GtkSortType order);
+static void gtk_list_store_set_sort_func (GtkTreeSortable *sortable,
+ gint sort_column_id,
+ GtkTreeIterCompareFunc func,
+ gpointer data,
+ GtkDestroyNotify destroy);
+static void gtk_list_store_set_default_sort_func (GtkTreeSortable *sortable,
+ GtkTreeIterCompareFunc func,
+ gpointer data,
+ GtkDestroyNotify destroy);
+static gboolean gtk_list_store_has_default_sort_func (GtkTreeSortable *sortable);
+
+static void gtk_list_store_move (GtkListStore *store,
+ GtkTreeIter *iter,
+ GtkTreeIter *path,
+ gboolean before);
+
+
+static GObjectClass *parent_class = NULL;
static void
}
}
-GtkType
+GType
gtk_list_store_get_type (void)
{
static GType list_store_type = 0;
NULL
};
- list_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkListStore", &list_store_info, 0);
+ list_store_type = g_type_register_static (G_TYPE_OBJECT, "GtkListStore",
+ &list_store_info, 0);
+
g_type_add_interface_static (list_store_type,
GTK_TYPE_TREE_MODEL,
&tree_model_info);
{
GObjectClass *object_class;
+ parent_class = g_type_class_peek_parent (class);
object_class = (GObjectClass*) class;
+
+ object_class->finalize = gtk_list_store_finalize;
}
static void
iface->get_sort_column_id = gtk_list_store_get_sort_column_id;
iface->set_sort_column_id = gtk_list_store_set_sort_column_id;
iface->set_sort_func = gtk_list_store_set_sort_func;
+ iface->set_default_sort_func = gtk_list_store_set_default_sort_func;
+ iface->has_default_sort_func = gtk_list_store_has_default_sort_func;
}
static void
list_store->sort_list = NULL;
list_store->stamp = g_random_int ();
list_store->length = 0;
- list_store->sort_column_id = -1;
+ list_store->sort_column_id = -2;
+ list_store->columns_dirty = FALSE;
}
/**
* gtk_list_store_new:
- *
- * Creates a new #GtkListStore. A #GtkListStore implements the
- * #GtkTreeModel interface, and stores a linked list of
- * rows; each row can have any number of columns. Columns are of uniform type,
- * i.e. all cells in a column have the same type such as #G_TYPE_STRING or
- * #GDK_TYPE_PIXBUF. Use #GtkListStore to store data to be displayed in a
- * #GtkTreeView.
- *
- * Return value: a new #GtkListStore
- **/
-GtkListStore *
-gtk_list_store_new (void)
-{
- return GTK_LIST_STORE (g_object_new (gtk_list_store_get_type (), NULL));
-}
-
-/**
- * gtk_list_store_new_with_types:
* @n_columns: number of columns in the list store
* @Varargs: all #GType types for the columns, from first to last
*
- * Creates a new list store as with gtk_list_store_new(), simultaneously setting
- * up the columns and column types as with gtk_list_store_set_n_columns() and
- * gtk_list_store_set_column_type(). As an example,
- * gtk_tree_store_new_with_types (3, G_TYPE_INT, G_TYPE_STRING,
- * GTK_TYPE_PIXBUF); will create a new GtkListStore with three columns, of type
- * int, string and GtkPixbuf respectively.
+ * Creates a new list store as with @n_columns columns each of the types passed
+ * in. As an example, <literal>gtk_tree_store_new (3, G_TYPE_INT, G_TYPE_STRING,
+ * GDK_TYPE_PIXBUF);</literal> will create a new #GtkListStore with three columns, of type
+ * int, string and #GdkPixbuf respectively.
*
* Return value: a new #GtkListStore
**/
GtkListStore *
-gtk_list_store_new_with_types (gint n_columns,
+gtk_list_store_new (gint n_columns,
...)
{
GtkListStore *retval;
g_return_val_if_fail (n_columns > 0, NULL);
- retval = gtk_list_store_new ();
+ retval = g_object_new (GTK_TYPE_LIST_STORE, NULL);
gtk_list_store_set_n_columns (retval, n_columns);
va_start (args, n_columns);
GType type = va_arg (args, GType);
if (! _gtk_tree_data_list_check_type (type))
{
- g_warning ("%s: Invalid type %s passed to gtk_list_store_new_with_types\n", G_STRLOC, g_type_name (type));
- g_object_unref (G_OBJECT (retval));
+ g_warning ("%s: Invalid type %s passed to gtk_list_store_new\n",
+ G_STRLOC, g_type_name (type));
+ g_object_unref (retval);
return NULL;
}
return retval;
}
+
/**
- * gtk_list_store_set_n_columns:
- * @store: a #GtkListStore
- * @n_columns: number of columns
+ * gtk_list_store_newv:
+ * @n_columns: number of columns in the list store
+ * @types: an array of #GType types for the columns, from first to last
*
- * Sets the number of columns in the #GtkListStore.
+ * Non-vararg creation function. Used primarily by language bindings.
*
+ * Return value: a new #GtkListStore
+ **/
+GtkListStore *
+gtk_list_store_newv (gint n_columns,
+ GType *types)
+{
+ GtkListStore *retval;
+ gint i;
+
+ g_return_val_if_fail (n_columns > 0, NULL);
+
+ retval = g_object_new (GTK_TYPE_LIST_STORE, NULL);
+ gtk_list_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_list_store_newv\n",
+ G_STRLOC, g_type_name (types[i]));
+ g_object_unref (retval);
+ return NULL;
+ }
+
+ gtk_list_store_set_column_type (retval, i, types[i]);
+ }
+
+ return retval;
+}
+
+/**
+ * gtk_list_store_set_column_types:
+ * @list_store: A #GtkListStore
+ * @n_columns: Number of columns for the list store
+ * @types: An array length n of #GTypes
+ *
+ * This function is meant primarily for #GObjects that inherit from #GtkListStore,
+ * and should only be used when constructing a new #GtkListStore. It will not
+ * function after a row has been added, or a method on the #GtkTreeModel
+ * interface is called.
**/
void
+gtk_list_store_set_column_types (GtkListStore *list_store,
+ gint n_columns,
+ GType *types)
+{
+ gint i;
+
+ g_return_if_fail (GTK_IS_LIST_STORE (list_store));
+ g_return_if_fail (list_store->columns_dirty == 0);
+
+ gtk_list_store_set_n_columns (list_store, 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_list_store_set_column_types\n", G_STRLOC, g_type_name (types[i]));
+ continue;
+ }
+ gtk_list_store_set_column_type (list_store, i, types[i]);
+ }
+}
+
+static void
gtk_list_store_set_n_columns (GtkListStore *list_store,
gint n_columns)
{
GType *new_columns;
- g_return_if_fail (list_store != NULL);
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
g_return_if_fail (n_columns > 0);
list_store->n_columns = n_columns;
}
-/**
- * gtk_list_store_set_column_type:
- * @store: a #GtkListStore
- * @column: column number
- * @type: type of the data 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_list_store_set_column_type (GtkListStore *list_store,
gint column,
GType type)
{
- g_return_if_fail (list_store != NULL);
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
g_return_if_fail (column >=0 && column < list_store->n_columns);
+
if (!_gtk_tree_data_list_check_type (type))
{
- g_warning ("%s: Invalid type %s passed to gtk_list_store_new_with_types\n", G_STRLOC, g_type_name (type));
+ g_warning ("%s: Invalid type %s passed to gtk_list_store_set_column_type\n", G_STRLOC, g_type_name (type));
return;
}
list_store->column_headers[column] = type;
}
+static void
+gtk_list_store_finalize (GObject *object)
+{
+ GtkListStore *list_store = GTK_LIST_STORE (object);
+
+ g_slist_foreach (list_store->root, (GFunc) _gtk_tree_data_list_free, list_store->column_headers);
+ g_slist_free (list_store->root);
+
+ _gtk_tree_data_list_header_free (list_store->sort_list);
+ g_free (list_store->column_headers);
+
+ if (list_store->default_sort_destroy)
+ {
+ GtkDestroyNotify d = list_store->default_sort_destroy;
+
+ list_store->default_sort_destroy = NULL;
+ d (list_store->default_sort_data);
+ list_store->default_sort_data = NULL;
+ }
+
+ /* must chain up */
+ (* parent_class->finalize) (object);
+}
+
/* Fulfill the GtkTreeModel requirements */
-static guint
+static GtkTreeModelFlags
gtk_list_store_get_flags (GtkTreeModel *tree_model)
{
g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), 0);
static gint
gtk_list_store_get_n_columns (GtkTreeModel *tree_model)
{
+ GtkListStore *list_store = (GtkListStore *) tree_model;
+
g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), 0);
- return GTK_LIST_STORE (tree_model)->n_columns;
+ list_store->columns_dirty = TRUE;
+
+ return list_store->n_columns;
}
static GType
gtk_list_store_get_column_type (GtkTreeModel *tree_model,
gint index)
{
+ GtkListStore *list_store = (GtkListStore *) tree_model;
+
g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), G_TYPE_INVALID);
g_return_val_if_fail (index < GTK_LIST_STORE (tree_model)->n_columns &&
index >= 0, G_TYPE_INVALID);
- return GTK_LIST_STORE (tree_model)->column_headers[index];
+ list_store->columns_dirty = TRUE;
+
+ return list_store->column_headers[index];
}
static gboolean
GtkTreeIter *iter,
GtkTreePath *path)
{
+ GtkListStore *list_store = (GtkListStore *) tree_model;
GSList *list;
gint i;
g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), FALSE);
g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
+ list_store->columns_dirty = TRUE;
+
i = gtk_tree_path_get_indices (path)[0];
- if (i >= GTK_LIST_STORE (tree_model)->length)
+ if (i >= list_store->length)
return FALSE;
- list = g_slist_nth (G_SLIST (GTK_LIST_STORE (tree_model)->root), i);
+ list = g_slist_nth (G_SLIST (list_store->root), i);
/* If this fails, list_store->length has gotten mangled. */
g_assert (list);
- iter->stamp = GTK_LIST_STORE (tree_model)->stamp;
+ iter->stamp = list_store->stamp;
iter->user_data = list;
+
return TRUE;
}
g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), NULL);
g_return_val_if_fail (iter->stamp == GTK_LIST_STORE (tree_model)->stamp, NULL);
+ if (G_SLIST (iter->user_data) == G_SLIST (GTK_LIST_STORE (tree_model)->tail))
+ {
+ retval = gtk_tree_path_new ();
+ gtk_tree_path_append_index (retval, GTK_LIST_STORE (tree_model)->length - 1);
+ return retval;
+ }
for (list = G_SLIST (GTK_LIST_STORE (tree_model)->root); list; list = list->next)
{
gtk_list_store_iter_n_children (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
- g_return_val_if_fail (GTK_LIST_STORE (tree_model)->stamp == iter->stamp, -1);
-
- if (iter->user_data == NULL)
+ g_return_val_if_fail (GTK_IS_LIST_STORE (tree_model), -1);
+ if (iter == NULL)
return GTK_LIST_STORE (tree_model)->length;
- else
- return 0;
+
+ g_return_val_if_fail (GTK_LIST_STORE (tree_model)->stamp == iter->stamp, -1);
+ return 0;
}
static gboolean
return FALSE;
}
-/* Public accessors */
-/* This is a somewhat inelegant function that does a lot of list
- * manipulations on it's own.
- */
-
-/**
- * gtk_list_store_set_value:
- * @store: a #GtkListStore
- * @iter: iterator for the row you're modifying
- * @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_list_store_set_value (GtkListStore *list_store,
- GtkTreeIter *iter,
- gint column,
- GValue *value)
+static gboolean
+gtk_list_store_real_set_value (GtkListStore *list_store,
+ GtkTreeIter *iter,
+ gint column,
+ GValue *value,
+ gboolean sort)
{
GtkTreeDataList *list;
GtkTreeDataList *prev;
- GtkTreePath *path;
+ gint old_column = column;
GValue real_value = {0, };
gboolean converted = FALSE;
- gint orig_column = column;
+ gboolean retval = FALSE;
- g_return_if_fail (GTK_IS_LIST_STORE (list_store));
- g_return_if_fail (iter != NULL);
- g_return_if_fail (column >= 0 && column < list_store->n_columns);
- g_return_if_fail (G_IS_VALUE (value));
+ g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE);
+ g_return_val_if_fail (VALID_ITER (iter, list_store), FALSE);
+ g_return_val_if_fail (column >= 0 && column < list_store->n_columns, FALSE);
+ g_return_val_if_fail (G_IS_VALUE (value), FALSE);
if (! g_type_is_a (G_VALUE_TYPE (value), list_store->column_headers[column]))
{
G_STRLOC,
g_type_name (G_VALUE_TYPE (value)),
g_type_name (list_store->column_headers[column]));
- return;
+ return retval;
}
if (!g_value_transform (value, &real_value))
{
g_type_name (G_VALUE_TYPE (value)),
g_type_name (list_store->column_headers[column]));
g_value_unset (&real_value);
- return;
+ return retval;
}
converted = TRUE;
}
{
if (column == 0)
{
- path = gtk_list_store_get_path (GTK_TREE_MODEL (list_store), iter);
if (converted)
_gtk_tree_data_list_value_to_node (list, &real_value);
else
_gtk_tree_data_list_value_to_node (list, value);
- gtk_tree_model_range_changed (GTK_TREE_MODEL (list_store), path, iter, path, iter);
- gtk_tree_path_free (path);
+ retval = TRUE;
if (converted)
g_value_unset (&real_value);
- return;
+ if (sort && GTK_LIST_STORE_IS_SORTED (list_store))
+ gtk_list_store_sort_iter_changed (list_store, iter, old_column);
+ return retval;
}
column--;
column --;
}
- path = gtk_list_store_get_path (GTK_TREE_MODEL (list_store), iter);
if (converted)
_gtk_tree_data_list_value_to_node (list, &real_value);
else
_gtk_tree_data_list_value_to_node (list, value);
- gtk_tree_model_range_changed (GTK_TREE_MODEL (list_store), path, iter, path, iter);
- gtk_tree_path_free (path);
+
+ retval = TRUE;
if (converted)
g_value_unset (&real_value);
- if (GTK_LIST_STORE_IS_SORTED (list_store))
- gtk_list_store_sort_iter_changed (list_store, iter, orig_column);
+ if (sort && GTK_LIST_STORE_IS_SORTED (list_store))
+ gtk_list_store_sort_iter_changed (list_store, iter, old_column);
+
+ return retval;
+}
+
+
+/**
+ * gtk_list_store_set_value:
+ * @list_store: A #GtkListStore
+ * @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_list_store_set_value (GtkListStore *list_store,
+ GtkTreeIter *iter,
+ gint column,
+ GValue *value)
+{
+ g_return_if_fail (GTK_IS_LIST_STORE (list_store));
+ g_return_if_fail (VALID_ITER (iter, list_store));
+ g_return_if_fail (column >= 0 && column < list_store->n_columns);
+ g_return_if_fail (G_IS_VALUE (value));
+
+ if (gtk_list_store_real_set_value (list_store, iter, column, value, TRUE))
+ {
+ GtkTreePath *path;
+
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter);
+ gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), path, iter);
+ gtk_tree_path_free (path);
+ }
}
/**
* gtk_list_store_set_valist:
- * @list_store: a #GtkListStore
- * @iter: row to set data for
+ * @list_store: A #GtkListStore
+ * @iter: A valid #GtkTreeIter for the row being modified
* @var_args: va_list of column/value pairs
*
- * See gtk_list_store_set(); this version takes a va_list for
- * use by language bindings.
+ * See gtk_list_store_set(); this version takes a va_list for use by language
+ * bindings.
*
**/
void
va_list var_args)
{
gint column;
+ gboolean emit_signal = FALSE;
+ gboolean maybe_need_sort = FALSE;
+ GtkTreeIterCompareFunc func = NULL;
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
+ g_return_if_fail (VALID_ITER (iter, list_store));
column = va_arg (var_args, gint);
+ if (GTK_LIST_STORE_IS_SORTED (list_store))
+ {
+ if (list_store->sort_column_id != -1)
+ {
+ GtkTreeDataSortHeader *header;
+ header = _gtk_tree_data_list_get_header (list_store->sort_list,
+ list_store->sort_column_id);
+ g_return_if_fail (header != NULL);
+ g_return_if_fail (header->func != NULL);
+ func = header->func;
+ }
+ else
+ {
+ func = list_store->default_sort_func;
+ }
+ }
+
+ if (func != gtk_tree_data_list_compare_func)
+ maybe_need_sort = TRUE;
+
while (column != -1)
{
GValue value = { 0, };
}
/* FIXME: instead of calling this n times, refactor with above */
- gtk_list_store_set_value (list_store,
- iter,
- column,
- &value);
+ emit_signal = gtk_list_store_real_set_value (list_store,
+ iter,
+ column,
+ &value,
+ FALSE) || emit_signal;
+
+ if (func == gtk_tree_data_list_compare_func &&
+ column == list_store->sort_column_id)
+ maybe_need_sort = TRUE;
g_value_unset (&value);
column = va_arg (var_args, gint);
}
+
+ if (maybe_need_sort && GTK_LIST_STORE_IS_SORTED (list_store))
+ gtk_list_store_sort_iter_changed (list_store, iter, list_store->sort_column_id);
+
+ if (emit_signal)
+ {
+ GtkTreePath *path;
+
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter);
+ gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), path, iter);
+ gtk_tree_path_free (path);
+ }
}
/**
* The variable argument list should contain integer column numbers,
* each column number followed by the value to be set.
* The list is terminated by a -1. For example, to set column 0 with type
- * %G_TYPE_STRING to "Foo", you would write gtk_list_store_set (store, iter,
- * 0, "Foo", -1).
+ * %G_TYPE_STRING to "Foo", you would write <literal>gtk_list_store_set (store, iter,
+ * 0, "Foo", -1)</literal>.
**/
void
gtk_list_store_set (GtkListStore *list_store,
va_list var_args;
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
+ g_return_if_fail (iter != NULL);
+ g_return_if_fail (iter->stamp == list_store->stamp);
va_start (var_args, iter);
gtk_list_store_set_valist (list_store, iter, var_args);
if (iter->user_data == list_store->tail)
list_store->tail = prev;
- }
- list_store->stamp ++;
+ g_slist_free (G_SLIST (iter->user_data));
+ }
}
/**
* gtk_list_store_remove:
- * @store: a #GtkListStore
- * @iter: a row in @list_store
+ * @list_store: A #GtkListStore
+ * @iter: A valid #GtkTreeIter
*
- * Removes the given row from the list store, emitting the
- * "deleted" signal on #GtkTreeModel.
+ * Removes the given row from the list store. After being removed,
+ * @iter is set to be the next valid row, or invalidated if it pointed
+ * to the last row in @list_store.
*
+ * Return value: %TRUE if @iter is valid, %FALSE if not.
**/
-void
+gboolean
gtk_list_store_remove (GtkListStore *list_store,
GtkTreeIter *iter)
{
GtkTreePath *path;
+ GSList *next;
- g_return_if_fail (list_store != NULL);
- g_return_if_fail (GTK_IS_LIST_STORE (list_store));
- g_return_if_fail (iter->user_data != NULL);
+ g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE);
+ g_return_val_if_fail (VALID_ITER (iter, list_store), FALSE);
+ next = G_SLIST (iter->user_data)->next;
path = gtk_list_store_get_path (GTK_TREE_MODEL (list_store), iter);
validate_list_store (list_store);
validate_list_store (list_store);
- list_store->stamp ++;
- gtk_tree_model_deleted (GTK_TREE_MODEL (list_store), path);
+ gtk_tree_model_row_deleted (GTK_TREE_MODEL (list_store), path);
gtk_tree_path_free (path);
+
+ if (next)
+ {
+ iter->stamp = list_store->stamp;
+ iter->user_data = next;
+ return TRUE;
+ }
+ else
+ {
+ iter->stamp = 0;
+ }
+
+ return FALSE;
}
static void
/**
* gtk_list_store_insert:
- * @store: a #GtkListStore
- * @iter: iterator to initialize with the new row
+ * @list_store: A #GtkListStore
+ * @iter: An unset #GtkTreeIter to set to the new row
* @position: position to insert the new row
*
- * Creates a new row at @position, initializing @iter to point to the
- * new row, and emitting the "inserted" signal from the #GtkTreeModel
- * interface.
+ * Creates a new row at @position. @iter will be changed to point to this new
+ * row. If @position is larger than the number of rows on the list, then the
+ * new row will be appended to the list. 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
GtkTreePath *path;
GSList *new_list;
- g_return_if_fail (list_store != NULL);
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
g_return_if_fail (iter != NULL);
g_return_if_fail (position >= 0);
+ list_store->columns_dirty = TRUE;
+
if (position == 0 ||
GTK_LIST_STORE_IS_SORTED (list_store))
{
if (list == NULL)
{
- g_warning ("%s: position %d is off the end of the list\n", G_STRLOC, position);
+ /* position if off the end of the list, append it */
+ gtk_list_store_append (list_store, iter);
+
return;
}
path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, position);
- gtk_tree_model_inserted (GTK_TREE_MODEL (list_store), path, iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
}
/**
* gtk_list_store_insert_before:
- * @store: a #GtkListStore
- * @iter: iterator to initialize with the new row
- * @sibling: an existing row
+ * @list_store: A #GtkListStore
+ * @iter: An unset #GtkTreeIter to set to the new row
+ * @sibling: A valid #GtkTreeIter, or %NULL
*
- * Inserts a new row before @sibling, initializing @iter to point to
- * the new row, and emitting the "inserted" signal from the
- * #GtkTreeModel interface.
+ * Inserts a new row before @sibling. If @sibling is %NULL, then the row will be
+ * appended 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
GSList *list, *prev, *new_list;
gint i = 0;
- g_return_if_fail (list_store != NULL);
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
g_return_if_fail (iter != NULL);
+ if (sibling)
+ g_return_if_fail (VALID_ITER (sibling, list_store));
+
+ list_store->columns_dirty = TRUE;
if (GTK_LIST_STORE_IS_SORTED (list_store))
{
path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, i);
- gtk_tree_model_inserted (GTK_TREE_MODEL (list_store), path, iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
}
/**
* gtk_list_store_insert_after:
- * @store: a #GtkListStore
- * @iter: iterator to initialize with the new row
- * @sibling: an existing row
+ * @list_store: A #GtkListStore
+ * @iter: An unset #GtkTreeIter to set to the new row
+ * @sibling: A valid #GtkTreeIter, or %NULL
*
- * Inserts a new row after @sibling, initializing @iter to point to
- * the new row, and emitting the "inserted" signal from the
- * #GtkTreeModel interface.
+ * Inserts a new row after @sibling. If @sibling is %NULL, then the row will be
+ * prepended to the beginning of the list. @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_list_store_set() or gtk_list_store_set_value().
*
**/
void
GSList *list, *new_list;
gint i = 0;
- g_return_if_fail (list_store != NULL);
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
g_return_if_fail (iter != NULL);
if (sibling)
- g_return_if_fail (sibling->stamp == list_store->stamp);
+ g_return_if_fail (VALID_ITER (sibling, list_store));
+
+ list_store->columns_dirty = TRUE;
if (sibling == NULL ||
GTK_LIST_STORE_IS_SORTED (list_store))
validate_list_store (list_store);
path = gtk_tree_path_new ();
- gtk_tree_path_append_index (path, i);
- gtk_tree_model_inserted (GTK_TREE_MODEL (list_store), path, iter);
+ gtk_tree_path_append_index (path, i + 1);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
}
/**
* gtk_list_store_prepend:
- * @store: a #GtkListStore
- * @iter: iterator to initialize with new row
+ * @list_store: A #GtkListStore
+ * @iter: An unset #GtkTreeIter to set to the prepend row
*
- * Prepends a row to @store, initializing @iter to point to the
- * new row, and emitting the "inserted" signal on the #GtkTreeModel
- * interface for the @store.
+ * Prepends a new row to @list_store. @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_list_store_set() or gtk_list_store_set_value().
*
**/
void
{
GtkTreePath *path;
- g_return_if_fail (list_store != NULL);
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
g_return_if_fail (iter != NULL);
iter->stamp = list_store->stamp;
iter->user_data = g_slist_alloc ();
+ list_store->columns_dirty = TRUE;
+
if (list_store->root == NULL)
list_store->tail = iter->user_data;
path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, 0);
- gtk_tree_model_inserted (GTK_TREE_MODEL (list_store), path, iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
}
/**
* gtk_list_store_append:
- * @store: a #GtkListStore
- * @iter: iterator to initialize with the new row
+ * @list_store: A #GtkListStore
+ * @iter: An unset #GtkTreeIter to set to the appended row
*
- * Appends a row to @store, initializing @iter to point to the
- * new row, and emitting the "inserted" signal on the #GtkTreeModel
- * interface for the @store.
+ * Appends a new row to @list_store. @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_list_store_set() or gtk_list_store_set_value().
*
**/
void
{
GtkTreePath *path;
- g_return_if_fail (list_store != NULL);
g_return_if_fail (GTK_IS_LIST_STORE (list_store));
g_return_if_fail (iter != NULL);
+ list_store->columns_dirty = TRUE;
+
if (GTK_LIST_STORE_IS_SORTED (list_store))
{
gtk_list_store_prepend (list_store, iter);
path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, list_store->length - 1);
- gtk_tree_model_inserted (GTK_TREE_MODEL (list_store), path, iter);
+ gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
}
+/**
+ * gtk_list_store_clear:
+ * @list_store: a #GtkListStore.
+ *
+ * Removes all rows from the list store.
+ *
+ **/
+void
+gtk_list_store_clear (GtkListStore *list_store)
+{
+ GtkTreeIter iter;
+ g_return_if_fail (GTK_IS_LIST_STORE (list_store));
+
+ while (list_store->root)
+ {
+ iter.stamp = list_store->stamp;
+ iter.user_data = list_store->root;
+ gtk_list_store_remove (list_store, &iter);
+ }
+}
+
+/**
+ * gtk_list_store_iter_is_valid:
+ * @list_store: A #GtkListStore.
+ * @iter: A #GtkTreeIter.
+ *
+ * WARNING: This function is slow. Only use it for debugging and/or testing
+ * purposes.
+ *
+ * Checks if the given iter is a valid iter for this #GtkListStore.
+ *
+ * Return value: %TRUE if the iter is valid, %FALSE if the iter is invalid.
+ *
+ * Since: 2.2
+ **/
+gboolean
+gtk_list_store_iter_is_valid (GtkListStore *list_store,
+ GtkTreeIter *iter)
+{
+ GList *list;
+
+ g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ if (!VALID_ITER (iter, list_store))
+ return FALSE;
+
+ if (iter->user_data == list_store->root)
+ return TRUE;
+ if (iter->user_data == list_store->tail)
+ return TRUE;
+
+ for (list = ((GList *)list_store->root)->next; list; list = list->next)
+ if (list == iter->user_data)
+ return TRUE;
+
+ return FALSE;
+}
+
static gboolean
gtk_list_store_drag_data_delete (GtkTreeDragSource *drag_source,
GtkTreePath *path)
&iter,
path))
{
- gtk_list_store_remove (GTK_LIST_STORE (drag_source),
- &iter);
+ gtk_list_store_remove (GTK_LIST_STORE (drag_source), &iter);
return TRUE;
}
- else
- {
- return FALSE;
- }
+ return FALSE;
}
static gboolean
* default handler.
*/
- if (gtk_selection_data_set_tree_row (selection_data,
- GTK_TREE_MODEL (drag_source),
- path))
+ if (gtk_tree_set_row_drag_data (selection_data,
+ GTK_TREE_MODEL (drag_source),
+ path))
{
return TRUE;
}
tree_model = GTK_TREE_MODEL (drag_dest);
list_store = GTK_LIST_STORE (drag_dest);
- if (gtk_selection_data_get_tree_row (selection_data,
- &src_model,
- &src_path) &&
+ if (gtk_tree_get_row_drag_data (selection_data,
+ &src_model,
+ &src_path) &&
src_model == tree_model)
{
/* Copy the given row to a new position */
prev))
{
GtkTreeIter tmp_iter = dest_iter;
- gtk_list_store_insert_after (GTK_LIST_STORE (tree_model),
- &dest_iter,
- &tmp_iter);
+
+ if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_model), "gtk-tree-model-drop-append")))
+ gtk_list_store_append (GTK_LIST_STORE (tree_model), &dest_iter);
+ else
+ gtk_list_store_insert_after (GTK_LIST_STORE (tree_model),
+ &dest_iter, &tmp_iter);
+
retval = TRUE;
}
}
+ g_object_set_data (G_OBJECT (tree_model), "gtk-tree-model-drop-append",
+ NULL);
+
gtk_tree_path_free (prev);
/* If we succeeded in creating dest_iter, copy data from src
G_SLIST (dest_iter.user_data)->data = copy_head;
path = gtk_list_store_get_path (GTK_TREE_MODEL (tree_model), &dest_iter);
- gtk_tree_model_range_changed (GTK_TREE_MODEL (tree_model), path, &dest_iter, path, &dest_iter);
+ gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_model), path, &dest_iter);
gtk_tree_path_free (path);
}
}
}
static gboolean
-gtk_list_store_row_drop_possible (GtkTreeDragDest *drag_dest,
- GtkTreeModel *src_model,
- GtkTreePath *src_path,
- GtkTreePath *dest_path)
+gtk_list_store_row_drop_possible (GtkTreeDragDest *drag_dest,
+ GtkTreePath *dest_path,
+ GtkSelectionData *selection_data)
{
gint *indices;
+ GtkTreeModel *src_model = NULL;
+ GtkTreePath *src_path = NULL;
+ gboolean retval = FALSE;
g_return_val_if_fail (GTK_IS_LIST_STORE (drag_dest), FALSE);
- if (src_model != GTK_TREE_MODEL (drag_dest))
+ /* don't accept drops if the list has been sorted */
+ if (GTK_LIST_STORE_IS_SORTED (drag_dest))
return FALSE;
+ if (!gtk_tree_get_row_drag_data (selection_data,
+ &src_model,
+ &src_path))
+ goto out;
+
+ if (src_model != GTK_TREE_MODEL (drag_dest))
+ goto out;
+
if (gtk_tree_path_get_depth (dest_path) != 1)
- return FALSE;
+ goto out;
/* can drop before any existing node, or before one past any existing. */
indices = gtk_tree_path_get_indices (dest_path);
if (indices[0] <= GTK_LIST_STORE (drag_dest)->length)
- return TRUE;
- else
- return FALSE;
-}
+ retval = TRUE;
+ out:
+ gtk_tree_path_free (src_path);
+
+ return retval;
+}
-/* Sorting */
+/* Sorting and reordering */
typedef struct _SortTuple
{
gint offset;
GSList *el;
} SortTuple;
+/* Reordering */
+static gint
+gtk_list_store_reorder_func (gconstpointer a,
+ gconstpointer b,
+ gpointer user_data)
+{
+ SortTuple *a_reorder;
+ SortTuple *b_reorder;
+
+ a_reorder = (SortTuple *)a;
+ b_reorder = (SortTuple *)b;
+
+ if (a_reorder->offset < b_reorder->offset)
+ return -1;
+ if (a_reorder->offset > b_reorder->offset)
+ return 1;
+
+ return 0;
+}
+
+/**
+ * gtk_list_store_reorder:
+ * @store: A #GtkTreeStore.
+ * @new_order: An integer array indicating the new order for the list.
+ *
+ * Reorders @store to follow the order indicated by @new_order. Note that
+ * this function only works with unsorted stores.
+ *
+ * Since: 2.2
+ **/
+void
+gtk_list_store_reorder (GtkListStore *store,
+ gint *new_order)
+{
+ gint i;
+ GSList *current_list;
+ GtkTreePath *path;
+ SortTuple *sort_array;
+
+ g_return_if_fail (GTK_IS_LIST_STORE (store));
+ g_return_if_fail (!GTK_LIST_STORE_IS_SORTED (store));
+ g_return_if_fail (new_order != NULL);
+
+ sort_array = g_new (SortTuple, store->length);
+
+ current_list = store->root;
+
+ for (i = 0; i < store->length; i++)
+ {
+ sort_array[i].offset = new_order[i];
+ sort_array[i].el = current_list;
+
+ current_list = current_list->next;
+ }
+
+ g_qsort_with_data (sort_array,
+ store->length,
+ sizeof (SortTuple),
+ gtk_list_store_reorder_func,
+ NULL);
+
+ for (i = 0; i < store->length - 1; i++)
+ G_SLIST (sort_array[i].el)->next = G_SLIST (sort_array[i+1].el);
+
+ store->root = G_SLIST (sort_array[0].el);
+ store->tail = G_SLIST (sort_array[store->length-1].el);
+ G_SLIST (store->tail)->next = NULL;
+
+ /* emit signal */
+ path = gtk_tree_path_new ();
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (store),
+ path, NULL, new_order);
+ gtk_tree_path_free (path);
+ g_free (sort_array);
+}
+
+/**
+ * gtk_list_store_swap:
+ * @store: A #GtkListStore.
+ * @a: A #GtkTreeIter.
+ * @b: Another #GtkTreeIter.
+ *
+ * Swaps @a and @b in @store. Note that this function only works with
+ * unsorted stores.
+ *
+ * Since: 2.2
+ **/
+void
+gtk_list_store_swap (GtkListStore *store,
+ GtkTreeIter *a,
+ GtkTreeIter *b)
+{
+ GSList *i, *prev_a = NULL, *prev_b = NULL;
+ gint j, a_count = 0, b_count = 0, *order;
+ GtkTreePath *path;
+
+ g_return_if_fail (GTK_IS_LIST_STORE (store));
+ g_return_if_fail (!GTK_LIST_STORE_IS_SORTED (store));
+ g_return_if_fail (VALID_ITER (a, store));
+ g_return_if_fail (VALID_ITER (b, store));
+
+ if (a->user_data == b->user_data)
+ return;
+
+ if (a->user_data == store->root)
+ prev_a = NULL;
+ else
+ {
+ for (i = store->root; i; i = i->next, a_count++)
+ if (i->next == a->user_data)
+ {
+ prev_a = i;
+ break;
+ }
+
+ a_count++;
+ }
+
+ if (b->user_data == store->root)
+ prev_b = NULL;
+ else
+ {
+ for (i = store->root; i; i = i->next, b_count++)
+ if (i->next == b->user_data)
+ {
+ prev_b = i;
+ break;
+ }
+
+ b_count++;
+ }
+
+ if (!prev_a)
+ store->root = b->user_data;
+ else
+ prev_a->next = b->user_data;
+
+ if (!prev_b)
+ store->root = a->user_data;
+ else
+ prev_b->next = a->user_data;
+
+ /* think a_next inspead of a_prev here ... */
+ prev_a = G_SLIST (a->user_data)->next;
+ prev_b = G_SLIST (b->user_data)->next;
+
+ G_SLIST (a->user_data)->next = prev_b;
+ G_SLIST (b->user_data)->next = prev_a;
+
+ /* emit signal */
+ order = g_new (gint, store->length);
+ for (j = 0; j < store->length; j++)
+ if (j == a_count)
+ order[j] = b_count;
+ else if (j == b_count)
+ order[j] = a_count;
+ else
+ order[j] = j;
+
+ path = gtk_tree_path_new ();
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (store),
+ path, NULL, order);
+ gtk_tree_path_free (path);
+ g_free (order);
+}
+
+static void
+gtk_list_store_move (GtkListStore *store,
+ GtkTreeIter *iter,
+ GtkTreeIter *position,
+ gboolean before)
+{
+ GtkTreeIter dst_a;
+ GSList *i, *a, *prev = NULL, *tmp;
+ gint new_pos = 0, old_pos = 0, j = 0, *order;
+ GtkTreePath *path, *pos_path = NULL;
+
+ g_return_if_fail (GTK_IS_LIST_STORE (store));
+ g_return_if_fail (!GTK_LIST_STORE_IS_SORTED (store));
+ g_return_if_fail (VALID_ITER (iter, store));
+ if (position)
+ g_return_if_fail (VALID_ITER (position, store));
+
+ /* lots of sanity checks */
+ if (position)
+ {
+ path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), iter);
+ pos_path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), position);
+
+ if (gtk_tree_path_get_depth (pos_path) != 1)
+ goto free_paths_and_out;
+
+ /* if before:
+ * moving the iter before path or "path + 1" doesn't make sense
+ * else
+ * moving the iter before path or "path - 1" doesn't make sense
+ */
+ if (!gtk_tree_path_compare (path, pos_path))
+ goto free_paths_and_out;
+
+ if (before)
+ gtk_tree_path_next (path);
+ else
+ gtk_tree_path_prev (path);
+
+ if (!gtk_tree_path_compare (path, pos_path))
+ goto free_paths_and_out;
+
+ gtk_tree_path_free (path);
+ }
+
+ /* getting destination iters */
+ if (before && position)
+ {
+ if (gtk_tree_path_get_indices (pos_path)[0] > 0)
+ {
+ gtk_tree_path_prev (pos_path);
+ if (gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &dst_a, pos_path))
+ a = G_SLIST (dst_a.user_data);
+ else
+ a = NULL;
+ gtk_tree_path_next (pos_path);
+ }
+ else
+ a = NULL;
+ }
+ else if (before && !position)
+ a = NULL;
+ else /* !before */
+ {
+ if (position)
+ a = G_SLIST (position->user_data);
+ else
+ a = NULL;
+ }
+
+ /* getting the old prev node */
+ if (iter->user_data == store->root)
+ prev = NULL;
+ else
+ {
+ for (i = store->root; i; i = i->next, old_pos++)
+ if (i->next == iter->user_data)
+ {
+ prev = i;
+ break;
+ }
+
+ old_pos++;
+ }
+
+ /* remove node */
+ if (!prev)
+ store->root = G_SLIST (iter->user_data)->next;
+ else
+ prev->next = G_SLIST (iter->user_data)->next;
+
+ /* and reinsert it */
+ if (a)
+ {
+ tmp = a->next;
+
+ a->next = G_SLIST (iter->user_data);
+ a->next->next = tmp;
+ }
+ else if (!a && !before)
+ {
+ tmp = G_SLIST (store->root);
+
+ store->root = G_SLIST (iter->user_data);
+ G_SLIST (store->root)->next = tmp;
+ }
+ else if (!a && before)
+ {
+ G_SLIST (store->tail)->next = G_SLIST (iter->user_data);
+ G_SLIST (iter->user_data)->next = NULL;
+ store->tail = iter->user_data;
+ }
+
+ /* emit signal */
+ if (position)
+ new_pos = gtk_tree_path_get_indices (pos_path)[0];
+ else if (before)
+ new_pos = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL) - 1;
+ else
+ new_pos = 0;
+
+ if (new_pos > old_pos)
+ {
+ if (before)
+ new_pos--;
+ }
+ else
+ {
+ if (!before)
+ new_pos++;
+ }
+
+ order = g_new (gint, store->length);
+ if (new_pos > old_pos)
+ {
+ for (j = 0; j < store->length; j++)
+ if (j < old_pos)
+ order[j] = j;
+ else if (j >= old_pos && j < new_pos)
+ order[j] = j + 1;
+ else if (j == new_pos)
+ order[j] = old_pos;
+ else
+ order[j] = j;
+ }
+ else
+ {
+ for (j = 0; j < store->length; j++)
+ if (j == new_pos)
+ order[j] = old_pos;
+ else if (j > new_pos && j <= old_pos)
+ order[j] = j - 1;
+ else
+ order[j] = j;
+ }
+
+ path = gtk_tree_path_new ();
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (store),
+ path, NULL, order);
+ gtk_tree_path_free (path);
+ if (position)
+ gtk_tree_path_free (pos_path);
+ g_free (order);
+
+ return;
+
+free_paths_and_out:
+ gtk_tree_path_free (path);
+ gtk_tree_path_free (pos_path);
+}
+
+/**
+ * gtk_list_store_move_before:
+ * @store: A #GtkListStore.
+ * @iter: A #GtkTreeIter.
+ * @position: A #GtkTreeIter, or %NULL.
+ *
+ * Moves @iter in @store to the position before @position. Note that this
+ * function only works with unsorted stores. If @position is %NULL, @iter
+ * will be moved to the end of the list.
+ *
+ * Since: 2.2
+ **/
+void
+gtk_list_store_move_before (GtkListStore *store,
+ GtkTreeIter *iter,
+ GtkTreeIter *position)
+{
+ gtk_list_store_move (store, iter, position, TRUE);
+}
+
+/**
+ * gtk_list_store_move_after:
+ * @store: A #GtkListStore.
+ * @iter: A #GtkTreeIter.
+ * @position: A #GtkTreeIter or %NULL.
+ *
+ * Moves @iter in @store to the position after @position. Note that this
+ * function only works with unsorted stores. If @position is %NULL, @iter
+ * will be moved to the start of the list.
+ *
+ * Since: 2.2
+ **/
+void
+gtk_list_store_move_after (GtkListStore *store,
+ GtkTreeIter *iter,
+ GtkTreeIter *position)
+{
+ gtk_list_store_move (store, iter, position, FALSE);
+}
+
+/* Sorting */
static gint
gtk_list_store_compare_func (gconstpointer a,
gconstpointer b,
gpointer user_data)
{
GtkListStore *list_store = user_data;
- GtkTreeDataSortHeader *header = NULL;
GSList *el_a; /* Los Angeles? */
GSList *el_b;
GtkTreeIter iter_a;
GtkTreeIter iter_b;
gint retval;
+ GtkTreeIterCompareFunc func;
+ gpointer data;
- header = _gtk_tree_data_list_get_header (list_store->sort_list,
- list_store->sort_column_id);
- g_return_val_if_fail (header != NULL, 0);
- g_return_val_if_fail (header->func != NULL, 0);
+ if (list_store->sort_column_id != -1)
+ {
+ GtkTreeDataSortHeader *header;
+
+ header = _gtk_tree_data_list_get_header (list_store->sort_list,
+ list_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 (list_store->default_sort_func != NULL, 0);
+ func = list_store->default_sort_func;
+ data = list_store->default_sort_data;
+ }
el_a = ((SortTuple *) a)->el;
el_b = ((SortTuple *) b)->el;
iter_b.stamp = list_store->stamp;
iter_b.user_data = el_b;
- retval = (* header->func) (GTK_TREE_MODEL (list_store),
- &iter_a, &iter_b,
- header->data);
+ retval = (* func) (GTK_TREE_MODEL (list_store), &iter_a, &iter_b, data);
- if (list_store->order == GTK_TREE_SORT_DESCENDING)
+ if (list_store->order == GTK_SORT_DESCENDING)
{
if (retval > 0)
retval = -1;
static void
gtk_list_store_sort (GtkListStore *list_store)
{
- GtkTreeDataSortHeader *header = NULL;
- GtkTreeIter iter;
GArray *sort_array;
gint i;
gint *new_order;
g_assert (GTK_LIST_STORE_IS_SORTED (list_store));
- header = _gtk_tree_data_list_get_header (list_store->sort_list, list_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);
-
list = G_SLIST (list_store->root);
sort_array = g_array_sized_new (FALSE, FALSE,
g_array_index (sort_array, SortTuple, i + 1).el;
g_array_index (sort_array, SortTuple, list_store->length - 1).el->next = NULL;
list_store->root = g_array_index (sort_array, SortTuple, 0).el;
+ list_store->tail = g_array_index (sort_array, SortTuple, list_store->length - 1).el;
/* Let the world know about our new order */
new_order = g_new (gint, list_store->length);
for (i = 0; i < list_store->length; i++)
new_order[i] = g_array_index (sort_array, SortTuple, i).offset;
+
path = gtk_tree_path_new ();
- iter.stamp = list_store->stamp;
- iter.user_data = NULL;
- gtk_tree_model_reordered (GTK_TREE_MODEL (list_store),
- path, &iter, new_order);
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (list_store),
+ path, NULL, new_order);
gtk_tree_path_free (path);
g_free (new_order);
g_array_free (sort_array, TRUE);
gint column)
{
- GtkTreeDataSortHeader *header;
GSList *prev = NULL;
GSList *next = NULL;
GSList *list = G_SLIST (list_store->root);
gint old_location;
gint new_location;
gint *new_order;
+ GtkTreeIterCompareFunc func;
+ gpointer data;
if (list_store->length < 2)
return;
tmp_iter.stamp = list_store->stamp;
- header = _gtk_tree_data_list_get_header (list_store->sort_list,
- list_store->sort_column_id);
- g_return_if_fail (header != NULL);
- g_return_if_fail (header->func != NULL);
+
+ if (list_store->sort_column_id != -1)
+ {
+ GtkTreeDataSortHeader *header;
+ header = _gtk_tree_data_list_get_header (list_store->sort_list,
+ list_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 (list_store->default_sort_func != NULL);
+ func = list_store->default_sort_func;
+ data = list_store->default_sort_data;
+ }
/* If it's the built in function, we don't sort. */
- if (header->func == gtk_tree_data_list_compare_func &&
+ if (func == gtk_tree_data_list_compare_func &&
list_store->sort_column_id != column)
return;
if (prev != NULL)
{
tmp_iter.user_data = prev;
- cmp_a = (* header->func) (GTK_TREE_MODEL (list_store),
- &tmp_iter, iter,
- header->data);
+ cmp_a = (* func) (GTK_TREE_MODEL (list_store), &tmp_iter, iter, data);
}
if (next != NULL)
{
tmp_iter.user_data = next;
- cmp_b = (* header->func) (GTK_TREE_MODEL (list_store),
- iter, &tmp_iter,
- header->data);
+ cmp_b = (* func) (GTK_TREE_MODEL (list_store), iter, &tmp_iter, data);
}
-
- if (list_store->order == GTK_TREE_SORT_DESCENDING)
+ if (list_store->order == GTK_SORT_DESCENDING)
{
if (cmp_a < 0)
cmp_a = 1;
list = G_SLIST (list_store->root);
new_location = 0;
tmp_iter.user_data = list;
- if (list_store->order == GTK_TREE_SORT_DESCENDING)
- cmp_a = (* header->func) (GTK_TREE_MODEL (list_store),
- &tmp_iter, iter, header->data);
+ if (list_store->order == GTK_SORT_DESCENDING)
+ cmp_a = (* func) (GTK_TREE_MODEL (list_store), &tmp_iter, iter, data);
else
- cmp_a = (* header->func) (GTK_TREE_MODEL (list_store),
- iter, &tmp_iter, header->data);
+ cmp_a = (* func) (GTK_TREE_MODEL (list_store), iter, &tmp_iter, data);
while ((list->next) && (cmp_a > 0))
{
list = list->next;
new_location++;
tmp_iter.user_data = list;
- if (list_store->order == GTK_TREE_SORT_DESCENDING)
- cmp_a = (* header->func) (GTK_TREE_MODEL (list_store),
- &tmp_iter, iter, header->data);
+ if (list_store->order == GTK_SORT_DESCENDING)
+ cmp_a = (* func) (GTK_TREE_MODEL (list_store), &tmp_iter, iter, data);
else
- cmp_a = (* header->func) (GTK_TREE_MODEL (list_store),
- iter, &tmp_iter, header->data);
+ cmp_a = (* func) (GTK_TREE_MODEL (list_store), iter, &tmp_iter, data);
}
if ((!list->next) && (cmp_a > 0))
{
+ new_location++;
list->next = G_SLIST (iter->user_data);
list_store->tail = list->next;
}
tmp_path = gtk_tree_path_new ();
tmp_iter.user_data = NULL;
- gtk_tree_model_reordered (GTK_TREE_MODEL (list_store),
- tmp_path, &tmp_iter,
- new_order);
-
+ gtk_tree_model_rows_reordered (GTK_TREE_MODEL (list_store),
+ tmp_path, NULL,
+ new_order);
gtk_tree_path_free (tmp_path);
g_free (new_order);
}
static gboolean
gtk_list_store_get_sort_column_id (GtkTreeSortable *sortable,
gint *sort_column_id,
- GtkTreeSortOrder *order)
+ GtkSortType *order)
{
GtkListStore *list_store = (GtkListStore *) sortable;
- g_return_val_if_fail (sortable != NULL, FALSE);
g_return_val_if_fail (GTK_IS_LIST_STORE (sortable), FALSE);
if (list_store->sort_column_id == -1)
static void
gtk_list_store_set_sort_column_id (GtkTreeSortable *sortable,
gint sort_column_id,
- GtkTreeSortOrder order)
+ GtkSortType order)
{
GtkListStore *list_store = (GtkListStore *) sortable;
- GList *list;
- g_return_if_fail (sortable != NULL);
g_return_if_fail (GTK_IS_LIST_STORE (sortable));
- for (list = list_store->sort_list; list; list = list->next)
- {
- GtkTreeDataSortHeader *header = (GtkTreeDataSortHeader*) list->data;
- if (header->sort_column_id == sort_column_id)
- break;
- }
- g_return_if_fail (list != NULL);
-
if ((list_store->sort_column_id == sort_column_id) &&
(list_store->order == order))
return;
+ if (sort_column_id != -1)
+ {
+ GtkTreeDataSortHeader *header = NULL;
+
+ header = _gtk_tree_data_list_get_header (list_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 (list_store->default_sort_func != NULL);
+ }
+
+
list_store->sort_column_id = sort_column_id;
list_store->order = order;
- if (list_store->sort_column_id >= 0)
- gtk_list_store_sort (list_store);
+ gtk_list_store_sort (list_store);
gtk_tree_sortable_sort_column_changed (sortable);
}
GtkTreeDataSortHeader *header = NULL;
GList *list;
- g_return_if_fail (sortable != NULL);
g_return_if_fail (GTK_IS_LIST_STORE (sortable));
g_return_if_fail (func != NULL);
for (list = list_store->sort_list; list; list = list->next)
{
- header = (GtkTreeDataSortHeader*) list->data;
- if (header->sort_column_id == sort_column_id)
- break;
+ GtkTreeDataSortHeader *list_header;
+
+ list_header = (GtkTreeDataSortHeader*) list->data;
+ if (list_header->sort_column_id == sort_column_id)
+ {
+ header = list_header;
+ break;
+ }
}
if (header == NULL)
}
if (header->destroy)
- (* header->destroy) (header->data);
+ {
+ GtkDestroyNotify d = header->destroy;
+
+ header->destroy = NULL;
+ d (header->data);
+ }
header->func = func;
header->data = data;
header->destroy = destroy;
}
+
+
+static void
+gtk_list_store_set_default_sort_func (GtkTreeSortable *sortable,
+ GtkTreeIterCompareFunc func,
+ gpointer data,
+ GtkDestroyNotify destroy)
+{
+ GtkListStore *list_store = (GtkListStore *) sortable;
+
+ g_return_if_fail (GTK_IS_LIST_STORE (sortable));
+
+ if (list_store->default_sort_destroy)
+ {
+ GtkDestroyNotify d = list_store->default_sort_destroy;
+
+ list_store->default_sort_destroy = NULL;
+ d (list_store->default_sort_data);
+ }
+
+ list_store->default_sort_func = func;
+ list_store->default_sort_data = data;
+ list_store->default_sort_destroy = destroy;
+}
+
+static gboolean
+gtk_list_store_has_default_sort_func (GtkTreeSortable *sortable)
+{
+ GtkListStore *list_store = (GtkListStore *) sortable;
+
+ g_return_val_if_fail (GTK_IS_LIST_STORE (sortable), FALSE);
+
+ return (list_store->default_sort_func != NULL);
+}
projects / ~andy / gtk / blobdiff