]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtktreeprivate.h
Moved search entries into priv data.
[~andy/gtk] / gtk / gtktreeprivate.h
index 60aee31fd92eb1fd83ee364d7da26fd65d95f5d6..58ec1ef5c5928548c7c0505f5083af9f38d52d1e 100644 (file)
@@ -29,8 +29,6 @@ extern "C" {
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtkrbtree.h>
 
-
-  
 #define TREE_VIEW_DRAG_WIDTH 6
 
 typedef enum
@@ -42,23 +40,30 @@ typedef enum
   GTK_TREE_VIEW_HEADERS_VISIBLE = 1 << 4,
   GTK_TREE_VIEW_DRAW_KEYFOCUS = 1 << 5,
   GTK_TREE_VIEW_MODEL_SETUP = 1 << 6,
-  GTK_TREE_VIEW_IN_COLUMN_DRAG = 1 << 7,
+  GTK_TREE_VIEW_IN_COLUMN_DRAG = 1 << 7
 } GtkTreeViewFlags;
 
+typedef enum
+{
+  GTK_TREE_SELECT_MODE_TOGGLE = 1 << 0,
+  GTK_TREE_SELECT_MODE_EXTEND = 1 << 1
+}
+GtkTreeSelectMode;
+
 enum
 {
   DRAG_COLUMN_WINDOW_STATE_UNSET = 0,
   DRAG_COLUMN_WINDOW_STATE_ORIGINAL = 1,
   DRAG_COLUMN_WINDOW_STATE_ARROW = 2,
   DRAG_COLUMN_WINDOW_STATE_ARROW_LEFT = 3,
-  DRAG_COLUMN_WINDOW_STATE_ARROW_RIGHT = 4,
-  
+  DRAG_COLUMN_WINDOW_STATE_ARROW_RIGHT = 4
 };
+
 #define GTK_TREE_VIEW_SET_FLAG(tree_view, flag)   G_STMT_START{ (tree_view->priv->flags|=flag); }G_STMT_END
 #define GTK_TREE_VIEW_UNSET_FLAG(tree_view, flag) G_STMT_START{ (tree_view->priv->flags&=~(flag)); }G_STMT_END
 #define GTK_TREE_VIEW_FLAG_SET(tree_view, flag)   ((tree_view->priv->flags&flag)==flag)
 #define TREE_VIEW_HEADER_HEIGHT(tree_view)        (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE)?tree_view->priv->header_height:0)
-#define TREE_VIEW_COLUMN_WIDTH(column)             (CLAMP (column->width, (column->min_width!=-1)?column->min_width:column->width, (column->max_width!=-1)?column->max_width:column->width))
+#define TREE_VIEW_COLUMN_REQUESTED_WIDTH(column)  (CLAMP (column->requested_width, (column->min_width!=-1)?column->min_width:column->requested_width, (column->max_width!=-1)?column->max_width:column->requested_width))
 #define TREE_VIEW_DRAW_EXPANDERS(tree_view)       (!GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IS_LIST)&&GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_SHOW_EXPANDERS))
 
  /* This lovely little value is used to determine how far away from the title bar
@@ -86,13 +91,13 @@ struct _GtkTreeViewPrivate
   /* tree information */
   GtkRBTree *tree;
 
-  gint tab_offset;
   GtkRBNode *button_pressed_node;
   GtkRBTree *button_pressed_tree;
 
   GList *children;
   gint width;
   gint height;
+  gint expander_size;
 
   GtkAdjustment *hadjustment;
   GtkAdjustment *vadjustment;
@@ -102,21 +107,32 @@ struct _GtkTreeViewPrivate
   GdkWindow *drag_window;
   GdkWindow *drag_highlight_window;
   GtkTreeViewColumn *drag_column;
+
+  GtkTreeRowReference *last_button_press;
+  GtkTreeRowReference *last_button_press_2;
+
+  /* bin_window offset */
+  GtkTreeRowReference *top_row;
+  gint top_row_dy;
+  /* dy == y pos of top_row + top_row_dy */
+  /* we cache it for simplicity of the code */
+  gint dy;
   gint drag_column_x;
 
   GtkTreeViewColumn *expander_column;
+  GtkTreeViewColumn *edited_column;
+  guint presize_handler_timer;
+  guint validate_rows_timer;
+  guint scroll_sync_timer;
 
   /* Focus code */
   GtkTreeViewColumn *focus_column;
-  GtkTreeViewColumn *scroll_column;
 
   /* Selection stuff */
   GtkTreeRowReference *anchor;
   GtkTreeRowReference *cursor;
 
   /* Column Resizing */
-  GdkCursor *cursor_drag;
-  GdkGC *xor_gc;
   gint drag_pos;
   gint x_drag;
 
@@ -160,28 +176,49 @@ struct _GtkTreeViewPrivate
   gint press_start_x;
   gint press_start_y;
 
+  /* fixed height */
+  gint fixed_height;
+
   /* Scroll-to functionality when unrealized */
-  GtkTreePath *scroll_to_path;
+  GtkTreeRowReference *scroll_to_path;
   GtkTreeViewColumn *scroll_to_column;
   gfloat scroll_to_row_align;
   gfloat scroll_to_col_align;
+  guint scroll_to_use_align : 1;
+
+  guint fixed_height_mode : 1;
+  guint fixed_height_check : 1;
 
   guint reorderable : 1;
   guint header_has_focus : 1;
   guint drag_column_window_state : 3;
   /* hint to display rows in alternating colors */
   guint has_rules : 1;
+  guint mark_rows_col_dirty : 1;
 
-  guint in_extended_selection : 1;
-  guint in_free_motion : 1;
+  /* for DnD */
+  guint empty_view_drop : 1;
+
+  guint ctrl_pressed : 1;
+  guint shift_pressed : 1;
+
+
+  guint init_hadjust_value : 1;
 
   /* interactive search */
   guint enable_search : 1;
+  guint disable_popdown : 1;
+
+  gint selected_iter;
   gint search_column;
   GtkTreeViewSearchDialogPositionFunc search_dialog_position_func;
   GtkTreeViewSearchEqualFunc search_equal_func;
   gpointer search_user_data;
   GtkDestroyNotify search_destroy;
+  GtkWidget *search_window;
+  GtkWidget *search_entry;
+
+  gint prev_width;
 };
 
 #ifdef __GNUC__
@@ -203,7 +240,7 @@ struct _GtkTreeViewPrivate
          return ret;                                                    \
        };                               }G_STMT_END
 
-#define TREE_VIEW_INTERNAL_ASSERT_VOID(expr)     G_STMT_START{             \
+#define TREE_VIEW_INTERNAL_ASSERT_VOID(expr)     G_STMT_START{          \
      if (!(expr))                                                       \
        {                                                                \
          g_log (G_LOG_DOMAIN,                                           \
@@ -261,7 +298,8 @@ void         _gtk_tree_selection_internal_select_node (GtkTreeSelection  *select
                                                       GtkRBNode         *node,
                                                       GtkRBTree         *tree,
                                                       GtkTreePath       *path,
-                                                      GdkModifierType    state);
+                                                       GtkTreeSelectMode  mode,
+                                                      gboolean           override_browse_mode);
 gboolean     _gtk_tree_view_find_node                 (GtkTreeView       *tree_view,
                                                       GtkTreePath       *path,
                                                       GtkRBTree        **tree,
@@ -269,25 +307,75 @@ gboolean     _gtk_tree_view_find_node                 (GtkTreeView       *tree_v
 GtkTreePath *_gtk_tree_view_find_path                 (GtkTreeView       *tree_view,
                                                       GtkRBTree         *tree,
                                                       GtkRBNode         *node);
-void         _gtk_tree_view_update_size               (GtkTreeView       *tree_view);
-
+void         _gtk_tree_view_child_move_resize         (GtkTreeView       *tree_view,
+                                                      GtkWidget         *widget,
+                                                      gint               x,
+                                                      gint               y,
+                                                      gint               width,
+                                                      gint               height);
+void         _gtk_tree_view_queue_draw_node           (GtkTreeView       *tree_view,
+                                                      GtkRBTree         *tree,
+                                                      GtkRBNode         *node,
+                                                      GdkRectangle      *clip_rect);
 
 void _gtk_tree_view_column_realize_button   (GtkTreeViewColumn *column);
 void _gtk_tree_view_column_unrealize_button (GtkTreeViewColumn *column);
 void _gtk_tree_view_column_set_tree_view    (GtkTreeViewColumn *column,
                                             GtkTreeView       *tree_view);
+void _gtk_tree_view_column_unset_model      (GtkTreeViewColumn *column,
+                                            GtkTreeModel      *old_model);
 void _gtk_tree_view_column_unset_tree_view  (GtkTreeViewColumn *column);
 void _gtk_tree_view_column_set_width        (GtkTreeViewColumn *column,
                                             gint               width);
 void _gtk_tree_view_column_start_drag       (GtkTreeView       *tree_view,
                                             GtkTreeViewColumn *column);
+gboolean _gtk_tree_view_column_cell_event   (GtkTreeViewColumn  *tree_column,
+                                            GtkCellEditable   **editable_widget,
+                                            GdkEvent           *event,
+                                            gchar              *path_string,
+                                            GdkRectangle       *background_area,
+                                            GdkRectangle       *cell_area,
+                                            guint               flags);
+void _gtk_tree_view_column_start_editing (GtkTreeViewColumn *tree_column,
+                                         GtkCellEditable   *editable_widget);
+void _gtk_tree_view_column_stop_editing  (GtkTreeViewColumn *tree_column);
+void _gtk_tree_view_install_mark_rows_col_dirty (GtkTreeView *tree_view);
+void             _gtk_tree_view_column_autosize          (GtkTreeView       *tree_view,
+                                                         GtkTreeViewColumn *column);
+
+gboolean         _gtk_tree_view_column_has_editable_cell (GtkTreeViewColumn *column);
+GtkCellRenderer *_gtk_tree_view_column_get_edited_cell   (GtkTreeViewColumn *column);
+gint             _gtk_tree_view_column_count_special_cells (GtkTreeViewColumn *column);
+GtkCellRenderer *_gtk_tree_view_column_get_cell_at_pos   (GtkTreeViewColumn *column,
+                                                         gint               x);
 
 GtkTreeSelection* _gtk_tree_selection_new                (void);
 GtkTreeSelection* _gtk_tree_selection_new_with_tree_view (GtkTreeView      *tree_view);
 void              _gtk_tree_selection_set_tree_view      (GtkTreeSelection *selection,
                                                           GtkTreeView      *tree_view);
 
-
+void             _gtk_tree_view_column_cell_render      (GtkTreeViewColumn *tree_column,
+                                                         GdkWindow         *window,
+                                                         GdkRectangle      *background_area,
+                                                         GdkRectangle      *cell_area,
+                                                         GdkRectangle      *expose_area,
+                                                         guint              flags);
+gboolean         _gtk_tree_view_column_cell_focus       (GtkTreeViewColumn *tree_column,
+                                                         gint               direction,
+                                                         gboolean           left,
+                                                         gboolean           right);
+void             _gtk_tree_view_column_cell_draw_focus  (GtkTreeViewColumn *tree_column,
+                                                         GdkWindow         *window,
+                                                         GdkRectangle      *background_area,
+                                                         GdkRectangle      *cell_area,
+                                                         GdkRectangle      *expose_area,
+                                                         guint              flags);
+void             _gtk_tree_view_column_cell_set_dirty   (GtkTreeViewColumn *tree_column,
+                                                         gboolean           install_handler);
+void              _gtk_tree_view_column_get_neighbor_sizes (GtkTreeViewColumn *column,
+                                                           GtkCellRenderer   *cell,
+                                                           gint              *left,
+                                                           gint              *right);
 
 
 #ifdef __cplusplus