2000-10-05 01:04:57 +00:00
|
|
|
/* gtkrbtree.c
|
|
|
|
* Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <jrb@redhat.com>
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2004-03-06 03:38:59 +00:00
|
|
|
#include <config.h>
|
2000-10-05 01:04:57 +00:00
|
|
|
#include "gtkrbtree.h"
|
2001-01-09 17:45:34 +00:00
|
|
|
#include "gtkdebug.h"
|
2005-03-20 07:01:23 +00:00
|
|
|
#include "gtkalias.h"
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
static void _gtk_rbnode_validate_allocator (GAllocator *allocator);
|
|
|
|
static GtkRBNode * _gtk_rbnode_new (GtkRBTree *tree,
|
|
|
|
gint height);
|
|
|
|
static void _gtk_rbnode_free (GtkRBNode *node);
|
|
|
|
static void _gtk_rbnode_rotate_left (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node);
|
|
|
|
static void _gtk_rbnode_rotate_right (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node);
|
|
|
|
static void _gtk_rbtree_insert_fixup (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node);
|
|
|
|
static void _gtk_rbtree_remove_node_fixup (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node);
|
|
|
|
static gint _count_nodes (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node);
|
|
|
|
static inline void _fixup_validation (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node);
|
2001-12-10 21:24:15 +00:00
|
|
|
static inline void _fixup_parity (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node);
|
2001-12-08 01:10:52 +00:00
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* node allocation
|
|
|
|
*/
|
|
|
|
struct _GAllocator /* from gmem.c */
|
|
|
|
{
|
|
|
|
gchar *name;
|
|
|
|
guint16 n_preallocs;
|
|
|
|
guint is_unused : 1;
|
|
|
|
guint type : 4;
|
|
|
|
GAllocator *last;
|
|
|
|
GMemChunk *mem_chunk;
|
|
|
|
GtkRBNode *free_nodes; /* implementation specific */
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
G_LOCK_DEFINE_STATIC (current_allocator);
|
|
|
|
static GAllocator *current_allocator = NULL;
|
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
/* HOLDS: current_allocator_lock */
|
|
|
|
static void
|
|
|
|
_gtk_rbnode_validate_allocator (GAllocator *allocator)
|
|
|
|
{
|
|
|
|
g_return_if_fail (allocator != NULL);
|
|
|
|
g_return_if_fail (allocator->is_unused == TRUE);
|
|
|
|
|
|
|
|
if (allocator->type != G_ALLOCATOR_NODE)
|
|
|
|
{
|
|
|
|
allocator->type = G_ALLOCATOR_NODE;
|
|
|
|
if (allocator->mem_chunk)
|
|
|
|
{
|
|
|
|
g_mem_chunk_destroy (allocator->mem_chunk);
|
|
|
|
allocator->mem_chunk = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!allocator->mem_chunk)
|
|
|
|
{
|
|
|
|
allocator->mem_chunk = g_mem_chunk_new (allocator->name,
|
|
|
|
sizeof (GtkRBNode),
|
|
|
|
sizeof (GtkRBNode) * allocator->n_preallocs,
|
|
|
|
G_ALLOC_ONLY);
|
|
|
|
allocator->free_nodes = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
allocator->is_unused = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static GtkRBNode *
|
|
|
|
_gtk_rbnode_new (GtkRBTree *tree,
|
|
|
|
gint height)
|
|
|
|
{
|
|
|
|
GtkRBNode *node;
|
|
|
|
|
|
|
|
G_LOCK (current_allocator);
|
|
|
|
if (!current_allocator)
|
|
|
|
{
|
|
|
|
GAllocator *allocator = g_allocator_new ("GTK+ default GtkRBNode allocator",
|
|
|
|
128);
|
|
|
|
_gtk_rbnode_validate_allocator (allocator);
|
|
|
|
allocator->last = NULL;
|
|
|
|
current_allocator = allocator;
|
|
|
|
}
|
|
|
|
if (!current_allocator->free_nodes)
|
|
|
|
node = g_chunk_new (GtkRBNode, current_allocator->mem_chunk);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
node = current_allocator->free_nodes;
|
|
|
|
current_allocator->free_nodes = node->left;
|
|
|
|
}
|
|
|
|
G_UNLOCK (current_allocator);
|
|
|
|
|
|
|
|
node->left = tree->nil;
|
|
|
|
node->right = tree->nil;
|
|
|
|
node->parent = tree->nil;
|
|
|
|
node->flags = GTK_RBNODE_RED;
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
node->parity = 1;
|
2000-10-05 01:04:57 +00:00
|
|
|
node->count = 1;
|
|
|
|
node->children = NULL;
|
|
|
|
node->offset = height;
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_gtk_rbnode_free (GtkRBNode *node)
|
|
|
|
{
|
|
|
|
G_LOCK (current_allocator);
|
|
|
|
node->left = current_allocator->free_nodes;
|
|
|
|
current_allocator->free_nodes = node;
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
if (gtk_debug_flags & GTK_DEBUG_TREE)
|
|
|
|
{
|
|
|
|
/* unfortunately node->left has to continue to point to
|
|
|
|
* a node...
|
|
|
|
*/
|
|
|
|
node->right = (gpointer) 0xdeadbeef;
|
|
|
|
node->parent = (gpointer) 0xdeadbeef;
|
|
|
|
node->offset = 56789;
|
|
|
|
node->count = 56789;
|
|
|
|
node->flags = 0;
|
|
|
|
}
|
2000-10-05 01:04:57 +00:00
|
|
|
G_UNLOCK (current_allocator);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_gtk_rbnode_rotate_left (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
gint node_height, right_height;
|
|
|
|
GtkRBNode *right = node->right;
|
|
|
|
|
|
|
|
g_return_if_fail (node != tree->nil);
|
|
|
|
|
|
|
|
node_height = node->offset -
|
|
|
|
(node->left?node->left->offset:0) -
|
|
|
|
(node->right?node->right->offset:0) -
|
|
|
|
(node->children?node->children->root->offset:0);
|
|
|
|
right_height = right->offset -
|
|
|
|
(right->left?right->left->offset:0) -
|
|
|
|
(right->right?right->right->offset:0) -
|
|
|
|
(right->children?right->children->root->offset:0);
|
|
|
|
node->right = right->left;
|
|
|
|
if (right->left != tree->nil)
|
|
|
|
right->left->parent = node;
|
|
|
|
|
|
|
|
if (right != tree->nil)
|
|
|
|
right->parent = node->parent;
|
|
|
|
if (node->parent != tree->nil)
|
|
|
|
{
|
|
|
|
if (node == node->parent->left)
|
|
|
|
node->parent->left = right;
|
|
|
|
else
|
|
|
|
node->parent->right = right;
|
|
|
|
} else {
|
|
|
|
tree->root = right;
|
|
|
|
}
|
|
|
|
|
|
|
|
right->left = node;
|
|
|
|
if (node != tree->nil)
|
|
|
|
node->parent = right;
|
|
|
|
|
|
|
|
node->count = 1 + (node->left?node->left->count:0) +
|
|
|
|
(node->right?node->right->count:0);
|
|
|
|
right->count = 1 + (right->left?right->left->count:0) +
|
|
|
|
(right->right?right->right->count:0);
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
node->offset = node_height +
|
|
|
|
(node->left?node->left->offset:0) +
|
|
|
|
(node->right?node->right->offset:0) +
|
|
|
|
(node->children?node->children->root->offset:0);
|
|
|
|
right->offset = right_height +
|
|
|
|
(right->left?right->left->offset:0) +
|
|
|
|
(right->right?right->right->offset:0) +
|
|
|
|
(right->children?right->children->root->offset:0);
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
_fixup_validation (tree, node);
|
|
|
|
_fixup_validation (tree, right);
|
2001-12-10 21:24:15 +00:00
|
|
|
_fixup_parity (tree, node);
|
|
|
|
_fixup_parity (tree, right);
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_gtk_rbnode_rotate_right (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
gint node_height, left_height;
|
|
|
|
GtkRBNode *left = node->left;
|
|
|
|
|
|
|
|
g_return_if_fail (node != tree->nil);
|
|
|
|
|
|
|
|
node_height = node->offset -
|
|
|
|
(node->left?node->left->offset:0) -
|
|
|
|
(node->right?node->right->offset:0) -
|
|
|
|
(node->children?node->children->root->offset:0);
|
|
|
|
left_height = left->offset -
|
|
|
|
(left->left?left->left->offset:0) -
|
|
|
|
(left->right?left->right->offset:0) -
|
|
|
|
(left->children?left->children->root->offset:0);
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
node->left = left->right;
|
|
|
|
if (left->right != tree->nil)
|
|
|
|
left->right->parent = node;
|
|
|
|
|
|
|
|
if (left != tree->nil)
|
|
|
|
left->parent = node->parent;
|
|
|
|
if (node->parent != tree->nil)
|
|
|
|
{
|
|
|
|
if (node == node->parent->right)
|
|
|
|
node->parent->right = left;
|
|
|
|
else
|
|
|
|
node->parent->left = left;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
tree->root = left;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* link node and left */
|
|
|
|
left->right = node;
|
|
|
|
if (node != tree->nil)
|
|
|
|
node->parent = left;
|
|
|
|
|
|
|
|
node->count = 1 + (node->left?node->left->count:0) +
|
|
|
|
(node->right?node->right->count:0);
|
|
|
|
left->count = 1 + (left->left?left->left->count:0) +
|
|
|
|
(left->right?left->right->count:0);
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
node->offset = node_height +
|
|
|
|
(node->left?node->left->offset:0) +
|
|
|
|
(node->right?node->right->offset:0) +
|
|
|
|
(node->children?node->children->root->offset:0);
|
|
|
|
left->offset = left_height +
|
|
|
|
(left->left?left->left->offset:0) +
|
|
|
|
(left->right?left->right->offset:0) +
|
|
|
|
(left->children?left->children->root->offset:0);
|
2001-10-25 20:32:40 +00:00
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
_fixup_validation (tree, node);
|
|
|
|
_fixup_validation (tree, left);
|
2001-12-10 21:24:15 +00:00
|
|
|
_fixup_parity (tree, node);
|
|
|
|
_fixup_parity (tree, left);
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_gtk_rbtree_insert_fixup (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
|
|
|
|
/* check Red-Black properties */
|
|
|
|
while (node != tree->root && GTK_RBNODE_GET_COLOR (node->parent) == GTK_RBNODE_RED)
|
|
|
|
{
|
|
|
|
/* we have a violation */
|
|
|
|
if (node->parent == node->parent->parent->left)
|
|
|
|
{
|
|
|
|
GtkRBNode *y = node->parent->parent->right;
|
|
|
|
if (GTK_RBNODE_GET_COLOR (y) == GTK_RBNODE_RED)
|
|
|
|
{
|
|
|
|
/* uncle is GTK_RBNODE_RED */
|
|
|
|
GTK_RBNODE_SET_COLOR (node->parent, GTK_RBNODE_BLACK);
|
|
|
|
GTK_RBNODE_SET_COLOR (y, GTK_RBNODE_BLACK);
|
|
|
|
GTK_RBNODE_SET_COLOR (node->parent->parent, GTK_RBNODE_RED);
|
|
|
|
node = node->parent->parent;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* uncle is GTK_RBNODE_BLACK */
|
|
|
|
if (node == node->parent->right)
|
|
|
|
{
|
|
|
|
/* make node a left child */
|
|
|
|
node = node->parent;
|
|
|
|
_gtk_rbnode_rotate_left (tree, node);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* recolor and rotate */
|
|
|
|
GTK_RBNODE_SET_COLOR (node->parent, GTK_RBNODE_BLACK);
|
|
|
|
GTK_RBNODE_SET_COLOR (node->parent->parent, GTK_RBNODE_RED);
|
|
|
|
_gtk_rbnode_rotate_right(tree, node->parent->parent);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* mirror image of above code */
|
|
|
|
GtkRBNode *y = node->parent->parent->left;
|
|
|
|
if (GTK_RBNODE_GET_COLOR (y) == GTK_RBNODE_RED)
|
|
|
|
{
|
|
|
|
/* uncle is GTK_RBNODE_RED */
|
|
|
|
GTK_RBNODE_SET_COLOR (node->parent, GTK_RBNODE_BLACK);
|
|
|
|
GTK_RBNODE_SET_COLOR (y, GTK_RBNODE_BLACK);
|
|
|
|
GTK_RBNODE_SET_COLOR (node->parent->parent, GTK_RBNODE_RED);
|
|
|
|
node = node->parent->parent;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* uncle is GTK_RBNODE_BLACK */
|
|
|
|
if (node == node->parent->left)
|
|
|
|
{
|
|
|
|
node = node->parent;
|
|
|
|
_gtk_rbnode_rotate_right (tree, node);
|
|
|
|
}
|
|
|
|
GTK_RBNODE_SET_COLOR (node->parent, GTK_RBNODE_BLACK);
|
|
|
|
GTK_RBNODE_SET_COLOR (node->parent->parent, GTK_RBNODE_RED);
|
|
|
|
_gtk_rbnode_rotate_left (tree, node->parent->parent);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
GTK_RBNODE_SET_COLOR (tree->root, GTK_RBNODE_BLACK);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_gtk_rbtree_remove_node_fixup (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
while (node != tree->root && GTK_RBNODE_GET_COLOR (node) == GTK_RBNODE_BLACK)
|
|
|
|
{
|
|
|
|
if (node == node->parent->left)
|
|
|
|
{
|
|
|
|
GtkRBNode *w = node->parent->right;
|
|
|
|
if (GTK_RBNODE_GET_COLOR (w) == GTK_RBNODE_RED)
|
|
|
|
{
|
|
|
|
GTK_RBNODE_SET_COLOR (w, GTK_RBNODE_BLACK);
|
|
|
|
GTK_RBNODE_SET_COLOR (node->parent, GTK_RBNODE_RED);
|
|
|
|
_gtk_rbnode_rotate_left (tree, node->parent);
|
|
|
|
w = node->parent->right;
|
|
|
|
}
|
|
|
|
if (GTK_RBNODE_GET_COLOR (w->left) == GTK_RBNODE_BLACK && GTK_RBNODE_GET_COLOR (w->right) == GTK_RBNODE_BLACK)
|
|
|
|
{
|
|
|
|
GTK_RBNODE_SET_COLOR (w, GTK_RBNODE_RED);
|
|
|
|
node = node->parent;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (GTK_RBNODE_GET_COLOR (w->right) == GTK_RBNODE_BLACK)
|
|
|
|
{
|
|
|
|
GTK_RBNODE_SET_COLOR (w->left, GTK_RBNODE_BLACK);
|
|
|
|
GTK_RBNODE_SET_COLOR (w, GTK_RBNODE_RED);
|
|
|
|
_gtk_rbnode_rotate_right (tree, w);
|
|
|
|
w = node->parent->right;
|
|
|
|
}
|
|
|
|
GTK_RBNODE_SET_COLOR (w, GTK_RBNODE_GET_COLOR (node->parent));
|
|
|
|
GTK_RBNODE_SET_COLOR (node->parent, GTK_RBNODE_BLACK);
|
|
|
|
GTK_RBNODE_SET_COLOR (w->right, GTK_RBNODE_BLACK);
|
|
|
|
_gtk_rbnode_rotate_left (tree, node->parent);
|
|
|
|
node = tree->root;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
GtkRBNode *w = node->parent->left;
|
|
|
|
if (GTK_RBNODE_GET_COLOR (w) == GTK_RBNODE_RED)
|
|
|
|
{
|
|
|
|
GTK_RBNODE_SET_COLOR (w, GTK_RBNODE_BLACK);
|
|
|
|
GTK_RBNODE_SET_COLOR (node->parent, GTK_RBNODE_RED);
|
|
|
|
_gtk_rbnode_rotate_right (tree, node->parent);
|
|
|
|
w = node->parent->left;
|
|
|
|
}
|
|
|
|
if (GTK_RBNODE_GET_COLOR (w->right) == GTK_RBNODE_BLACK && GTK_RBNODE_GET_COLOR (w->left) == GTK_RBNODE_BLACK)
|
|
|
|
{
|
|
|
|
GTK_RBNODE_SET_COLOR (w, GTK_RBNODE_RED);
|
|
|
|
node = node->parent;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (GTK_RBNODE_GET_COLOR (w->left) == GTK_RBNODE_BLACK)
|
|
|
|
{
|
|
|
|
GTK_RBNODE_SET_COLOR (w->right, GTK_RBNODE_BLACK);
|
|
|
|
GTK_RBNODE_SET_COLOR (w, GTK_RBNODE_RED);
|
|
|
|
_gtk_rbnode_rotate_left (tree, w);
|
|
|
|
w = node->parent->left;
|
|
|
|
}
|
|
|
|
GTK_RBNODE_SET_COLOR (w, GTK_RBNODE_GET_COLOR (node->parent));
|
|
|
|
GTK_RBNODE_SET_COLOR (node->parent, GTK_RBNODE_BLACK);
|
|
|
|
GTK_RBNODE_SET_COLOR (w->left, GTK_RBNODE_BLACK);
|
|
|
|
_gtk_rbnode_rotate_right (tree, node->parent);
|
|
|
|
node = tree->root;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
GTK_RBNODE_SET_COLOR (node, GTK_RBNODE_BLACK);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Public functions */
|
|
|
|
void
|
|
|
|
_gtk_rbnode_push_allocator (GAllocator *allocator)
|
|
|
|
{
|
|
|
|
G_LOCK (current_allocator);
|
|
|
|
_gtk_rbnode_validate_allocator ( allocator );
|
|
|
|
allocator->last = current_allocator;
|
|
|
|
current_allocator = allocator;
|
|
|
|
G_UNLOCK (current_allocator);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_gtk_rbnode_pop_allocator (void)
|
|
|
|
{
|
|
|
|
G_LOCK (current_allocator);
|
|
|
|
if (current_allocator)
|
|
|
|
{
|
|
|
|
GAllocator *allocator;
|
|
|
|
|
|
|
|
allocator = current_allocator;
|
|
|
|
current_allocator = allocator->last;
|
|
|
|
allocator->last = NULL;
|
|
|
|
allocator->is_unused = TRUE;
|
|
|
|
}
|
|
|
|
G_UNLOCK (current_allocator);
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkRBTree *
|
|
|
|
_gtk_rbtree_new (void)
|
|
|
|
{
|
|
|
|
GtkRBTree *retval;
|
|
|
|
|
|
|
|
retval = (GtkRBTree *) g_new (GtkRBTree, 1);
|
|
|
|
retval->parent_tree = NULL;
|
|
|
|
retval->parent_node = NULL;
|
|
|
|
|
|
|
|
retval->nil = g_new0 (GtkRBNode, 1);
|
|
|
|
retval->nil->left = NULL;
|
|
|
|
retval->nil->right = NULL;
|
|
|
|
retval->nil->parent = NULL;
|
|
|
|
retval->nil->flags = GTK_RBNODE_BLACK;
|
|
|
|
retval->nil->count = 0;
|
|
|
|
retval->nil->offset = 0;
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
retval->nil->parity = 0;
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
retval->root = retval->nil;
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_gtk_rbtree_free_helper (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
if (node->children)
|
|
|
|
_gtk_rbtree_free (node->children);
|
|
|
|
|
|
|
|
_gtk_rbnode_free (node);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_gtk_rbtree_free (GtkRBTree *tree)
|
|
|
|
{
|
|
|
|
_gtk_rbtree_traverse (tree,
|
|
|
|
tree->root,
|
|
|
|
G_POST_ORDER,
|
|
|
|
_gtk_rbtree_free_helper,
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
if (tree->parent_node &&
|
|
|
|
tree->parent_node->children == tree)
|
|
|
|
tree->parent_node->children = NULL;
|
|
|
|
_gtk_rbnode_free (tree->nil);
|
|
|
|
g_free (tree);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_gtk_rbtree_remove (GtkRBTree *tree)
|
|
|
|
{
|
|
|
|
GtkRBTree *tmp_tree;
|
|
|
|
GtkRBNode *tmp_node;
|
|
|
|
|
|
|
|
gint height = tree->root->offset;
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
2002-05-16 21:37:49 +00:00
|
|
|
#ifdef G_ENABLE_DEBUG
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
if (gtk_debug_flags & GTK_DEBUG_TREE)
|
|
|
|
_gtk_rbtree_test (G_STRLOC, tree);
|
2002-05-16 21:37:49 +00:00
|
|
|
#endif
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
tmp_tree = tree->parent_tree;
|
|
|
|
tmp_node = tree->parent_node;
|
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
/* ugly hack to make _fixup_validation work in the first iteration of the
|
|
|
|
* loop below */
|
|
|
|
GTK_RBNODE_UNSET_FLAG (tree->root, GTK_RBNODE_DESCENDANTS_INVALID);
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
while (tmp_tree && tmp_node && tmp_node != tmp_tree->nil)
|
|
|
|
{
|
2001-12-08 01:10:52 +00:00
|
|
|
_fixup_validation (tmp_tree, tmp_node);
|
2000-10-05 01:04:57 +00:00
|
|
|
tmp_node->offset -= height;
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
|
|
|
/* If the removed tree was odd, flip all parents */
|
|
|
|
if (tree->root->parity)
|
|
|
|
tmp_node->parity = !tmp_node->parity;
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
tmp_node = tmp_node->parent;
|
|
|
|
if (tmp_node == tmp_tree->nil)
|
|
|
|
{
|
|
|
|
tmp_node = tmp_tree->parent_node;
|
|
|
|
tmp_tree = tmp_tree->parent_tree;
|
|
|
|
}
|
|
|
|
}
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
|
|
|
tmp_tree = tree->parent_tree;
|
2001-10-01 18:12:34 +00:00
|
|
|
tmp_node = tree->parent_node;
|
2000-10-05 01:04:57 +00:00
|
|
|
_gtk_rbtree_free (tree);
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
2002-05-16 21:37:49 +00:00
|
|
|
#ifdef G_ENABLE_DEBUG
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
if (gtk_debug_flags & GTK_DEBUG_TREE)
|
|
|
|
_gtk_rbtree_test (G_STRLOC, tmp_tree);
|
2002-05-16 21:37:49 +00:00
|
|
|
#endif
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
GtkRBNode *
|
2001-12-04 23:49:57 +00:00
|
|
|
_gtk_rbtree_insert_after (GtkRBTree *tree,
|
|
|
|
GtkRBNode *current,
|
|
|
|
gint height,
|
|
|
|
gboolean valid)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
|
|
|
GtkRBNode *node;
|
|
|
|
gboolean right = TRUE;
|
|
|
|
GtkRBNode *tmp_node;
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
GtkRBTree *tmp_tree;
|
2000-10-05 01:04:57 +00:00
|
|
|
|
2002-05-16 19:11:43 +00:00
|
|
|
#ifdef G_ENABLE_DEBUG
|
2001-12-08 20:14:15 +00:00
|
|
|
if (gtk_debug_flags & GTK_DEBUG_TREE)
|
|
|
|
{
|
2002-05-16 19:11:43 +00:00
|
|
|
g_print ("\n\n_gtk_rbtree_insert_after: %p\n", current);
|
2001-12-08 20:14:15 +00:00
|
|
|
_gtk_rbtree_debug_spew (tree);
|
|
|
|
_gtk_rbtree_test (G_STRLOC, tree);
|
|
|
|
}
|
2002-05-16 19:11:43 +00:00
|
|
|
#endif /* G_ENABLE_DEBUG */
|
2001-12-08 20:14:15 +00:00
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
if (current != NULL && current->right != tree->nil)
|
|
|
|
{
|
|
|
|
current = current->right;
|
|
|
|
while (current->left != tree->nil)
|
|
|
|
current = current->left;
|
|
|
|
right = FALSE;
|
|
|
|
}
|
|
|
|
/* setup new node */
|
|
|
|
node = _gtk_rbnode_new (tree, height);
|
|
|
|
node->parent = (current?current:tree->nil);
|
|
|
|
|
|
|
|
/* insert node in tree */
|
|
|
|
if (current)
|
|
|
|
{
|
|
|
|
if (right)
|
|
|
|
current->right = node;
|
|
|
|
else
|
|
|
|
current->left = node;
|
|
|
|
tmp_node = node->parent;
|
|
|
|
tmp_tree = tree;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
tree->root = node;
|
|
|
|
tmp_node = tree->parent_node;
|
|
|
|
tmp_tree = tree->parent_tree;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (tmp_tree && tmp_node && tmp_node != tmp_tree->nil)
|
|
|
|
{
|
|
|
|
/* We only want to propagate the count if we are in the tree we
|
|
|
|
* started in. */
|
|
|
|
if (tmp_tree == tree)
|
|
|
|
tmp_node->count++;
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
|
|
|
tmp_node->parity += 1;
|
2000-10-05 01:04:57 +00:00
|
|
|
tmp_node->offset += height;
|
|
|
|
tmp_node = tmp_node->parent;
|
|
|
|
if (tmp_node == tmp_tree->nil)
|
|
|
|
{
|
|
|
|
tmp_node = tmp_tree->parent_node;
|
|
|
|
tmp_tree = tmp_tree->parent_tree;
|
|
|
|
}
|
|
|
|
}
|
2001-12-04 23:49:57 +00:00
|
|
|
|
|
|
|
if (valid)
|
|
|
|
_gtk_rbtree_node_mark_valid (tree, node);
|
|
|
|
else
|
|
|
|
_gtk_rbtree_node_mark_invalid (tree, node);
|
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
_gtk_rbtree_insert_fixup (tree, node);
|
|
|
|
|
2002-05-16 19:11:43 +00:00
|
|
|
#ifdef G_ENABLE_DEBUG
|
2001-12-08 01:10:52 +00:00
|
|
|
if (gtk_debug_flags & GTK_DEBUG_TREE)
|
2001-12-08 20:14:15 +00:00
|
|
|
{
|
2001-12-10 21:24:15 +00:00
|
|
|
g_print ("_gtk_rbtree_insert_after finished...\n");
|
2001-12-08 20:14:15 +00:00
|
|
|
_gtk_rbtree_debug_spew (tree);
|
2001-12-10 21:24:15 +00:00
|
|
|
g_print ("\n\n");
|
2001-12-08 20:14:15 +00:00
|
|
|
_gtk_rbtree_test (G_STRLOC, tree);
|
|
|
|
}
|
2002-05-16 19:11:43 +00:00
|
|
|
#endif /* G_ENABLE_DEBUG */
|
2001-12-08 01:10:52 +00:00
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkRBNode *
|
2001-12-04 23:49:57 +00:00
|
|
|
_gtk_rbtree_insert_before (GtkRBTree *tree,
|
|
|
|
GtkRBNode *current,
|
|
|
|
gint height,
|
|
|
|
gboolean valid)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
|
|
|
GtkRBNode *node;
|
|
|
|
gboolean left = TRUE;
|
|
|
|
GtkRBNode *tmp_node;
|
|
|
|
GtkRBTree *tmp_tree;
|
2002-05-16 19:11:43 +00:00
|
|
|
|
|
|
|
#ifdef G_ENABLE_DEBUG
|
2001-12-08 20:14:15 +00:00
|
|
|
if (gtk_debug_flags & GTK_DEBUG_TREE)
|
|
|
|
{
|
2002-05-16 19:11:43 +00:00
|
|
|
g_print ("\n\n_gtk_rbtree_insert_before: %p\n", current);
|
2001-12-08 20:14:15 +00:00
|
|
|
_gtk_rbtree_debug_spew (tree);
|
|
|
|
_gtk_rbtree_test (G_STRLOC, tree);
|
|
|
|
}
|
2002-05-16 19:11:43 +00:00
|
|
|
#endif /* G_ENABLE_DEBUG */
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
if (current != NULL && current->left != tree->nil)
|
|
|
|
{
|
|
|
|
current = current->left;
|
|
|
|
while (current->right != tree->nil)
|
|
|
|
current = current->right;
|
|
|
|
left = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* setup new node */
|
|
|
|
node = _gtk_rbnode_new (tree, height);
|
|
|
|
node->parent = (current?current:tree->nil);
|
|
|
|
|
|
|
|
/* insert node in tree */
|
|
|
|
if (current)
|
|
|
|
{
|
|
|
|
if (left)
|
|
|
|
current->left = node;
|
|
|
|
else
|
|
|
|
current->right = node;
|
|
|
|
tmp_node = node->parent;
|
|
|
|
tmp_tree = tree;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
tree->root = node;
|
|
|
|
tmp_node = tree->parent_node;
|
|
|
|
tmp_tree = tree->parent_tree;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (tmp_tree && tmp_node && tmp_node != tmp_tree->nil)
|
|
|
|
{
|
|
|
|
/* We only want to propagate the count if we are in the tree we
|
|
|
|
* started in. */
|
|
|
|
if (tmp_tree == tree)
|
|
|
|
tmp_node->count++;
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
|
|
|
tmp_node->parity += 1;
|
2000-10-05 01:04:57 +00:00
|
|
|
tmp_node->offset += height;
|
|
|
|
tmp_node = tmp_node->parent;
|
|
|
|
if (tmp_node == tmp_tree->nil)
|
|
|
|
{
|
|
|
|
tmp_node = tmp_tree->parent_node;
|
|
|
|
tmp_tree = tmp_tree->parent_tree;
|
|
|
|
}
|
|
|
|
}
|
2001-12-04 23:49:57 +00:00
|
|
|
|
|
|
|
if (valid)
|
|
|
|
_gtk_rbtree_node_mark_valid (tree, node);
|
|
|
|
else
|
|
|
|
_gtk_rbtree_node_mark_invalid (tree, node);
|
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
_gtk_rbtree_insert_fixup (tree, node);
|
|
|
|
|
2002-05-16 19:11:43 +00:00
|
|
|
#ifdef G_ENABLE_DEBUG
|
2001-12-08 01:10:52 +00:00
|
|
|
if (gtk_debug_flags & GTK_DEBUG_TREE)
|
2001-12-08 20:14:15 +00:00
|
|
|
{
|
2001-12-10 21:24:15 +00:00
|
|
|
g_print ("_gtk_rbtree_insert_before finished...\n");
|
2001-12-08 20:14:15 +00:00
|
|
|
_gtk_rbtree_debug_spew (tree);
|
2001-12-10 21:24:15 +00:00
|
|
|
g_print ("\n\n");
|
2001-12-08 20:14:15 +00:00
|
|
|
_gtk_rbtree_test (G_STRLOC, tree);
|
|
|
|
}
|
2002-05-16 19:11:43 +00:00
|
|
|
#endif /* G_ENABLE_DEBUG */
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkRBNode *
|
|
|
|
_gtk_rbtree_find_count (GtkRBTree *tree,
|
|
|
|
gint count)
|
|
|
|
{
|
|
|
|
GtkRBNode *node;
|
|
|
|
|
|
|
|
node = tree->root;
|
|
|
|
while (node != tree->nil && (node->left->count + 1 != count))
|
|
|
|
{
|
|
|
|
if (node->left->count >= count)
|
|
|
|
node = node->left;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
count -= (node->left->count + 1);
|
|
|
|
node = node->right;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (node == tree->nil)
|
|
|
|
return NULL;
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_gtk_rbtree_node_set_height (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node,
|
|
|
|
gint height)
|
|
|
|
{
|
|
|
|
gint diff = height - GTK_RBNODE_GET_HEIGHT (node);
|
|
|
|
GtkRBNode *tmp_node = node;
|
|
|
|
GtkRBTree *tmp_tree = tree;
|
|
|
|
|
|
|
|
if (diff == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
while (tmp_tree && tmp_node && tmp_node != tmp_tree->nil)
|
|
|
|
{
|
|
|
|
tmp_node->offset += diff;
|
|
|
|
tmp_node = tmp_node->parent;
|
|
|
|
if (tmp_node == tmp_tree->nil)
|
|
|
|
{
|
|
|
|
tmp_node = tmp_tree->parent_node;
|
|
|
|
tmp_tree = tmp_tree->parent_tree;
|
|
|
|
}
|
|
|
|
}
|
2002-05-16 21:37:49 +00:00
|
|
|
#ifdef G_ENABLE_DEBUG
|
2001-12-08 01:10:52 +00:00
|
|
|
if (gtk_debug_flags & GTK_DEBUG_TREE)
|
|
|
|
_gtk_rbtree_test (G_STRLOC, tree);
|
2002-05-16 21:37:49 +00:00
|
|
|
#endif
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
2001-10-25 20:32:40 +00:00
|
|
|
void
|
|
|
|
_gtk_rbtree_node_mark_invalid (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID))
|
|
|
|
return;
|
|
|
|
|
|
|
|
GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_INVALID);
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_DESCENDANTS_INVALID))
|
|
|
|
return;
|
|
|
|
GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_DESCENDANTS_INVALID);
|
|
|
|
node = node->parent;
|
2001-12-08 01:10:52 +00:00
|
|
|
if (node == tree->nil)
|
2001-10-25 20:32:40 +00:00
|
|
|
{
|
|
|
|
node = tree->parent_node;
|
|
|
|
tree = tree->parent_tree;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (node);
|
|
|
|
}
|
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
#if 0
|
|
|
|
/* Draconian version. */
|
|
|
|
void
|
|
|
|
_gtk_rbtree_node_mark_invalid (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_INVALID);
|
|
|
|
do
|
|
|
|
{
|
|
|
|
_fixup_validation (tree, node);
|
|
|
|
node = node->parent;
|
|
|
|
if (node == tree->nil)
|
|
|
|
{
|
|
|
|
node = tree->parent_node;
|
|
|
|
tree = tree->parent_tree;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (node);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2001-10-25 20:32:40 +00:00
|
|
|
void
|
|
|
|
_gtk_rbtree_node_mark_valid (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
2001-12-04 23:49:57 +00:00
|
|
|
if ((!GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID)) &&
|
|
|
|
(!GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID)))
|
2001-10-25 20:32:40 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_INVALID);
|
2001-12-04 23:49:57 +00:00
|
|
|
GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_COLUMN_INVALID);
|
|
|
|
|
2001-10-25 20:32:40 +00:00
|
|
|
do
|
|
|
|
{
|
2001-12-04 23:49:57 +00:00
|
|
|
if ((GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID)) ||
|
|
|
|
(GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID)) ||
|
2001-10-25 20:32:40 +00:00
|
|
|
(node->children && GTK_RBNODE_FLAG_SET (node->children->root, GTK_RBNODE_DESCENDANTS_INVALID)) ||
|
2001-12-04 23:49:57 +00:00
|
|
|
(node->left != tree->nil && GTK_RBNODE_FLAG_SET (node->left, GTK_RBNODE_DESCENDANTS_INVALID)) ||
|
|
|
|
(node->right != tree->nil && GTK_RBNODE_FLAG_SET (node->right, GTK_RBNODE_DESCENDANTS_INVALID)))
|
2001-10-25 20:32:40 +00:00
|
|
|
return;
|
2001-12-04 23:49:57 +00:00
|
|
|
|
2001-10-25 20:32:40 +00:00
|
|
|
GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_DESCENDANTS_INVALID);
|
|
|
|
node = node->parent;
|
2001-12-08 01:10:52 +00:00
|
|
|
if (node == tree->nil)
|
2001-10-25 20:32:40 +00:00
|
|
|
{
|
|
|
|
node = tree->parent_node;
|
|
|
|
tree = tree->parent_tree;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (node);
|
|
|
|
}
|
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
#if 0
|
|
|
|
/* Draconian version */
|
|
|
|
void
|
|
|
|
_gtk_rbtree_node_mark_valid (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_INVALID);
|
|
|
|
GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_COLUMN_INVALID);
|
2001-12-04 23:49:57 +00:00
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
do
|
|
|
|
{
|
|
|
|
_fixup_validation (tree, node);
|
|
|
|
node = node->parent;
|
|
|
|
if (node == tree->nil)
|
|
|
|
{
|
|
|
|
node = tree->parent_node;
|
|
|
|
tree = tree->parent_tree;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (node);
|
|
|
|
}
|
|
|
|
#endif
|
2001-12-04 23:49:57 +00:00
|
|
|
/* Assume tree is the root node as it doesn't set DESCENDANTS_INVALID above.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
_gtk_rbtree_column_invalid (GtkRBTree *tree)
|
|
|
|
{
|
|
|
|
GtkRBNode *node;
|
|
|
|
|
|
|
|
if (tree == NULL)
|
|
|
|
return;
|
|
|
|
node = tree->root;
|
|
|
|
g_assert (node);
|
|
|
|
|
|
|
|
while (node->left != tree->nil)
|
|
|
|
node = node->left;
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (! (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID)))
|
|
|
|
GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_COLUMN_INVALID);
|
|
|
|
GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_DESCENDANTS_INVALID);
|
|
|
|
|
|
|
|
if (node->children)
|
|
|
|
_gtk_rbtree_column_invalid (node->children);
|
|
|
|
}
|
|
|
|
while ((node = _gtk_rbtree_next (tree, node)) != NULL);
|
|
|
|
}
|
|
|
|
|
2002-01-27 22:21:27 +00:00
|
|
|
void
|
|
|
|
_gtk_rbtree_mark_invalid (GtkRBTree *tree)
|
|
|
|
{
|
|
|
|
GtkRBNode *node;
|
|
|
|
|
|
|
|
if (tree == NULL)
|
|
|
|
return;
|
|
|
|
node = tree->root;
|
|
|
|
g_assert (node);
|
|
|
|
|
|
|
|
while (node->left != tree->nil)
|
|
|
|
node = node->left;
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_INVALID);
|
|
|
|
GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_DESCENDANTS_INVALID);
|
|
|
|
|
|
|
|
if (node->children)
|
|
|
|
_gtk_rbtree_mark_invalid (node->children);
|
|
|
|
}
|
|
|
|
while ((node = _gtk_rbtree_next (tree, node)) != NULL);
|
|
|
|
}
|
|
|
|
|
2002-03-20 22:06:05 +00:00
|
|
|
void
|
|
|
|
_gtk_rbtree_set_fixed_height (GtkRBTree *tree,
|
|
|
|
gint height)
|
|
|
|
{
|
|
|
|
GtkRBNode *node;
|
|
|
|
|
|
|
|
if (tree == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
node = tree->root;
|
|
|
|
g_assert (node);
|
|
|
|
|
|
|
|
while (node->left != tree->nil)
|
|
|
|
node = node->left;
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID))
|
|
|
|
_gtk_rbtree_node_set_height (tree, node, height);
|
|
|
|
|
|
|
|
if (node->children)
|
|
|
|
_gtk_rbtree_set_fixed_height (node->children, height);
|
|
|
|
}
|
|
|
|
while ((node = _gtk_rbtree_next (tree, node)) != NULL);
|
|
|
|
}
|
|
|
|
|
2001-03-28 22:27:20 +00:00
|
|
|
typedef struct _GtkRBReorder
|
|
|
|
{
|
|
|
|
GtkRBTree *children;
|
|
|
|
gint height;
|
|
|
|
gint flags;
|
|
|
|
gint order;
|
2001-03-29 21:30:05 +00:00
|
|
|
gint invert_order;
|
2001-11-02 00:13:30 +00:00
|
|
|
gint parity;
|
2001-03-28 22:27:20 +00:00
|
|
|
} GtkRBReorder;
|
|
|
|
|
|
|
|
static int
|
|
|
|
gtk_rbtree_reorder_sort_func (gconstpointer a,
|
|
|
|
gconstpointer b)
|
|
|
|
{
|
return a value in the range of [-1, 1] instead [0, 1],
Wed Nov 20 19:29:50 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtkrbtree.c (gtk_rbtree_reorder_sort_func): return a value
in the range of [-1, 1] instead [0, 1],
(gtk_rbtree_reorder_invert_func): ditto,
This makes treeview reordering working on platforms as FreeBSD and
solaris, thanks go to Heiner Eichmann for finding this out and
sending in a patch (#98251).
Wed Nov 20 19:27:07 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreestore.c (node_free): only free the data list if
node->data is not NULL,
(gtk_tree_store_remove): free the data list from the node if
needed. (#94728, pointed out by Peter Bloomfield).
Wed Nov 20 19:23:13 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_remove_column): stop editing
and set the edited_column to NULL if edited_column is set.
(#91288, modified patch from Josh Parsons).
Wed Nov 20 19:20:34 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): do a full
redraw if vadjustment->value is bigger than tree_view->priv->height,
(gtk_tree_view_row_deleted): free the row ref if it isn't valid
anymore. (#83726, reported by Robert Kinsella).
2002-11-20 18:15:28 +00:00
|
|
|
return ((GtkRBReorder *) a)->order - ((GtkRBReorder *) b)->order;
|
2001-03-28 22:27:20 +00:00
|
|
|
}
|
|
|
|
|
2001-03-29 21:30:05 +00:00
|
|
|
static int
|
|
|
|
gtk_rbtree_reorder_invert_func (gconstpointer a,
|
|
|
|
gconstpointer b)
|
|
|
|
{
|
return a value in the range of [-1, 1] instead [0, 1],
Wed Nov 20 19:29:50 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtkrbtree.c (gtk_rbtree_reorder_sort_func): return a value
in the range of [-1, 1] instead [0, 1],
(gtk_rbtree_reorder_invert_func): ditto,
This makes treeview reordering working on platforms as FreeBSD and
solaris, thanks go to Heiner Eichmann for finding this out and
sending in a patch (#98251).
Wed Nov 20 19:27:07 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreestore.c (node_free): only free the data list if
node->data is not NULL,
(gtk_tree_store_remove): free the data list from the node if
needed. (#94728, pointed out by Peter Bloomfield).
Wed Nov 20 19:23:13 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_remove_column): stop editing
and set the edited_column to NULL if edited_column is set.
(#91288, modified patch from Josh Parsons).
Wed Nov 20 19:20:34 2002 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): do a full
redraw if vadjustment->value is bigger than tree_view->priv->height,
(gtk_tree_view_row_deleted): free the row ref if it isn't valid
anymore. (#83726, reported by Robert Kinsella).
2002-11-20 18:15:28 +00:00
|
|
|
return ((GtkRBReorder *) a)->invert_order - ((GtkRBReorder *) b)->invert_order;
|
2001-03-29 21:30:05 +00:00
|
|
|
}
|
|
|
|
|
2001-03-28 22:27:20 +00:00
|
|
|
static void
|
|
|
|
gtk_rbtree_reorder_fixup (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
if (node == tree->nil)
|
|
|
|
return;
|
|
|
|
|
2001-11-02 00:13:30 +00:00
|
|
|
node->parity = 1;
|
|
|
|
|
2001-03-28 22:27:20 +00:00
|
|
|
if (node->left != tree->nil)
|
|
|
|
{
|
|
|
|
gtk_rbtree_reorder_fixup (tree, node->left);
|
|
|
|
node->offset += node->left->offset;
|
2001-11-02 00:13:30 +00:00
|
|
|
node->parity += node->left->parity;
|
2001-03-28 22:27:20 +00:00
|
|
|
}
|
|
|
|
if (node->right != tree->nil)
|
|
|
|
{
|
|
|
|
gtk_rbtree_reorder_fixup (tree, node->right);
|
|
|
|
node->offset += node->right->offset;
|
2001-11-02 00:13:30 +00:00
|
|
|
node->parity += node->right->parity;
|
2001-03-28 22:27:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (node->children)
|
2001-11-02 00:13:30 +00:00
|
|
|
{
|
|
|
|
node->offset += node->children->root->offset;
|
|
|
|
node->parity += node->children->root->parity;
|
|
|
|
}
|
2001-12-04 23:49:57 +00:00
|
|
|
|
|
|
|
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID) ||
|
|
|
|
(node->right != tree->nil && GTK_RBNODE_FLAG_SET (node->right, GTK_RBNODE_DESCENDANTS_INVALID)) ||
|
|
|
|
(node->left != tree->nil && GTK_RBNODE_FLAG_SET (node->left, GTK_RBNODE_DESCENDANTS_INVALID)) ||
|
|
|
|
(node->children && GTK_RBNODE_FLAG_SET (node->children->root, GTK_RBNODE_DESCENDANTS_INVALID)))
|
|
|
|
GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_DESCENDANTS_INVALID);
|
|
|
|
else
|
|
|
|
GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_DESCENDANTS_INVALID);
|
2001-03-28 22:27:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* It basically pulls everything out of the tree, rearranges it, and puts it
|
|
|
|
* back together. Our strategy is to keep the old RBTree intact, and just
|
|
|
|
* rearrange the contents. When that is done, we go through and update the
|
|
|
|
* heights. There is probably a more elegant way to write this function. If
|
|
|
|
* anyone wants to spend the time writing it, patches will be accepted.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
_gtk_rbtree_reorder (GtkRBTree *tree,
|
|
|
|
gint *new_order,
|
|
|
|
gint length)
|
|
|
|
{
|
2004-10-28 15:00:05 +00:00
|
|
|
GtkRBReorder reorder = { NULL };
|
2001-03-28 22:27:20 +00:00
|
|
|
GArray *array;
|
|
|
|
GtkRBNode *node;
|
|
|
|
gint i;
|
2001-09-01 20:56:41 +00:00
|
|
|
|
|
|
|
g_return_if_fail (tree != NULL);
|
|
|
|
g_return_if_fail (length > 0);
|
|
|
|
g_return_if_fail (tree->root->count == length);
|
|
|
|
|
2001-03-28 22:27:20 +00:00
|
|
|
/* Sort the trees values in the new tree. */
|
|
|
|
array = g_array_sized_new (FALSE, FALSE, sizeof (GtkRBReorder), length);
|
|
|
|
for (i = 0; i < length; i++)
|
|
|
|
{
|
|
|
|
reorder.order = new_order[i];
|
2001-03-29 21:30:05 +00:00
|
|
|
reorder.invert_order = i;
|
2001-03-28 22:27:20 +00:00
|
|
|
g_array_append_val (array, reorder);
|
2001-03-29 21:30:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
g_array_sort(array, gtk_rbtree_reorder_sort_func);
|
|
|
|
|
|
|
|
/* rewind node*/
|
|
|
|
node = tree->root;
|
|
|
|
while (node && node->left != tree->nil)
|
|
|
|
node = node->left;
|
|
|
|
|
|
|
|
for (i = 0; i < length; i++)
|
|
|
|
{
|
|
|
|
g_assert (node != tree->nil);
|
|
|
|
g_array_index (array, GtkRBReorder, i).children = node->children;
|
|
|
|
g_array_index (array, GtkRBReorder, i).flags = GTK_RBNODE_NON_COLORS & node->flags;
|
|
|
|
g_array_index (array, GtkRBReorder, i).height = GTK_RBNODE_GET_HEIGHT (node);
|
2001-03-28 22:27:20 +00:00
|
|
|
|
|
|
|
node = _gtk_rbtree_next (tree, node);
|
|
|
|
}
|
|
|
|
|
2001-03-29 21:30:05 +00:00
|
|
|
g_array_sort (array, gtk_rbtree_reorder_invert_func);
|
|
|
|
|
2001-03-28 22:27:20 +00:00
|
|
|
/* rewind node*/
|
|
|
|
node = tree->root;
|
|
|
|
while (node && node->left != tree->nil)
|
|
|
|
node = node->left;
|
|
|
|
|
|
|
|
/* Go through the tree and change the values to the new ones. */
|
|
|
|
for (i = 0; i < length; i++)
|
|
|
|
{
|
|
|
|
reorder = g_array_index (array, GtkRBReorder, i);
|
|
|
|
node->children = reorder.children;
|
2001-06-15 23:03:27 +00:00
|
|
|
if (node->children)
|
|
|
|
node->children->parent_node = node;
|
2001-03-28 22:27:20 +00:00
|
|
|
node->flags = GTK_RBNODE_GET_COLOR (node) | reorder.flags;
|
|
|
|
/* We temporarily set the height to this. */
|
|
|
|
node->offset = reorder.height;
|
|
|
|
node = _gtk_rbtree_next (tree, node);
|
|
|
|
}
|
|
|
|
gtk_rbtree_reorder_fixup (tree, tree->root);
|
2002-06-06 15:18:52 +00:00
|
|
|
|
|
|
|
g_array_free (array, TRUE);
|
2001-03-28 22:27:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
gint
|
|
|
|
_gtk_rbtree_node_find_offset (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
GtkRBNode *last;
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
gint retval;
|
|
|
|
|
|
|
|
g_assert (node);
|
|
|
|
g_assert (node->left);
|
|
|
|
|
|
|
|
retval = node->left->offset;
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
while (tree && node && node != tree->nil)
|
|
|
|
{
|
|
|
|
last = node;
|
|
|
|
node = node->parent;
|
2001-01-19 22:39:19 +00:00
|
|
|
|
|
|
|
/* Add left branch, plus children, iff we came from the right */
|
2000-10-05 01:04:57 +00:00
|
|
|
if (node->right == last)
|
2001-01-19 22:39:19 +00:00
|
|
|
retval += node->offset - node->right->offset;
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
if (node == tree->nil)
|
|
|
|
{
|
|
|
|
node = tree->parent_node;
|
|
|
|
tree = tree->parent_tree;
|
2001-01-19 22:39:19 +00:00
|
|
|
|
|
|
|
/* Add the parent node, plus the left branch. */
|
2000-10-05 01:04:57 +00:00
|
|
|
if (node)
|
2001-01-19 22:39:19 +00:00
|
|
|
retval += node->left->offset + GTK_RBNODE_GET_HEIGHT (node);
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
gint
|
|
|
|
_gtk_rbtree_node_find_parity (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
GtkRBNode *last;
|
|
|
|
gint retval;
|
|
|
|
|
|
|
|
g_assert (node);
|
|
|
|
g_assert (node->left);
|
|
|
|
|
|
|
|
retval = node->left->parity;
|
|
|
|
|
|
|
|
while (tree && node && node != tree->nil)
|
|
|
|
{
|
|
|
|
last = node;
|
|
|
|
node = node->parent;
|
|
|
|
|
|
|
|
/* Add left branch, plus children, iff we came from the right */
|
|
|
|
if (node->right == last)
|
|
|
|
retval += node->parity - node->right->parity;
|
|
|
|
|
|
|
|
if (node == tree->nil)
|
|
|
|
{
|
|
|
|
node = tree->parent_node;
|
|
|
|
tree = tree->parent_tree;
|
|
|
|
|
|
|
|
/* Add the parent node, plus the left branch. */
|
|
|
|
if (node)
|
|
|
|
retval += node->left->parity + 1; /* 1 == GTK_RBNODE_GET_PARITY() */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval % 2;
|
|
|
|
}
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
gint
|
2001-12-04 23:49:57 +00:00
|
|
|
_gtk_rbtree_real_find_offset (GtkRBTree *tree,
|
|
|
|
gint height,
|
|
|
|
GtkRBTree **new_tree,
|
|
|
|
GtkRBNode **new_node)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
|
|
|
GtkRBNode *tmp_node;
|
|
|
|
|
2001-12-04 23:49:57 +00:00
|
|
|
g_assert (tree);
|
|
|
|
|
2000-10-26 00:36:47 +00:00
|
|
|
if (height < 0)
|
|
|
|
{
|
|
|
|
*new_tree = NULL;
|
|
|
|
*new_node = NULL;
|
2001-12-04 23:49:57 +00:00
|
|
|
|
2000-10-26 00:36:47 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2001-12-04 23:49:57 +00:00
|
|
|
|
2000-10-26 00:36:47 +00:00
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
tmp_node = tree->root;
|
|
|
|
while (tmp_node != tree->nil &&
|
|
|
|
(tmp_node->left->offset > height ||
|
|
|
|
(tmp_node->offset - tmp_node->right->offset) < height))
|
|
|
|
{
|
|
|
|
if (tmp_node->left->offset > height)
|
|
|
|
tmp_node = tmp_node->left;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
height -= (tmp_node->offset - tmp_node->right->offset);
|
|
|
|
tmp_node = tmp_node->right;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (tmp_node == tree->nil)
|
|
|
|
{
|
|
|
|
*new_tree = NULL;
|
|
|
|
*new_node = NULL;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (tmp_node->children)
|
|
|
|
{
|
|
|
|
if ((tmp_node->offset -
|
|
|
|
tmp_node->right->offset -
|
|
|
|
tmp_node->children->root->offset) > height)
|
|
|
|
{
|
|
|
|
*new_tree = tree;
|
|
|
|
*new_node = tmp_node;
|
|
|
|
return (height - tmp_node->left->offset);
|
|
|
|
}
|
2001-12-04 23:49:57 +00:00
|
|
|
return _gtk_rbtree_real_find_offset (tmp_node->children,
|
|
|
|
height - tmp_node->left->offset -
|
|
|
|
(tmp_node->offset -
|
|
|
|
tmp_node->left->offset -
|
|
|
|
tmp_node->right->offset -
|
|
|
|
tmp_node->children->root->offset),
|
|
|
|
new_tree,
|
|
|
|
new_node);
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
*new_tree = tree;
|
|
|
|
*new_node = tmp_node;
|
|
|
|
return (height - tmp_node->left->offset);
|
|
|
|
}
|
|
|
|
|
2001-12-04 23:49:57 +00:00
|
|
|
gint
|
|
|
|
_gtk_rbtree_find_offset (GtkRBTree *tree,
|
|
|
|
gint height,
|
|
|
|
GtkRBTree **new_tree,
|
|
|
|
GtkRBNode **new_node)
|
|
|
|
{
|
|
|
|
g_assert (tree);
|
|
|
|
|
|
|
|
if ((height < 0) ||
|
|
|
|
(height >= tree->root->offset))
|
|
|
|
{
|
|
|
|
*new_tree = NULL;
|
|
|
|
*new_node = NULL;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2001-12-08 01:10:52 +00:00
|
|
|
return _gtk_rbtree_real_find_offset (tree, height, new_tree, new_node);
|
2001-12-04 23:49:57 +00:00
|
|
|
}
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
_gtk_rbtree_remove_node (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
GtkRBNode *x, *y;
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
GtkRBTree *tmp_tree;
|
|
|
|
GtkRBNode *tmp_node;
|
2001-11-02 21:47:27 +00:00
|
|
|
gint node_height;
|
|
|
|
gint y_height;
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
g_return_if_fail (tree != NULL);
|
|
|
|
g_return_if_fail (node != NULL);
|
2001-12-08 01:10:52 +00:00
|
|
|
|
2002-05-16 19:11:43 +00:00
|
|
|
|
|
|
|
#ifdef G_ENABLE_DEBUG
|
2001-12-08 01:10:52 +00:00
|
|
|
if (gtk_debug_flags & GTK_DEBUG_TREE)
|
|
|
|
{
|
2002-05-16 19:11:43 +00:00
|
|
|
g_print ("\n\n_gtk_rbtree_remove_node: %p\n", node);
|
2001-12-08 01:10:52 +00:00
|
|
|
_gtk_rbtree_debug_spew (tree);
|
|
|
|
_gtk_rbtree_test (G_STRLOC, tree);
|
|
|
|
}
|
2002-05-16 19:11:43 +00:00
|
|
|
#endif /* G_ENABLE_DEBUG */
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
/* make sure we're deleting a node that's actually in the tree */
|
|
|
|
for (x = node; x->parent != tree->nil; x = x->parent)
|
|
|
|
;
|
|
|
|
g_return_if_fail (x == tree->root);
|
|
|
|
|
2002-05-16 21:37:49 +00:00
|
|
|
#ifdef G_ENABLE_DEBUG
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
if (gtk_debug_flags & GTK_DEBUG_TREE)
|
|
|
|
_gtk_rbtree_test (G_STRLOC, tree);
|
2002-05-16 21:37:49 +00:00
|
|
|
#endif
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
if (node->left == tree->nil || node->right == tree->nil)
|
|
|
|
{
|
|
|
|
y = node;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
y = node->right;
|
|
|
|
|
|
|
|
while (y->left != tree->nil)
|
|
|
|
y = y->left;
|
|
|
|
}
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
|
|
|
/* adjust count only beneath tree */
|
2000-10-05 01:04:57 +00:00
|
|
|
for (x = y; x != tree->nil; x = x->parent)
|
2001-12-08 01:10:52 +00:00
|
|
|
{
|
|
|
|
x->count--;
|
|
|
|
}
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
|
|
|
/* offsets and parity adjust all the way up through parent trees */
|
2001-11-02 21:47:27 +00:00
|
|
|
y_height = GTK_RBNODE_GET_HEIGHT (y);
|
|
|
|
node_height = GTK_RBNODE_GET_HEIGHT (node) + (node->children?node->children->root->offset:0);
|
|
|
|
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
tmp_tree = tree;
|
|
|
|
tmp_node = y;
|
|
|
|
while (tmp_tree && tmp_node && tmp_node != tmp_tree->nil)
|
|
|
|
{
|
2001-11-02 21:47:27 +00:00
|
|
|
tmp_node->offset -= (y_height + (y->children?y->children->root->offset:0));
|
2001-12-08 01:10:52 +00:00
|
|
|
_fixup_validation (tmp_tree, tmp_node);
|
2001-12-10 21:24:15 +00:00
|
|
|
_fixup_parity (tmp_tree, tmp_node);
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
tmp_node = tmp_node->parent;
|
|
|
|
if (tmp_node == tmp_tree->nil)
|
|
|
|
{
|
|
|
|
tmp_node = tmp_tree->parent_node;
|
|
|
|
tmp_tree = tmp_tree->parent_tree;
|
|
|
|
}
|
|
|
|
}
|
2001-11-02 21:47:27 +00:00
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
/* x is y's only child, or nil */
|
2000-10-05 01:04:57 +00:00
|
|
|
if (y->left != tree->nil)
|
|
|
|
x = y->left;
|
|
|
|
else
|
|
|
|
x = y->right;
|
|
|
|
|
|
|
|
/* remove y from the parent chain */
|
|
|
|
x->parent = y->parent;
|
|
|
|
if (y->parent != tree->nil)
|
2001-12-08 01:10:52 +00:00
|
|
|
{
|
|
|
|
if (y == y->parent->left)
|
|
|
|
y->parent->left = x;
|
|
|
|
else
|
|
|
|
y->parent->right = x;
|
|
|
|
}
|
2000-10-05 01:04:57 +00:00
|
|
|
else
|
2001-12-08 01:10:52 +00:00
|
|
|
{
|
|
|
|
tree->root = x;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We need to clean up the validity of the tree.
|
|
|
|
*/
|
|
|
|
|
|
|
|
tmp_tree = tree;
|
|
|
|
tmp_node = x;
|
|
|
|
do
|
|
|
|
{
|
2001-12-10 21:24:15 +00:00
|
|
|
/* We skip the first time, iff x is nil */
|
2001-12-08 01:10:52 +00:00
|
|
|
if (tmp_node != tmp_tree->nil)
|
|
|
|
{
|
|
|
|
_fixup_validation (tmp_tree, tmp_node);
|
2001-12-10 21:24:15 +00:00
|
|
|
_fixup_parity (tmp_tree, tmp_node);
|
2001-12-08 01:10:52 +00:00
|
|
|
}
|
|
|
|
tmp_node = tmp_node->parent;
|
|
|
|
if (tmp_node == tmp_tree->nil)
|
|
|
|
{
|
|
|
|
tmp_node = tmp_tree->parent_node;
|
|
|
|
tmp_tree = tmp_tree->parent_tree;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (tmp_tree != NULL);
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
if (y != node)
|
2001-02-28 00:35:25 +00:00
|
|
|
{
|
2001-11-02 21:47:27 +00:00
|
|
|
gint diff;
|
|
|
|
|
2001-02-28 00:35:25 +00:00
|
|
|
/* Copy the node over */
|
|
|
|
if (GTK_RBNODE_GET_COLOR (node) == GTK_RBNODE_BLACK)
|
|
|
|
node->flags = ((y->flags & (GTK_RBNODE_NON_COLORS)) | GTK_RBNODE_BLACK);
|
|
|
|
else
|
|
|
|
node->flags = ((y->flags & (GTK_RBNODE_NON_COLORS)) | GTK_RBNODE_RED);
|
|
|
|
node->children = y->children;
|
2001-12-08 01:10:52 +00:00
|
|
|
if (y->children)
|
|
|
|
{
|
|
|
|
node->children = y->children;
|
|
|
|
node->children->parent_node = node;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
node->children = NULL;
|
|
|
|
}
|
|
|
|
_fixup_validation (tree, node);
|
2001-12-10 21:24:15 +00:00
|
|
|
_fixup_parity (tree, node);
|
2001-11-02 21:47:27 +00:00
|
|
|
/* We want to see how different our height is from the previous node.
|
|
|
|
* To do this, we compare our current height with our supposed height.
|
|
|
|
*/
|
|
|
|
diff = y_height - GTK_RBNODE_GET_HEIGHT (node);
|
2001-12-08 01:10:52 +00:00
|
|
|
tmp_tree = tree;
|
|
|
|
tmp_node = node;
|
2001-11-02 21:47:27 +00:00
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
while (tmp_tree && tmp_node && tmp_node != tmp_tree->nil)
|
|
|
|
{
|
|
|
|
tmp_node->offset += diff;
|
|
|
|
_fixup_validation (tmp_tree, tmp_node);
|
2001-12-10 21:24:15 +00:00
|
|
|
_fixup_parity (tmp_tree, tmp_node);
|
2001-12-08 01:10:52 +00:00
|
|
|
tmp_node = tmp_node->parent;
|
|
|
|
if (tmp_node == tmp_tree->nil)
|
2001-11-02 21:47:27 +00:00
|
|
|
{
|
2001-12-08 01:10:52 +00:00
|
|
|
tmp_node = tmp_tree->parent_node;
|
|
|
|
tmp_tree = tmp_tree->parent_tree;
|
2001-11-02 21:47:27 +00:00
|
|
|
}
|
|
|
|
}
|
2001-02-28 00:35:25 +00:00
|
|
|
}
|
2000-10-05 01:04:57 +00:00
|
|
|
|
|
|
|
if (GTK_RBNODE_GET_COLOR (y) == GTK_RBNODE_BLACK)
|
|
|
|
_gtk_rbtree_remove_node_fixup (tree, x);
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
_gtk_rbnode_free (y);
|
2001-01-09 17:45:34 +00:00
|
|
|
|
2002-05-16 19:11:43 +00:00
|
|
|
#ifdef G_ENABLE_DEBUG
|
2001-01-09 17:45:34 +00:00
|
|
|
if (gtk_debug_flags & GTK_DEBUG_TREE)
|
2001-12-08 01:10:52 +00:00
|
|
|
{
|
2001-12-10 21:24:15 +00:00
|
|
|
g_print ("_gtk_rbtree_remove_node finished...\n");
|
2001-12-08 01:10:52 +00:00
|
|
|
_gtk_rbtree_debug_spew (tree);
|
2001-12-10 21:24:15 +00:00
|
|
|
g_print ("\n\n");
|
2001-12-08 01:10:52 +00:00
|
|
|
_gtk_rbtree_test (G_STRLOC, tree);
|
|
|
|
}
|
2002-05-16 19:11:43 +00:00
|
|
|
#endif /* G_ENABLE_DEBUG */
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
GtkRBNode *
|
|
|
|
_gtk_rbtree_next (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (tree != NULL, NULL);
|
|
|
|
g_return_val_if_fail (node != NULL, NULL);
|
|
|
|
|
|
|
|
/* Case 1: the node's below us. */
|
|
|
|
if (node->right != tree->nil)
|
|
|
|
{
|
|
|
|
node = node->right;
|
|
|
|
while (node->left != tree->nil)
|
|
|
|
node = node->left;
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Case 2: it's an ancestor */
|
|
|
|
while (node->parent != tree->nil)
|
|
|
|
{
|
|
|
|
if (node->parent->right == node)
|
|
|
|
node = node->parent;
|
|
|
|
else
|
|
|
|
return (node->parent);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Case 3: There is no next node */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkRBNode *
|
|
|
|
_gtk_rbtree_prev (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
g_return_val_if_fail (tree != NULL, NULL);
|
|
|
|
g_return_val_if_fail (node != NULL, NULL);
|
|
|
|
|
|
|
|
/* Case 1: the node's below us. */
|
|
|
|
if (node->left != tree->nil)
|
|
|
|
{
|
|
|
|
node = node->left;
|
|
|
|
while (node->right != tree->nil)
|
|
|
|
node = node->right;
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Case 2: it's an ancestor */
|
|
|
|
while (node->parent != tree->nil)
|
|
|
|
{
|
|
|
|
if (node->parent->left == node)
|
|
|
|
node = node->parent;
|
|
|
|
else
|
|
|
|
return (node->parent);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Case 3: There is no next node */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_gtk_rbtree_next_full (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node,
|
|
|
|
GtkRBTree **new_tree,
|
|
|
|
GtkRBNode **new_node)
|
|
|
|
{
|
|
|
|
g_return_if_fail (tree != NULL);
|
|
|
|
g_return_if_fail (node != NULL);
|
|
|
|
g_return_if_fail (new_tree != NULL);
|
|
|
|
g_return_if_fail (new_node != NULL);
|
|
|
|
|
|
|
|
if (node->children)
|
|
|
|
{
|
|
|
|
*new_tree = node->children;
|
|
|
|
*new_node = (*new_tree)->root;
|
|
|
|
while ((*new_node)->left != (*new_tree)->nil)
|
|
|
|
*new_node = (*new_node)->left;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
*new_tree = tree;
|
|
|
|
*new_node = _gtk_rbtree_next (tree, node);
|
|
|
|
|
|
|
|
while ((*new_node == NULL) &&
|
|
|
|
(*new_tree != NULL))
|
|
|
|
{
|
|
|
|
*new_node = (*new_tree)->parent_node;
|
|
|
|
*new_tree = (*new_tree)->parent_tree;
|
|
|
|
if (*new_tree)
|
|
|
|
*new_node = _gtk_rbtree_next (*new_tree, *new_node);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_gtk_rbtree_prev_full (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node,
|
|
|
|
GtkRBTree **new_tree,
|
|
|
|
GtkRBNode **new_node)
|
|
|
|
{
|
|
|
|
g_return_if_fail (tree != NULL);
|
|
|
|
g_return_if_fail (node != NULL);
|
|
|
|
g_return_if_fail (new_tree != NULL);
|
|
|
|
g_return_if_fail (new_node != NULL);
|
|
|
|
|
|
|
|
*new_tree = tree;
|
|
|
|
*new_node = _gtk_rbtree_prev (tree, node);
|
|
|
|
|
|
|
|
if (*new_node == NULL)
|
|
|
|
{
|
|
|
|
*new_node = (*new_tree)->parent_node;
|
|
|
|
*new_tree = (*new_tree)->parent_tree;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
while ((*new_node)->children)
|
|
|
|
{
|
|
|
|
*new_tree = (*new_node)->children;
|
|
|
|
*new_node = (*new_tree)->root;
|
|
|
|
while ((*new_node)->right != (*new_tree)->nil)
|
|
|
|
*new_node = (*new_node)->right;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
adapt to handle PangoColor
2001-01-26 Havoc Pennington <hp@redhat.com>
* gtk/gtktextlayout.c (convert_color): adapt to handle PangoColor
* gtk/gtktreeview.c (gtk_tree_view_widget_to_tree_coords): fix to
not offset by TREE_VIEW_HEADER_HEIGHT
(gtk_tree_view_tree_to_widget_coords): fix to not offset by
TREE_VIEW_HEADER_HEIGHT
* configure.in (included_loaders): for me, --with-included-loaders
generates the error "the specified loader yes does not exist",
i.e. the arg defaults to "yes", so change test for value ""
to test for value "yes", and include all loaders in that case.
* gtk/gtkrbtree.c (_gtk_rbtree_get_depth): new function
* gtk/gtktreeview.c (gtk_tree_view_get_cell_rect): fix to properly
handle TREE_VIEW_VERTICAL_SEPARATOR
(gtk_tree_view_bin_expose): fix to consider the row offset as
pointing halfway into vertical separator.
(gtk_tree_view_draw_node_focus_rect): ditto
* gtk/gtkdebug.h, gtk/gtkmain.c (gtk_init_check): Add
--gtk-debug=updates, which causes gdk_window_set_debug_updates
(TRUE) to be called.
* gdk/gdkwindow.c (gdk_window_set_debug_updates): Allow enabling a
debug mode where the invalid region is colored in on invalidate,
so you can see the flicker and know whether your redraw code is
doing a good job.
* gtk/gtktreeview.c (gtk_tree_view_queue_draw_node): Work in
tree window coordinates (clip rect is in tree window coords)
* gtk/Makefile.am: add gtktreednd.[hc]
* gtk/gtkliststore.c: implement gtktreednd interfaces.
* gtk/gtktreednd.c, gtk/gtktreednd.h: New interface to support
drag-and-drop data operations on a model (so we can set up tree
drag-and-drop automatically)
* gtk/testgtk.c: Add a window to change sensitivity in the
GtkLabel test; add a way to change the entry frame in GtkEntry
test
* gtk/gtkentry.c (gtk_entry_set_has_frame):
(gtk_entry_get_has_frame): new functions to remove the frame
around an entry
(gtk_entry_size_request): shrink requisition if no frame
(gtk_entry_draw_focus): don't draw frame if no frame
* gtk/gtkstyle.c (gtk_default_draw_check): draw custom look for
checks inside a cell renderer
(gtk_default_draw_option): ditto for options
* gtk/gtktreeviewcolumn.c (update_button_contents): add/remove
children from the alignment, not the button
(gtk_tree_view_column_init): ref/sink the column, to emulate
GObject refcounting.
* gtk/gtkcellrenderer.c (gtk_cell_renderer_init): ref/sink
* gtk/gtkcellrenderertoggle.c (gtk_cell_renderer_toggle_render):
Use theme functions to draw the toggles
* gdk/gdkpango.c (gdk_pango_get_gc): use GdkRGB to alloc colors
* gdk/gdkpango.h, gdk/gdkpango.c: Add GdkPangoAttrStipple and
GdkPangoAttrEmbossed to use in rendering insensitive text
* gdk/gdkpango.c (gdk_draw_layout_line): render new properties
* gtk/gtkstyle.c (gtk_default_draw_layout): handle sensitivity
using new GDK features
2001-01-26 21:12:05 +00:00
|
|
|
gint
|
|
|
|
_gtk_rbtree_get_depth (GtkRBTree *tree)
|
|
|
|
{
|
|
|
|
GtkRBTree *tmp_tree;
|
|
|
|
gint depth = 0;
|
|
|
|
|
|
|
|
tmp_tree = tree->parent_tree;
|
|
|
|
while (tmp_tree)
|
|
|
|
{
|
|
|
|
++depth;
|
|
|
|
tmp_tree = tmp_tree->parent_tree;
|
|
|
|
}
|
|
|
|
|
|
|
|
return depth;
|
|
|
|
}
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
static void
|
|
|
|
_gtk_rbtree_traverse_pre_order (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node,
|
|
|
|
GtkRBTreeTraverseFunc func,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
if (node == tree->nil)
|
|
|
|
return;
|
|
|
|
|
|
|
|
(* func) (tree, node, data);
|
|
|
|
_gtk_rbtree_traverse_pre_order (tree, node->left, func, data);
|
|
|
|
_gtk_rbtree_traverse_pre_order (tree, node->right, func, data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_gtk_rbtree_traverse_post_order (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node,
|
|
|
|
GtkRBTreeTraverseFunc func,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
if (node == tree->nil)
|
|
|
|
return;
|
|
|
|
|
|
|
|
_gtk_rbtree_traverse_post_order (tree, node->left, func, data);
|
|
|
|
_gtk_rbtree_traverse_post_order (tree, node->right, func, data);
|
|
|
|
(* func) (tree, node, data);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_gtk_rbtree_traverse (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node,
|
|
|
|
GTraverseType order,
|
|
|
|
GtkRBTreeTraverseFunc func,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
g_return_if_fail (tree != NULL);
|
|
|
|
g_return_if_fail (node != NULL);
|
|
|
|
g_return_if_fail (func != NULL);
|
|
|
|
g_return_if_fail (order <= G_LEVEL_ORDER);
|
|
|
|
|
|
|
|
switch (order)
|
|
|
|
{
|
|
|
|
case G_PRE_ORDER:
|
|
|
|
_gtk_rbtree_traverse_pre_order (tree, node, func, data);
|
|
|
|
break;
|
|
|
|
case G_POST_ORDER:
|
|
|
|
_gtk_rbtree_traverse_post_order (tree, node, func, data);
|
|
|
|
break;
|
|
|
|
case G_IN_ORDER:
|
|
|
|
case G_LEVEL_ORDER:
|
|
|
|
default:
|
|
|
|
g_warning ("unsupported traversal order.");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
|
|
|
_count_nodes (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
gint res;
|
|
|
|
if (node == tree->nil)
|
|
|
|
return 0;
|
|
|
|
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
g_assert (node->left);
|
|
|
|
g_assert (node->right);
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
res = (_count_nodes (tree, node->left) +
|
|
|
|
_count_nodes (tree, node->right) + 1);
|
|
|
|
|
|
|
|
if (res != node->count)
|
|
|
|
g_print ("Tree failed\n");
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
static inline
|
|
|
|
void _fixup_validation (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID) ||
|
|
|
|
GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID) ||
|
|
|
|
(node->left != tree->nil && GTK_RBNODE_FLAG_SET (node->left, GTK_RBNODE_DESCENDANTS_INVALID)) ||
|
|
|
|
(node->right != tree->nil && GTK_RBNODE_FLAG_SET (node->right, GTK_RBNODE_DESCENDANTS_INVALID)) ||
|
|
|
|
(node->children != NULL && GTK_RBNODE_FLAG_SET (node->children->root, GTK_RBNODE_DESCENDANTS_INVALID)))
|
|
|
|
{
|
|
|
|
GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_DESCENDANTS_INVALID);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_DESCENDANTS_INVALID);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-12-10 21:24:15 +00:00
|
|
|
static inline
|
|
|
|
void _fixup_parity (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
node->parity = 1 +
|
|
|
|
((node->children != NULL && node->children->root != node->children->nil) ? node->children->root->parity : 0) +
|
|
|
|
((node->left != tree->nil) ? node->left->parity : 0) +
|
|
|
|
((node->right != tree->nil) ? node->right->parity : 0);
|
|
|
|
}
|
|
|
|
|
2002-05-16 19:11:43 +00:00
|
|
|
#ifdef G_ENABLE_DEBUG
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
static guint
|
|
|
|
get_parity (GtkRBNode *node)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
guint child_total = 0;
|
|
|
|
guint rem;
|
|
|
|
|
|
|
|
/* The parity of a node is node->parity minus
|
|
|
|
* the parity of left, right, and children.
|
|
|
|
*
|
|
|
|
* This is equivalent to saying that if left, right, children
|
|
|
|
* sum to 0 parity, then node->parity is the parity of node,
|
|
|
|
* and if left, right, children are odd parity, then
|
|
|
|
* node->parity is the reverse of the node's parity.
|
|
|
|
*/
|
|
|
|
|
|
|
|
child_total += (guint) node->left->parity;
|
|
|
|
child_total += (guint) node->right->parity;
|
|
|
|
|
|
|
|
if (node->children)
|
|
|
|
child_total += (guint) node->children->root->parity;
|
|
|
|
|
|
|
|
rem = child_total % 2;
|
|
|
|
|
|
|
|
if (rem == 0)
|
|
|
|
return node->parity;
|
2000-10-05 01:04:57 +00:00
|
|
|
else
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
return !node->parity;
|
|
|
|
}
|
2000-10-05 01:04:57 +00:00
|
|
|
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
static guint
|
|
|
|
count_parity (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
guint res;
|
|
|
|
|
|
|
|
if (node == tree->nil)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
res =
|
|
|
|
count_parity (tree, node->left) +
|
|
|
|
count_parity (tree, node->right) +
|
|
|
|
(guint)1 +
|
|
|
|
(node->children ? count_parity (node->children, node->children->root) : 0);
|
|
|
|
|
|
|
|
res = res % (guint)2;
|
|
|
|
|
|
|
|
if (res != node->parity)
|
|
|
|
g_print ("parity incorrect for node\n");
|
|
|
|
|
|
|
|
if (get_parity (node) != 1)
|
|
|
|
g_error ("Node has incorrect parity %d", get_parity (node));
|
|
|
|
|
|
|
|
return res;
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
_gtk_rbtree_test_height (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
gint computed_offset = 0;
|
2000-10-05 01:04:57 +00:00
|
|
|
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
/* This whole test is sort of a useless truism. */
|
|
|
|
|
|
|
|
if (node->left != tree->nil)
|
|
|
|
computed_offset += node->left->offset;
|
2000-10-05 01:04:57 +00:00
|
|
|
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
if (node->right != tree->nil)
|
|
|
|
computed_offset += node->right->offset;
|
|
|
|
|
|
|
|
if (node->children && node->children->root != node->children->nil)
|
|
|
|
computed_offset += node->children->root->offset;
|
|
|
|
|
|
|
|
if (GTK_RBNODE_GET_HEIGHT (node) + computed_offset != node->offset)
|
|
|
|
g_error ("node has broken offset\n");
|
2000-10-05 01:04:57 +00:00
|
|
|
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
if (node->left != tree->nil)
|
|
|
|
_gtk_rbtree_test_height (tree, node->left);
|
|
|
|
|
|
|
|
if (node->right != tree->nil)
|
|
|
|
_gtk_rbtree_test_height (tree, node->right);
|
|
|
|
|
|
|
|
if (node->children && node->children->root != node->children->nil)
|
|
|
|
_gtk_rbtree_test_height (node->children, node->children->root);
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
static void
|
|
|
|
_gtk_rbtree_test_dirty (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node,
|
|
|
|
gint expected_dirtyness)
|
|
|
|
{
|
|
|
|
|
|
|
|
if (expected_dirtyness)
|
|
|
|
{
|
|
|
|
g_assert (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID) ||
|
|
|
|
GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID) ||
|
|
|
|
(node->left != tree->nil && GTK_RBNODE_FLAG_SET (node->left, GTK_RBNODE_DESCENDANTS_INVALID)) ||
|
|
|
|
(node->right != tree->nil && GTK_RBNODE_FLAG_SET (node->right, GTK_RBNODE_DESCENDANTS_INVALID)) ||
|
|
|
|
(node->children && GTK_RBNODE_FLAG_SET (node->children->root, GTK_RBNODE_DESCENDANTS_INVALID)));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
g_assert (! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID) &&
|
|
|
|
! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID));
|
|
|
|
if (node->left != tree->nil)
|
|
|
|
g_assert (! GTK_RBNODE_FLAG_SET (node->left, GTK_RBNODE_DESCENDANTS_INVALID));
|
|
|
|
if (node->right != tree->nil)
|
|
|
|
g_assert (! GTK_RBNODE_FLAG_SET (node->right, GTK_RBNODE_DESCENDANTS_INVALID));
|
|
|
|
if (node->children != NULL)
|
|
|
|
g_assert (! GTK_RBNODE_FLAG_SET (node->children->root, GTK_RBNODE_DESCENDANTS_INVALID));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (node->left != tree->nil)
|
|
|
|
_gtk_rbtree_test_dirty (tree, node->left, GTK_RBNODE_FLAG_SET (node->left, GTK_RBNODE_DESCENDANTS_INVALID));
|
|
|
|
if (node->right != tree->nil)
|
|
|
|
_gtk_rbtree_test_dirty (tree, node->right, GTK_RBNODE_FLAG_SET (node->right, GTK_RBNODE_DESCENDANTS_INVALID));
|
2001-12-10 21:24:15 +00:00
|
|
|
if (node->children != NULL && node->children->root != node->children->nil)
|
2001-12-08 01:10:52 +00:00
|
|
|
_gtk_rbtree_test_dirty (node->children, node->children->root, GTK_RBNODE_FLAG_SET (node->children->root, GTK_RBNODE_DESCENDANTS_INVALID));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void _gtk_rbtree_test_structure (GtkRBTree *tree);
|
|
|
|
|
|
|
|
static void
|
|
|
|
_gtk_rbtree_test_structure_helper (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node)
|
|
|
|
{
|
|
|
|
g_assert (node != tree->nil);
|
|
|
|
|
|
|
|
g_assert (node->left != NULL);
|
|
|
|
g_assert (node->right != NULL);
|
|
|
|
g_assert (node->parent != NULL);
|
|
|
|
|
|
|
|
if (node->left != tree->nil)
|
|
|
|
{
|
|
|
|
g_assert (node->left->parent == node);
|
|
|
|
_gtk_rbtree_test_structure_helper (tree, node->left);
|
|
|
|
}
|
|
|
|
if (node->right != tree->nil)
|
|
|
|
{
|
|
|
|
g_assert (node->right->parent == node);
|
|
|
|
_gtk_rbtree_test_structure_helper (tree, node->right);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (node->children != NULL)
|
|
|
|
{
|
|
|
|
g_assert (node->children->parent_tree == tree);
|
|
|
|
g_assert (node->children->parent_node == node);
|
|
|
|
|
|
|
|
_gtk_rbtree_test_structure (node->children);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
static void
|
|
|
|
_gtk_rbtree_test_structure (GtkRBTree *tree)
|
|
|
|
{
|
|
|
|
g_assert (tree->root);
|
2001-12-10 21:24:15 +00:00
|
|
|
if (tree->root == tree->nil)
|
|
|
|
return;
|
2001-12-08 01:10:52 +00:00
|
|
|
|
2001-12-10 21:24:15 +00:00
|
|
|
g_assert (tree->root->parent == tree->nil);
|
2001-12-08 01:10:52 +00:00
|
|
|
_gtk_rbtree_test_structure_helper (tree, tree->root);
|
|
|
|
}
|
|
|
|
|
2000-10-05 01:04:57 +00:00
|
|
|
void
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
_gtk_rbtree_test (const gchar *where,
|
|
|
|
GtkRBTree *tree)
|
2000-10-05 01:04:57 +00:00
|
|
|
{
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
GtkRBTree *tmp_tree;
|
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
if (tree == NULL)
|
|
|
|
return;
|
|
|
|
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
/* Test the entire tree */
|
|
|
|
tmp_tree = tree;
|
|
|
|
while (tmp_tree->parent_tree)
|
|
|
|
tmp_tree = tmp_tree->parent_tree;
|
|
|
|
|
2001-12-10 21:24:15 +00:00
|
|
|
g_assert (tmp_tree->nil != NULL);
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
2001-12-10 21:24:15 +00:00
|
|
|
if (tmp_tree->root == tmp_tree->nil)
|
|
|
|
return;
|
2001-12-08 01:10:52 +00:00
|
|
|
|
|
|
|
_gtk_rbtree_test_structure (tmp_tree);
|
|
|
|
|
|
|
|
g_assert ((_count_nodes (tmp_tree, tmp_tree->root->left) +
|
|
|
|
_count_nodes (tmp_tree, tmp_tree->root->right) + 1) == tmp_tree->root->count);
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
_gtk_rbtree_test_height (tmp_tree, tmp_tree->root);
|
|
|
|
_gtk_rbtree_test_dirty (tmp_tree, tmp_tree->root, GTK_RBNODE_FLAG_SET (tmp_tree->root, GTK_RBNODE_DESCENDANTS_INVALID));
|
|
|
|
g_assert (count_parity (tmp_tree, tmp_tree->root) == tmp_tree->root->parity);
|
2000-10-05 01:04:57 +00:00
|
|
|
}
|
remove validation idle
2001-02-08 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_destroy_layout): remove
validation idle
* demos/gtk-demo/main.c (create_tree): adjust to changes in text
cell renderer
* demos/pixbuf-demo.c (timeout): remove deprecated
gtk_widget_draw
* demos/testpixbuf-save.c (main): remove deprecated
gtk_drawing_area_size
* gtk/gtktreeview.c (gtk_tree_view_size_allocate): allocate
buttons even if the model isn't setup. gtk_tree_view_check_dirty()
at the start of the allocation.
(gtk_tree_view_check_dirty): handle column->button == NULL, handle
unsetup or NULL model.
* gtk/gtkstyle.c (gtk_default_draw_flat_box): drawing for the
even/odd/sorted cells in the tree view.
* gtk/gtktreeselection.c (gtk_tree_selection_real_unselect_all):
bugfixes
* gtk/gtktreeview.c: assorted bugfixy stuff. Draw the row
backgrounds with draw_flat_box using different detail for even/odd
rows.
* gtk/gtkrbtree.c, gtkrbtree.h: Keep track of the parity of each
row, so we can draw the alternating colors thing
* gtk/gtktexttag.c (gtk_text_tag_set_property): if we change a
property from a synonym property, notify for the synonym.
Also, nuke the background_gdk_set and foreground_gdk_set synonyms
(gtk_text_tag_get_property): Always return the font, even if
all its fields aren't set
* gtk/gtkcellrenderertext.h (struct _GtkCellRendererText): don't
store the attr list; it leaves us with no way to change attributes
in _render according to the render flags, and no way to implement
get_property. Instead store all the specific text attributes.
Separate whether an attribute is enabled from its value. Sync all
properties with GtkTextTag, make them all consistent, etc.
* gtk/gtkcellrenderer.h: Add a flag GTK_CELL_RENDERER_SORTED so
renderers can highlight the sort row/column
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_get_property): use
accessor functions to get values; this has the side effect of
showing up which accessor functions were missing. Added those.
* gtk/gtktreeviewcolumn.h: Replace set_justification with
set_alignment, to be consistent with GtkLabel, GtkMisc
* gtk/gtktreeviewcolumn.c: Added code to display sort indicator
arrow.
* gtk/Makefile.am (gtk_public_h_sources): add gtktreesortable.h
* gtk/gtktreesortable.h: updates in here
2001-02-08 23:36:53 +00:00
|
|
|
|
2001-12-08 01:10:52 +00:00
|
|
|
static void
|
|
|
|
_gtk_rbtree_debug_spew_helper (GtkRBTree *tree,
|
|
|
|
GtkRBNode *node,
|
|
|
|
gint depth)
|
|
|
|
{
|
|
|
|
gint i;
|
|
|
|
for (i = 0; i < depth; i++)
|
|
|
|
g_print ("\t");
|
|
|
|
|
2002-05-16 19:11:43 +00:00
|
|
|
g_print ("(%p - %s) (Offset %d) (Parity %d) (Validity %d%d%d)\n",
|
|
|
|
node,
|
2001-12-08 01:10:52 +00:00
|
|
|
(GTK_RBNODE_GET_COLOR (node) == GTK_RBNODE_BLACK)?"BLACK":" RED ",
|
2001-12-08 20:14:15 +00:00
|
|
|
node->offset,
|
|
|
|
node->parity?1:0,
|
2001-12-08 01:10:52 +00:00
|
|
|
(GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_DESCENDANTS_INVALID))?1:0,
|
|
|
|
(GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID))?1:0,
|
|
|
|
(GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID))?1:0);
|
2001-12-10 21:24:15 +00:00
|
|
|
if (node->children != NULL)
|
|
|
|
{
|
|
|
|
g_print ("Looking at child.\n");
|
|
|
|
_gtk_rbtree_debug_spew (node->children);
|
|
|
|
g_print ("Done looking at child.\n");
|
|
|
|
}
|
2001-12-08 01:10:52 +00:00
|
|
|
if (node->left != tree->nil)
|
2001-12-10 21:24:15 +00:00
|
|
|
{
|
|
|
|
_gtk_rbtree_debug_spew_helper (tree, node->left, depth+1);
|
|
|
|
}
|
2001-12-08 01:10:52 +00:00
|
|
|
if (node->right != tree->nil)
|
2001-12-10 21:24:15 +00:00
|
|
|
{
|
|
|
|
_gtk_rbtree_debug_spew_helper (tree, node->right, depth+1);
|
|
|
|
}
|
2001-12-08 01:10:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_gtk_rbtree_debug_spew (GtkRBTree *tree)
|
|
|
|
{
|
|
|
|
g_return_if_fail (tree != NULL);
|
|
|
|
|
2001-12-10 21:24:15 +00:00
|
|
|
if (tree->root == tree->nil)
|
|
|
|
g_print ("Empty tree...\n");
|
|
|
|
else
|
|
|
|
_gtk_rbtree_debug_spew_helper (tree, tree->root, 0);
|
2001-12-08 01:10:52 +00:00
|
|
|
}
|
2002-05-16 19:11:43 +00:00
|
|
|
#endif /* G_ENABLE_DEBUG */
|