X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktreemodelfilter.c;h=45281c298a8532e5805d68de4b2041d59729be86;hb=feb64f40b0f50735104da0a7fdafbe480763c180;hp=d88702c2988cc6eb7d2f39042a1d62124c9267ff;hpb=a43f2ba01030bd603c3e2dc4cf1bb257ab1a6bf5;p=~andy%2Fgtk diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index d88702c29..45281c298 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -13,9 +13,7 @@ * 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" @@ -423,7 +421,8 @@ static void gtk_tree_model_filter_build_level (GtkTr static void gtk_tree_model_filter_free_level (GtkTreeModelFilter *filter, FilterLevel *filter_level, - gboolean unref, + gboolean unref_self, + gboolean unref_parent, gboolean unref_external); static GtkTreePath *gtk_tree_model_filter_elt_get_path (FilterLevel *level, @@ -602,7 +601,7 @@ gtk_tree_model_filter_finalize (GObject *object) gtk_tree_path_free (filter->priv->virtual_root); if (filter->priv->root) - gtk_tree_model_filter_free_level (filter, filter->priv->root, TRUE, FALSE); + gtk_tree_model_filter_free_level (filter, filter->priv->root, TRUE, TRUE, FALSE); g_free (filter->priv->modify_types); @@ -892,7 +891,7 @@ gtk_tree_model_filter_build_level (GtkTreeModelFilter *filter, if (empty && (parent_level && parent_level->ext_ref_count == 0)) { - gtk_tree_model_filter_free_level (filter, new_level, FALSE, FALSE); + gtk_tree_model_filter_free_level (filter, new_level, FALSE, TRUE, FALSE); return; } @@ -931,7 +930,8 @@ gtk_tree_model_filter_build_level (GtkTreeModelFilter *filter, static void gtk_tree_model_filter_free_level (GtkTreeModelFilter *filter, FilterLevel *filter_level, - gboolean unref, + gboolean unref_self, + gboolean unref_parent, gboolean unref_external) { GSequenceIter *siter; @@ -947,9 +947,17 @@ gtk_tree_model_filter_free_level (GtkTreeModelFilter *filter, FilterElt *elt = g_sequence_get (siter); if (elt->children) - gtk_tree_model_filter_free_level (filter, - FILTER_LEVEL (elt->children), - unref, unref_external); + { + /* If we recurse and unref_self == FALSE, then unref_parent + * must also be FALSE (otherwise a still unref a node in this + * level). + */ + gtk_tree_model_filter_free_level (filter, + FILTER_LEVEL (elt->children), + unref_self, + unref_self == FALSE ? FALSE : unref_parent, + unref_external); + } if (unref_external) { @@ -962,13 +970,13 @@ gtk_tree_model_filter_free_level (GtkTreeModelFilter *filter, while (elt->ext_ref_count > 0) gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (filter), &f_iter, - TRUE, unref); + TRUE, unref_self); } } /* Release the reference on the first item. */ - if (unref) + if (unref_self) { GtkTreeIter f_iter; @@ -997,20 +1005,22 @@ gtk_tree_model_filter_free_level (GtkTreeModelFilter *filter, filter->priv->zero_ref_count--; } +#ifdef MODEL_FILTER_DEBUG + if (filter_level == filter->priv->root) + g_assert (filter->priv->zero_ref_count == 0); +#endif + if (filter_level->parent_elt) { /* Release reference on parent */ - if (unref) - { - GtkTreeIter parent_iter; + GtkTreeIter parent_iter; - parent_iter.stamp = filter->priv->stamp; - parent_iter.user_data = filter_level->parent_level; - parent_iter.user_data2 = filter_level->parent_elt; + parent_iter.stamp = filter->priv->stamp; + parent_iter.user_data = filter_level->parent_level; + parent_iter.user_data2 = filter_level->parent_elt; - gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (filter), - &parent_iter, FALSE, TRUE); - } + gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (filter), + &parent_iter, FALSE, unref_parent); filter_level->parent_elt->children = NULL; } @@ -1052,8 +1062,8 @@ gtk_tree_model_filter_prune_level (GtkTreeModelFilter *filter, if (elt->children) gtk_tree_model_filter_free_level (filter, - FILTER_LEVEL (elt->children), TRUE, - TRUE); + FILTER_LEVEL (elt->children), + TRUE, TRUE, TRUE); } /* For the first item, only drop the external references */ @@ -1252,7 +1262,7 @@ gtk_tree_model_filter_real_visible (GtkTreeModelFilter *filter, } else if (filter->priv->visible_column >= 0) { - GValue val = {0, }; + GValue val = G_VALUE_INIT; gtk_tree_model_get_value (child_model, child_iter, filter->priv->visible_column, &val); @@ -1316,7 +1326,7 @@ gtk_tree_model_filter_clear_cache_helper (GtkTreeModelFilter *filter, level->parent_level && level->parent_level != filter->priv->root && level->parent_level->ext_ref_count == 0) { - gtk_tree_model_filter_free_level (filter, level, TRUE, FALSE); + gtk_tree_model_filter_free_level (filter, level, TRUE, TRUE, FALSE); return; } } @@ -1643,7 +1653,10 @@ gtk_tree_model_filter_remove_elt_from_level (GtkTreeModelFilter *filter, iter.user_data = level; iter.user_data2 = elt; - if (orig_level_ext_ref_count > 0) + parent = level->parent_elt; + parent_level = level->parent_level; + + if (!parent || orig_level_ext_ref_count > 0) path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter), &iter); else /* If the level is not visible, the parent is potentially invisible @@ -1652,9 +1665,6 @@ gtk_tree_model_filter_remove_elt_from_level (GtkTreeModelFilter *filter, */ path = NULL; - parent = level->parent_elt; - parent_level = level->parent_level; - length = g_sequence_get_length (level->seq); /* first register the node to be invisible */ @@ -1693,7 +1703,7 @@ gtk_tree_model_filter_remove_elt_from_level (GtkTreeModelFilter *filter, * the case length == 1. */ if (elt->children) - gtk_tree_model_filter_free_level (filter, elt->children, TRUE, TRUE); + gtk_tree_model_filter_free_level (filter, elt->children, TRUE, TRUE, TRUE); /* If the first node is being removed, transfer, the reference */ if (elt == g_sequence_get (g_sequence_get_begin_iter (level->seq))) @@ -1751,7 +1761,7 @@ gtk_tree_model_filter_remove_elt_from_level (GtkTreeModelFilter *filter, level->parent_level->ext_ref_count > 0)) { /* Otherwise, the level can be removed */ - gtk_tree_model_filter_free_level (filter, level, TRUE, TRUE); + gtk_tree_model_filter_free_level (filter, level, TRUE, TRUE, TRUE); } else { @@ -1768,7 +1778,7 @@ gtk_tree_model_filter_remove_elt_from_level (GtkTreeModelFilter *filter, #endif if (elt->children) gtk_tree_model_filter_free_level (filter, elt->children, - TRUE, TRUE); + TRUE, TRUE, TRUE); } else { @@ -2061,17 +2071,17 @@ gtk_tree_model_filter_row_changed (GtkTreeModel *c_model, if (current_state == TRUE && requested_state == TRUE) { - /* propagate the signal; also get a path taking only visible - * nodes into account. - */ - gtk_tree_path_free (path); - path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter), &iter); - level = FILTER_LEVEL (iter.user_data); elt = FILTER_ELT (iter.user_data2); if (gtk_tree_model_filter_elt_is_visible_in_target (level, elt)) { + /* propagate the signal; also get a path taking only visible + * nodes into account. + */ + gtk_tree_path_free (path); + path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter), &iter); + if (level->ext_ref_count > 0) gtk_tree_model_row_changed (GTK_TREE_MODEL (filter), path, &iter); @@ -2279,7 +2289,8 @@ gtk_tree_model_filter_row_inserted (GtkTreeModel *c_model, } done: - gtk_tree_model_filter_check_ancestors (filter, real_path); + if (real_path) + gtk_tree_model_filter_check_ancestors (filter, real_path); if (emit_row_inserted) gtk_tree_model_filter_emit_row_inserted_for_path (filter, c_model, @@ -2421,7 +2432,7 @@ gtk_tree_model_filter_virtual_root_deleted (GtkTreeModelFilter *filter, * nodes will fail, since the respective nodes in the child model are * no longer there. */ - gtk_tree_model_filter_free_level (filter, filter->priv->root, FALSE, FALSE); + gtk_tree_model_filter_free_level (filter, filter->priv->root, FALSE, TRUE, FALSE); gtk_tree_model_filter_increment_stamp (filter); @@ -2600,14 +2611,24 @@ gtk_tree_model_filter_row_deleted (GtkTreeModel *c_model, while (elt->ext_ref_count > 0) gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (data), &iter, TRUE, FALSE); - while (elt->ref_count > 0) - gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (data), &iter, - FALSE, FALSE); + + if (elt->children) + /* If this last node has children, then the recursion in free_level + * will release this reference. + */ + while (elt->ref_count > 1) + gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (data), &iter, + FALSE, FALSE); + else + while (elt->ref_count > 0) + gtk_tree_model_filter_real_unref_node (GTK_TREE_MODEL (data), &iter, + FALSE, FALSE); + if (g_sequence_get_length (level->seq) == 1) { /* kill level */ - gtk_tree_model_filter_free_level (filter, level, FALSE, FALSE); + gtk_tree_model_filter_free_level (filter, level, FALSE, TRUE, FALSE); } else { @@ -2617,8 +2638,13 @@ gtk_tree_model_filter_row_deleted (GtkTreeModel *c_model, lookup_elt_with_offset (level->seq, elt->offset, &siter); is_first = g_sequence_get_begin_iter (level->seq) == siter; + if (elt->children) + gtk_tree_model_filter_free_level (filter, elt->children, + FALSE, FALSE, FALSE); + /* remove the row */ - g_sequence_remove (elt->visible_siter); + if (elt->visible_siter) + g_sequence_remove (elt->visible_siter); tmp = g_sequence_iter_next (siter); g_sequence_remove (siter); g_sequence_foreach_range (tmp, g_sequence_get_end_iter (level->seq), @@ -3167,7 +3193,6 @@ static gboolean gtk_tree_model_filter_iter_next (GtkTreeModel *model, GtkTreeIter *iter) { - FilterLevel *level; FilterElt *elt; GSequenceIter *siter; @@ -3175,7 +3200,6 @@ gtk_tree_model_filter_iter_next (GtkTreeModel *model, g_return_val_if_fail (GTK_TREE_MODEL_FILTER (model)->priv->child_model != NULL, FALSE); g_return_val_if_fail (GTK_TREE_MODEL_FILTER (model)->priv->stamp == iter->stamp, FALSE); - level = iter->user_data; elt = iter->user_data2; siter = g_sequence_iter_next (elt->visible_siter); @@ -3203,12 +3227,12 @@ gtk_tree_model_filter_iter_previous (GtkTreeModel *model, elt = iter->user_data2; - siter = g_sequence_iter_prev (elt->visible_siter); - if (g_sequence_iter_is_begin (siter)) + if (g_sequence_iter_is_begin (elt->visible_siter)) { iter->stamp = 0; return FALSE; } + siter = g_sequence_iter_prev (elt->visible_siter); iter->user_data2 = GET_ELT (siter); @@ -3471,6 +3495,8 @@ gtk_tree_model_filter_real_ref_node (GtkTreeModel *model, #ifdef MODEL_FILTER_DEBUG g_assert (filter->priv->zero_ref_count >= 0); + if (filter->priv->zero_ref_count > 0) + g_assert (filter->priv->root != NULL); #endif } } @@ -3547,6 +3573,8 @@ gtk_tree_model_filter_real_unref_node (GtkTreeModel *model, #ifdef MODEL_FILTER_DEBUG g_assert (filter->priv->zero_ref_count >= 0); + if (filter->priv->zero_ref_count > 0) + g_assert (filter->priv->root != NULL); #endif } } @@ -3637,7 +3665,7 @@ gtk_tree_model_filter_set_model (GtkTreeModelFilter *filter, /* reset our state */ if (filter->priv->root) gtk_tree_model_filter_free_level (filter, filter->priv->root, - TRUE, FALSE); + TRUE, TRUE, FALSE); filter->priv->root = NULL; g_object_unref (filter->priv->child_model); @@ -3730,10 +3758,14 @@ gtk_tree_model_filter_set_root (GtkTreeModelFilter *filter, { g_return_if_fail (GTK_IS_TREE_MODEL_FILTER (filter)); - if (!root) - filter->priv->virtual_root = NULL; + if (root) + { + filter->priv->virtual_root = gtk_tree_path_copy (root); + gtk_tree_model_filter_ref_path (filter, filter->priv->virtual_root); + filter->priv->virtual_root_deleted = FALSE; + } else - filter->priv->virtual_root = gtk_tree_path_copy (root); + filter->priv->virtual_root = NULL; } /* public API */ @@ -3754,24 +3786,12 @@ GtkTreeModel * gtk_tree_model_filter_new (GtkTreeModel *child_model, GtkTreePath *root) { - GtkTreeModel *retval; - GtkTreeModelFilter *filter; - g_return_val_if_fail (GTK_IS_TREE_MODEL (child_model), NULL); - retval = g_object_new (GTK_TYPE_TREE_MODEL_FILTER, - "child-model", child_model, - "virtual-root", root, - NULL); - - filter = GTK_TREE_MODEL_FILTER (retval); - if (filter->priv->virtual_root) - { - gtk_tree_model_filter_ref_path (filter, filter->priv->virtual_root); - filter->priv->virtual_root_deleted = FALSE; - } - - return retval; + return g_object_new (GTK_TYPE_TREE_MODEL_FILTER, + "child-model", child_model, + "virtual-root", root, + NULL); } /**