* 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 <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include "gtkrbtree.h"
#include "gtkmarshalers.h"
#include "gtkintl.h"
+#include "gtktypebuiltins.h"
+#include "a11y/gtktreeviewaccessibleprivate.h"
/**
*
* One of the important things to remember when monitoring the selection of
* a view is that the #GtkTreeSelection::changed signal is mostly a hint.
- * That is,it may only emit one signal when a range of rows is selected.
+ * That is, it may only emit one signal when a range of rows is selected.
* Additionally, it may on occasion emit a #GtkTreeSelection::changed signal
* when nothing has happened (mostly as a result of programmers calling
* select_row on an already selected row).
*/
+struct _GtkTreeSelectionPrivate
+{
+ GtkTreeView *tree_view;
+ GtkSelectionMode type;
+ GtkTreeSelectionFunc user_func;
+ gpointer user_data;
+ GDestroyNotify destroy;
+};
static void gtk_tree_selection_finalize (GObject *object);
static gint gtk_tree_selection_real_select_all (GtkTreeSelection *selection);
GtkRBTree *tree,
GtkRBNode *node,
gboolean select);
+static void gtk_tree_selection_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_tree_selection_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+enum
+{
+ PROP_0,
+ PROP_MODE,
+ N_PROPERTIES
+};
enum
{
LAST_SIGNAL
};
+static GParamSpec *properties[N_PROPERTIES];
static guint tree_selection_signals [LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE (GtkTreeSelection, gtk_tree_selection, G_TYPE_OBJECT)
object_class = (GObjectClass*) class;
object_class->finalize = gtk_tree_selection_finalize;
+ object_class->set_property = gtk_tree_selection_set_property;
+ object_class->get_property = gtk_tree_selection_get_property;
class->changed = NULL;
+ /* Properties */
+
+ /**
+ * GtkTreeSelection:mode:
+ *
+ * Selection mode.
+ * See gtk_tree_selection_set_mode() for more information on this property.
+ *
+ * Since: 3.2
+ */
+ properties[PROP_MODE] = g_param_spec_enum ("mode",
+ P_("Mode"),
+ P_("Selection mode"),
+ GTK_TYPE_SELECTION_MODE,
+ GTK_SELECTION_SINGLE,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS);
+
+ /* Install all properties */
+ g_object_class_install_properties (object_class, N_PROPERTIES, properties);
+
+ /* Signals */
+
/**
* GtkTreeSelection::changed:
* @treeselection: the object which received the signal.
NULL, NULL,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+
+ g_type_class_add_private (class, sizeof (GtkTreeSelectionPrivate));
}
static void
gtk_tree_selection_init (GtkTreeSelection *selection)
{
- selection->type = GTK_SELECTION_SINGLE;
+ GtkTreeSelectionPrivate *priv;
+
+ selection->priv = G_TYPE_INSTANCE_GET_PRIVATE (selection,
+ GTK_TYPE_TREE_SELECTION,
+ GtkTreeSelectionPrivate);
+ priv = selection->priv;
+
+ priv->type = GTK_SELECTION_SINGLE;
}
static void
gtk_tree_selection_finalize (GObject *object)
{
GtkTreeSelection *selection = GTK_TREE_SELECTION (object);
+ GtkTreeSelectionPrivate *priv = selection->priv;
- if (selection->destroy)
- selection->destroy (selection->user_data);
+ if (priv->destroy)
+ priv->destroy (priv->user_data);
/* chain parent_class' handler */
G_OBJECT_CLASS (gtk_tree_selection_parent_class)->finalize (object);
}
+static void
+gtk_tree_selection_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ g_return_if_fail (GTK_IS_TREE_SELECTION (object));
+
+ switch (prop_id)
+ {
+ case PROP_MODE:
+ gtk_tree_selection_set_mode (GTK_TREE_SELECTION (object), g_value_get_enum (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+gtk_tree_selection_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ g_return_if_fail (GTK_IS_TREE_SELECTION (object));
+
+ switch (prop_id)
+ {
+ case PROP_MODE:
+ g_value_set_enum (value, gtk_tree_selection_get_mode (GTK_TREE_SELECTION (object)));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
/**
* _gtk_tree_selection_new:
*
_gtk_tree_selection_set_tree_view (GtkTreeSelection *selection,
GtkTreeView *tree_view)
{
+ GtkTreeSelectionPrivate *priv;
+
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;
+ priv = selection->priv;
+
+ priv->tree_view = tree_view;
}
/**
gtk_tree_selection_set_mode (GtkTreeSelection *selection,
GtkSelectionMode type)
{
+ GtkTreeSelectionPrivate *priv;
GtkTreeSelectionFunc tmp_func;
+
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
- if (selection->type == type)
+ priv = selection->priv;
+
+ if (priv->type == type)
return;
-
if (type == GTK_SELECTION_NONE)
{
/* We do this so that we unconditionally unset all rows
*/
- tmp_func = selection->user_func;
- selection->user_func = NULL;
+ tmp_func = priv->user_func;
+ priv->user_func = NULL;
gtk_tree_selection_unselect_all (selection);
- selection->user_func = tmp_func;
+ priv->user_func = tmp_func;
- gtk_tree_row_reference_free (selection->tree_view->priv->anchor);
- selection->tree_view->priv->anchor = NULL;
+ _gtk_tree_view_set_anchor_path (priv->tree_view, NULL);
}
else if (type == GTK_SELECTION_SINGLE ||
type == GTK_SELECTION_BROWSE)
gint selected = FALSE;
GtkTreePath *anchor_path = NULL;
- if (selection->tree_view->priv->anchor)
+ anchor_path = _gtk_tree_view_get_anchor_path (priv->tree_view);
+
+ if (anchor_path)
{
- 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;
- }
+ _gtk_tree_view_find_node (priv->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;
+ tmp_func = priv->user_func;
+ priv->user_func = NULL;
gtk_tree_selection_unselect_all (selection);
- selection->user_func = tmp_func;
+ priv->user_func = tmp_func;
if (node && selected)
_gtk_tree_selection_internal_select_node (selection,
gtk_tree_path_free (anchor_path);
}
- selection->type = type;
+ priv->type = type;
+
+ g_object_notify_by_pspec (G_OBJECT (selection), properties[PROP_MODE]);
}
/**
{
g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), GTK_SELECTION_SINGLE);
- return selection->type;
+ return selection->priv->type;
}
/**
gpointer data,
GDestroyNotify destroy)
{
+ GtkTreeSelectionPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
- if (selection->destroy)
- selection->destroy (selection->user_data);
+ priv = selection->priv;
- selection->user_func = func;
- selection->user_data = data;
- selection->destroy = destroy;
+ if (priv->destroy)
+ priv->destroy (priv->user_data);
+
+ priv->user_func = func;
+ priv->user_data = data;
+ priv->destroy = destroy;
}
/**
{
g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), NULL);
- return selection->user_func;
+ return selection->priv->user_func;
}
/**
{
g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), NULL);
- return selection->user_data;
+ return selection->priv->user_data;
}
/**
{
g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), NULL);
- return selection->tree_view;
+ return selection->priv->tree_view;
}
/**
GtkTreeModel **model,
GtkTreeIter *iter)
{
+ GtkTreeSelectionPrivate *priv;
GtkRBTree *tree;
GtkRBNode *node;
GtkTreePath *anchor_path;
gboolean found_node;
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);
+
+ priv = selection->priv;
+
+ g_return_val_if_fail (priv->type != GTK_SELECTION_MULTIPLE, FALSE);
+ g_return_val_if_fail (priv->tree_view != NULL, FALSE);
/* Clear the iter */
if (iter)
memset (iter, 0, sizeof (GtkTreeIter));
if (model)
- *model = selection->tree_view->priv->model;
+ *model = gtk_tree_view_get_model (priv->tree_view);
- if (selection->tree_view->priv->anchor == NULL)
- return FALSE;
-
- anchor_path = gtk_tree_row_reference_get_path (selection->tree_view->priv->anchor);
+ anchor_path = _gtk_tree_view_get_anchor_path (priv->tree_view);
if (anchor_path == NULL)
return FALSE;
retval = FALSE;
- found_node = !_gtk_tree_view_find_node (selection->tree_view,
+ found_node = !_gtk_tree_view_find_node (priv->tree_view,
anchor_path,
&tree,
&node);
if (iter == NULL)
retval = TRUE;
else
- retval = gtk_tree_model_get_iter (selection->tree_view->priv->model,
+ retval = gtk_tree_model_get_iter (gtk_tree_view_get_model (priv->tree_view),
iter,
anchor_path);
}
*
* To free the return value, use:
* |[
- * g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL);
- * g_list_free (list);
+ * g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free);
* ]|
*
* Return value: (element-type GtkTreePath) (transfer full): A #GList containing a #GtkTreePath for each selected row.
gtk_tree_selection_get_selected_rows (GtkTreeSelection *selection,
GtkTreeModel **model)
{
+ GtkTreeSelectionPrivate *priv;
GList *list = NULL;
GtkRBTree *tree = NULL;
GtkRBNode *node = NULL;
GtkTreePath *path;
g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), NULL);
- g_return_val_if_fail (selection->tree_view != NULL, NULL);
+
+ priv = selection->priv;
+
+ g_return_val_if_fail (priv->tree_view != NULL, NULL);
if (model)
- *model = selection->tree_view->priv->model;
+ *model = gtk_tree_view_get_model (priv->tree_view);
- if (selection->tree_view->priv->tree == NULL ||
- selection->tree_view->priv->tree->root == NULL)
+ tree = _gtk_tree_view_get_rbtree (priv->tree_view);
+
+ if (tree == NULL || tree->root == NULL)
return NULL;
- if (selection->type == GTK_SELECTION_NONE)
+ if (priv->type == GTK_SELECTION_NONE)
return NULL;
- else if (selection->type != GTK_SELECTION_MULTIPLE)
+ else if (priv->type != GTK_SELECTION_MULTIPLE)
{
GtkTreeIter iter;
{
GtkTreePath *path;
- path = gtk_tree_model_get_path (selection->tree_view->priv->model, &iter);
+ path = gtk_tree_model_get_path (gtk_tree_view_get_model (priv->tree_view), &iter);
list = g_list_append (list, path);
return list;
return NULL;
}
- tree = selection->tree_view->priv->tree;
- node = selection->tree_view->priv->tree->root;
-
- while (node->left != tree->nil)
- node = node->left;
+ node = _gtk_rbtree_first (tree);
path = gtk_tree_path_new_first ();
do
if (node->children)
{
tree = node->children;
- node = tree->root;
-
- while (node->left != tree->nil)
- node = node->left;
+ node = _gtk_rbtree_first (tree);
gtk_tree_path_append_index (path, 0);
}
gint
gtk_tree_selection_count_selected_rows (GtkTreeSelection *selection)
{
+ GtkTreeSelectionPrivate *priv;
gint count = 0;
+ GtkRBTree *tree;
g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), 0);
- g_return_val_if_fail (selection->tree_view != NULL, 0);
- if (selection->tree_view->priv->tree == NULL ||
- selection->tree_view->priv->tree->root == NULL)
+ priv = selection->priv;
+
+ g_return_val_if_fail (priv->tree_view != NULL, 0);
+
+ tree = _gtk_tree_view_get_rbtree (priv->tree_view);
+
+ if (tree == NULL || tree->root == NULL)
return 0;
- if (selection->type == GTK_SELECTION_SINGLE ||
- selection->type == GTK_SELECTION_BROWSE)
+ if (priv->type == GTK_SELECTION_SINGLE ||
+ priv->type == GTK_SELECTION_BROWSE)
{
if (gtk_tree_selection_get_selected (selection, NULL, NULL))
return 1;
return 0;
}
- _gtk_rbtree_traverse (selection->tree_view->priv->tree,
- selection->tree_view->priv->tree->root,
+ _gtk_rbtree_traverse (tree, tree->root,
G_PRE_ORDER,
gtk_tree_selection_count_selected_rows_helper,
&count);
GtkTreeSelectionForeachFunc func,
gpointer data)
{
+ GtkTreeSelectionPrivate *priv;
GtkTreePath *path;
GtkRBTree *tree;
GtkRBNode *node;
gboolean stop = FALSE;
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
- g_return_if_fail (selection->tree_view != NULL);
- if (func == NULL ||
- selection->tree_view->priv->tree == NULL ||
- selection->tree_view->priv->tree->root == NULL)
+ priv = selection->priv;
+
+ g_return_if_fail (priv->tree_view != NULL);
+
+ tree = _gtk_tree_view_get_rbtree (priv->tree_view);
+
+ if (func == NULL || tree == NULL || tree->root == NULL)
return;
- if (selection->type == GTK_SELECTION_SINGLE ||
- selection->type == GTK_SELECTION_BROWSE)
+ model = gtk_tree_view_get_model (priv->tree_view);
+
+ if (priv->type == GTK_SELECTION_SINGLE ||
+ priv->type == GTK_SELECTION_BROWSE)
{
- if (gtk_tree_row_reference_valid (selection->tree_view->priv->anchor))
+ path = _gtk_tree_view_get_anchor_path (priv->tree_view);
+
+ if (path)
{
- 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_model_get_iter (model, &iter, path);
+ (* func) (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;
+ node = _gtk_rbtree_first (tree);
- model = selection->tree_view->priv->model;
g_object_ref (model);
/* connect to signals to monitor changes in treemodel */
reordered_id = g_signal_connect_swapped (model, "rows-reordered",
G_CALLBACK (model_changed),
&stop);
- changed_id = g_signal_connect_swapped (selection->tree_view, "notify::model",
+ changed_id = g_signal_connect_swapped (priv->tree_view, "notify::model",
G_CALLBACK (model_changed),
&stop);
if (node->children)
{
tree = node->children;
- node = tree->root;
-
- while (node->left != tree->nil)
- node = node->left;
+ node = _gtk_rbtree_first (tree);
gtk_tree_path_append_index (path, 0);
}
g_signal_handler_disconnect (model, inserted_id);
g_signal_handler_disconnect (model, deleted_id);
g_signal_handler_disconnect (model, reordered_id);
- g_signal_handler_disconnect (selection->tree_view, changed_id);
+ g_signal_handler_disconnect (priv->tree_view, changed_id);
g_object_unref (model);
/* check if we have to spew a scary message */
gtk_tree_selection_select_path (GtkTreeSelection *selection,
GtkTreePath *path)
{
+ GtkTreeSelectionPrivate *priv;
GtkRBNode *node;
GtkRBTree *tree;
gboolean ret;
GtkTreeSelectMode mode = 0;
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
- g_return_if_fail (selection->tree_view != NULL);
+
+ priv = selection->priv;
+
+ g_return_if_fail (priv->tree_view != NULL);
g_return_if_fail (path != NULL);
- ret = _gtk_tree_view_find_node (selection->tree_view,
+ ret = _gtk_tree_view_find_node (priv->tree_view,
path,
&tree,
&node);
ret == TRUE)
return;
- if (selection->type == GTK_SELECTION_MULTIPLE)
+ if (priv->type == GTK_SELECTION_MULTIPLE)
mode = GTK_TREE_SELECT_MODE_TOGGLE;
_gtk_tree_selection_internal_select_node (selection,
gtk_tree_selection_unselect_path (GtkTreeSelection *selection,
GtkTreePath *path)
{
+ GtkTreeSelectionPrivate *priv;
GtkRBNode *node;
GtkRBTree *tree;
gboolean ret;
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
- g_return_if_fail (selection->tree_view != NULL);
+
+ priv = selection->priv;
+
+ g_return_if_fail (priv->tree_view != NULL);
g_return_if_fail (path != NULL);
- ret = _gtk_tree_view_find_node (selection->tree_view,
+ ret = _gtk_tree_view_find_node (priv->tree_view,
path,
&tree,
&node);
gtk_tree_selection_select_iter (GtkTreeSelection *selection,
GtkTreeIter *iter)
{
+ GtkTreeSelectionPrivate *priv;
GtkTreePath *path;
+ GtkTreeModel *model;
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);
+
+ priv = selection->priv;
+
+ g_return_if_fail (priv->tree_view != NULL);
+
+ model = gtk_tree_view_get_model (priv->tree_view);
+ g_return_if_fail (model != NULL);
g_return_if_fail (iter != NULL);
- path = gtk_tree_model_get_path (selection->tree_view->priv->model,
- iter);
+ path = gtk_tree_model_get_path (model, iter);
if (path == NULL)
return;
gtk_tree_selection_unselect_iter (GtkTreeSelection *selection,
GtkTreeIter *iter)
{
+ GtkTreeSelectionPrivate *priv;
GtkTreePath *path;
+ GtkTreeModel *model;
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);
+
+ priv = selection->priv;
+
+ g_return_if_fail (priv->tree_view != NULL);
+
+ model = gtk_tree_view_get_model (priv->tree_view);
+ g_return_if_fail (model != NULL);
g_return_if_fail (iter != NULL);
- path = gtk_tree_model_get_path (selection->tree_view->priv->model,
- iter);
+ path = gtk_tree_model_get_path (model, iter);
if (path == NULL)
return;
gtk_tree_selection_path_is_selected (GtkTreeSelection *selection,
GtkTreePath *path)
{
+ GtkTreeSelectionPrivate *priv;
GtkRBNode *node;
GtkRBTree *tree;
gboolean ret;
g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), FALSE);
+
+ priv = selection->priv;
+
g_return_val_if_fail (path != NULL, FALSE);
- g_return_val_if_fail (selection->tree_view != NULL, FALSE);
+ g_return_val_if_fail (priv->tree_view != NULL, FALSE);
- if (selection->tree_view->priv->model == NULL)
+ if (gtk_tree_view_get_model (priv->tree_view) == NULL)
return FALSE;
- ret = _gtk_tree_view_find_node (selection->tree_view,
+ ret = _gtk_tree_view_find_node (priv->tree_view,
path,
&tree,
&node);
gtk_tree_selection_iter_is_selected (GtkTreeSelection *selection,
GtkTreeIter *iter)
{
+ GtkTreeSelectionPrivate *priv;
GtkTreePath *path;
+ GtkTreeModel *model;
gboolean retval;
g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), FALSE);
+
+ priv = selection->priv;
+
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);
+ g_return_val_if_fail (priv->tree_view != NULL, FALSE);
+
+ model = gtk_tree_view_get_model (priv->tree_view);
+ g_return_val_if_fail (model != NULL, FALSE);
- path = gtk_tree_model_get_path (selection->tree_view->priv->model, iter);
+ path = gtk_tree_model_get_path (model, iter);
if (path == NULL)
return FALSE;
static gint
gtk_tree_selection_real_select_all (GtkTreeSelection *selection)
{
+ GtkTreeSelectionPrivate *priv = selection->priv;
struct _TempTuple *tuple;
+ GtkRBTree *tree;
+
+ tree = _gtk_tree_view_get_rbtree (priv->tree_view);
- if (selection->tree_view->priv->tree == NULL)
+ if (tree == NULL)
return FALSE;
/* Mark all nodes selected */
tuple->selection = selection;
tuple->dirty = FALSE;
- _gtk_rbtree_traverse (selection->tree_view->priv->tree,
- selection->tree_view->priv->tree->root,
+ _gtk_rbtree_traverse (tree, tree->root,
G_PRE_ORDER,
select_all_helper,
tuple);
void
gtk_tree_selection_select_all (GtkTreeSelection *selection)
{
+ GtkTreeSelectionPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
- g_return_if_fail (selection->tree_view != NULL);
- if (selection->tree_view->priv->tree == NULL || selection->tree_view->priv->model == NULL)
+ priv = selection->priv;
+
+ g_return_if_fail (priv->tree_view != NULL);
+
+ if (_gtk_tree_view_get_rbtree (priv->tree_view) == NULL ||
+ gtk_tree_view_get_model (priv->tree_view) == NULL)
return;
- g_return_if_fail (selection->type == GTK_SELECTION_MULTIPLE);
+ g_return_if_fail (priv->type == GTK_SELECTION_MULTIPLE);
if (gtk_tree_selection_real_select_all (selection))
g_signal_emit (selection, tree_selection_signals[CHANGED], 0);
static gboolean
gtk_tree_selection_real_unselect_all (GtkTreeSelection *selection)
{
+ GtkTreeSelectionPrivate *priv = selection->priv;
struct _TempTuple *tuple;
- if (selection->type == GTK_SELECTION_SINGLE ||
- selection->type == GTK_SELECTION_BROWSE)
+ if (priv->type == GTK_SELECTION_SINGLE ||
+ priv->type == GTK_SELECTION_BROWSE)
{
GtkRBTree *tree = NULL;
GtkRBNode *node = NULL;
GtkTreePath *anchor_path;
- if (selection->tree_view->priv->anchor == NULL)
- return FALSE;
-
- anchor_path = gtk_tree_row_reference_get_path (selection->tree_view->priv->anchor);
+ anchor_path = _gtk_tree_view_get_anchor_path (priv->tree_view);
if (anchor_path == NULL)
return FALSE;
- _gtk_tree_view_find_node (selection->tree_view,
+ _gtk_tree_view_find_node (priv->tree_view,
anchor_path,
&tree,
&node);
{
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;
+ _gtk_tree_view_set_anchor_path (priv->tree_view, NULL);
return TRUE;
}
}
}
else
{
+ GtkRBTree *tree;
+
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,
+ tree = _gtk_tree_view_get_rbtree (priv->tree_view);
+ _gtk_rbtree_traverse (tree, tree->root,
G_PRE_ORDER,
unselect_all_helper,
tuple);
void
gtk_tree_selection_unselect_all (GtkTreeSelection *selection)
{
+ GtkTreeSelectionPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
- g_return_if_fail (selection->tree_view != NULL);
- if (selection->tree_view->priv->tree == NULL || selection->tree_view->priv->model == NULL)
+ priv = selection->priv;
+
+ g_return_if_fail (priv->tree_view != NULL);
+
+ if (_gtk_tree_view_get_rbtree (priv->tree_view) == NULL ||
+ gtk_tree_view_get_model (priv->tree_view) == NULL)
return;
if (gtk_tree_selection_real_unselect_all (selection))
GtkTreePath *start_path,
GtkTreePath *end_path)
{
+ GtkTreeSelectionPrivate *priv = selection->priv;
GtkRBNode *start_node, *end_node;
GtkRBTree *start_tree, *end_tree;
GtkTreePath *anchor_path = NULL;
switch (gtk_tree_path_compare (start_path, end_path))
{
case 1:
- _gtk_tree_view_find_node (selection->tree_view,
+ _gtk_tree_view_find_node (priv->tree_view,
end_path,
&start_tree,
&start_node);
- _gtk_tree_view_find_node (selection->tree_view,
+ _gtk_tree_view_find_node (priv->tree_view,
start_path,
&end_tree,
&end_node);
anchor_path = start_path;
break;
case 0:
- _gtk_tree_view_find_node (selection->tree_view,
+ _gtk_tree_view_find_node (priv->tree_view,
start_path,
&start_tree,
&start_node);
anchor_path = start_path;
break;
case -1:
- _gtk_tree_view_find_node (selection->tree_view,
+ _gtk_tree_view_find_node (priv->tree_view,
start_path,
&start_tree,
&start_node);
- _gtk_tree_view_find_node (selection->tree_view,
+ _gtk_tree_view_find_node (priv->tree_view,
end_path,
&end_tree,
&end_node);
g_return_val_if_fail (end_node != NULL, FALSE);
if (anchor_path)
- {
- 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,
- anchor_path);
- }
+ _gtk_tree_view_set_anchor_path (priv->tree_view, anchor_path);
do
{
if (start_node->children)
{
start_tree = start_node->children;
- start_node = start_tree->root;
- while (start_node->left != start_tree->nil)
- start_node = start_node->left;
+ start_node = _gtk_rbtree_first (start_tree);
}
else
{
GtkTreePath *start_path,
GtkTreePath *end_path)
{
+ GtkTreeSelectionPrivate *priv;
+
g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
- g_return_if_fail (selection->tree_view != NULL);
- g_return_if_fail (selection->type == GTK_SELECTION_MULTIPLE);
- g_return_if_fail (selection->tree_view->priv->model != NULL);
+
+ priv = selection->priv;
+
+ g_return_if_fail (priv->tree_view != NULL);
+ g_return_if_fail (priv->type == GTK_SELECTION_MULTIPLE);
+ g_return_if_fail (gtk_tree_view_get_model (priv->tree_view) != NULL);
if (gtk_tree_selection_real_modify_range (selection, RANGE_SELECT, start_path, end_path))
g_signal_emit (selection, tree_selection_signals[CHANGED], 0);
GtkTreePath *start_path,
GtkTreePath *end_path)
{
+ GtkTreeSelectionPrivate *priv;
+
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);
+
+ priv = selection->priv;
+
+ g_return_if_fail (priv->tree_view != NULL);
+ g_return_if_fail (gtk_tree_view_get_model (priv->tree_view) != NULL);
if (gtk_tree_selection_real_modify_range (selection, RANGE_UNSELECT, start_path, end_path))
g_signal_emit (selection, tree_selection_signals[CHANGED], 0);
GtkRBNode *node,
GtkTreePath *path)
{
+ GtkTreeSelectionPrivate *priv = selection->priv;
GtkTreeIter iter;
+ GtkTreeModel *model;
+ GtkTreeViewRowSeparatorFunc separator_func;
+ gpointer separator_data;
gboolean sensitive = FALSE;
- if (!gtk_tree_model_get_iter (selection->tree_view->priv->model, &iter, path))
+ model = gtk_tree_view_get_model (priv->tree_view);
+
+ _gtk_tree_view_get_row_separator_func (priv->tree_view,
+ &separator_func, &separator_data);
+
+ if (!gtk_tree_model_get_iter (model, &iter, path))
sensitive = TRUE;
- if (!sensitive && selection->tree_view->priv->row_separator_func)
+ if (!sensitive && separator_func)
{
/* never allow separators to be selected */
- if ((* selection->tree_view->priv->row_separator_func) (selection->tree_view->priv->model,
- &iter,
- selection->tree_view->priv->row_separator_data))
+ if ((* separator_func) (model, &iter, separator_data))
return FALSE;
}
- if (selection->user_func)
- return (*selection->user_func) (selection, selection->tree_view->priv->model, path,
+ if (priv->user_func)
+ return (*priv->user_func) (selection, model, path,
GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED),
- selection->user_data);
+ priv->user_data);
else
return TRUE;
}
GtkTreeSelectMode mode,
gboolean override_browse_mode)
{
+ GtkTreeSelectionPrivate *priv = selection->priv;
gint flags;
gint dirty = FALSE;
GtkTreePath *anchor_path = NULL;
- if (selection->type == GTK_SELECTION_NONE)
+ if (priv->type == GTK_SELECTION_NONE)
return;
- if (selection->tree_view->priv->anchor)
- anchor_path = gtk_tree_row_reference_get_path (selection->tree_view->priv->anchor);
+ anchor_path = _gtk_tree_view_get_anchor_path (priv->tree_view);
- if (selection->type == GTK_SELECTION_SINGLE ||
- selection->type == GTK_SELECTION_BROWSE)
+ if (priv->type == GTK_SELECTION_SINGLE ||
+ priv->type == GTK_SELECTION_BROWSE)
{
/* just unselect */
- if (selection->type == GTK_SELECTION_BROWSE && override_browse_mode)
+ if (priv->type == GTK_SELECTION_BROWSE && override_browse_mode)
{
dirty = gtk_tree_selection_real_unselect_all (selection);
}
/* Did we try to select the same node again? */
- else if (selection->type == GTK_SELECTION_SINGLE &&
+ else if (priv->type == GTK_SELECTION_SINGLE &&
anchor_path && gtk_tree_path_compare (path, anchor_path) == 0)
{
if ((mode & GTK_TREE_SELECT_MODE_TOGGLE) == GTK_TREE_SELECT_MODE_TOGGLE)
* old one, and can then select the new one */
if (dirty)
{
- if (selection->tree_view->priv->anchor)
- {
- gtk_tree_row_reference_free (selection->tree_view->priv->anchor);
- selection->tree_view->priv->anchor = NULL;
- }
+
+ _gtk_tree_view_set_anchor_path (priv->tree_view, NULL);
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);
- }
+ _gtk_tree_view_set_anchor_path (priv->tree_view, path);
}
}
else
if (gtk_tree_selection_real_select_node (selection, tree, node, TRUE))
{
dirty = TRUE;
- 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);
+ _gtk_tree_view_set_anchor_path (priv->tree_view, path);
}
}
}
}
- else if (selection->type == GTK_SELECTION_MULTIPLE)
+ else if (priv->type == GTK_SELECTION_MULTIPLE)
{
if ((mode & GTK_TREE_SELECT_MODE_EXTEND) == GTK_TREE_SELECT_MODE_EXTEND
&& (anchor_path == NULL))
{
- if (selection->tree_view->priv->anchor)
- gtk_tree_row_reference_free (selection->tree_view->priv->anchor);
+ _gtk_tree_view_set_anchor_path (priv->tree_view, path);
- 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 ((mode & (GTK_TREE_SELECT_MODE_EXTEND | GTK_TREE_SELECT_MODE_TOGGLE)) == (GTK_TREE_SELECT_MODE_EXTEND | GTK_TREE_SELECT_MODE_TOGGLE))
else if ((mode & GTK_TREE_SELECT_MODE_TOGGLE) == GTK_TREE_SELECT_MODE_TOGGLE)
{
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);
+ _gtk_tree_view_set_anchor_path (priv->tree_view, path);
if ((flags & GTK_RBNODE_IS_SELECTED) == GTK_RBNODE_IS_SELECTED)
dirty |= gtk_tree_selection_real_select_node (selection, tree, node, FALSE);
{
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);
+ _gtk_tree_view_set_anchor_path (priv->tree_view, path);
dirty |= gtk_tree_selection_real_select_node (selection, tree, node, TRUE);
}
GtkRBNode *node,
gboolean select)
{
+ GtkTreeSelectionPrivate *priv = selection->priv;
gboolean toggle = 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);
+ path = _gtk_tree_path_new_from_rbtree (tree, node);
toggle = _gtk_tree_selection_row_is_selectable (selection, node, path);
gtk_tree_path_free (path);
}
if (toggle)
{
- node->flags ^= GTK_RBNODE_IS_SELECTED;
+ if (!GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
+ {
+ GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_SELECTED);
+ _gtk_tree_view_accessible_add_state (priv->tree_view, tree, node, GTK_CELL_RENDERER_SELECTED);
+ }
+ else
+ {
+ GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_IS_SELECTED);
+ _gtk_tree_view_accessible_remove_state (priv->tree_view, tree, node, GTK_CELL_RENDERER_SELECTED);
+ }
+
+ _gtk_tree_view_queue_draw_node (priv->tree_view, tree, node, NULL);
- _gtk_tree_view_queue_draw_node (selection->tree_view, tree, node, NULL);
-
return TRUE;
}
projects / ~andy / gtk / blobdiff