X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktreestore.c;h=21e7a205d95a941ab9e429cd1b9a649da6cf2b1e;hb=563eb60666d9f72c38d7542b0ab37841e6aac488;hp=d2bc74246fc78ca32fc1ea937b7233ddb7927ddb;hpb=83e9cd53209b4d0636d01920afbb48458ef75739;p=~andy%2Fgtk diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index d2bc74246..21e7a205d 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -12,28 +12,81 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ +#include "config.h" #include #include #include "gtktreemodel.h" #include "gtktreestore.h" #include "gtktreedatalist.h" #include "gtktreednd.h" +#include "gtkbuildable.h" +#include "gtkdebug.h" +#include "gtkintl.h" + + +/** + * SECTION:gtktreestore + * @Short_description: A tree-like data structure that can be used with the GtkTreeView + * @Title: GtkTreeStore + * @See_also: #GtkTreeModel + * + * The #GtkTreeStore object is a list model for use with a #GtkTreeView + * widget. It implements the #GtkTreeModel interface, and consequentialy, + * can use all of the methods available there. It also implements the + * #GtkTreeSortable interface so it can be sorted by the view. Finally, + * it also implements the tree drag and + * drop interfaces. + * + * + * GtkTreeStore as GtkBuildable + * The GtkTreeStore implementation of the #GtkBuildable interface allows + * to specify the model columns with a <columns> element that may + * contain multiple <column> elements, each specifying one model + * column. The "type" attribute specifies the data type for the column. + * + * A UI Definition fragment for a tree store + * + * + * + * + * + * + * + * ]]> + * + * + */ + +struct _GtkTreeStorePrivate +{ + gint stamp; + gpointer root; + gpointer last; + gint n_columns; + gint sort_column_id; + GList *sort_list; + GtkSortType order; + GType *column_headers; + GtkTreeIterCompareFunc default_sort_func; + gpointer default_sort_data; + GDestroyNotify default_sort_destroy; + guint columns_dirty : 1; +}; + #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) +#define GTK_TREE_STORE_IS_SORTED(tree) (((GtkTreeStore*)(tree))->priv->sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID) +#define VALID_ITER(iter, tree_store) ((iter)!= NULL && (iter)->user_data != NULL && ((GtkTreeStore*)(tree_store))->priv->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_buildable_init (GtkBuildableIface *iface); static void gtk_tree_store_finalize (GObject *object); static GtkTreeModelFlags gtk_tree_store_get_flags (GtkTreeModel *tree_model); static gint gtk_tree_store_get_n_columns (GtkTreeModel *tree_model); @@ -50,6 +103,8 @@ static void gtk_tree_store_get_value (GtkTreeModel *tree_mode GValue *value); static gboolean gtk_tree_store_iter_next (GtkTreeModel *tree_model, GtkTreeIter *iter); +static gboolean gtk_tree_store_iter_previous (GtkTreeModel *tree_model, + GtkTreeIter *iter); static gboolean gtk_tree_store_iter_children (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *parent); @@ -72,8 +127,12 @@ static void gtk_tree_store_set_column_type (GtkTreeStore *tree_store, gint column, GType type); +static void gtk_tree_store_increment_stamp (GtkTreeStore *tree_store); + /* DND interfaces */ +static gboolean real_gtk_tree_store_row_draggable (GtkTreeDragSource *drag_source, + GtkTreePath *path); static gboolean gtk_tree_store_drag_data_delete (GtkTreeDragSource *drag_source, GtkTreePath *path); static gboolean gtk_tree_store_drag_data_get (GtkTreeDragSource *drag_source, @@ -91,7 +150,8 @@ static gboolean gtk_tree_store_row_drop_possible (GtkTreeDragDest *drag_dest, static void gtk_tree_store_sort (GtkTreeStore *tree_store); static void gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store, GtkTreeIter *iter, - gint column); + gint column, + gboolean emit_signal); static gboolean gtk_tree_store_get_sort_column_id (GtkTreeSortable *sortable, gint *sort_column_id, GtkSortType *order); @@ -102,13 +162,28 @@ static void gtk_tree_store_set_sort_func (GtkTreeSortable * gint sort_column_id, GtkTreeIterCompareFunc func, gpointer data, - GtkDestroyNotify destroy); + GDestroyNotify destroy); static void gtk_tree_store_set_default_sort_func (GtkTreeSortable *sortable, GtkTreeIterCompareFunc func, gpointer data, - GtkDestroyNotify destroy); + GDestroyNotify destroy); static gboolean gtk_tree_store_has_default_sort_func (GtkTreeSortable *sortable); + +/* buildable */ + +static gboolean gtk_tree_store_buildable_custom_tag_start (GtkBuildable *buildable, + GtkBuilder *builder, + GObject *child, + const gchar *tagname, + GMarkupParser *parser, + gpointer *data); +static void gtk_tree_store_buildable_custom_finished (GtkBuildable *buildable, + GtkBuilder *builder, + GObject *child, + const gchar *tagname, + gpointer user_data); + static void validate_gnode (GNode *node); static void gtk_tree_store_move (GtkTreeStore *tree_store, @@ -117,98 +192,39 @@ static void gtk_tree_store_move (GtkTreeStore * gboolean before); -static GObjectClass *parent_class = NULL; - - static inline void validate_tree (GtkTreeStore *tree_store) { - if (gtk_debug_flags & GTK_DEBUG_TREE) + if (gtk_get_debug_flags () & GTK_DEBUG_TREE) { - g_assert (G_NODE (tree_store->root)->parent == NULL); + g_assert (G_NODE (tree_store->priv->root)->parent == NULL); - validate_gnode (G_NODE (tree_store->root)); + validate_gnode (G_NODE (tree_store->priv->root)); } } -GType -gtk_tree_store_get_type (void) -{ - static GType tree_store_type = 0; - - if (!tree_store_type) - { - static const GTypeInfo tree_store_info = - { - sizeof (GtkTreeStoreClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gtk_tree_store_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkTreeStore), - 0, /* n_preallocs */ - (GInstanceInitFunc) gtk_tree_store_init - }; - - static const GInterfaceInfo tree_model_info = - { - (GInterfaceInitFunc) gtk_tree_store_tree_model_init, - NULL, - NULL - }; - - static const GInterfaceInfo drag_source_info = - { - (GInterfaceInitFunc) gtk_tree_store_drag_source_init, - NULL, - NULL - }; - - static const GInterfaceInfo drag_dest_info = - { - (GInterfaceInitFunc) gtk_tree_store_drag_dest_init, - 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; -} +G_DEFINE_TYPE_WITH_CODE (GtkTreeStore, gtk_tree_store, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL, + gtk_tree_store_tree_model_init) + G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE, + gtk_tree_store_drag_source_init) + G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_DEST, + gtk_tree_store_drag_dest_init) + G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_SORTABLE, + gtk_tree_store_sortable_init) + G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, + gtk_tree_store_buildable_init)) static void gtk_tree_store_class_init (GtkTreeStoreClass *class) { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass *) class; object_class->finalize = gtk_tree_store_finalize; + + g_type_class_add_private (class, sizeof (GtkTreeStorePrivate)); } static void @@ -221,6 +237,7 @@ gtk_tree_store_tree_model_init (GtkTreeModelIface *iface) iface->get_path = gtk_tree_store_get_path; iface->get_value = gtk_tree_store_get_value; iface->iter_next = gtk_tree_store_iter_next; + iface->iter_previous = gtk_tree_store_iter_previous; iface->iter_children = gtk_tree_store_iter_children; iface->iter_has_child = gtk_tree_store_iter_has_child; iface->iter_n_children = gtk_tree_store_iter_n_children; @@ -231,6 +248,7 @@ gtk_tree_store_tree_model_init (GtkTreeModelIface *iface) static void gtk_tree_store_drag_source_init (GtkTreeDragSourceIface *iface) { + iface->row_draggable = real_gtk_tree_store_row_draggable; iface->drag_data_delete = gtk_tree_store_drag_data_delete; iface->drag_data_get = gtk_tree_store_drag_data_get; } @@ -252,30 +270,45 @@ gtk_tree_store_sortable_init (GtkTreeSortableIface *iface) iface->has_default_sort_func = gtk_tree_store_has_default_sort_func; } +void +gtk_tree_store_buildable_init (GtkBuildableIface *iface) +{ + iface->custom_tag_start = gtk_tree_store_buildable_custom_tag_start; + iface->custom_finished = gtk_tree_store_buildable_custom_finished; +} + static void gtk_tree_store_init (GtkTreeStore *tree_store) { - tree_store->root = g_node_new (NULL); - /* While the odds are against us getting 0... - */ + GtkTreeStorePrivate *priv; + + priv = G_TYPE_INSTANCE_GET_PRIVATE (tree_store, + GTK_TYPE_TREE_STORE, + GtkTreeStorePrivate); + tree_store->priv = priv; + priv->root = g_node_new (NULL); + /* While the odds are against us getting 0... */ do { - tree_store->stamp = g_random_int (); + priv->stamp = g_random_int (); } - while (tree_store->stamp == 0); + while (priv->stamp == 0); - tree_store->sort_list = NULL; - tree_store->sort_column_id = -2; - tree_store->columns_dirty = FALSE; + priv->sort_list = NULL; + priv->sort_column_id = GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID; + priv->columns_dirty = FALSE; } /** * gtk_tree_store_new: * @n_columns: number of columns in the tree store - * @Varargs: all #GType types for the columns, from first to last + * @...: 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, + * in. Note that only types derived from standard GObject fundamental types + * are supported. + * + * 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. * @@ -301,9 +334,9 @@ gtk_tree_store_new (gint 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_tree_store_new_with_types\n", - G_STRLOC, g_type_name (type)); + g_warning ("%s: Invalid type %s\n", G_STRLOC, g_type_name (type)); g_object_unref (retval); + va_end (args); return NULL; } gtk_tree_store_set_column_type (retval, i, type); @@ -315,11 +348,12 @@ gtk_tree_store_new (gint n_columns, /** * 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 + * @types: (array length=n_columns): 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 + * Return value: (transfer full): a new #GtkTreeStore + * Rename to: gtk_tree_store_new **/ GtkTreeStore * gtk_tree_store_newv (gint n_columns, @@ -337,8 +371,7 @@ gtk_tree_store_newv (gint n_columns, { 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_warning ("%s: Invalid type %s\n", G_STRLOC, g_type_name (types[i])); g_object_unref (retval); return NULL; } @@ -353,7 +386,7 @@ gtk_tree_store_newv (gint n_columns, * gtk_tree_store_set_column_types: * @tree_store: A #GtkTreeStore * @n_columns: Number of columns for the tree store - * @types: An array of #GType types, one for each column + * @types: (array length=n_columns): An array of #GType types, one for each column * * This function is meant primarily for #GObjects that inherit from * #GtkTreeStore, and should only be used when constructing a new @@ -368,14 +401,14 @@ gtk_tree_store_set_column_types (GtkTreeStore *tree_store, gint i; g_return_if_fail (GTK_IS_TREE_STORE (tree_store)); - g_return_if_fail (tree_store->columns_dirty == 0); + g_return_if_fail (tree_store->priv->columns_dirty == 0); gtk_tree_store_set_n_columns (tree_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_tree_store_set_column_types\n", G_STRLOC, g_type_name (types[i])); + g_warning ("%s: Invalid type %s\n", G_STRLOC, g_type_name (types[i])); continue; } gtk_tree_store_set_column_type (tree_store, i, types[i]); @@ -386,32 +419,21 @@ static void gtk_tree_store_set_n_columns (GtkTreeStore *tree_store, gint n_columns) { - GType *new_columns; + GtkTreeStorePrivate *priv = tree_store->priv; + int i; - g_return_if_fail (GTK_IS_TREE_STORE (tree_store)); - - if (tree_store->n_columns == n_columns) + if (priv->n_columns == n_columns) return; - new_columns = g_new0 (GType, n_columns); - if (tree_store->column_headers) - { - /* copy the old header orders over */ - if (n_columns >= tree_store->n_columns) - memcpy (new_columns, tree_store->column_headers, tree_store->n_columns * sizeof (gchar *)); - else - memcpy (new_columns, tree_store->column_headers, n_columns * sizeof (GType)); + priv->column_headers = g_renew (GType, priv->column_headers, n_columns); + for (i = priv->n_columns; i < n_columns; i++) + priv->column_headers[i] = G_TYPE_INVALID; + priv->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); + if (priv->sort_list) + _gtk_tree_data_list_header_free (priv->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; + priv->sort_list = _gtk_tree_data_list_header_new (n_columns, priv->column_headers); } /** @@ -431,14 +453,14 @@ gtk_tree_store_set_column_type (GtkTreeStore *tree_store, gint column, GType type) { - g_return_if_fail (GTK_IS_TREE_STORE (tree_store)); - g_return_if_fail (column >=0 && column < tree_store->n_columns); + GtkTreeStorePrivate *priv = tree_store->priv; + if (!_gtk_tree_data_list_check_type (type)) { - g_warning ("%s: Invalid type %s passed to gtk_tree_store_new_with_types\n", G_STRLOC, g_type_name (type)); + g_warning ("%s: Invalid type %s\n", G_STRLOC, g_type_name (type)); return; } - tree_store->column_headers[column] = type; + priv->column_headers[column] = type; } static gboolean @@ -455,24 +477,25 @@ static void gtk_tree_store_finalize (GObject *object) { GtkTreeStore *tree_store = GTK_TREE_STORE (object); + GtkTreeStorePrivate *priv = tree_store->priv; - g_node_traverse (tree_store->root, G_POST_ORDER, G_TRAVERSE_ALL, -1, - node_free, tree_store->column_headers); - g_node_destroy (tree_store->root); - _gtk_tree_data_list_header_free (tree_store->sort_list); - g_free (tree_store->column_headers); + g_node_traverse (priv->root, G_POST_ORDER, G_TRAVERSE_ALL, -1, + node_free, priv->column_headers); + g_node_destroy (priv->root); + _gtk_tree_data_list_header_free (priv->sort_list); + g_free (priv->column_headers); - if (tree_store->default_sort_destroy) + if (priv->default_sort_destroy) { - GtkDestroyNotify d = tree_store->default_sort_destroy; + GDestroyNotify d = priv->default_sort_destroy; - tree_store->default_sort_destroy = NULL; - d (tree_store->default_sort_data); - tree_store->default_sort_data = NULL; + priv->default_sort_destroy = NULL; + d (priv->default_sort_data); + priv->default_sort_data = NULL; } /* must chain up */ - (* parent_class->finalize) (object); + G_OBJECT_CLASS (gtk_tree_store_parent_class)->finalize (object); } /* fulfill the GtkTreeModel requirements */ @@ -485,8 +508,6 @@ gtk_tree_store_finalize (GObject *object) static GtkTreeModelFlags gtk_tree_store_get_flags (GtkTreeModel *tree_model) { - g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0); - return GTK_TREE_MODEL_ITERS_PERSIST; } @@ -494,12 +515,11 @@ static gint gtk_tree_store_get_n_columns (GtkTreeModel *tree_model) { GtkTreeStore *tree_store = (GtkTreeStore *) tree_model; + GtkTreeStorePrivate *priv = tree_store->priv; - g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0); + priv->columns_dirty = TRUE; - tree_store->columns_dirty = TRUE; - - return tree_store->n_columns; + return priv->n_columns; } static GType @@ -507,14 +527,13 @@ gtk_tree_store_get_column_type (GtkTreeModel *tree_model, gint index) { GtkTreeStore *tree_store = (GtkTreeStore *) tree_model; + GtkTreeStorePrivate *priv = tree_store->priv; - g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), G_TYPE_INVALID); - g_return_val_if_fail (index < GTK_TREE_STORE (tree_model)->n_columns && - index >= 0, G_TYPE_INVALID); + g_return_val_if_fail (index < priv->n_columns, G_TYPE_INVALID); - tree_store->columns_dirty = TRUE; + priv->columns_dirty = TRUE; - return tree_store->column_headers[index]; + return priv->column_headers[index]; } static gboolean @@ -523,30 +542,35 @@ gtk_tree_store_get_iter (GtkTreeModel *tree_model, GtkTreePath *path) { GtkTreeStore *tree_store = (GtkTreeStore *) tree_model; + GtkTreeStorePrivate *priv = tree_store->priv; GtkTreeIter parent; gint *indices; gint depth, i; - g_return_val_if_fail (GTK_IS_TREE_STORE (tree_store), FALSE); - - tree_store->columns_dirty = TRUE; + priv->columns_dirty = TRUE; 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; + parent.stamp = priv->stamp; + parent.user_data = priv->root; - if (! gtk_tree_model_iter_nth_child (tree_model, iter, &parent, indices[0])) - return FALSE; + if (!gtk_tree_store_iter_nth_child (tree_model, iter, &parent, indices[0])) + { + iter->stamp = 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; + if (!gtk_tree_store_iter_nth_child (tree_model, iter, &parent, indices[i])) + { + iter->stamp = 0; + return FALSE; + } } return TRUE; @@ -556,26 +580,26 @@ static GtkTreePath * gtk_tree_store_get_path (GtkTreeModel *tree_model, GtkTreeIter *iter) { + GtkTreeStore *tree_store = (GtkTreeStore *) tree_model; + GtkTreeStorePrivate *priv = tree_store->priv; GtkTreePath *retval; GNode *tmp_node; gint i = 0; - 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); + g_return_val_if_fail (iter->stamp == priv->stamp, NULL); - validate_tree ((GtkTreeStore*)tree_model); + validate_tree (tree_store); if (G_NODE (iter->user_data)->parent == NULL && - G_NODE (iter->user_data) == GTK_TREE_STORE (tree_model)->root) + G_NODE (iter->user_data) == priv->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)) + if (G_NODE (iter->user_data)->parent == G_NODE (priv->root)) { retval = gtk_tree_path_new (); - tmp_node = G_NODE (GTK_TREE_STORE (tree_model)->root)->children; + tmp_node = G_NODE (priv->root)->children; } else { @@ -583,8 +607,7 @@ gtk_tree_store_get_path (GtkTreeModel *tree_model, tmp_iter.user_data = G_NODE (iter->user_data)->parent; - retval = gtk_tree_store_get_path (tree_model, - &tmp_iter); + retval = gtk_tree_store_get_path (tree_model, &tmp_iter); tmp_node = G_NODE (iter->user_data)->parent->children; } @@ -624,13 +647,13 @@ gtk_tree_store_get_value (GtkTreeModel *tree_model, gint column, GValue *value) { + GtkTreeStore *tree_store = (GtkTreeStore *) tree_model; + GtkTreeStorePrivate *priv = tree_store->priv; GtkTreeDataList *list; gint tmp_column = column; - g_return_if_fail (GTK_IS_TREE_STORE (tree_model)); - g_return_if_fail (iter != NULL); - g_return_if_fail (iter->stamp == GTK_TREE_STORE (tree_model)->stamp); - g_return_if_fail (column < GTK_TREE_STORE (tree_model)->n_columns); + g_return_if_fail (column < priv->n_columns); + g_return_if_fail (VALID_ITER (iter, tree_store)); list = G_NODE (iter->user_data)->data; @@ -640,13 +663,13 @@ gtk_tree_store_get_value (GtkTreeModel *tree_model, if (list) { _gtk_tree_data_list_node_to_value (list, - GTK_TREE_STORE (tree_model)->column_headers[column], + priv->column_headers[column], value); } else { /* We want to return an initialized but empty (default) value */ - g_value_init (value, GTK_TREE_STORE (tree_model)->column_headers[column]); + g_value_init (value, priv->column_headers[column]); } } @@ -654,17 +677,36 @@ static gboolean gtk_tree_store_iter_next (GtkTreeModel *tree_model, GtkTreeIter *iter) { - g_return_val_if_fail (iter != NULL, FALSE); g_return_val_if_fail (iter->user_data != NULL, FALSE); - g_return_val_if_fail (iter->stamp == GTK_TREE_STORE (tree_model)->stamp, FALSE); + g_return_val_if_fail (iter->stamp == GTK_TREE_STORE (tree_model)->priv->stamp, FALSE); - if (G_NODE (iter->user_data)->next) + if (G_NODE (iter->user_data)->next == NULL) { - iter->user_data = G_NODE (iter->user_data)->next; - return TRUE; + iter->stamp = 0; + return FALSE; } - else - return FALSE; + + iter->user_data = G_NODE (iter->user_data)->next; + + return TRUE; +} + +static gboolean +gtk_tree_store_iter_previous (GtkTreeModel *tree_model, + GtkTreeIter *iter) +{ + g_return_val_if_fail (iter->user_data != NULL, FALSE); + g_return_val_if_fail (iter->stamp == GTK_TREE_STORE (tree_model)->priv->stamp, FALSE); + + if (G_NODE (iter->user_data)->prev == NULL) + { + iter->stamp = 0; + return FALSE; + } + + iter->user_data = G_NODE (iter->user_data)->prev; + + return TRUE; } static gboolean @@ -672,33 +714,37 @@ gtk_tree_store_iter_children (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *parent) { + GtkTreeStore *tree_store = (GtkTreeStore *) tree_model; + GtkTreeStorePrivate *priv = tree_store->priv; GNode *children; - g_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE); - g_return_val_if_fail (parent == NULL || parent->stamp == GTK_TREE_STORE (tree_model)->stamp, FALSE); + if (parent) + g_return_val_if_fail (VALID_ITER (parent, tree_store), FALSE); if (parent) children = G_NODE (parent->user_data)->children; else - children = G_NODE (GTK_TREE_STORE (tree_model)->root)->children; + children = G_NODE (priv->root)->children; if (children) { - iter->stamp = GTK_TREE_STORE (tree_model)->stamp; + iter->stamp = priv->stamp; iter->user_data = children; return TRUE; } else - return FALSE; + { + iter->stamp = 0; + return FALSE; + } } static gboolean gtk_tree_store_iter_has_child (GtkTreeModel *tree_model, GtkTreeIter *iter) { - g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 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); + g_return_val_if_fail (VALID_ITER (iter, tree_model), FALSE); return G_NODE (iter->user_data)->children != NULL; } @@ -710,11 +756,10 @@ gtk_tree_store_iter_n_children (GtkTreeModel *tree_model, GNode *node; gint i = 0; - g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), 0); - g_return_val_if_fail (iter == NULL || iter->user_data != NULL, FALSE); + g_return_val_if_fail (iter == NULL || iter->user_data != NULL, 0); if (iter == NULL) - node = G_NODE (GTK_TREE_STORE (tree_model)->root)->children; + node = G_NODE (GTK_TREE_STORE (tree_model)->priv->root)->children; else node = G_NODE (iter->user_data)->children; @@ -733,14 +778,15 @@ gtk_tree_store_iter_nth_child (GtkTreeModel *tree_model, GtkTreeIter *parent, gint n) { + GtkTreeStore *tree_store = (GtkTreeStore *) tree_model; + GtkTreeStorePrivate *priv = tree_store->priv; GNode *parent_node; GNode *child; - g_return_val_if_fail (GTK_IS_TREE_STORE (tree_model), FALSE); g_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE); if (parent == NULL) - parent_node = GTK_TREE_STORE (tree_model)->root; + parent_node = priv->root; else parent_node = parent->user_data; @@ -749,11 +795,14 @@ gtk_tree_store_iter_nth_child (GtkTreeModel *tree_model, if (child) { iter->user_data = child; - iter->stamp = GTK_TREE_STORE (tree_model)->stamp; + iter->stamp = priv->stamp; return TRUE; } else - return FALSE; + { + iter->stamp = 0; + return FALSE; + } } static gboolean @@ -761,25 +810,28 @@ gtk_tree_store_iter_parent (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *child) { + GtkTreeStore *tree_store = (GtkTreeStore *) tree_model; + GtkTreeStorePrivate *priv = tree_store->priv; GNode *parent; g_return_val_if_fail (iter != NULL, FALSE); - g_return_val_if_fail (child != NULL, FALSE); - g_return_val_if_fail (child->user_data != NULL, FALSE); - g_return_val_if_fail (child->stamp == GTK_TREE_STORE (tree_model)->stamp, FALSE); + g_return_val_if_fail (VALID_ITER (child, tree_store), FALSE); parent = G_NODE (child->user_data)->parent; g_assert (parent != NULL); - if (parent != GTK_TREE_STORE (tree_model)->root) + if (parent != priv->root) { iter->user_data = parent; - iter->stamp = GTK_TREE_STORE (tree_model)->stamp; + iter->stamp = priv->stamp; return TRUE; } else - return FALSE; + { + iter->stamp = 0; + return FALSE; + } } @@ -791,35 +843,32 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store, GValue *value, gboolean sort) { + GtkTreeStorePrivate *priv = tree_store->priv; GtkTreeDataList *list; GtkTreeDataList *prev; gint old_column = column; - GValue real_value = {0, }; + GValue real_value = G_VALUE_INIT; gboolean converted = FALSE; gboolean retval = 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 (column >= 0 && column < tree_store->n_columns, FALSE); - g_return_val_if_fail (G_IS_VALUE (value), FALSE); - - if (! g_type_is_a (G_VALUE_TYPE (value), tree_store->column_headers[column])) + if (! g_type_is_a (G_VALUE_TYPE (value), priv->column_headers[column])) { - 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)))) + if (! (g_value_type_transformable (G_VALUE_TYPE (value), priv->column_headers[column]))) { g_warning ("%s: Unable to convert from %s to %s\n", G_STRLOC, g_type_name (G_VALUE_TYPE (value)), - g_type_name (tree_store->column_headers[column])); + g_type_name (priv->column_headers[column])); return retval; } + + g_value_init (&real_value, priv->column_headers[column]); 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 (tree_store->column_headers[column])); + g_type_name (priv->column_headers[column])); g_value_unset (&real_value); return retval; } @@ -839,6 +888,8 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store, retval = TRUE; if (converted) g_value_unset (&real_value); + if (sort && GTK_TREE_STORE_IS_SORTED (tree_store)) + gtk_tree_store_sort_iter_changed (tree_store, iter, old_column, TRUE); return retval; } @@ -876,7 +927,7 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store, g_value_unset (&real_value); if (sort && GTK_TREE_STORE_IS_SORTED (tree_store)) - gtk_tree_store_sort_iter_changed (tree_store, iter, old_column); + gtk_tree_store_sort_iter_changed (tree_store, iter, old_column, TRUE); return retval; } @@ -901,77 +952,104 @@ gtk_tree_store_set_value (GtkTreeStore *tree_store, { 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 (column >= 0 && column < tree_store->priv->n_columns); g_return_if_fail (G_IS_VALUE (value)); if (gtk_tree_store_real_set_value (tree_store, iter, column, value, TRUE)) { GtkTreePath *path; - path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), iter); + path = gtk_tree_store_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 - * use by language bindings. - * - **/ -void -gtk_tree_store_set_valist (GtkTreeStore *tree_store, - GtkTreeIter *iter, - va_list var_args) +static GtkTreeIterCompareFunc +gtk_tree_store_get_compare_func (GtkTreeStore *tree_store) { - gint column; - gboolean emit_signal = FALSE; - gboolean maybe_need_sort = FALSE; + GtkTreeStorePrivate *priv = tree_store->priv; GtkTreeIterCompareFunc func = NULL; - 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); - if (GTK_TREE_STORE_IS_SORTED (tree_store)) { - if (tree_store->sort_column_id != -1) + if (priv->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); + header = _gtk_tree_data_list_get_header (priv->sort_list, + priv->sort_column_id); + g_return_val_if_fail (header != NULL, NULL); + g_return_val_if_fail (header->func != NULL, NULL); func = header->func; } else { - func = tree_store->default_sort_func; + func = priv->default_sort_func; } } - if (func != gtk_tree_data_list_compare_func) - maybe_need_sort = TRUE; + return func; +} + +static void +gtk_tree_store_set_vector_internal (GtkTreeStore *tree_store, + GtkTreeIter *iter, + gboolean *emit_signal, + gboolean *maybe_need_sort, + gint *columns, + GValue *values, + gint n_values) +{ + GtkTreeStorePrivate *priv = tree_store->priv; + gint i; + GtkTreeIterCompareFunc func = NULL; + + func = gtk_tree_store_get_compare_func (tree_store); + if (func != _gtk_tree_data_list_compare_func) + *maybe_need_sort = TRUE; + + for (i = 0; i < n_values; i++) + { + *emit_signal = gtk_tree_store_real_set_value (tree_store, iter, + columns[i], &values[i], + FALSE) || *emit_signal; + + if (func == _gtk_tree_data_list_compare_func && + columns[i] == priv->sort_column_id) + *maybe_need_sort = TRUE; + } +} + +static void +gtk_tree_store_set_valist_internal (GtkTreeStore *tree_store, + GtkTreeIter *iter, + gboolean *emit_signal, + gboolean *maybe_need_sort, + va_list var_args) +{ + GtkTreeStorePrivate *priv = tree_store->priv; + gint column; + GtkTreeIterCompareFunc func = NULL; + + column = va_arg (var_args, gint); + + func = gtk_tree_store_get_compare_func (tree_store); + if (func != _gtk_tree_data_list_compare_func) + *maybe_need_sort = TRUE; while (column != -1) { - GValue value = { 0, }; + GValue value = G_VALUE_INIT; gchar *error = NULL; - if (column >= tree_store->n_columns) + if (column < 0 || column >= priv->n_columns) { g_warning ("%s: Invalid column number %d added to iter (remember to end your list of columns with a -1)", G_STRLOC, column); break; } - g_value_init (&value, tree_store->column_headers[column]); - G_VALUE_COLLECT (&value, var_args, 0, &error); + G_VALUE_COLLECT_INIT (&value, priv->column_headers[column], + var_args, 0, &error); if (error) { g_warning ("%s: %s", G_STRLOC, error); @@ -983,29 +1061,105 @@ gtk_tree_store_set_valist (GtkTreeStore *tree_store, break; } - emit_signal = gtk_tree_store_real_set_value (tree_store, - iter, - column, - &value, - FALSE) || emit_signal; + *emit_signal = gtk_tree_store_real_set_value (tree_store, + iter, + column, + &value, + FALSE) || *emit_signal; - if (func == gtk_tree_data_list_compare_func && - column == tree_store->sort_column_id) - maybe_need_sort = TRUE; + if (func == _gtk_tree_data_list_compare_func && + column == priv->sort_column_id) + *maybe_need_sort = TRUE; g_value_unset (&value); column = va_arg (var_args, gint); } +} + +/** + * gtk_tree_store_set_valuesv: + * @tree_store: A #GtkTreeStore + * @iter: A valid #GtkTreeIter for the row being modified + * @columns: (array length=n_values): an array of column numbers + * @values: (array length=n_values): an array of GValues + * @n_values: the length of the @columns and @values arrays + * + * A variant of gtk_tree_store_set_valist() which takes + * the columns and values as two arrays, instead of varargs. This + * function is mainly intended for language bindings or in case + * the number of columns to change is not known until run-time. + * + * Since: 2.12 + * Rename to: gtk_tree_store_set + **/ +void +gtk_tree_store_set_valuesv (GtkTreeStore *tree_store, + GtkTreeIter *iter, + gint *columns, + GValue *values, + gint n_values) +{ + GtkTreeStorePrivate *priv = tree_store->priv; + gboolean emit_signal = FALSE; + gboolean maybe_need_sort = FALSE; + + g_return_if_fail (GTK_IS_TREE_STORE (tree_store)); + g_return_if_fail (VALID_ITER (iter, tree_store)); + + gtk_tree_store_set_vector_internal (tree_store, iter, + &emit_signal, + &maybe_need_sort, + columns, values, n_values); if (maybe_need_sort && GTK_TREE_STORE_IS_SORTED (tree_store)) - gtk_tree_store_sort_iter_changed (tree_store, iter, tree_store->sort_column_id); + gtk_tree_store_sort_iter_changed (tree_store, iter, priv->sort_column_id, TRUE); if (emit_signal) { GtkTreePath *path; - path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), iter); + path = gtk_tree_store_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 + * use by language bindings. + * + **/ +void +gtk_tree_store_set_valist (GtkTreeStore *tree_store, + GtkTreeIter *iter, + va_list var_args) +{ + GtkTreeStorePrivate *priv = tree_store->priv; + gboolean emit_signal = FALSE; + gboolean maybe_need_sort = FALSE; + + g_return_if_fail (GTK_IS_TREE_STORE (tree_store)); + g_return_if_fail (VALID_ITER (iter, tree_store)); + + gtk_tree_store_set_valist_internal (tree_store, iter, + &emit_signal, + &maybe_need_sort, + var_args); + + if (maybe_need_sort && GTK_TREE_STORE_IS_SORTED (tree_store)) + gtk_tree_store_sort_iter_changed (tree_store, iter, priv->sort_column_id, TRUE); + + if (emit_signal) + { + GtkTreePath *path; + + path = gtk_tree_store_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); } @@ -1015,14 +1169,17 @@ gtk_tree_store_set_valist (GtkTreeStore *tree_store, * gtk_tree_store_set: * @tree_store: A #GtkTreeStore * @iter: A valid #GtkTreeIter for the row being modified - * @Varargs: pairs of column number and value, terminated with -1 + * @...: 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. + * 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 + * %G_TYPE_STRING to "Foo", you would write * gtk_tree_store_set (store, iter, 0, "Foo", -1). + * + * The value will be referenced by the store if it is a %G_TYPE_OBJECT, and it + * will be copied if it is a %G_TYPE_STRING or %G_TYPE_BOXED. **/ void gtk_tree_store_set (GtkTreeStore *tree_store, @@ -1031,9 +1188,6 @@ gtk_tree_store_set (GtkTreeStore *tree_store, { 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); @@ -1054,6 +1208,7 @@ gboolean gtk_tree_store_remove (GtkTreeStore *tree_store, GtkTreeIter *iter) { + GtkTreeStorePrivate *priv = tree_store->priv; GtkTreePath *path; GtkTreeIter new_iter = {0,}; GNode *parent; @@ -1069,21 +1224,21 @@ gtk_tree_store_remove (GtkTreeStore *tree_store, if (G_NODE (iter->user_data)->data) g_node_traverse (G_NODE (iter->user_data), G_POST_ORDER, G_TRAVERSE_ALL, - -1, node_free, tree_store->column_headers); + -1, node_free, priv->column_headers); path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter); g_node_destroy (G_NODE (iter->user_data)); gtk_tree_model_row_deleted (GTK_TREE_MODEL (tree_store), path); - if (parent != G_NODE (tree_store->root)) + if (parent != G_NODE (priv->root)) { /* child_toggled */ if (parent->children == NULL) { gtk_tree_path_up (path); - new_iter.stamp = tree_store->stamp; + new_iter.stamp = priv->stamp; new_iter.user_data = parent; gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, &new_iter); } @@ -1093,7 +1248,7 @@ gtk_tree_store_remove (GtkTreeStore *tree_store, /* revalidate iter */ if (next_node != NULL) { - iter->stamp = tree_store->stamp; + iter->stamp = priv->stamp; iter->user_data = next_node; return TRUE; } @@ -1109,16 +1264,16 @@ gtk_tree_store_remove (GtkTreeStore *tree_store, /** * gtk_tree_store_insert: * @tree_store: A #GtkTreeStore - * @iter: An unset #GtkTreeIter to set to the new row - * @parent: A valid #GtkTreeIter, or %NULL - * @position: position to insert the new row + * @iter: (out): An unset #GtkTreeIter to set to the new row + * @parent: (allow-none): A valid #GtkTreeIter, or %NULL + * @position: position to insert the new row, or -1 for last * * 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 after this function is called. To - * fill in values, you need to call gtk_tree_store_set() or + * If @position is -1 or 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 after this function is + * called. To fill in values, you need to call gtk_tree_store_set() or * gtk_tree_store_set_value(). * **/ @@ -1128,27 +1283,41 @@ gtk_tree_store_insert (GtkTreeStore *tree_store, GtkTreeIter *parent, gint position) { + GtkTreeStorePrivate *priv = tree_store->priv; GtkTreePath *path; GNode *parent_node; + GNode *new_node; g_return_if_fail (GTK_IS_TREE_STORE (tree_store)); + g_return_if_fail (iter != NULL); if (parent) g_return_if_fail (VALID_ITER (parent, tree_store)); if (parent) parent_node = parent->user_data; else - parent_node = tree_store->root; + parent_node = priv->root; - tree_store->columns_dirty = TRUE; + priv->columns_dirty = TRUE; - iter->stamp = tree_store->stamp; - iter->user_data = g_node_new (NULL); - g_node_insert (parent_node, position, G_NODE (iter->user_data)); + new_node = g_node_new (NULL); + + iter->stamp = priv->stamp; + iter->user_data = new_node; + g_node_insert (parent_node, position, new_node); 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 != priv->root) + { + if (new_node->prev == NULL && new_node->next == NULL) + { + gtk_tree_path_up (path); + gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent); + } + } + gtk_tree_path_free (path); validate_tree ((GtkTreeStore*)tree_store); @@ -1157,9 +1326,9 @@ gtk_tree_store_insert (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 + * @iter: (out): An unset #GtkTreeIter to set to the new row + * @parent: (allow-none): A valid #GtkTreeIter, or %NULL + * @sibling: (allow-none): A valid #GtkTreeIter, or %NULL * * Inserts a new row before @sibling. If @sibling is %NULL, then the row will * be appended to @parent 's children. If @parent and @sibling are %NULL, then @@ -1178,6 +1347,7 @@ gtk_tree_store_insert_before (GtkTreeStore *tree_store, GtkTreeIter *parent, GtkTreeIter *sibling) { + GtkTreeStorePrivate *priv = tree_store->priv; GtkTreePath *path; GNode *parent_node = NULL; GNode *new_node; @@ -1189,12 +1359,8 @@ gtk_tree_store_insert_before (GtkTreeStore *tree_store, if (sibling != NULL) g_return_if_fail (VALID_ITER (sibling, tree_store)); - tree_store->columns_dirty = TRUE; - - new_node = g_node_new (NULL); - if (parent == NULL && sibling == NULL) - parent_node = tree_store->root; + parent_node = priv->root; else if (parent == NULL) parent_node = G_NODE (sibling->user_data)->parent; else if (sibling == NULL) @@ -1205,27 +1371,45 @@ gtk_tree_store_insert_before (GtkTreeStore *tree_store, parent_node = G_NODE (parent->user_data); } + priv->columns_dirty = TRUE; + + new_node = g_node_new (NULL); + g_node_insert_before (parent_node, sibling ? G_NODE (sibling->user_data) : NULL, new_node); - iter->stamp = tree_store->stamp; + iter->stamp = priv->stamp; iter->user_data = new_node; 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 != priv->root) + { + if (new_node->prev == NULL && new_node->next == NULL) + { + GtkTreeIter parent_iter; + + parent_iter.stamp = priv->stamp; + parent_iter.user_data = parent_node; + + gtk_tree_path_up (path); + gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, &parent_iter); + } + } + gtk_tree_path_free (path); - validate_tree ((GtkTreeStore*)tree_store); + validate_tree (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 + * @iter: (out): An unset #GtkTreeIter to set to the new row + * @parent: (allow-none): A valid #GtkTreeIter, or %NULL + * @sibling: (allow-none): A valid #GtkTreeIter, or %NULL * * Inserts a new row after @sibling. If @sibling is %NULL, then the row will be * prepended to @parent 's children. If @parent and @sibling are %NULL, then @@ -1244,6 +1428,7 @@ gtk_tree_store_insert_after (GtkTreeStore *tree_store, GtkTreeIter *parent, GtkTreeIter *sibling) { + GtkTreeStorePrivate *priv = tree_store->priv; GtkTreePath *path; GNode *parent_node; GNode *new_node; @@ -1255,12 +1440,8 @@ gtk_tree_store_insert_after (GtkTreeStore *tree_store, if (sibling != NULL) g_return_if_fail (VALID_ITER (sibling, tree_store)); - tree_store->columns_dirty = TRUE; - - new_node = g_node_new (NULL); - if (parent == NULL && sibling == NULL) - parent_node = tree_store->root; + parent_node = priv->root; else if (parent == NULL) parent_node = G_NODE (sibling->user_data)->parent; else if (sibling == NULL) @@ -1272,27 +1453,215 @@ gtk_tree_store_insert_after (GtkTreeStore *tree_store, parent_node = G_NODE (parent->user_data); } + priv->columns_dirty = TRUE; + + new_node = g_node_new (NULL); g_node_insert_after (parent_node, sibling ? G_NODE (sibling->user_data) : NULL, new_node); - iter->stamp = tree_store->stamp; + iter->stamp = priv->stamp; + iter->user_data = new_node; + + 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 != priv->root) + { + if (new_node->prev == NULL && new_node->next == NULL) + { + GtkTreeIter parent_iter; + + parent_iter.stamp = priv->stamp; + parent_iter.user_data = parent_node; + + gtk_tree_path_up (path); + gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, &parent_iter); + } + } + + gtk_tree_path_free (path); + + validate_tree (tree_store); +} + +/** + * gtk_tree_store_insert_with_values: + * @tree_store: A #GtkTreeStore + * @iter: (out) (allow-none): An unset #GtkTreeIter to set the new row, or %NULL. + * @parent: (allow-none): A valid #GtkTreeIter, or %NULL + * @position: position to insert the new row, or -1 to append after existing rows + * @...: pairs of column number and value, terminated with -1 + * + * Creates a new row at @position. @iter will be changed to point to this + * new row. If @position is -1, or larger than the number of rows on the list, then + * the new row will be appended to the list. The row will be filled with + * the values given to this function. + * + * Calling + * gtk_tree_store_insert_with_values (tree_store, iter, position, ...) + * has the same effect as calling + * |[ + * gtk_tree_store_insert (tree_store, iter, position); + * gtk_tree_store_set (tree_store, iter, ...); + * ]| + * with the different that the former will only emit a row_inserted signal, + * while the latter will emit row_inserted, row_changed and if the tree store + * is sorted, rows_reordered. Since emitting the rows_reordered signal + * repeatedly can affect the performance of the program, + * gtk_tree_store_insert_with_values() should generally be preferred when + * inserting rows in a sorted tree store. + * + * Since: 2.10 + */ +void +gtk_tree_store_insert_with_values (GtkTreeStore *tree_store, + GtkTreeIter *iter, + GtkTreeIter *parent, + gint position, + ...) +{ + GtkTreeStorePrivate *priv = tree_store->priv; + GtkTreePath *path; + GNode *parent_node; + GNode *new_node; + GtkTreeIter tmp_iter; + va_list var_args; + gboolean changed = FALSE; + gboolean maybe_need_sort = FALSE; + + g_return_if_fail (GTK_IS_TREE_STORE (tree_store)); + + if (!iter) + iter = &tmp_iter; + + if (parent) + g_return_if_fail (VALID_ITER (parent, tree_store)); + + if (parent) + parent_node = parent->user_data; + else + parent_node = priv->root; + + priv->columns_dirty = TRUE; + + new_node = g_node_new (NULL); + + iter->stamp = priv->stamp; iter->user_data = new_node; + g_node_insert (parent_node, position, new_node); + + va_start (var_args, position); + gtk_tree_store_set_valist_internal (tree_store, iter, + &changed, &maybe_need_sort, + var_args); + va_end (var_args); + + if (maybe_need_sort && GTK_TREE_STORE_IS_SORTED (tree_store)) + gtk_tree_store_sort_iter_changed (tree_store, iter, priv->sort_column_id, FALSE); 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 != priv->root) + { + if (new_node->prev == NULL && new_node->next == NULL) + { + gtk_tree_path_up (path); + gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent); + } + } + gtk_tree_path_free (path); - validate_tree ((GtkTreeStore*)tree_store); + validate_tree ((GtkTreeStore *)tree_store); +} + +/** + * gtk_tree_store_insert_with_valuesv: + * @tree_store: A #GtkTreeStore + * @iter: (out) (allow-none): An unset #GtkTreeIter to set the new row, or %NULL. + * @parent: (allow-none): A valid #GtkTreeIter, or %NULL + * @position: position to insert the new row, or -1 for last + * @columns: (array length=n_values): an array of column numbers + * @values: (array length=n_values): an array of GValues + * @n_values: the length of the @columns and @values arrays + * + * A variant of gtk_tree_store_insert_with_values() which takes + * the columns and values as two arrays, instead of varargs. This + * function is mainly intended for language bindings. + * + * Since: 2.10 + * Rename to: gtk_tree_store_insert_with_values + */ +void +gtk_tree_store_insert_with_valuesv (GtkTreeStore *tree_store, + GtkTreeIter *iter, + GtkTreeIter *parent, + gint position, + gint *columns, + GValue *values, + gint n_values) +{ + GtkTreeStorePrivate *priv = tree_store->priv; + GtkTreePath *path; + GNode *parent_node; + GNode *new_node; + GtkTreeIter tmp_iter; + gboolean changed = FALSE; + gboolean maybe_need_sort = FALSE; + + g_return_if_fail (GTK_IS_TREE_STORE (tree_store)); + + if (!iter) + iter = &tmp_iter; + + if (parent) + g_return_if_fail (VALID_ITER (parent, tree_store)); + + if (parent) + parent_node = parent->user_data; + else + parent_node = priv->root; + + priv->columns_dirty = TRUE; + + new_node = g_node_new (NULL); + + iter->stamp = priv->stamp; + iter->user_data = new_node; + g_node_insert (parent_node, position, new_node); + + gtk_tree_store_set_vector_internal (tree_store, iter, + &changed, &maybe_need_sort, + columns, values, n_values); + + if (maybe_need_sort && GTK_TREE_STORE_IS_SORTED (tree_store)) + gtk_tree_store_sort_iter_changed (tree_store, iter, priv->sort_column_id, FALSE); + + 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 != priv->root) + { + if (new_node->prev == NULL && new_node->next == NULL) + { + gtk_tree_path_up (path); + gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent); + } + } + + gtk_tree_path_free (path); + + 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 + * @iter: (out): An unset #GtkTreeIter to set to the prepended row + * @parent: (allow-none): 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 @@ -1305,6 +1674,7 @@ gtk_tree_store_prepend (GtkTreeStore *tree_store, GtkTreeIter *iter, GtkTreeIter *parent) { + GtkTreeStorePrivate *priv = tree_store->priv; GNode *parent_node; g_return_if_fail (GTK_IS_TREE_STORE (tree_store)); @@ -1312,10 +1682,10 @@ gtk_tree_store_prepend (GtkTreeStore *tree_store, if (parent != NULL) g_return_if_fail (VALID_ITER (parent, tree_store)); - tree_store->columns_dirty = TRUE; + priv->columns_dirty = TRUE; if (parent == NULL) - parent_node = tree_store->root; + parent_node = priv->root; else parent_node = parent->user_data; @@ -1323,7 +1693,7 @@ gtk_tree_store_prepend (GtkTreeStore *tree_store, { GtkTreePath *path; - iter->stamp = tree_store->stamp; + iter->stamp = priv->stamp; iter->user_data = g_node_new (NULL); g_node_prepend (parent_node, G_NODE (iter->user_data)); @@ -1331,7 +1701,7 @@ gtk_tree_store_prepend (GtkTreeStore *tree_store, 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) + if (parent_node != priv->root) { gtk_tree_path_up (path); gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent); @@ -1343,14 +1713,14 @@ gtk_tree_store_prepend (GtkTreeStore *tree_store, gtk_tree_store_insert_after (tree_store, iter, parent, NULL); } - validate_tree ((GtkTreeStore*)tree_store); + validate_tree (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 + * @iter: (out): An unset #GtkTreeIter to set to the appended row + * @parent: (allow-none): 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 @@ -1363,26 +1733,26 @@ gtk_tree_store_append (GtkTreeStore *tree_store, GtkTreeIter *iter, GtkTreeIter *parent) { + GtkTreeStorePrivate *priv = tree_store->priv; GNode *parent_node; 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 = tree_store->root; + parent_node = priv->root; else parent_node = parent->user_data; - tree_store->columns_dirty = TRUE; + priv->columns_dirty = TRUE; if (parent_node->children == NULL) { GtkTreePath *path; - iter->stamp = tree_store->stamp; + iter->stamp = priv->stamp; iter->user_data = g_node_new (NULL); g_node_append (parent_node, G_NODE (iter->user_data)); @@ -1390,7 +1760,7 @@ gtk_tree_store_append (GtkTreeStore *tree_store, 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) + if (parent_node != priv->root) { gtk_tree_path_up (path); gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent); @@ -1402,7 +1772,7 @@ gtk_tree_store_append (GtkTreeStore *tree_store, gtk_tree_store_insert_before (tree_store, iter, parent, NULL); } - validate_tree ((GtkTreeStore*)tree_store); + validate_tree (tree_store); } /** @@ -1452,7 +1822,7 @@ gtk_tree_store_iter_depth (GtkTreeStore *tree_store, /* simple ripoff from g_node_traverse_post_order */ static gboolean -gtk_tree_store_clear_traverse (GNode *node, +gtk_tree_store_clear_traverse (GNode *node, GtkTreeStore *store) { GtkTreeIter iter; @@ -1474,7 +1844,7 @@ gtk_tree_store_clear_traverse (GNode *node, if (node->parent) { - iter.stamp = store->stamp; + iter.stamp = store->priv->stamp; iter.user_data = node; gtk_tree_store_remove (store, &iter); @@ -1482,7 +1852,7 @@ gtk_tree_store_clear_traverse (GNode *node, } else if (node->parent) { - iter.stamp = store->stamp; + iter.stamp = store->priv->stamp; iter.user_data = node; gtk_tree_store_remove (store, &iter); @@ -1491,6 +1861,17 @@ gtk_tree_store_clear_traverse (GNode *node, return FALSE; } +static void +gtk_tree_store_increment_stamp (GtkTreeStore *tree_store) +{ + GtkTreeStorePrivate *priv = tree_store->priv; + do + { + priv->stamp++; + } + while (priv->stamp == 0); +} + /** * gtk_tree_store_clear: * @tree_store: a #GtkTreeStore @@ -1502,7 +1883,8 @@ gtk_tree_store_clear (GtkTreeStore *tree_store) { g_return_if_fail (GTK_IS_TREE_STORE (tree_store)); - gtk_tree_store_clear_traverse (tree_store->root, tree_store); + gtk_tree_store_clear_traverse (tree_store->priv->root, tree_store); + gtk_tree_store_increment_stamp (tree_store); } static gboolean @@ -1540,6 +1922,8 @@ gtk_tree_store_iter_is_valid_helper (GtkTreeIter *iter, * Checks if the given iter is a valid iter for this #GtkTreeStore. * * Return value: %TRUE if the iter is valid, %FALSE if the iter is invalid. + * + * Since: 2.2 **/ gboolean gtk_tree_store_iter_is_valid (GtkTreeStore *tree_store, @@ -1551,21 +1935,25 @@ gtk_tree_store_iter_is_valid (GtkTreeStore *tree_store, if (!VALID_ITER (iter, tree_store)) return FALSE; - return gtk_tree_store_iter_is_valid_helper (iter, tree_store->root); + return gtk_tree_store_iter_is_valid_helper (iter, tree_store->priv->root); } /* DND */ +static gboolean real_gtk_tree_store_row_draggable (GtkTreeDragSource *drag_source, + GtkTreePath *path) +{ + return TRUE; +} + static gboolean gtk_tree_store_drag_data_delete (GtkTreeDragSource *drag_source, GtkTreePath *path) { 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), + if (gtk_tree_store_get_iter (GTK_TREE_MODEL (drag_source), &iter, path)) { @@ -1584,8 +1972,6 @@ gtk_tree_store_drag_data_get (GtkTreeDragSource *drag_source, GtkTreePath *path, GtkSelectionData *selection_data) { - g_return_val_if_fail (GTK_IS_TREE_STORE (drag_source), FALSE); - /* Note that we don't need to handle the GTK_TREE_MODEL_ROW * target, because the default handler does it for us, but * we do anyway for the convenience of someone maybe overriding the @@ -1621,7 +2007,7 @@ copy_node_data (GtkTreeStore *tree_store, col = 0; while (dl) { - copy_iter = _gtk_tree_data_list_node_copy (dl, tree_store->column_headers[col]); + copy_iter = _gtk_tree_data_list_node_copy (dl, tree_store->priv->column_headers[col]); if (copy_head == NULL) copy_head = copy_iter; @@ -1654,7 +2040,7 @@ recursive_node_copy (GtkTreeStore *tree_store, copy_node_data (tree_store, src_iter, dest_iter); - if (gtk_tree_model_iter_children (model, + if (gtk_tree_store_iter_children (model, &child, src_iter)) { @@ -1672,7 +2058,7 @@ recursive_node_copy (GtkTreeStore *tree_store, recursive_node_copy (tree_store, &child, ©); } - while (gtk_tree_model_iter_next (model, &child)); + while (gtk_tree_store_iter_next (model, &child)); } } @@ -1687,8 +2073,6 @@ gtk_tree_store_drag_data_received (GtkTreeDragDest *drag_dest, 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); @@ -1704,7 +2088,7 @@ gtk_tree_store_drag_data_received (GtkTreeDragDest *drag_dest, GtkTreeIter dest_iter; GtkTreePath *prev; - if (!gtk_tree_model_get_iter (src_model, + if (!gtk_tree_store_get_iter (src_model, &src_iter, src_path)) { @@ -1730,7 +2114,7 @@ gtk_tree_store_drag_data_received (GtkTreeDragDest *drag_dest, if (gtk_tree_path_up (parent) && gtk_tree_path_get_depth (parent) > 0) { - gtk_tree_model_get_iter (tree_model, + gtk_tree_store_get_iter (tree_model, &dest_parent, parent); dest_parent_p = &dest_parent; @@ -1738,7 +2122,7 @@ gtk_tree_store_drag_data_received (GtkTreeDragDest *drag_dest, gtk_tree_path_free (parent); parent = NULL; - gtk_tree_store_prepend (GTK_TREE_STORE (tree_model), + gtk_tree_store_prepend (tree_store, &dest_iter, dest_parent_p); @@ -1746,36 +2130,17 @@ gtk_tree_store_drag_data_received (GtkTreeDragDest *drag_dest, } else { - if (gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_model), - &dest_iter, - prev)) + if (gtk_tree_store_get_iter (tree_model, &dest_iter, prev)) { GtkTreeIter tmp_iter = dest_iter; - if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_model), "gtk-tree-model-drop-append"))) - { - GtkTreeIter parent; - - if (gtk_tree_model_iter_parent (GTK_TREE_MODEL (tree_model), &parent, &tmp_iter)) - gtk_tree_store_append (GTK_TREE_STORE (tree_model), - &dest_iter, &parent); - else - gtk_tree_store_append (GTK_TREE_STORE (tree_model), - &dest_iter, NULL); - } - else - gtk_tree_store_insert_after (GTK_TREE_STORE (tree_model), - &dest_iter, - NULL, - &tmp_iter); - retval = TRUE; + gtk_tree_store_insert_after (tree_store, &dest_iter, NULL, + &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, walk src_iter tree branch, @@ -1815,8 +2180,6 @@ gtk_tree_store_row_drop_possible (GtkTreeDragDest *drag_dest, GtkTreePath *tmp = NULL; gboolean retval = FALSE; - g_return_val_if_fail (GTK_IS_TREE_STORE (drag_dest), FALSE); - /* don't accept drops if the tree has been sorted */ if (GTK_TREE_STORE_IS_SORTED (drag_dest)) return FALSE; @@ -1844,7 +2207,7 @@ gtk_tree_store_row_drop_possible (GtkTreeDragDest *drag_dest, tmp = gtk_tree_path_copy (dest_path); gtk_tree_path_up (tmp); - if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_dest), + if (!gtk_tree_store_get_iter (GTK_TREE_MODEL (drag_dest), &iter, tmp)) goto out; } @@ -1891,14 +2254,18 @@ gtk_tree_store_reorder_func (gconstpointer a, } /** - * gtk_tree_store_reorder: + * gtk_tree_store_reorder: (skip) * @tree_store: A #GtkTreeStore. * @parent: A #GtkTreeIter. - * @new_order: An integer array indication the new order for the list. + * @new_order: (array): an array of integers mapping the new position of each child + * to its old position before the re-ordering, + * i.e. @new_order[newpos] = oldpos. * * Reorders the children of @parent in @tree_store to follow the order * indicated by @new_order. Note that this function only works with * unsorted stores. + * + * Since: 2.2 **/ void gtk_tree_store_reorder (GtkTreeStore *tree_store, @@ -1916,7 +2283,7 @@ gtk_tree_store_reorder (GtkTreeStore *tree_store, g_return_if_fail (new_order != NULL); if (!parent) - level = G_NODE (tree_store->root)->children; + level = G_NODE (tree_store->priv->root)->children; else level = G_NODE (parent->user_data)->children; @@ -1934,7 +2301,7 @@ gtk_tree_store_reorder (GtkTreeStore *tree_store, node = level; for (i = 0; i < length; i++) { - sort_array[i].offset = new_order[i]; + sort_array[new_order[i]].offset = i; sort_array[i].node = node; node = node->next; @@ -1958,11 +2325,11 @@ gtk_tree_store_reorder (GtkTreeStore *tree_store, if (parent) G_NODE (parent->user_data)->children = sort_array[0].node; else - G_NODE (tree_store->root)->children = sort_array[0].node; + G_NODE (tree_store->priv->root)->children = sort_array[0].node; /* emit signal */ if (parent) - path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), parent); + path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), parent); else path = gtk_tree_path_new (); gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store), path, @@ -1979,6 +2346,8 @@ gtk_tree_store_reorder (GtkTreeStore *tree_store, * * Swaps @a and @b in the same level of @tree_store. Note that this function * only works with unsorted stores. + * + * Since: 2.2 **/ void gtk_tree_store_swap (GtkTreeStore *tree_store, @@ -2002,26 +2371,41 @@ gtk_tree_store_swap (GtkTreeStore *tree_store, if (node_a == node_b) return; - path_a = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), a); - path_b = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), b); + path_a = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), a); + path_b = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), b); g_return_if_fail (path_a && path_b); gtk_tree_path_up (path_a); gtk_tree_path_up (path_b); - if (gtk_tree_path_compare (path_a, path_b)) + if (gtk_tree_path_get_depth (path_a) == 0 + || gtk_tree_path_get_depth (path_b) == 0) { - gtk_tree_path_free (path_a); - gtk_tree_path_free (path_b); + if (gtk_tree_path_get_depth (path_a) != gtk_tree_path_get_depth (path_b)) + { + gtk_tree_path_free (path_a); + gtk_tree_path_free (path_b); - g_warning ("Given childs are not in the same level\n"); - return; + g_warning ("Given children are not in the same level\n"); + return; + } + parent_node = G_NODE (tree_store->priv->root); } + else + { + if (gtk_tree_path_compare (path_a, path_b)) + { + gtk_tree_path_free (path_a); + gtk_tree_path_free (path_b); - gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_store), &parent, path_a); - parent_node = G_NODE (parent.user_data); - + g_warning ("Given children don't have a common parent\n"); + return; + } + gtk_tree_store_get_iter (GTK_TREE_MODEL (tree_store), &parent, + path_a); + parent_node = G_NODE (parent.user_data); + } gtk_tree_path_free (path_b); /* old links which we have to keep around */ @@ -2091,12 +2475,13 @@ gtk_tree_store_swap (GtkTreeStore *tree_store, order[i] = i; gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store), path_a, - &parent, order); + parent_node == tree_store->priv->root + ? NULL : &parent, order); gtk_tree_path_free (path_a); g_free (order); } -/* WARNING: this function is *incredibly* fragily. Please smashtest after +/* WARNING: this function is *incredibly* fragile. Please smashtest after * making changes here. * -Kris */ @@ -2124,8 +2509,8 @@ gtk_tree_store_move (GtkTreeStore *tree_store, /* sanity checks */ if (position) { - path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), iter); - pos_path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), + path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter); + pos_path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), position); /* if before: @@ -2151,7 +2536,7 @@ gtk_tree_store_move (GtkTreeStore *tree_store, if (gtk_tree_path_get_depth (path) != gtk_tree_path_get_depth (pos_path)) { - g_warning ("Given childs are not in the same level\n"); + g_warning ("Given children are not in the same level\n"); goto free_paths_and_out; } @@ -2163,7 +2548,7 @@ gtk_tree_store_move (GtkTreeStore *tree_store, if (gtk_tree_path_get_depth (path) > 0 && gtk_tree_path_compare (path, tmppath)) { - g_warning ("Given childs are not in the same level\n"); + g_warning ("Given children are not in the same level\n"); gtk_tree_path_free (tmppath); goto free_paths_and_out; @@ -2174,7 +2559,7 @@ gtk_tree_store_move (GtkTreeStore *tree_store, if (!path) { - path = gtk_tree_model_get_path (GTK_TREE_MODEL (tree_store), iter); + path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter); gtk_tree_path_up (path); } @@ -2182,13 +2567,13 @@ gtk_tree_store_move (GtkTreeStore *tree_store, if (depth) { - gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_store), &parent_iter, path); - gtk_tree_path_free (path); + gtk_tree_store_get_iter (GTK_TREE_MODEL (tree_store), + &parent_iter, path); parent = G_NODE (parent_iter.user_data); } else - parent = G_NODE (tree_store->root); + parent = G_NODE (tree_store->priv->root); /* yes, I know that this can be done shorter, but I'm doing it this way * so the code is also maintainable @@ -2201,7 +2586,8 @@ gtk_tree_store_move (GtkTreeStore *tree_store, if (gtk_tree_path_get_indices (pos_path)[gtk_tree_path_get_depth (pos_path) - 1] > 0) { gtk_tree_path_prev (pos_path); - if (gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_store), &dst_a, pos_path)) + if (gtk_tree_store_get_iter (GTK_TREE_MODEL (tree_store), + &dst_a, pos_path)) a = G_NODE (dst_a.user_data); else a = NULL; @@ -2229,7 +2615,7 @@ gtk_tree_store_move (GtkTreeStore *tree_store, if (position) { gtk_tree_path_next (pos_path); - if (gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_store), &dst_b, pos_path)) + if (gtk_tree_store_get_iter (GTK_TREE_MODEL (tree_store), &dst_b, pos_path)) b = G_NODE (dst_b.user_data); else b = NULL; @@ -2239,16 +2625,16 @@ gtk_tree_store_move (GtkTreeStore *tree_store, { /* move after without position is prepending */ if (depth) - gtk_tree_model_iter_children (GTK_TREE_MODEL (tree_store), &dst_b, + gtk_tree_store_iter_children (GTK_TREE_MODEL (tree_store), &dst_b, &parent_iter); else - gtk_tree_model_iter_children (GTK_TREE_MODEL (tree_store), &dst_b, + gtk_tree_store_iter_children (GTK_TREE_MODEL (tree_store), &dst_b, NULL); b = G_NODE (dst_b.user_data); } - /* if a is NULL, a is NULL too -- we are at the end of the list + /* if a is NULL, b is NULL too -- we are at the end of the list * yes and we leak memory here ... */ if (position) @@ -2298,7 +2684,8 @@ gtk_tree_store_move (GtkTreeStore *tree_store, parent->children = node; node->next = tmp; - tmp->prev = node; + if (tmp) + tmp->prev = node; handle_b = FALSE; } @@ -2320,6 +2707,8 @@ gtk_tree_store_move (GtkTreeStore *tree_store, /* after with sibling = NULL prepends */ g_node_insert_after (parent, NULL, node); } + + handle_b = FALSE; } if (handle_b) @@ -2342,10 +2731,10 @@ gtk_tree_store_move (GtkTreeStore *tree_store, else if (before) { if (depth) - new_pos = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (tree_store), + new_pos = gtk_tree_store_iter_n_children (GTK_TREE_MODEL (tree_store), &parent_iter) - 1; else - new_pos = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (tree_store), + new_pos = gtk_tree_store_iter_n_children (GTK_TREE_MODEL (tree_store), NULL) - 1; } else @@ -2386,14 +2775,21 @@ gtk_tree_store_move (GtkTreeStore *tree_store, order[i] = i; } - path = gtk_tree_path_new (); - gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store), - path, NULL, order); - - for (i = 0; i < length; i++) - g_print ("%2d ", order[i]); - g_print ("\n"); + if (depth) + { + tmppath = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), + &parent_iter); + gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store), + tmppath, &parent_iter, order); + } + else + { + tmppath = gtk_tree_path_new (); + gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store), + tmppath, NULL, order); + } + gtk_tree_path_free (tmppath); gtk_tree_path_free (path); if (position) gtk_tree_path_free (pos_path); @@ -2410,12 +2806,14 @@ free_paths_and_out: * gtk_tree_store_move_before: * @tree_store: A #GtkTreeStore. * @iter: A #GtkTreeIter. - * @position: A #GtkTreeIter or %NULL. + * @position: (allow-none): A #GtkTreeIter or %NULL. * * Moves @iter in @tree_store to the position before @position. @iter and * @position should be in the same level. Note that this function only * works with unsorted stores. If @position is %NULL, @iter will be * moved to the end of the level. + * + * Since: 2.2 **/ void gtk_tree_store_move_before (GtkTreeStore *tree_store, @@ -2429,12 +2827,14 @@ gtk_tree_store_move_before (GtkTreeStore *tree_store, * gtk_tree_store_move_after: * @tree_store: A #GtkTreeStore. * @iter: A #GtkTreeIter. - * @position: A #GtkTreeIter. + * @position: (allow-none): A #GtkTreeIter. * * Moves @iter in @tree_store to the position after @position. @iter and * @position should be in the same level. Note that this function only * works with unsorted stores. If @position is %NULL, @iter will be moved * to the start of the level. + * + * Since: 2.2 **/ void gtk_tree_store_move_after (GtkTreeStore *tree_store, @@ -2451,6 +2851,7 @@ gtk_tree_store_compare_func (gconstpointer a, gpointer user_data) { GtkTreeStore *tree_store = user_data; + GtkTreeStorePrivate *priv = tree_store->priv; GNode *node_a; GNode *node_b; GtkTreeIterCompareFunc func; @@ -2460,12 +2861,12 @@ gtk_tree_store_compare_func (gconstpointer a, GtkTreeIter iter_b; gint retval; - if (tree_store->sort_column_id != -1) + if (priv->sort_column_id != -1) { GtkTreeDataSortHeader *header; - header = _gtk_tree_data_list_get_header (tree_store->sort_list, - tree_store->sort_column_id); + header = _gtk_tree_data_list_get_header (priv->sort_list, + priv->sort_column_id); g_return_val_if_fail (header != NULL, 0); g_return_val_if_fail (header->func != NULL, 0); @@ -2474,22 +2875,22 @@ gtk_tree_store_compare_func (gconstpointer a, } 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; + g_return_val_if_fail (priv->default_sort_func != NULL, 0); + func = priv->default_sort_func; + data = priv->default_sort_data; } node_a = ((SortTuple *) a)->node; node_b = ((SortTuple *) b)->node; - iter_a.stamp = tree_store->stamp; + iter_a.stamp = priv->stamp; iter_a.user_data = node_a; - iter_b.stamp = tree_store->stamp; + iter_b.stamp = priv->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 (priv->order == GTK_SORT_DESCENDING) { if (retval > 0) retval = -1; @@ -2515,9 +2916,12 @@ gtk_tree_store_sort_helper (GtkTreeStore *tree_store, node = parent->children; if (node == NULL || node->next == NULL) - return; + { + if (recurse && node && node->children) + gtk_tree_store_sort_helper (tree_store, node, TRUE); - g_assert (GTK_TREE_STORE_IS_SORTED (tree_store)); + return; + } list_length = 0; for (tmp_node = node; tmp_node; tmp_node = tmp_node->next) @@ -2555,7 +2959,7 @@ gtk_tree_store_sort_helper (GtkTreeStore *tree_store, for (i = 0; i < list_length; i++) new_order[i] = g_array_index (sort_array, SortTuple, i).offset; - iter.stamp = tree_store->stamp; + iter.stamp = tree_store->priv->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), @@ -2577,11 +2981,17 @@ gtk_tree_store_sort_helper (GtkTreeStore *tree_store, static void gtk_tree_store_sort (GtkTreeStore *tree_store) { - if (tree_store->sort_column_id != -1) + GtkTreeStorePrivate *priv = tree_store->priv; + + if (!GTK_TREE_STORE_IS_SORTED (tree_store)) + return; + + if (priv->sort_column_id != -1) { GtkTreeDataSortHeader *header = NULL; - header = _gtk_tree_data_list_get_header (tree_store->sort_list, tree_store->sort_column_id); + header = _gtk_tree_data_list_get_header (priv->sort_list, + priv->sort_column_id); /* We want to make sure that we have a function */ g_return_if_fail (header != NULL); @@ -2589,17 +2999,19 @@ gtk_tree_store_sort (GtkTreeStore *tree_store) } else { - g_return_if_fail (tree_store->default_sort_func != NULL); + g_return_if_fail (priv->default_sort_func != NULL); } - gtk_tree_store_sort_helper (tree_store, G_NODE (tree_store->root), TRUE); + gtk_tree_store_sort_helper (tree_store, G_NODE (priv->root), TRUE); } static void gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store, GtkTreeIter *iter, - gint column) + gint column, + gboolean emit_signal) { + GtkTreeStorePrivate *priv = tree_store->priv; GNode *prev = NULL; GNode *next = NULL; GNode *node; @@ -2617,12 +3029,12 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store, g_return_if_fail (G_NODE (iter->user_data)->parent != NULL); - tmp_iter.stamp = tree_store->stamp; - if (tree_store->sort_column_id != -1) + tmp_iter.stamp = priv->stamp; + if (priv->sort_column_id != -1) { GtkTreeDataSortHeader *header; - header = _gtk_tree_data_list_get_header (tree_store->sort_list, - tree_store->sort_column_id); + header = _gtk_tree_data_list_get_header (priv->sort_list, + priv->sort_column_id); g_return_if_fail (header != NULL); g_return_if_fail (header->func != NULL); func = header->func; @@ -2630,14 +3042,14 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store, } else { - g_return_if_fail (tree_store->default_sort_func != NULL); - func = tree_store->default_sort_func; - data = tree_store->default_sort_data; + g_return_if_fail (priv->default_sort_func != NULL); + func = priv->default_sort_func; + data = priv->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) + if (func == _gtk_tree_data_list_compare_func && + priv->sort_column_id != column) return; old_location = 0; @@ -2668,7 +3080,7 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store, cmp_b = (* func) (GTK_TREE_MODEL (tree_store), iter, &tmp_iter, data); } - if (tree_store->order == GTK_SORT_DESCENDING) + if (priv->order == GTK_SORT_DESCENDING) { if (cmp_a < 0) cmp_a = 1; @@ -2708,7 +3120,7 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store, node = node->parent->children; new_location = 0; tmp_iter.user_data = node; - if (tree_store->order == GTK_SORT_DESCENDING) + if (priv->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); @@ -2719,7 +3131,7 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store, node = node->next; new_location++; tmp_iter.user_data = node; - if (tree_store->order == GTK_SORT_DESCENDING) + if (priv->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); @@ -2745,6 +3157,9 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store, G_NODE (iter->user_data)->parent->children = G_NODE (iter->user_data); } + if (!emit_signal) + return; + /* Emit the reordered signal. */ length = g_node_n_children (node->parent); new_order = g_new (int, length); @@ -2791,18 +3206,18 @@ gtk_tree_store_get_sort_column_id (GtkTreeSortable *sortable, GtkSortType *order) { GtkTreeStore *tree_store = (GtkTreeStore *) sortable; + GtkTreeStorePrivate *priv = tree_store->priv; - g_return_val_if_fail (GTK_IS_TREE_STORE (sortable), FALSE); + if (sort_column_id) + * sort_column_id = priv->sort_column_id; + if (order) + * order = priv->order; - if (tree_store->sort_column_id == -1) + if (priv->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID || + priv->sort_column_id == GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID) return FALSE; - if (sort_column_id) - * sort_column_id = tree_store->sort_column_id; - if (order) - * order = tree_store->order; return TRUE; - } static void @@ -2811,35 +3226,37 @@ gtk_tree_store_set_sort_column_id (GtkTreeSortable *sortable, GtkSortType order) { GtkTreeStore *tree_store = (GtkTreeStore *) sortable; + GtkTreeStorePrivate *priv = tree_store->priv; - g_return_if_fail (GTK_IS_TREE_STORE (sortable)); - - - if ((tree_store->sort_column_id == sort_column_id) && - (tree_store->order == order)) + if ((priv->sort_column_id == sort_column_id) && + (priv->order == order)) return; - if (sort_column_id != -1) + if (sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID) { - GtkTreeDataSortHeader *header = NULL; + if (sort_column_id != GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID) + { + GtkTreeDataSortHeader *header = NULL; - header = _gtk_tree_data_list_get_header (tree_store->sort_list, sort_column_id); + header = _gtk_tree_data_list_get_header (priv->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); + /* 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 (priv->default_sort_func != NULL); + } } - tree_store->sort_column_id = sort_column_id; - tree_store->order = order; - - gtk_tree_store_sort (tree_store); + priv->sort_column_id = sort_column_id; + priv->order = order; gtk_tree_sortable_sort_column_changed (sortable); + + gtk_tree_store_sort (tree_store); } static void @@ -2847,68 +3264,42 @@ gtk_tree_store_set_sort_func (GtkTreeSortable *sortable, gint sort_column_id, GtkTreeIterCompareFunc func, gpointer data, - GtkDestroyNotify destroy) + GDestroyNotify destroy) { GtkTreeStore *tree_store = (GtkTreeStore *) sortable; - GtkTreeDataSortHeader *header = NULL; - GList *list; + GtkTreeStorePrivate *priv = tree_store->priv; - 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) - { - GtkTreeDataSortHeader *list_header; + priv->sort_list = _gtk_tree_data_list_set_header (priv->sort_list, + sort_column_id, + func, data, destroy); - list_header = (GtkTreeDataSortHeader*) list->data; - if (list_header->sort_column_id == sort_column_id) - { - header = list_header; - 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) - { - GtkDestroyNotify d = header->destroy; - - header->destroy = NULL; - d (header->data); - } - - header->func = func; - header->data = data; - header->destroy = destroy; + if (priv->sort_column_id == sort_column_id) + gtk_tree_store_sort (tree_store); } static void gtk_tree_store_set_default_sort_func (GtkTreeSortable *sortable, GtkTreeIterCompareFunc func, gpointer data, - GtkDestroyNotify destroy) + GDestroyNotify destroy) { GtkTreeStore *tree_store = (GtkTreeStore *) sortable; + GtkTreeStorePrivate *priv = tree_store->priv; - g_return_if_fail (GTK_IS_TREE_STORE (sortable)); - - if (tree_store->default_sort_destroy) + if (priv->default_sort_destroy) { - GtkDestroyNotify d = tree_store->default_sort_destroy; + GDestroyNotify d = priv->default_sort_destroy; - tree_store->default_sort_destroy = NULL; - d (tree_store->default_sort_data); + priv->default_sort_destroy = NULL; + d (priv->default_sort_data); } - tree_store->default_sort_func = func; - tree_store->default_sort_data = data; - tree_store->default_sort_destroy = destroy; + priv->default_sort_func = func; + priv->default_sort_data = data; + priv->default_sort_destroy = destroy; + + if (priv->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID) + gtk_tree_store_sort (tree_store); } static gboolean @@ -2916,9 +3307,7 @@ 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); + return (tree_store->priv->default_sort_func != NULL); } static void @@ -2937,5 +3326,128 @@ validate_gnode (GNode* node) } } +/* GtkBuildable custom tag implementation + * + * + * + * + * + */ +typedef struct { + GtkBuilder *builder; + GObject *object; + GSList *items; +} GSListSubParserData; +static void +tree_model_start_element (GMarkupParseContext *context, + const gchar *element_name, + const gchar **names, + const gchar **values, + gpointer user_data, + GError **error) +{ + guint i; + GSListSubParserData *data = (GSListSubParserData*)user_data; + + for (i = 0; names[i]; i++) + { + if (strcmp (names[i], "type") == 0) + data->items = g_slist_prepend (data->items, g_strdup (values[i])); + } +} + +static void +tree_model_end_element (GMarkupParseContext *context, + const gchar *element_name, + gpointer user_data, + GError **error) +{ + GSListSubParserData *data = (GSListSubParserData*)user_data; + + g_assert(data->builder); + + if (strcmp (element_name, "columns") == 0) + { + GSList *l; + GType *types; + int i; + GType type; + + data = (GSListSubParserData*)user_data; + data->items = g_slist_reverse (data->items); + types = g_new0 (GType, g_slist_length (data->items)); + + for (l = data->items, i = 0; l; l = l->next, i++) + { + type = gtk_builder_get_type_from_name (data->builder, l->data); + if (type == G_TYPE_INVALID) + { + g_warning ("Unknown type %s specified in treemodel %s", + (const gchar*)l->data, + gtk_buildable_get_name (GTK_BUILDABLE (data->object))); + continue; + } + types[i] = type; + g_free (l->data); + } + + gtk_tree_store_set_column_types (GTK_TREE_STORE (data->object), i, types); + + g_free (types); + } +} + +static const GMarkupParser tree_model_parser = + { + tree_model_start_element, + tree_model_end_element + }; + + +static gboolean +gtk_tree_store_buildable_custom_tag_start (GtkBuildable *buildable, + GtkBuilder *builder, + GObject *child, + const gchar *tagname, + GMarkupParser *parser, + gpointer *data) +{ + GSListSubParserData *parser_data; + + if (child) + return FALSE; + + if (strcmp (tagname, "columns") == 0) + { + parser_data = g_slice_new0 (GSListSubParserData); + parser_data->builder = builder; + parser_data->items = NULL; + parser_data->object = G_OBJECT (buildable); + + *parser = tree_model_parser; + *data = parser_data; + return TRUE; + } + + return FALSE; +} + +static void +gtk_tree_store_buildable_custom_finished (GtkBuildable *buildable, + GtkBuilder *builder, + GObject *child, + const gchar *tagname, + gpointer user_data) +{ + GSListSubParserData *data; + + if (strcmp (tagname, "columns")) + return; + + data = (GSListSubParserData*)user_data; + + g_slist_free (data->items); + g_slice_free (GSListSubParserData, data); +}