]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtktreeselection.c
Add gdk_pixbuf_get_option.
[~andy/gtk] / gtk / gtktreeselection.c
index 73d84f076cf9e243e323cebfe3cb8c510b1d74d0..6174fc4789134daf95a4933e8ec886ed3aa9794d 100644 (file)
 #include "gtktreeselection.h"
 #include "gtktreeprivate.h"
 #include "gtkrbtree.h"
+#include "gtkmarshalers.h"
 #include "gtksignal.h"
 
-static void     gtk_tree_selection_init           (GtkTreeSelection       *selection);
-static void     gtk_tree_selection_class_init     (GtkTreeSelectionClass  *class);
+static void gtk_tree_selection_init              (GtkTreeSelection      *selection);
+static void gtk_tree_selection_class_init        (GtkTreeSelectionClass *class);
 
-enum {
-  ROW_SELECTED,
-  ROW_UNSELECTED,
-  LAST_SIGNAL
-};
-
-static GtkObjectClass *parent_class = NULL;
-static guint tree_selection_signals[LAST_SIGNAL] = { 0 };
+static void gtk_tree_selection_finalize          (GObject               *object);
+static gint gtk_tree_selection_real_select_all   (GtkTreeSelection      *selection);
+static gint gtk_tree_selection_real_unselect_all (GtkTreeSelection      *selection);
+static gint gtk_tree_selection_real_select_node  (GtkTreeSelection      *selection,
+                                                 GtkRBTree             *tree,
+                                                 GtkRBNode             *node,
+                                                 gboolean               select);
 
-static void
-gtk_tree_selection_real_select_node (GtkTreeSelection *selection, GtkRBTree *tree, GtkRBNode *node, gboolean select)
+enum
 {
-  gboolean selected = FALSE;
-  GtkTreePath *path = NULL;
-
-  if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED) != select)
-    {
-      path = _gtk_tree_view_find_path (selection->tree_view, tree, node);
-      if (selection->user_func)
-       {
-         if ((*selection->user_func) (selection, selection->tree_view->priv->model, path, selection->user_data))
-           selected = TRUE;
-       }
-      else
-       selected = TRUE;
-    }
-  if (selected == TRUE)
-    {
-      GtkTreeNode tree_node;
-      tree_node = gtk_tree_model_get_node (selection->tree_view->priv->model, path);
+  CHANGED,
+  LAST_SIGNAL
+};
 
-      node->flags ^= GTK_RBNODE_IS_SELECTED;
-      if (select)
-       gtk_signal_emit (GTK_OBJECT (selection), tree_selection_signals[ROW_SELECTED], selection->tree_view->priv->model, tree_node);
-      else
-       gtk_signal_emit (GTK_OBJECT (selection), tree_selection_signals[ROW_UNSELECTED], selection->tree_view->priv->model, tree_node);
-      gtk_widget_queue_draw (GTK_WIDGET (selection->tree_view));
-    }
-}
+static GObjectClass *parent_class = NULL;
+static guint tree_selection_signals [LAST_SIGNAL] = { 0 };
 
 GtkType
 gtk_tree_selection_get_type (void)
@@ -85,7 +63,7 @@ gtk_tree_selection_get_type (void)
         (GInstanceInitFunc) gtk_tree_selection_init
       };
 
-      selection_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkTreeSelection", &selection_info);
+      selection_type = g_type_register_static (G_TYPE_OBJECT, "GtkTreeSelection", &selection_info, 0);
     }
 
   return selection_type;
@@ -94,170 +72,325 @@ gtk_tree_selection_get_type (void)
 static void
 gtk_tree_selection_class_init (GtkTreeSelectionClass *class)
 {
-  GtkObjectClass *object_class;
+  GObjectClass *object_class;
 
-  object_class = (GtkObjectClass*) class;
+  object_class = (GObjectClass*) class;
   parent_class = g_type_class_peek_parent (class);
 
-  tree_selection_signals[ROW_SELECTED] =
-    gtk_signal_new ("row_selected",
-                   GTK_RUN_FIRST,
-                   GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkTreeSelectionClass, row_selected),
-                   gtk_marshal_NONE__POINTER_POINTER,
-                   GTK_TYPE_NONE, 2,
-                   GTK_TYPE_POINTER,
-                   GTK_TYPE_POINTER);
-
-  tree_selection_signals[ROW_UNSELECTED] =
-    gtk_signal_new ("row_unselected",
+  object_class->finalize = gtk_tree_selection_finalize;
+  class->changed = NULL;
+
+  tree_selection_signals[CHANGED] =
+    gtk_signal_new ("changed",
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
-                   GTK_SIGNAL_OFFSET (GtkTreeSelectionClass, row_unselected),
-                   gtk_marshal_NONE__POINTER_POINTER,
-                   GTK_TYPE_NONE, 2,
-                   GTK_TYPE_POINTER,
-                   GTK_TYPE_POINTER);
-
-  gtk_object_class_add_signals (object_class, tree_selection_signals, LAST_SIGNAL);
-
-  class->row_selected = NULL;
-  class->row_unselected = NULL;
+                   GTK_SIGNAL_OFFSET (GtkTreeSelectionClass, changed),
+                   _gtk_marshal_VOID__VOID,
+                   GTK_TYPE_NONE, 0);
 }
 
 static void
 gtk_tree_selection_init (GtkTreeSelection *selection)
 {
-  selection->type = GTK_TREE_SELECTION_MULTI;
-  selection->user_func = NULL;
-  selection->user_data = NULL;
-  selection->user_func = NULL;
-  selection->tree_view = NULL;
+  selection->type = GTK_SELECTION_SINGLE;
+}
+
+static void
+gtk_tree_selection_finalize (GObject *object)
+{
+  if (GTK_TREE_SELECTION (object)->destroy)
+    (* GTK_TREE_SELECTION (object)->destroy) (GTK_TREE_SELECTION (object)->user_data);
+
+  /* chain parent_class' handler */
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-GtkObject *
-gtk_tree_selection_new (void)
+/**
+ * _gtk_tree_selection_new:
+ *
+ * Creates a new #GtkTreeSelection object.  This function should not be invoked,
+ * as each #GtkTreeView will create it's own #GtkTreeSelection.
+ *
+ * Return value: A newly created #GtkTreeSelection object.
+ **/
+GtkTreeSelection*
+_gtk_tree_selection_new (void)
 {
-  GtkObject *selection;
+  GtkTreeSelection *selection;
 
-  selection = GTK_OBJECT (gtk_type_new (GTK_TYPE_TREE_SELECTION));
+  selection = GTK_TREE_SELECTION (g_object_new (GTK_TYPE_TREE_SELECTION, NULL));
 
   return selection;
 }
 
-GtkObject *
-gtk_tree_selection_new_with_tree_view (GtkTreeView *tree_view)
+/**
+ * _gtk_tree_selection_new_with_tree_view:
+ * @tree_view: The #GtkTreeView.
+ *
+ * Creates a new #GtkTreeSelection object.  This function should not be invoked,
+ * as each #GtkTreeView will create it's own #GtkTreeSelection.
+ *
+ * Return value: A newly created #GtkTreeSelection object.
+ **/
+GtkTreeSelection*
+_gtk_tree_selection_new_with_tree_view (GtkTreeView *tree_view)
 {
-  GtkObject *selection;
+  GtkTreeSelection *selection;
 
-  g_return_val_if_fail (tree_view != NULL, NULL);
   g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
 
-  selection = gtk_tree_selection_new ();
-  gtk_tree_selection_set_tree_view (GTK_TREE_SELECTION (selection), tree_view);
+  selection = _gtk_tree_selection_new ();
+  _gtk_tree_selection_set_tree_view (selection, tree_view);
 
   return selection;
 }
 
+/**
+ * _gtk_tree_selection_set_tree_view:
+ * @selection: A #GtkTreeSelection.
+ * @tree_view: The #GtkTreeView.
+ *
+ * Sets the #GtkTreeView of @selection.  This function should not be invoked, as
+ * it is used internally by #GtkTreeView.
+ **/
 void
-gtk_tree_selection_set_tree_view (GtkTreeSelection *selection,
-                                 GtkTreeView      *tree_view)
+_gtk_tree_selection_set_tree_view (GtkTreeSelection *selection,
+                                   GtkTreeView      *tree_view)
 {
-  g_return_if_fail (selection != NULL);
   g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
   if (tree_view != NULL)
     g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
   selection->tree_view = tree_view;
-  tree_view->priv->selection = selection;
 }
 
+/**
+ * gtk_tree_selection_set_mode:
+ * @selection: A #GtkTreeSelection.
+ * @type: The selection mode
+ *
+ * Sets the selection mode of the @selection.  If the previous type was
+ * #GTK_SELECTION_MULTIPLE, then the anchor is kept selected, if it was
+ * previously selected.
+ **/
 void
-gtk_tree_selection_set_type (GtkTreeSelection     *selection,
-                            GtkTreeSelectionType  type)
+gtk_tree_selection_set_mode (GtkTreeSelection *selection,
+                            GtkSelectionMode  type)
 {
-  g_return_if_fail (selection != NULL);
+  GtkTreeSelectionFunc tmp_func;
   g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
 
   if (selection->type == type)
     return;
 
-  if (type == GTK_TREE_SELECTION_SINGLE)
+  
+  if (type == GTK_SELECTION_NONE)
+    {
+      gtk_tree_row_reference_free (selection->tree_view->priv->anchor);
+      /* We do this so that we unconditionally unset all rows
+       */
+      tmp_func = selection->user_func;
+      selection->user_func = NULL;
+      gtk_tree_selection_unselect_all (selection);
+      selection->user_func = tmp_func;
+    }
+  else if (type == GTK_SELECTION_SINGLE ||
+          type == GTK_SELECTION_BROWSE)
     {
       GtkRBTree *tree = NULL;
       GtkRBNode *node = NULL;
       gint selected = FALSE;
+      GtkTreePath *anchor_path = NULL;
 
       if (selection->tree_view->priv->anchor)
        {
-         _gtk_tree_view_find_node (selection->tree_view,
-                                   selection->tree_view->priv->anchor,
-                                   &tree,
-                                   &node);
-
-         if (node && GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
-           selected = TRUE;
+          anchor_path = gtk_tree_row_reference_get_path (selection->tree_view->priv->anchor);
+
+          if (anchor_path)
+            {
+              _gtk_tree_view_find_node (selection->tree_view,
+                                        anchor_path,
+                                        &tree,
+                                        &node);
+
+              if (node && GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
+                selected = TRUE;
+            }
        }
+
+      /* We do this so that we unconditionally unset all rows
+       */
+      tmp_func = selection->user_func;
+      selection->user_func = NULL;
       gtk_tree_selection_unselect_all (selection);
+      selection->user_func = tmp_func;
+
       if (node && selected)
-       GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_SELECTED);
+       _gtk_tree_selection_internal_select_node (selection,
+                                                 node,
+                                                 tree,
+                                                 anchor_path,
+                                                 0);
+      if (anchor_path)
+       gtk_tree_path_free (anchor_path);
     }
+
   selection->type = type;
 }
 
+/**
+ * gtk_tree_selection_get_mode:
+ * @selection: a #GtkTreeSelection
+ *
+ * Gets the selection mode for @selection. See
+ * gtk_tree_selection_set_mode().
+ *
+ * Return value: the current selection mode
+ **/
+GtkSelectionMode
+gtk_tree_selection_get_mode (GtkTreeSelection *selection)
+{
+  g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), GTK_SELECTION_SINGLE);
+
+  return selection->type;
+}
+
+/**
+ * gtk_tree_selection_set_select_function:
+ * @selection: A #GtkTreeSelection.
+ * @func: The selection function.
+ * @data: The selection function's data.
+ * @destroy: The destroy function for user data.  May be NULL.
+ *
+ * Sets the selection function.  If set, this function is called before any node
+ * is selected or unselected, giving some control over which nodes are selected.
+ * The select function should return %TRUE if the state of the node may be toggled,
+ * and %FALSE if the state of the node should be left unchanged.
+ **/
 void
 gtk_tree_selection_set_select_function (GtkTreeSelection     *selection,
                                        GtkTreeSelectionFunc  func,
-                                       gpointer            data)
+                                       gpointer              data,
+                                       GtkDestroyNotify      destroy)
 {
-  g_return_if_fail (selection != NULL);
   g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
   g_return_if_fail (func != NULL);
 
   selection->user_func = func;
   selection->user_data = data;
+  selection->destroy = destroy;
 }
 
+/**
+ * gtk_tree_selection_get_user_data:
+ * @selection: A #GtkTreeSelection.
+ *
+ * Returns the user data for the selection function.
+ *
+ * Return value: The user data.
+ **/
 gpointer
 gtk_tree_selection_get_user_data (GtkTreeSelection *selection)
 {
-  g_return_val_if_fail (selection != NULL, NULL);
   g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), NULL);
 
   return selection->user_data;
 }
 
-GtkTreeNode *
-gtk_tree_selection_get_selected (GtkTreeSelection *selection)
+/**
+ * gtk_tree_selection_get_tree_view:
+ * @selection: A #GtkTreeSelection
+ * 
+ * Returns the tree view associated with @selection.
+ * 
+ * Return value: A #GtkTreeView
+ **/
+GtkTreeView *
+gtk_tree_selection_get_tree_view (GtkTreeSelection *selection)
+{
+  g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), NULL);
+
+  return selection->tree_view;
+}
+
+/**
+ * gtk_tree_selection_get_selected:
+ * @selection: A #GtkTreeSelection.
+ * @model: A pointer set to the #GtkTreeModel, or NULL.
+ * @iter: The #GtkTreeIter, or NULL.
+ *
+ * Sets @iter to the currently selected node if @selection is set to
+ * #GTK_SELECTION_SINGLE or #GTK_SELECTION_BROWSE.  @iter may be NULL if you
+ * just want to test if @selection has any selected nodes.  @model is filled
+ * with the current model as a convenience.  This function will not work if you
+ * use @selection is #GTK_SELECTION_MULTIPLE.
+ *
+ * Return value: TRUE, if there is a selected node.
+ **/
+gboolean
+gtk_tree_selection_get_selected (GtkTreeSelection  *selection,
+                                GtkTreeModel     **model,
+                                GtkTreeIter       *iter)
 {
-  GtkTreeNode *retval;
   GtkRBTree *tree;
   GtkRBNode *node;
+  GtkTreePath *anchor_path;
+  gboolean retval;
 
-  g_return_val_if_fail (selection != NULL, NULL);
-  g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), NULL);
+  g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), FALSE);
+  g_return_val_if_fail (selection->type != GTK_SELECTION_MULTIPLE, FALSE);
+  g_return_val_if_fail (selection->tree_view != NULL, FALSE);
+  g_return_val_if_fail (selection->tree_view->priv->model != NULL, FALSE);
+
+  if (model)
+    *model = selection->tree_view->priv->model;
 
   if (selection->tree_view->priv->anchor == NULL)
-    return NULL;
+    return FALSE;
+
+  anchor_path = gtk_tree_row_reference_get_path (selection->tree_view->priv->anchor);
+
+  if (anchor_path == NULL)
+    return FALSE;
 
-  g_return_val_if_fail (selection->tree_view != NULL, NULL);
-  g_return_val_if_fail (selection->tree_view->priv->model != NULL, NULL);
+  if (iter == NULL)
+    {
+      gtk_tree_path_free (anchor_path);
+      return TRUE;
+    }
+
+  retval = FALSE;
 
   if (!_gtk_tree_view_find_node (selection->tree_view,
-                               selection->tree_view->priv->anchor,
-                               &tree,
-                               &node) &&
+                                 anchor_path,
+                                 &tree,
+                                 &node) &&
       ! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
-    /* We don't want to return the anchor if it isn't actually selected.
-     */
+    {
+      /* We don't want to return the anchor if it isn't actually selected.
+       */
+      retval = FALSE;
+    }
+  else
+    {
+      retval = gtk_tree_model_get_iter (selection->tree_view->priv->model,
+                                        iter,
+                                        anchor_path);
+    }
 
-      return NULL;
+  gtk_tree_path_free (anchor_path);
 
-  retval = gtk_tree_model_get_node (selection->tree_view->priv->model,
-                                   selection->tree_view->priv->anchor);
   return retval;
 }
 
+/**
+ * gtk_tree_selection_selected_foreach:
+ * @selection: A #GtkTreeSelection.
+ * @func: The function to call for each selected node.
+ * @data: user data to pass to the function.
+ *
+ * Calls a function for each selected node.
+ **/
 void
 gtk_tree_selection_selected_foreach (GtkTreeSelection            *selection,
                                     GtkTreeSelectionForeachFunc  func,
@@ -266,9 +399,8 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection            *selection,
   GtkTreePath *path;
   GtkRBTree *tree;
   GtkRBNode *node;
-  GtkTreeNode tree_node;
+  GtkTreeIter iter;
 
-  g_return_if_fail (selection != NULL);
   g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
   g_return_if_fail (selection->tree_view != NULL);
   g_return_if_fail (selection->tree_view->priv->model != NULL);
@@ -278,31 +410,48 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection            *selection,
       selection->tree_view->priv->tree->root == NULL)
     return;
 
+  if (selection->type == GTK_SELECTION_SINGLE ||
+      selection->type == GTK_SELECTION_BROWSE)
+    {
+      if (gtk_tree_row_reference_valid (selection->tree_view->priv->anchor))
+       {
+         path = gtk_tree_row_reference_get_path (selection->tree_view->priv->anchor);
+         gtk_tree_model_get_iter (selection->tree_view->priv->model, &iter, path);
+         (* func) (selection->tree_view->priv->model, path, &iter, data);
+         gtk_tree_path_free (path);
+       }
+      return;
+    }
+
   tree = selection->tree_view->priv->tree;
   node = selection->tree_view->priv->tree->root;
-
+  
   while (node->left != tree->nil)
     node = node->left;
 
   /* find the node internally */
   path = gtk_tree_path_new_root ();
-  tree_node = gtk_tree_model_get_node (selection->tree_view->priv->model, path);
-  gtk_tree_path_free (path);
+  gtk_tree_model_get_iter (selection->tree_view->priv->model,
+                          &iter, path);
 
   do
     {
       if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
-       (* func) (selection->tree_view->priv->model, tree_node, data);
+       (* func) (selection->tree_view->priv->model, path, &iter, data);
       if (node->children)
        {
+         gboolean has_child;
+         GtkTreeIter tmp;
+
          tree = node->children;
          node = tree->root;
          while (node->left != tree->nil)
            node = node->left;
-         tree_node = gtk_tree_model_node_children (selection->tree_view->priv->model, tree_node);
-
+         tmp = iter;
+         has_child = gtk_tree_model_iter_children (selection->tree_view->priv->model, &iter, &tmp);
+         gtk_tree_path_append_index (path, 0);
          /* Sanity Check! */
-         TREE_VIEW_INTERNAL_ASSERT_VOID (tree_node != NULL);
+         TREE_VIEW_INTERNAL_ASSERT_VOID (has_child);
        }
       else
        {
@@ -312,24 +461,33 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection            *selection,
              node = _gtk_rbtree_next (tree, node);
              if (node != NULL)
                {
-                 gtk_tree_model_node_next (selection->tree_view->priv->model, &tree_node);
+                 gboolean has_next;
+
+                 has_next = gtk_tree_model_iter_next (selection->tree_view->priv->model, &iter);
                  done = TRUE;
+                 gtk_tree_path_next (path);
 
                  /* Sanity Check! */
-                 TREE_VIEW_INTERNAL_ASSERT_VOID (tree_node != NULL);
+                 TREE_VIEW_INTERNAL_ASSERT_VOID (has_next);
                }
              else
                {
+                 gboolean has_parent;
+                 GtkTreeIter tmp_iter = iter;
+
                  node = tree->parent_node;
                  tree = tree->parent_tree;
                  if (tree == NULL)
-                   /* we've run out of tree */
-                   /* We're done with this function */
-                   return;
-                 tree_node = gtk_tree_model_node_parent (selection->tree_view->priv->model, tree_node);
-
+                   {
+                     gtk_tree_path_free (path);
+                     /* we've run out of tree */
+                     /* We're done with this function */
+                     return;
+                   }
+                 has_parent = gtk_tree_model_iter_parent (selection->tree_view->priv->model, &iter, &tmp_iter);
+                 gtk_tree_path_up (path);
                  /* Sanity check */
-                 TREE_VIEW_INTERNAL_ASSERT_VOID (tree_node != NULL);
+                 TREE_VIEW_INTERNAL_ASSERT_VOID (has_parent);
                }
            }
          while (!done);
@@ -338,6 +496,13 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection            *selection,
   while (TRUE);
 }
 
+/**
+ * gtk_tree_selection_select_path:
+ * @selection: A #GtkTreeSelection.
+ * @path: The #GtkTreePath to be selected.
+ *
+ * Select the row at @path.
+ **/
 void
 gtk_tree_selection_select_path (GtkTreeSelection *selection,
                                GtkTreePath      *path)
@@ -346,7 +511,6 @@ gtk_tree_selection_select_path (GtkTreeSelection *selection,
   GtkRBTree *tree;
   GdkModifierType state = 0;
 
-  g_return_if_fail (selection != NULL);
   g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
   g_return_if_fail (selection->tree_view != NULL);
   g_return_if_fail (path != NULL);
@@ -359,7 +523,7 @@ gtk_tree_selection_select_path (GtkTreeSelection *selection,
   if (node == NULL || GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
     return;
 
-  if (selection->type == GTK_TREE_SELECTION_MULTI)
+  if (selection->type == GTK_SELECTION_MULTIPLE)
     state = GDK_CONTROL_MASK;
 
   _gtk_tree_selection_internal_select_node (selection,
@@ -369,6 +533,13 @@ gtk_tree_selection_select_path (GtkTreeSelection *selection,
                                            state);
 }
 
+/**
+ * gtk_tree_selection_unselect_path:
+ * @selection: A #GtkTreeSelection.
+ * @path: The #GtkTreePath to be unselected.
+ *
+ * Unselects the row at @path.
+ **/
 void
 gtk_tree_selection_unselect_path (GtkTreeSelection *selection,
                                  GtkTreePath      *path)
@@ -376,7 +547,6 @@ gtk_tree_selection_unselect_path (GtkTreeSelection *selection,
   GtkRBNode *node;
   GtkRBTree *tree;
 
-  g_return_if_fail (selection != NULL);
   g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
   g_return_if_fail (selection->tree_view != NULL);
   g_return_if_fail (path != NULL);
@@ -396,19 +566,26 @@ gtk_tree_selection_unselect_path (GtkTreeSelection *selection,
                                            GDK_CONTROL_MASK);
 }
 
+/**
+ * gtk_tree_selection_select_iter:
+ * @selection: A #GtkTreeSelection.
+ * @iter: The #GtkTreeIter to be selected.
+ *
+ * Selects the specified iterator.
+ **/
 void
-gtk_tree_selection_select_node (GtkTreeSelection *selection,
-                               GtkTreeNode      *tree_node)
+gtk_tree_selection_select_iter (GtkTreeSelection *selection,
+                               GtkTreeIter      *iter)
 {
   GtkTreePath *path;
 
-  g_return_if_fail (selection != NULL);
   g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
   g_return_if_fail (selection->tree_view != NULL);
   g_return_if_fail (selection->tree_view->priv->model != NULL);
+  g_return_if_fail (iter != NULL);
 
   path = gtk_tree_model_get_path (selection->tree_view->priv->model,
-                                 tree_node);
+                                 iter);
 
   if (path == NULL)
     return;
@@ -418,18 +595,26 @@ gtk_tree_selection_select_node (GtkTreeSelection *selection,
 }
 
 
+/**
+ * gtk_tree_selection_unselect_iter:
+ * @selection: A #GtkTreeSelection.
+ * @iter: The #GtkTreeIter to be unselected.
+ *
+ * Unselects the specified iterator.
+ **/
 void
-gtk_tree_selection_unselect_node (GtkTreeSelection *selection,
-                                 GtkTreeNode      *tree_node)
+gtk_tree_selection_unselect_iter (GtkTreeSelection *selection,
+                                 GtkTreeIter      *iter)
 {
   GtkTreePath *path;
 
-  g_return_if_fail (selection != NULL);
   g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
   g_return_if_fail (selection->tree_view != NULL);
+  g_return_if_fail (selection->tree_view->priv->model != NULL);
+  g_return_if_fail (iter != NULL);
 
   path = gtk_tree_model_get_path (selection->tree_view->priv->model,
-                                 tree_node);
+                                 iter);
 
   if (path == NULL)
     return;
@@ -438,6 +623,71 @@ gtk_tree_selection_unselect_node (GtkTreeSelection *selection,
   gtk_tree_path_free (path);
 }
 
+/**
+ * gtk_tree_selection_path_is_selected:
+ * @selection: A #GtkTreeSelection.
+ * @path: A #GtkTreePath to check selection on.
+ * 
+ * Returns %TRUE if the row pointed to by @path is currently selected.  If @path
+ * does not point to a valid location, %FALSE is returned
+ * 
+ * Return value: %TRUE if @path is selected.
+ **/
+gboolean
+gtk_tree_selection_path_is_selected (GtkTreeSelection *selection,
+                                    GtkTreePath      *path)
+{
+  GtkRBNode *node;
+  GtkRBTree *tree;
+
+  g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), FALSE);
+  g_return_val_if_fail (path != NULL, FALSE);
+  g_return_val_if_fail (selection->tree_view != NULL, FALSE);
+  g_return_val_if_fail (selection->tree_view->priv->model != NULL, FALSE);
+
+  _gtk_tree_view_find_node (selection->tree_view,
+                           path,
+                           &tree,
+                           &node);
+
+  if ((node == NULL) || !GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
+    return FALSE;
+
+  return TRUE;
+}
+
+/**
+ * gtk_tree_selection_iter_is_selected:
+ * @selection: A #GtkTreeSelection
+ * @iter: A valid #GtkTreeIter
+ * 
+ * Returns %TRUE if the row pointed to by @path is currently selected.
+ * 
+ * Return value: %TRUE, if @iter is selected
+ **/
+gboolean
+gtk_tree_selection_iter_is_selected (GtkTreeSelection *selection,
+                                    GtkTreeIter      *iter)
+{
+  GtkTreePath *path;
+  gboolean retval;
+
+  g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), FALSE);
+  g_return_val_if_fail (iter != NULL, FALSE);
+  g_return_val_if_fail (selection->tree_view != NULL, FALSE);
+  g_return_val_if_fail (selection->tree_view->priv->model != NULL, FALSE);
+
+  path = gtk_tree_model_get_path (selection->tree_view->priv->model, iter);
+  if (path == NULL)
+    return FALSE;
+
+  retval = gtk_tree_selection_path_is_selected (selection, path);
+  gtk_tree_path_free (path);
+
+  return retval;
+}
+
+
 /* Wish I was in python, right now... */
 struct _TempTuple {
   GtkTreeSelection *selection;
@@ -447,7 +697,7 @@ struct _TempTuple {
 static void
 select_all_helper (GtkRBTree  *tree,
                   GtkRBNode  *node,
-                  gpointer  data)
+                  gpointer    data)
 {
   struct _TempTuple *tuple = data;
 
@@ -459,31 +709,23 @@ select_all_helper (GtkRBTree  *tree,
                          data);
   if (!GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
     {
-      gtk_tree_selection_real_select_node (tuple->selection, tree, node, TRUE);
-      tuple->dirty = TRUE;
+      tuple->dirty = gtk_tree_selection_real_select_node (tuple->selection, tree, node, TRUE) || tuple->dirty;
     }
 }
 
-void
-gtk_tree_selection_select_all (GtkTreeSelection *selection)
+
+/* We have a real_{un,}select_all function that doesn't emit the signal, so we
+ * can use it in other places without fear of the signal being emitted.
+ */
+static gint
+gtk_tree_selection_real_select_all (GtkTreeSelection *selection)
 {
   struct _TempTuple *tuple;
 
-  g_return_if_fail (selection != NULL);
-  g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
-  g_return_if_fail (selection->tree_view != NULL);
-  g_return_if_fail (selection->tree_view->priv->tree != NULL);
-
-  if (selection->type == GTK_TREE_SELECTION_SINGLE)
-    {
-      GtkRBNode *node;
-      node = selection->tree_view->priv->tree->root;
-
-      while (node->right != selection->tree_view->priv->tree->nil)
-       node = node->right;
-      return;
-    }
+  if (selection->tree_view->priv->tree == NULL)
+    return FALSE;
 
+  /* Mark all nodes selected */
   tuple = g_new (struct _TempTuple, 1);
   tuple->selection = selection;
   tuple->dirty = FALSE;
@@ -494,14 +736,38 @@ gtk_tree_selection_select_all (GtkTreeSelection *selection)
                        select_all_helper,
                        tuple);
   if (tuple->dirty)
-    gtk_widget_queue_draw (GTK_WIDGET (selection->tree_view));
+    {
+      g_free (tuple);
+      return TRUE;
+    }
   g_free (tuple);
+  return FALSE;
+}
+
+/**
+ * gtk_tree_selection_select_all:
+ * @selection: A #GtkTreeSelection.
+ *
+ * Selects all the nodes.  @selection is must be set to #GTK_SELECTION_MULTIPLE
+ * mode.
+ **/
+void
+gtk_tree_selection_select_all (GtkTreeSelection *selection)
+{
+  g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
+  g_return_if_fail (selection->tree_view != NULL);
+  if (selection->tree_view->priv->tree == NULL)
+    return;
+  g_return_if_fail (selection->type == GTK_SELECTION_MULTIPLE);
+
+  if (gtk_tree_selection_real_select_all (selection))
+    g_signal_emit (G_OBJECT (selection), tree_selection_signals[CHANGED], 0);
 }
 
 static void
 unselect_all_helper (GtkRBTree  *tree,
                     GtkRBNode  *node,
-                    gpointer  data)
+                    gpointer    data)
 {
   struct _TempTuple *tuple = data;
 
@@ -513,67 +779,106 @@ unselect_all_helper (GtkRBTree  *tree,
                          data);
   if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
     {
-      gtk_tree_selection_real_select_node (tuple->selection, tree, node, FALSE);
-      tuple->dirty = TRUE;
+      tuple->dirty = gtk_tree_selection_real_select_node (tuple->selection, tree, node, FALSE) || tuple->dirty;
     }
 }
 
-void
-gtk_tree_selection_unselect_all (GtkTreeSelection *selection)
+static gint
+gtk_tree_selection_real_unselect_all (GtkTreeSelection *selection)
 {
   struct _TempTuple *tuple;
 
-  g_return_if_fail (selection != NULL);
-  g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
-  g_return_if_fail (selection->tree_view != NULL);
-  if (selection->tree_view->priv->tree == NULL)
-    return;
-
-  if (selection->type == GTK_TREE_SELECTION_SINGLE)
+  if (selection->type == GTK_SELECTION_SINGLE ||
+      selection->type == GTK_SELECTION_BROWSE)
     {
       GtkRBTree *tree = NULL;
       GtkRBNode *node = NULL;
+      GtkTreePath *anchor_path;
+
       if (selection->tree_view->priv->anchor == NULL)
-       return;
+       return FALSE;
+
+      anchor_path = gtk_tree_row_reference_get_path (selection->tree_view->priv->anchor);
+
+      if (anchor_path == NULL)
+        return FALSE;
 
       _gtk_tree_view_find_node (selection->tree_view,
-                               selection->tree_view->priv->anchor,
+                                anchor_path,
                                &tree,
                                &node);
+
+      gtk_tree_path_free (anchor_path);
+
+      if (tree == NULL)
+        return FALSE;
+
       if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
-       gtk_tree_selection_real_select_node (selection, tree, node, FALSE);
-      return;
+       {
+         if (gtk_tree_selection_real_select_node (selection, tree, node, FALSE))
+           {
+             gtk_tree_row_reference_free (selection->tree_view->priv->anchor);
+             selection->tree_view->priv->anchor = NULL;
+             return TRUE;
+           }
+       }
+      return FALSE;
+    }
+  else
+    {
+      tuple = g_new (struct _TempTuple, 1);
+      tuple->selection = selection;
+      tuple->dirty = FALSE;
+
+      _gtk_rbtree_traverse (selection->tree_view->priv->tree,
+                            selection->tree_view->priv->tree->root,
+                            G_PRE_ORDER,
+                            unselect_all_helper,
+                            tuple);
+
+      if (tuple->dirty)
+        {
+          g_free (tuple);
+          return TRUE;
+        }
+      g_free (tuple);
+      return FALSE;
     }
+}
 
-  tuple = g_new (struct _TempTuple, 1);
-  tuple->selection = selection;
-  tuple->dirty = FALSE;
+/**
+ * gtk_tree_selection_unselect_all:
+ * @selection: A #GtkTreeSelection.
+ *
+ * Unselects all the nodes.
+ **/
+void
+gtk_tree_selection_unselect_all (GtkTreeSelection *selection)
+{
+  g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
+  g_return_if_fail (selection->tree_view != NULL);
+  if (selection->tree_view->priv->tree == NULL)
+    return;
+  
+  if (selection->tree_view->priv->tree == NULL)
+    return;
 
-  _gtk_rbtree_traverse (selection->tree_view->priv->tree,
-                       selection->tree_view->priv->tree->root,
-                       G_PRE_ORDER,
-                       unselect_all_helper,
-                       tuple);
-  if (tuple->dirty)
-    gtk_widget_queue_draw (GTK_WIDGET (selection->tree_view));
-  g_free (tuple);
+  if (gtk_tree_selection_real_unselect_all (selection))
+    g_signal_emit (G_OBJECT (selection), tree_selection_signals[CHANGED], 0);
 }
 
-void
-gtk_tree_selection_select_range (GtkTreeSelection *selection,
-                                GtkTreePath      *start_path,
-                                GtkTreePath      *end_path)
+static gint
+gtk_tree_selection_real_select_range (GtkTreeSelection *selection,
+                                     GtkTreePath      *start_path,
+                                     GtkTreePath      *end_path)
 {
   GtkRBNode *start_node, *end_node;
   GtkRBTree *start_tree, *end_tree;
-
-  g_return_if_fail (selection != NULL);
-  g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
-  g_return_if_fail (selection->tree_view != NULL);
+  gboolean dirty = FALSE;
 
   switch (gtk_tree_path_compare (start_path, end_path))
     {
-    case -1:
+    case 1:
       _gtk_tree_view_find_node (selection->tree_view,
                                end_path,
                                &start_tree,
@@ -591,7 +896,7 @@ gtk_tree_selection_select_range (GtkTreeSelection *selection,
       end_tree = start_tree;
       end_node = start_node;
       break;
-    case 1:
+    case -1:
       _gtk_tree_view_find_node (selection->tree_view,
                                start_path,
                                &start_tree,
@@ -603,15 +908,15 @@ gtk_tree_selection_select_range (GtkTreeSelection *selection,
       break;
     }
 
-  g_return_if_fail (start_node != NULL);
-  g_return_if_fail (end_node != NULL);
+  g_return_val_if_fail (start_node != NULL, FALSE);
+  g_return_val_if_fail (end_node != NULL, FALSE);
 
   do
     {
-      gtk_tree_selection_real_select_node (selection, start_tree, start_node, TRUE);
+      dirty |= gtk_tree_selection_real_select_node (selection, start_tree, start_node, TRUE);
 
       if (start_node == end_node)
-       return;
+       break;
 
       if (start_node->children)
        {
@@ -622,34 +927,42 @@ gtk_tree_selection_select_range (GtkTreeSelection *selection,
        }
       else
        {
-         gboolean done = FALSE;
-         do
+         _gtk_rbtree_next_full (start_tree, start_node, &start_tree, &start_node);
+         if (start_tree == NULL)
            {
-             start_node = _gtk_rbtree_next (start_tree, start_node);
-             if (start_node != NULL)
-               {
-                 done = TRUE;
-               }
-             else
-               {
-                 start_node = start_tree->parent_node;
-                 start_tree = start_tree->parent_tree;
-                 if (start_tree == NULL)
-                   /* we've run out of tree */
-                   /* This means we never found end node!! */
-                   return;
-               }
+             /* we just ran out of tree.  That means someone passed in bogus values.
+              */
+             return dirty;
            }
-         while (!done);
        }
     }
   while (TRUE);
+
+  return dirty;
 }
 
+/**
+ * gtk_tree_selection_select_range:
+ * @selection: A #GtkTreeSelection.
+ * @start_path: The initial node of the range.
+ * @end_path: The final node of the range.
+ *
+ * Selects a range of nodes, determined by @start_path and @end_path inclusive.
+ **/
+void
+gtk_tree_selection_select_range (GtkTreeSelection *selection,
+                                GtkTreePath      *start_path,
+                                GtkTreePath      *end_path)
+{
+  g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
+  g_return_if_fail (selection->tree_view != NULL);
+
+  if (gtk_tree_selection_real_select_range (selection, start_path, end_path))
+    g_signal_emit (G_OBJECT (selection), tree_selection_signals[CHANGED], 0);
+}
 
-/* Called internally by gtktree_view.  It handles actually selecting
- * the tree.  This should almost certainly ever be called by
- * anywhere else */
+/* Called internally by gtktreeview.c It handles actually selecting the tree.
+ */
 void
 _gtk_tree_selection_internal_select_node (GtkTreeSelection *selection,
                                          GtkRBNode        *node,
@@ -658,45 +971,152 @@ _gtk_tree_selection_internal_select_node (GtkTreeSelection *selection,
                                          GdkModifierType   state)
 {
   gint flags;
+  gint dirty = FALSE;
+  GtkTreePath *anchor_path = NULL;
 
-  if (((state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK) && (selection->tree_view->priv->anchor == NULL))
-    {
-      selection->tree_view->priv->anchor = gtk_tree_path_copy (path);
-      gtk_tree_selection_real_select_node (selection, tree, node, TRUE);
-    }
-  else if ((state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) == (GDK_SHIFT_MASK|GDK_CONTROL_MASK))
+  if (selection->type == GTK_SELECTION_NONE)
+    return;
+
+  if (selection->tree_view->priv->anchor)
+    anchor_path = gtk_tree_row_reference_get_path (selection->tree_view->priv->anchor);
+
+  if (selection->type == GTK_SELECTION_SINGLE ||
+      selection->type == GTK_SELECTION_BROWSE)
     {
-      gtk_tree_selection_select_range (selection,
-                                      selection->tree_view->priv->anchor,
-                                      path);
+      /* Did we try to select the same node again? */
+      if (selection->type == GTK_SELECTION_SINGLE &&
+         anchor_path && gtk_tree_path_compare (path, anchor_path) == 0)
+       {
+         if ((state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+           {
+             dirty = gtk_tree_selection_real_unselect_all (selection);
+           }
+       }
+      else
+       {
+         /* FIXME: We only want to select the new node if we can unselect the
+          * old one, and we can select the new one.  We are currently
+          * unselecting the old one first, then trying the new one. */
+         if (anchor_path)
+           {
+             dirty = gtk_tree_selection_real_unselect_all (selection);
+             if (dirty)
+               {
+                 if (selection->tree_view->priv->anchor)
+                   gtk_tree_row_reference_free (selection->tree_view->priv->anchor);
+                 if (gtk_tree_selection_real_select_node (selection, tree, node, TRUE))
+                   {
+                     selection->tree_view->priv->anchor =
+                       gtk_tree_row_reference_new_proxy (G_OBJECT (selection->tree_view), selection->tree_view->priv->model, path);
+                   }
+               }
+           }
+         else
+           {
+             if (gtk_tree_selection_real_select_node (selection, tree, node, TRUE))
+               {
+                 dirty = TRUE;
+                 selection->tree_view->priv->anchor =
+                   gtk_tree_row_reference_new_proxy (G_OBJECT (selection->tree_view), selection->tree_view->priv->model, path);
+               }
+           }
+       }
     }
-  else if ((state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+  else if (selection->type == GTK_SELECTION_MULTIPLE)
     {
-      flags = node->flags;
-      if (selection->type == GTK_TREE_SELECTION_SINGLE)
-       gtk_tree_selection_unselect_all (selection);
-      if (selection->tree_view->priv->anchor)
-       gtk_tree_path_free (selection->tree_view->priv->anchor);
-      selection->tree_view->priv->anchor = gtk_tree_path_copy (path);
-      if ((flags & GTK_RBNODE_IS_SELECTED) == GTK_RBNODE_IS_SELECTED)
-       gtk_tree_selection_real_select_node (selection, tree, node, FALSE);
+      if (((state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK) && (anchor_path == NULL))
+       {
+         if (selection->tree_view->priv->anchor)
+           gtk_tree_row_reference_free (selection->tree_view->priv->anchor);
+
+         selection->tree_view->priv->anchor =
+           gtk_tree_row_reference_new_proxy (G_OBJECT (selection->tree_view), selection->tree_view->priv->model, path);
+         dirty = gtk_tree_selection_real_select_node (selection, tree, node, TRUE);
+       }
+      else if ((state & (GDK_CONTROL_MASK|GDK_SHIFT_MASK)) == (GDK_SHIFT_MASK|GDK_CONTROL_MASK))
+       {
+         gtk_tree_selection_select_range (selection,
+                                          anchor_path,
+                                          path);
+       }
+      else if ((state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+       {
+         flags = node->flags;
+         if (selection->tree_view->priv->anchor)
+           gtk_tree_row_reference_free (selection->tree_view->priv->anchor);
+
+         selection->tree_view->priv->anchor =
+           gtk_tree_row_reference_new_proxy (G_OBJECT (selection->tree_view), selection->tree_view->priv->model, path);
+
+         if ((flags & GTK_RBNODE_IS_SELECTED) == GTK_RBNODE_IS_SELECTED)
+           dirty |= gtk_tree_selection_real_select_node (selection, tree, node, FALSE);
+         else
+           dirty |= gtk_tree_selection_real_select_node (selection, tree, node, TRUE);
+       }
+      else if ((state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK)
+       {
+         dirty = gtk_tree_selection_real_unselect_all (selection);
+         dirty |= gtk_tree_selection_real_select_range (selection,
+                                                        anchor_path,
+                                                        path);
+       }
       else
-       gtk_tree_selection_real_select_node (selection, tree, node, TRUE);
+       {
+         dirty = gtk_tree_selection_real_unselect_all (selection);
+
+         if (selection->tree_view->priv->anchor)
+           gtk_tree_row_reference_free (selection->tree_view->priv->anchor);
+
+         selection->tree_view->priv->anchor =
+           gtk_tree_row_reference_new_proxy (G_OBJECT (selection->tree_view), selection->tree_view->priv->model, path);
+
+         dirty |= gtk_tree_selection_real_select_node (selection, tree, node, TRUE);
+       }
     }
-  else if ((state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK)
+
+  if (anchor_path)
+    gtk_tree_path_free (anchor_path);
+
+  if (dirty)
+    g_signal_emit (G_OBJECT (selection), tree_selection_signals[CHANGED], 0);
+}
+
+/* NOTE: Any {un,}selection ever done _MUST_ be done through this function!
+ */
+
+static gint
+gtk_tree_selection_real_select_node (GtkTreeSelection *selection,
+                                    GtkRBTree        *tree,
+                                    GtkRBNode        *node,
+                                    gboolean          select)
+{
+  gboolean selected = FALSE;
+  GtkTreePath *path = NULL;
+
+  if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED) != select)
     {
-      gtk_tree_selection_unselect_all (selection);
-      gtk_tree_selection_select_range (selection,
-                                      selection->tree_view->priv->anchor,
-                                      path);
+      path = _gtk_tree_view_find_path (selection->tree_view, tree, node);
+      if (selection->user_func)
+       {
+         if ((*selection->user_func) (selection, selection->tree_view->priv->model, path,
+                                       GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED),
+                                       selection->user_data))
+           selected = TRUE;
+       }
+      else
+       selected = TRUE;
+      gtk_tree_path_free (path);
     }
-  else
+
+  if (selected == TRUE)
     {
-      gtk_tree_selection_unselect_all (selection);
-      if (selection->tree_view->priv->anchor)
-       gtk_tree_path_free (selection->tree_view->priv->anchor);
-      selection->tree_view->priv->anchor = gtk_tree_path_copy (path);
-      gtk_tree_selection_real_select_node (selection, tree, node, TRUE);
+      node->flags ^= GTK_RBNODE_IS_SELECTED;
+
+      /* FIXME: just draw the one node*/
+      gtk_widget_queue_draw (GTK_WIDGET (selection->tree_view));
+      return TRUE;
     }
+
+  return FALSE;
 }