]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkrbtree.h
Fixing debug build (s/extended layout/size request/ in GTK_NOTE flags).
[~andy/gtk] / gtk / gtkrbtree.h
index 40b4c451b5219d287ba1c5a5aba0b8fc6a021985..c42a6addbe150f2cf7c1571b158a9afe92c3c571 100644 (file)
  * Boston, MA 02111-1307, USA.
  */
 
+/* A Red-Black Tree implementation used specifically by GtkTreeView.
+ */
 #ifndef __GTK_RBTREE_H__
 #define __GTK_RBTREE_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <glib.h>
+
+
+G_BEGIN_DECLS
+
+
 typedef enum
 {
   GTK_RBNODE_BLACK = 1 << 0,
@@ -32,7 +35,19 @@ typedef enum
   GTK_RBNODE_IS_PARENT = 1 << 2,
   GTK_RBNODE_IS_SELECTED = 1 << 3,
   GTK_RBNODE_IS_PRELIT = 1 << 4,
-  GTK_RBNODE_IS_VIEW = 1 << 5
+  GTK_RBNODE_IS_SEMI_COLLAPSED = 1 << 5,
+  GTK_RBNODE_IS_SEMI_EXPANDED = 1 << 6,
+  GTK_RBNODE_INVALID = 1 << 7,
+  GTK_RBNODE_COLUMN_INVALID = 1 << 8,
+  GTK_RBNODE_DESCENDANTS_INVALID = 1 << 9,
+  GTK_RBNODE_NON_COLORS = GTK_RBNODE_IS_PARENT |
+                         GTK_RBNODE_IS_SELECTED |
+                         GTK_RBNODE_IS_PRELIT |
+                          GTK_RBNODE_IS_SEMI_COLLAPSED |
+                          GTK_RBNODE_IS_SEMI_EXPANDED |
+                          GTK_RBNODE_INVALID |
+                          GTK_RBNODE_COLUMN_INVALID |
+                          GTK_RBNODE_DESCENDANTS_INVALID
 } GtkRBNodeColor;
 
 typedef struct _GtkRBTree GtkRBTree;
@@ -53,22 +68,41 @@ struct _GtkRBTree
 
 struct _GtkRBNode
 {
-  guint flags;
+  guint flags : 14;
+
+  /* We keep track of whether the aggregate count of children plus 1
+   * for the node itself comes to an even number.  The parity flag is
+   * the total count of children mod 2, where the total count of
+   * children gets computed in the same way that the total offset gets
+   * computed. i.e. not the same as the "count" field below which
+   * doesn't include children. We could replace parity with a
+   * full-size int field here, and then take % 2 to get the parity flag,
+   * but that would use extra memory.
+   */
+
+  guint parity : 1;
+  
   GtkRBNode *left;
   GtkRBNode *right;
   GtkRBNode *parent;
-  gint count;  /* aggregate number of children we have */
-  gint offset; /* aggregate of the heights of all our children */
-  GtkRBTree *children;
-};
 
-struct _GtkRBNodeView
-{
-  GtkRBNode parent;
+  /* count is the number of nodes beneath us, plus 1 for ourselves.
+   * i.e. node->left->count + node->right->count + 1
+   */
+  gint count;
+  
+  /* this is the total of sizes of
+   * node->left, node->right, our own height, and the height
+   * of all trees in ->children, iff children exists because
+   * the thing is expanded.
+   */
   gint offset;
+
+  /* Child trees */
   GtkRBTree *children;
 };
 
+
 #define GTK_RBNODE_GET_COLOR(node)             (node?(((node->flags&GTK_RBNODE_RED)==GTK_RBNODE_RED)?GTK_RBNODE_RED:GTK_RBNODE_BLACK):GTK_RBNODE_BLACK)
 #define GTK_RBNODE_SET_COLOR(node,color)       if((node->flags&color)!=color)node->flags=node->flags^(GTK_RBNODE_RED|GTK_RBNODE_BLACK)
 #define GTK_RBNODE_GET_HEIGHT(node)            (node->offset-(node->left->offset+node->right->offset+(node->children?node->children->root->offset:0)))
@@ -77,27 +111,41 @@ struct _GtkRBNodeView
 #define GTK_RBNODE_FLAG_SET(node, flag)        (node?(((node->flags&flag)==flag)?TRUE:FALSE):FALSE)
 
 
-void       _gtk_rbtree_push_allocator   (GAllocator             *allocator);
-void       _gtk_rbtree_pop_allocator    (void);
 GtkRBTree *_gtk_rbtree_new              (void);
 void       _gtk_rbtree_free             (GtkRBTree              *tree);
 void       _gtk_rbtree_remove           (GtkRBTree              *tree);
 void       _gtk_rbtree_destroy          (GtkRBTree              *tree);
 GtkRBNode *_gtk_rbtree_insert_before    (GtkRBTree              *tree,
                                         GtkRBNode              *node,
-                                        gint                    height);
+                                        gint                    height,
+                                        gboolean                valid);
 GtkRBNode *_gtk_rbtree_insert_after     (GtkRBTree              *tree,
                                         GtkRBNode              *node,
-                                        gint                    height);
+                                        gint                    height,
+                                        gboolean                valid);
 void       _gtk_rbtree_remove_node      (GtkRBTree              *tree,
                                         GtkRBNode              *node);
+void       _gtk_rbtree_reorder          (GtkRBTree              *tree,
+                                        gint                   *new_order,
+                                        gint                    length);
 GtkRBNode *_gtk_rbtree_find_count       (GtkRBTree              *tree,
                                         gint                    count);
 void       _gtk_rbtree_node_set_height  (GtkRBTree              *tree,
                                         GtkRBNode              *node,
                                         gint                    height);
+void       _gtk_rbtree_node_mark_invalid(GtkRBTree              *tree,
+                                        GtkRBNode              *node);
+void       _gtk_rbtree_node_mark_valid  (GtkRBTree              *tree,
+                                        GtkRBNode              *node);
+void       _gtk_rbtree_column_invalid   (GtkRBTree              *tree);
+void       _gtk_rbtree_mark_invalid     (GtkRBTree              *tree);
+void       _gtk_rbtree_set_fixed_height (GtkRBTree              *tree,
+                                        gint                    height,
+                                        gboolean                mark_valid);
 gint       _gtk_rbtree_node_find_offset (GtkRBTree              *tree,
                                         GtkRBNode              *node);
+gint       _gtk_rbtree_node_find_parity (GtkRBTree              *tree,
+                                        GtkRBNode              *node);
 gint       _gtk_rbtree_find_offset      (GtkRBTree              *tree,
                                         gint                    offset,
                                         GtkRBTree             **new_tree,
@@ -120,14 +168,17 @@ void       _gtk_rbtree_prev_full        (GtkRBTree              *tree,
                                         GtkRBTree             **new_tree,
                                         GtkRBNode             **new_node);
 
+gint       _gtk_rbtree_get_depth        (GtkRBTree              *tree);
+
+/* This func checks the integrity of the tree */
+#ifdef G_ENABLE_DEBUG  
+void       _gtk_rbtree_test             (const gchar            *where,
+                                         GtkRBTree              *tree);
+void       _gtk_rbtree_debug_spew       (GtkRBTree              *tree);
+#endif
 
-/* This func just checks the integrity of the tree */
-/* It will go away later. */
-void       _gtk_rbtree_test             (GtkRBTree              *tree);
 
+G_END_DECLS
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
 #endif /* __GTK_RBTREE_H__ */