]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtktreeview.c
Convert input to filename encoding and construct an URI from that. Add
[~andy/gtk] / gtk / gtktreeview.c
index 22e80d3a6d48b6224da0bc32c16f5d5423ac4348..dd0eddbb64d59e77f98a8e21e370b5bea5debe91 100644 (file)
@@ -133,12 +133,14 @@ enum {
   PROP_SEARCH_COLUMN,
   PROP_FIXED_HEIGHT_MODE,
   PROP_HOVER_SELECTION,
-  PROP_HOVER_EXPAND
+  PROP_HOVER_EXPAND,
+  PROP_SHOW_EXPANDERS,
+  PROP_LEVEL_INDENTATION,
+  PROP_RUBBER_BANDING,
+  PROP_ENABLE_GRID_LINES,
+  PROP_ENABLE_TREE_LINES
 };
 
-static void     gtk_tree_view_class_init           (GtkTreeViewClass *klass);
-static void     gtk_tree_view_init                 (GtkTreeView      *tree_view);
-
 /* object signals */
 static void     gtk_tree_view_finalize             (GObject          *object);
 static void     gtk_tree_view_set_property         (GObject         *object,
@@ -380,6 +382,7 @@ static void     column_sizing_notify                         (GObject
                                                               gpointer           data);
 static gboolean expand_collapse_timeout                      (gpointer           data);
 static gboolean do_expand_collapse                           (GtkTreeView       *tree_view);
+static void     gtk_tree_view_stop_rubber_band                (GtkTreeView       *tree_view);
 
 /* interactive search */
 static void     gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view);
@@ -456,8 +459,9 @@ static void gtk_tree_view_tree_window_to_tree_coords (GtkTreeView *tree_view,
                                                      gint        *tx,
                                                      gint        *ty);
 
+static gint scroll_row_timeout                       (gpointer     data);
+static void remove_scroll_timeout                    (GtkTreeView *tree_view);
 
-static GtkContainerClass *parent_class = NULL;
 static guint tree_view_signals [LAST_SIGNAL] = { 0 };
 
 \f
@@ -465,33 +469,7 @@ static guint tree_view_signals [LAST_SIGNAL] = { 0 };
 /* GType Methods
  */
 
-GType
-gtk_tree_view_get_type (void)
-{
-  static GType tree_view_type = 0;
-
-  if (!tree_view_type)
-    {
-      static const GTypeInfo tree_view_info =
-      {
-        sizeof (GtkTreeViewClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-        (GClassInitFunc) gtk_tree_view_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-        sizeof (GtkTreeView),
-       0,              /* n_preallocs */
-        (GInstanceInitFunc) gtk_tree_view_init
-      };
-
-      tree_view_type =
-       g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkTreeView"),
-                               &tree_view_info, 0);
-    }
-
-  return tree_view_type;
-}
+G_DEFINE_TYPE (GtkTreeView, gtk_tree_view, GTK_TYPE_CONTAINER)
 
 static void
 gtk_tree_view_class_init (GtkTreeViewClass *class)
@@ -502,7 +480,6 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
   GtkContainerClass *container_class;
   GtkBindingSet *binding_set;
 
-  parent_class = g_type_class_peek_parent (class);
   binding_set = gtk_binding_set_by_class (class);
 
   o_class = (GObjectClass *) class;
@@ -708,6 +685,48 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                            FALSE,
                                                            GTK_PARAM_READWRITE));
 
+    g_object_class_install_property (o_class,
+                                    PROP_SHOW_EXPANDERS,
+                                    g_param_spec_boolean ("show-expanders",
+                                                          P_("Show Expanders"),
+                                                          P_("View has expanders"),
+                                                          TRUE,
+                                                          GTK_PARAM_READWRITE));
+
+    g_object_class_install_property (o_class,
+                                    PROP_LEVEL_INDENTATION,
+                                    g_param_spec_int ("level-indentation",
+                                                      P_("Level Indentation"),
+                                                      P_("Extra indentation for each level"),
+                                                      0,
+                                                      G_MAXINT,
+                                                      0,
+                                                      GTK_PARAM_READWRITE));
+
+    g_object_class_install_property (o_class,
+                                     PROP_RUBBER_BANDING,
+                                     g_param_spec_boolean ("rubber-banding",
+                                                           P_("Rubber Banding"),
+                                                           P_("Whether to enable selection of multiple items by dragging the mouse pointer"),
+                                                           FALSE,
+                                                           GTK_PARAM_READWRITE));
+
+    g_object_class_install_property (o_class,
+                                     PROP_ENABLE_GRID_LINES,
+                                     g_param_spec_boolean ("enable-grid-lines",
+                                                           P_("Enable Grid Lines"),
+                                                           P_("Whether grid lines should be drawn in the tree view"),
+                                                           FALSE,
+                                                           GTK_PARAM_READWRITE));
+
+    g_object_class_install_property (o_class,
+                                     PROP_ENABLE_TREE_LINES,
+                                     g_param_spec_boolean ("enable-tree-lines",
+                                                           P_("Enable Tree Lines"),
+                                                           P_("Whether tree lines should be drawn in the tree view"),
+                                                           FALSE,
+                                                           GTK_PARAM_READWRITE));
+
   /* Style properties */
 #define _TREE_VIEW_EXPANDER_SIZE 12
 #define _TREE_VIEW_VERTICAL_SEPARATOR 2
@@ -768,6 +787,41 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                               GDK_TYPE_COLOR,
                                                               GTK_PARAM_READABLE));
 
+  gtk_widget_class_install_style_property (widget_class,
+                                          g_param_spec_boolean ("row-ending-details",
+                                                                P_("Row Ending details"),
+                                                                P_("Enable extended row background theming"),
+                                                                FALSE,
+                                                                GTK_PARAM_READABLE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                          g_param_spec_int ("grid-line-width",
+                                                            P_("Grid line width"),
+                                                            P_("Width, in pixels, of the tree view grid lines"),
+                                                            0, G_MAXINT, 1,
+                                                            GTK_PARAM_READABLE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                          g_param_spec_int ("tree-line-width",
+                                                            P_("Tree line width"),
+                                                            P_("Width, in pixels, of the tree view lines"),
+                                                            0, G_MAXINT, 1,
+                                                            GTK_PARAM_READABLE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                          g_param_spec_string ("grid-line-pattern",
+                                                               P_("Grid line pattern"),
+                                                               P_("Dash pattern used to draw the tree view grid lines"),
+                                                               "\1\1",
+                                                               GTK_PARAM_READABLE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                          g_param_spec_string ("tree-line-pattern",
+                                                               P_("Tree line pattern"),
+                                                               P_("Dash pattern used to draw the tree view lines"),
+                                                               "\1\1",
+                                                               GTK_PARAM_READABLE));
+
   /* Signals */
   widget_class->set_scroll_adjustments_signal =
     g_signal_new (I_("set_scroll_adjustments"),
@@ -806,8 +860,19 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  GTK_TYPE_TREE_PATH,
                  GTK_TYPE_TREE_VIEW_COLUMN);
 
+  /**
+   * GtkTreeView::test-expand-row:
+   * @tree_view: the object on which the signal is emitted
+   * @iter: the tree iter of the row to expand
+   * @path: a tree path that points to the row 
+   * 
+   * The given row is about to be expanded (show its children nodes). Use this
+   * signal if you need to control the expandability of individual rows.
+   *
+   * Returns: %TRUE to allow expansion, %FALSE to reject
+   */
   tree_view_signals[TEST_EXPAND_ROW] =
-    g_signal_new (I_("test_expand_row"),
+    g_signal_new (I_("test-expand-row"),
                  G_TYPE_FROM_CLASS (o_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkTreeViewClass, test_expand_row),
@@ -817,8 +882,19 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  GTK_TYPE_TREE_ITER,
                  GTK_TYPE_TREE_PATH);
 
+  /**
+   * GtkTreeView::test-collapse-row:
+   * @tree_view: the object on which the signal is emitted
+   * @iter: the tree iter of the row to collapse
+   * @path: a tree path that points to the row 
+   * 
+   * The given row is about to be collapsed (hide its children nodes). Use this
+   * signal if you need to control the collapsibility of individual rows.
+   *
+   * Returns: %TRUE to allow expansion, %FALSE to reject
+   */
   tree_view_signals[TEST_COLLAPSE_ROW] =
-    g_signal_new (I_("test_collapse_row"),
+    g_signal_new (I_("test-collapse-row"),
                  G_TYPE_FROM_CLASS (o_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkTreeViewClass, test_collapse_row),
@@ -828,8 +904,16 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  GTK_TYPE_TREE_ITER,
                  GTK_TYPE_TREE_PATH);
 
+  /**
+   * GtkTreeView::row-expanded:
+   * @tree_view: the object on which the signal is emitted
+   * @iter: the tree iter of the expanded row
+   * @path: a tree path that points to the row 
+   * 
+   * The given row has been expanded (child nodes are shown).
+   */
   tree_view_signals[ROW_EXPANDED] =
-    g_signal_new (I_("row_expanded"),
+    g_signal_new (I_("row-expanded"),
                  G_TYPE_FROM_CLASS (o_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkTreeViewClass, row_expanded),
@@ -839,8 +923,16 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  GTK_TYPE_TREE_ITER,
                  GTK_TYPE_TREE_PATH);
 
+  /**
+   * GtkTreeView::row-collapsed:
+   * @tree_view: the object on which the signal is emitted
+   * @iter: the tree iter of the collapsed row
+   * @path: a tree path that points to the row 
+   * 
+   * The given row has been collapsed (child nodes are hidden).
+   */
   tree_view_signals[ROW_COLLAPSED] =
-    g_signal_new (I_("row_collapsed"),
+    g_signal_new (I_("row-collapsed"),
                  G_TYPE_FROM_CLASS (o_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkTreeViewClass, row_collapsed),
@@ -850,8 +942,14 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  GTK_TYPE_TREE_ITER,
                  GTK_TYPE_TREE_PATH);
 
+  /**
+   * GtkTreeView::columns-changed:
+   * @tree_view: the object on which the signal is emitted 
+   * 
+   * The number of columns of the treeview has changed.
+   */
   tree_view_signals[COLUMNS_CHANGED] =
-    g_signal_new (I_("columns_changed"),
+    g_signal_new (I_("columns-changed"),
                  G_TYPE_FROM_CLASS (o_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkTreeViewClass, columns_changed),
@@ -859,8 +957,14 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  _gtk_marshal_NONE__NONE,
                  G_TYPE_NONE, 0);
 
+  /**
+   * GtkTreeView::cursor-changed:
+   * @tree_view: the object on which the signal is emitted
+   * 
+   * The position of the cursor (focused cell) has changed.
+   */
   tree_view_signals[CURSOR_CHANGED] =
-    g_signal_new (I_("cursor_changed"),
+    g_signal_new (I_("cursor-changed"),
                  G_TYPE_FROM_CLASS (o_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkTreeViewClass, cursor_changed),
@@ -1199,6 +1303,13 @@ gtk_tree_view_init (GtkTreeView *tree_view)
           
   tree_view->priv->hover_selection = FALSE;
   tree_view->priv->hover_expand = FALSE;
+
+  tree_view->priv->level_indentation = 0;
+
+  tree_view->priv->rubber_banding_enable = FALSE;
+
+  tree_view->priv->grid_lines = GTK_TREE_VIEW_GRID_LINES_NONE;
+  tree_view->priv->tree_lines_enabled = FALSE;
 }
 
 \f
@@ -1257,6 +1368,24 @@ gtk_tree_view_set_property (GObject         *object,
     case PROP_HOVER_EXPAND:
       tree_view->priv->hover_expand = g_value_get_boolean (value);
       break;
+    case PROP_SHOW_EXPANDERS:
+      if (g_value_get_boolean (value))
+       GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_SHOW_EXPANDERS);
+      else
+       GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_SHOW_EXPANDERS);
+      break;
+    case PROP_LEVEL_INDENTATION:
+      tree_view->priv->level_indentation = g_value_get_int (value);
+      break;
+    case PROP_RUBBER_BANDING:
+      tree_view->priv->rubber_banding_enable = g_value_get_boolean (value);
+      break;
+    case PROP_ENABLE_GRID_LINES:
+      gtk_tree_view_set_grid_lines (tree_view, g_value_get_boolean (value));
+      break;
+    case PROP_ENABLE_TREE_LINES:
+      gtk_tree_view_set_enable_tree_lines (tree_view, g_value_get_boolean (value));
+      break;
     default:
       break;
     }
@@ -1313,6 +1442,21 @@ gtk_tree_view_get_property (GObject    *object,
     case PROP_HOVER_EXPAND:
       g_value_set_boolean (value, tree_view->priv->hover_expand);
       break;
+    case PROP_SHOW_EXPANDERS:
+      g_value_set_boolean (value, GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_SHOW_EXPANDERS));
+      break;
+    case PROP_LEVEL_INDENTATION:
+      g_value_set_int (value, tree_view->priv->level_indentation);
+      break;
+    case PROP_RUBBER_BANDING:
+      g_value_set_boolean (value, tree_view->priv->rubber_banding_enable);
+      break;
+    case PROP_ENABLE_GRID_LINES:
+      g_value_set_boolean (value, tree_view->priv->grid_lines);
+      break;
+    case PROP_ENABLE_TREE_LINES:
+      g_value_set_boolean (value, tree_view->priv->tree_lines_enabled);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1322,7 +1466,7 @@ gtk_tree_view_get_property (GObject    *object,
 static void
 gtk_tree_view_finalize (GObject *object)
 {
-  (* G_OBJECT_CLASS (parent_class)->finalize) (object);
+  (* G_OBJECT_CLASS (gtk_tree_view_parent_class)->finalize) (object);
 }
 
 \f
@@ -1473,8 +1617,8 @@ gtk_tree_view_destroy (GtkObject *object)
       tree_view->priv->vadjustment = NULL;
     }
 
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+  if (GTK_OBJECT_CLASS (gtk_tree_view_parent_class)->destroy)
+    (* GTK_OBJECT_CLASS (gtk_tree_view_parent_class)->destroy) (object);
 }
 
 \f
@@ -1617,7 +1761,7 @@ gtk_tree_view_realize (GtkWidget *widget)
 
   /* Add them all up. */
   widget->style = gtk_style_attach (widget->style, widget->window);
-  gdk_window_set_background (widget->window, &widget->style->base[widget->state]);
+  gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
   gdk_window_set_background (tree_view->priv->bin_window, &widget->style->base[widget->state]);
   gtk_style_set_background (widget->style, tree_view->priv->header_window, GTK_STATE_NORMAL);
 
@@ -1633,6 +1777,10 @@ gtk_tree_view_realize (GtkWidget *widget)
   for (tmp_list = tree_view->priv->columns; tmp_list; tmp_list = tmp_list->next)
     _gtk_tree_view_column_realize_button (GTK_TREE_VIEW_COLUMN (tmp_list->data));
 
+  /* Need to call those here, since they craete GCs */
+  gtk_tree_view_set_grid_lines (tree_view, tree_view->priv->grid_lines);
+  gtk_tree_view_set_enable_tree_lines (tree_view, tree_view->priv->tree_lines_enabled);
+
   install_presize_handler (tree_view); 
 }
 
@@ -1714,8 +1862,8 @@ gtk_tree_view_unrealize (GtkWidget *widget)
     }
 
   /* GtkWidget::unrealize destroys children and widget->window */
-  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+  if (GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->unrealize)
+    (* GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->unrealize) (widget);
 }
 
 /* GtkWidget::size_request helper */
@@ -2247,6 +2395,7 @@ gtk_tree_view_button_press (GtkWidget      *widget,
       gint column_handled_click = FALSE;
       gboolean row_double_click = FALSE;
       gboolean rtl;
+      gboolean node_selected;
 
       /* Empty tree? */
       if (tree_view->priv->tree == NULL)
@@ -2257,7 +2406,8 @@ gtk_tree_view_button_press (GtkWidget      *widget,
 
       /* are we in an arrow? */
       if (tree_view->priv->prelight_node &&
-          GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT))
+          GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT) &&
+         TREE_VIEW_DRAW_EXPANDERS (tree_view))
        {
          if (event->button == 1)
            {
@@ -2321,11 +2471,18 @@ gtk_tree_view_button_press (GtkWidget      *widget,
          cell_area.height -= vertical_separator;
          cell_area.x += horizontal_separator/2;
          cell_area.y += vertical_separator/2;
-         if (gtk_tree_view_is_expander_column (tree_view, column) &&
-              TREE_VIEW_DRAW_EXPANDERS(tree_view))
+         if (gtk_tree_view_is_expander_column (tree_view, column))
            {
-             cell_area.x += depth * tree_view->priv->expander_size;
-             cell_area.width -= depth * tree_view->priv->expander_size;
+             if (!rtl)
+               cell_area.x += (depth - 1) * tree_view->priv->level_indentation;
+             cell_area.width -= (depth - 1) * tree_view->priv->level_indentation;
+
+              if (TREE_VIEW_DRAW_EXPANDERS (tree_view))
+               {
+                 if (!rtl)
+                   cell_area.x += depth * tree_view->priv->expander_size;
+                 cell_area.width -= depth * tree_view->priv->expander_size;
+               }
            }
          break;
        }
@@ -2407,6 +2564,7 @@ gtk_tree_view_button_press (GtkWidget      *widget,
        }
 
       /* select */
+      node_selected = GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED);
       pre_val = tree_view->priv->vadjustment->value;
 
       /* we only handle selection modifications on the first button press
@@ -2459,6 +2617,21 @@ gtk_tree_view_button_press (GtkWidget      *widget,
           tree_view->priv->pressed_button = event->button;
           tree_view->priv->press_start_x = event->x;
           tree_view->priv->press_start_y = event->y;
+
+         if (tree_view->priv->rubber_banding_enable
+             && !node_selected
+             && tree_view->priv->selection->type == GTK_SELECTION_MULTIPLE)
+           {
+             tree_view->priv->press_start_y += tree_view->priv->dy;
+             tree_view->priv->rubber_band_x = event->x;
+             tree_view->priv->rubber_band_y = event->y + tree_view->priv->dy;
+             tree_view->priv->rubber_band_status = RUBBER_BAND_MAYBE_START;
+
+             if ((event->state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+               tree_view->priv->rubber_band_ctrl = TRUE;
+             if ((event->state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK)
+               tree_view->priv->rubber_band_shift = TRUE;
+           }
         }
 
       /* Test if a double click happened on the same row. */
@@ -2674,6 +2847,9 @@ gtk_tree_view_button_release (GtkWidget      *widget,
   if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IN_COLUMN_DRAG))
     return gtk_tree_view_button_release_drag_column (widget, event);
 
+  if (tree_view->priv->rubber_band_status)
+    gtk_tree_view_stop_rubber_band (tree_view);
+
   if (tree_view->priv->pressed_button == event->button)
     tree_view->priv->pressed_button = -1;
 
@@ -2835,7 +3011,7 @@ do_prelight (GtkTreeView *tree_view,
       /*  We are still on the same node,
          but we might need to take care of the arrow  */
 
-      if (tree && node)
+      if (tree && node && TREE_VIEW_DRAW_EXPANDERS (tree_view))
        {
          gboolean over_arrow;
          gboolean flag_set;
@@ -2867,7 +3043,8 @@ do_prelight (GtkTreeView *tree_view,
       GTK_RBNODE_UNSET_FLAG (tree_view->priv->prelight_node,
                             GTK_RBNODE_IS_PRELIT);
 
-      if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT))
+      if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_ARROW_PRELIT)
+         && TREE_VIEW_DRAW_EXPANDERS (tree_view))
        {
          GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT);
          
@@ -2897,7 +3074,8 @@ do_prelight (GtkTreeView *tree_view,
 
   /*  Prelight the new node and arrow  */
 
-  if (coords_are_over_arrow (tree_view, tree, node, x, y))
+  if (TREE_VIEW_DRAW_EXPANDERS (tree_view)
+      && coords_are_over_arrow (tree_view, tree, node, x, y))
     {
       GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_ARROW_PRELIT);
 
@@ -3370,6 +3548,335 @@ gtk_tree_view_motion_drag_column (GtkWidget      *widget,
   return TRUE;
 }
 
+static void
+gtk_tree_view_stop_rubber_band (GtkTreeView *tree_view)
+{
+  remove_scroll_timeout (tree_view);
+  gtk_grab_remove (GTK_WIDGET (tree_view));
+
+  gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+
+  if (tree_view->priv->rubber_band_status == RUBBER_BAND_ACTIVE)
+    {
+      GtkTreePath *tmp_path;
+
+      /* The anchor path should be set to the start path */
+      tmp_path = _gtk_tree_view_find_path (tree_view,
+                                          tree_view->priv->rubber_band_start_tree,
+                                          tree_view->priv->rubber_band_start_node);
+
+      if (tree_view->priv->anchor)
+       gtk_tree_row_reference_free (tree_view->priv->anchor);
+
+      tree_view->priv->anchor =
+       gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view),
+                                         tree_view->priv->model,
+                                         tmp_path);
+
+      gtk_tree_path_free (tmp_path);
+
+      /* ... and the cursor to the end path */
+      tmp_path = _gtk_tree_view_find_path (tree_view,
+                                          tree_view->priv->rubber_band_end_tree,
+                                          tree_view->priv->rubber_band_end_node);
+      gtk_tree_view_real_set_cursor (GTK_TREE_VIEW (tree_view), tmp_path, FALSE, FALSE);
+      gtk_tree_path_free (tmp_path);
+
+      _gtk_tree_selection_emit_changed (tree_view->priv->selection);
+    }
+
+  /* Clear status variables */
+  tree_view->priv->rubber_band_status = RUBBER_BAND_OFF;
+  tree_view->priv->rubber_band_shift = 0;
+  tree_view->priv->rubber_band_ctrl = 0;
+
+  tree_view->priv->rubber_band_start_node = NULL;
+  tree_view->priv->rubber_band_start_tree = NULL;
+  tree_view->priv->rubber_band_end_node = NULL;
+  tree_view->priv->rubber_band_end_tree = NULL;
+}
+
+static void
+gtk_tree_view_update_rubber_band_selection_range (GtkTreeView *tree_view,
+                                                GtkRBTree   *start_tree,
+                                                GtkRBNode   *start_node,
+                                                GtkRBTree   *end_tree,
+                                                GtkRBNode   *end_node,
+                                                gboolean     select,
+                                                gboolean     skip_start,
+                                                gboolean     skip_end)
+{
+  if (start_node == end_node)
+    return;
+
+  /* We skip the first node and jump inside the loop */
+  if (skip_start)
+    goto skip_first;
+
+  do
+    {
+      if (select)
+        {
+         if (tree_view->priv->rubber_band_shift)
+           GTK_RBNODE_SET_FLAG (start_node, GTK_RBNODE_IS_SELECTED);
+         else if (tree_view->priv->rubber_band_ctrl)
+           {
+             /* Toggle the selection state */
+             if (GTK_RBNODE_FLAG_SET (start_node, GTK_RBNODE_IS_SELECTED))
+               GTK_RBNODE_UNSET_FLAG (start_node, GTK_RBNODE_IS_SELECTED);
+             else
+               GTK_RBNODE_SET_FLAG (start_node, GTK_RBNODE_IS_SELECTED);
+           }
+         else
+           GTK_RBNODE_SET_FLAG (start_node, GTK_RBNODE_IS_SELECTED);
+       }
+      else
+        {
+         /* Mirror the above */
+         if (tree_view->priv->rubber_band_shift)
+           GTK_RBNODE_UNSET_FLAG (start_node, GTK_RBNODE_IS_SELECTED);
+         else if (tree_view->priv->rubber_band_ctrl)
+           {
+             /* Toggle the selection state */
+             if (GTK_RBNODE_FLAG_SET (start_node, GTK_RBNODE_IS_SELECTED))
+               GTK_RBNODE_UNSET_FLAG (start_node, GTK_RBNODE_IS_SELECTED);
+             else
+               GTK_RBNODE_SET_FLAG (start_node, GTK_RBNODE_IS_SELECTED);
+           }
+         else
+           GTK_RBNODE_UNSET_FLAG (start_node, GTK_RBNODE_IS_SELECTED);
+       }
+
+      _gtk_tree_view_queue_draw_node (tree_view, start_tree, start_node, NULL);
+
+      if (start_node == end_node)
+       break;
+
+skip_first:
+
+      if (start_node->children)
+        {
+         start_tree = start_node->children;
+         start_node = start_tree->root;
+         while (start_node->left != start_tree->nil)
+           start_node = start_node->left;
+       }
+      else
+        {
+         _gtk_rbtree_next_full (start_tree, start_node, &start_tree, &start_node);
+
+         if (!start_tree)
+           /* Ran out of tree */
+           break;
+       }
+
+      if (skip_end && start_node == end_node)
+       break;
+    }
+  while (TRUE);
+}
+
+static void
+gtk_tree_view_update_rubber_band_selection (GtkTreeView *tree_view)
+{
+  GtkRBTree *start_tree, *end_tree;
+  GtkRBNode *start_node, *end_node;
+
+  _gtk_rbtree_find_offset (tree_view->priv->tree, MIN (tree_view->priv->press_start_y, tree_view->priv->rubber_band_y), &start_tree, &start_node);
+  _gtk_rbtree_find_offset (tree_view->priv->tree, MAX (tree_view->priv->press_start_y, tree_view->priv->rubber_band_y), &end_tree, &end_node);
+
+  /* Handle the start area first */
+  if (!tree_view->priv->rubber_band_start_node)
+    {
+      gtk_tree_view_update_rubber_band_selection_range (tree_view,
+                                                      start_tree,
+                                                      start_node,
+                                                      end_tree,
+                                                      end_node,
+                                                      TRUE,
+                                                      FALSE,
+                                                      FALSE);
+    }
+  else if (_gtk_rbtree_node_find_offset (start_tree, start_node) <
+           _gtk_rbtree_node_find_offset (tree_view->priv->rubber_band_start_tree, tree_view->priv->rubber_band_start_node))
+    {
+      /* New node is above the old one; selection became bigger */
+      gtk_tree_view_update_rubber_band_selection_range (tree_view,
+                                                      start_tree,
+                                                      start_node,
+                                                      tree_view->priv->rubber_band_start_tree,
+                                                      tree_view->priv->rubber_band_start_node,
+                                                      TRUE,
+                                                      FALSE,
+                                                      TRUE);
+    }
+  else if (_gtk_rbtree_node_find_offset (start_tree, start_node) >
+           _gtk_rbtree_node_find_offset (tree_view->priv->rubber_band_start_tree, tree_view->priv->rubber_band_start_node))
+    {
+      /* New node is below the old one; selection became smaller */
+      gtk_tree_view_update_rubber_band_selection_range (tree_view,
+                                                      tree_view->priv->rubber_band_start_tree,
+                                                      tree_view->priv->rubber_band_start_node,
+                                                      start_tree,
+                                                      start_node,
+                                                      FALSE,
+                                                      FALSE,
+                                                      TRUE);
+    }
+
+  tree_view->priv->rubber_band_start_tree = start_tree;
+  tree_view->priv->rubber_band_start_node = start_node;
+
+  /* Next, handle the end area */
+  if (!tree_view->priv->rubber_band_end_node)
+    {
+      /* In the event this happens, start_node was also NULL; this case is
+       * handled above.
+       */
+    }
+  else if (!end_node)
+    {
+      /* Find the last node in the tree */
+      _gtk_rbtree_find_offset (tree_view->priv->tree, tree_view->priv->height - 1,
+                              &end_tree, &end_node);
+
+      /* Selection reached end of the tree */
+      gtk_tree_view_update_rubber_band_selection_range (tree_view,
+                                                      tree_view->priv->rubber_band_end_tree,
+                                                      tree_view->priv->rubber_band_end_node,
+                                                      end_tree,
+                                                      end_node,
+                                                      TRUE,
+                                                      TRUE,
+                                                      FALSE);
+    }
+  else if (_gtk_rbtree_node_find_offset (end_tree, end_node) >
+           _gtk_rbtree_node_find_offset (tree_view->priv->rubber_band_end_tree, tree_view->priv->rubber_band_end_node))
+    {
+      /* New node is below the old one; selection became bigger */
+      gtk_tree_view_update_rubber_band_selection_range (tree_view,
+                                                      tree_view->priv->rubber_band_end_tree,
+                                                      tree_view->priv->rubber_band_end_node,
+                                                      end_tree,
+                                                      end_node,
+                                                      TRUE,
+                                                      TRUE,
+                                                      FALSE);
+    }
+  else if (_gtk_rbtree_node_find_offset (end_tree, end_node) <
+           _gtk_rbtree_node_find_offset (tree_view->priv->rubber_band_end_tree, tree_view->priv->rubber_band_end_node))
+    {
+      /* New node is above the old one; selection became smaller */
+      gtk_tree_view_update_rubber_band_selection_range (tree_view,
+                                                      end_tree,
+                                                      end_node,
+                                                      tree_view->priv->rubber_band_end_tree,
+                                                      tree_view->priv->rubber_band_end_node,
+                                                      FALSE,
+                                                      TRUE,
+                                                      FALSE);
+    }
+
+  tree_view->priv->rubber_band_end_tree = end_tree;
+  tree_view->priv->rubber_band_end_node = end_node;
+}
+
+static void
+gtk_tree_view_update_rubber_band (GtkTreeView *tree_view)
+{
+  gint x, y;
+  GdkRectangle old_area;
+  GdkRectangle new_area;
+  GdkRectangle common;
+  GdkRegion *invalid_region;
+
+  old_area.x = MIN (tree_view->priv->press_start_x, tree_view->priv->rubber_band_x);
+  old_area.y = MIN (tree_view->priv->press_start_y, tree_view->priv->rubber_band_y) - tree_view->priv->dy;
+  old_area.width = ABS (tree_view->priv->rubber_band_x - tree_view->priv->press_start_x) + 1;
+  old_area.height = ABS (tree_view->priv->rubber_band_y - tree_view->priv->press_start_y) + 1;
+
+  gdk_window_get_pointer (tree_view->priv->bin_window, &x, &y, NULL);
+
+  x = MAX (x, 0);
+  y = MAX (y, 0) + tree_view->priv->dy;
+
+  new_area.x = MIN (tree_view->priv->press_start_x, x);
+  new_area.y = MIN (tree_view->priv->press_start_y, y) - tree_view->priv->dy;
+  new_area.width = ABS (x - tree_view->priv->press_start_x) + 1;
+  new_area.height = ABS (y - tree_view->priv->press_start_y) + 1;
+
+  invalid_region = gdk_region_rectangle (&old_area);
+  gdk_region_union_with_rect (invalid_region, &new_area);
+
+  gdk_rectangle_intersect (&old_area, &new_area, &common);
+  if (common.width > 2 && common.height > 2)
+    {
+      GdkRegion *common_region;
+
+      /* make sure the border is invalidated */
+      common.x += 1;
+      common.y += 1;
+      common.width -= 2;
+      common.height -= 2;
+
+      common_region = gdk_region_rectangle (&common);
+
+      gdk_region_subtract (invalid_region, common_region);
+      gdk_region_destroy (common_region);
+    }
+
+  gdk_window_invalidate_region (tree_view->priv->bin_window, invalid_region, TRUE);
+
+  gdk_region_destroy (invalid_region);
+
+  tree_view->priv->rubber_band_x = x;
+  tree_view->priv->rubber_band_y = y;
+
+  gtk_tree_view_update_rubber_band_selection (tree_view);
+}
+
+static void
+gtk_tree_view_paint_rubber_band (GtkTreeView  *tree_view,
+                               GdkRectangle *area)
+{
+  cairo_t *cr;
+  GdkRectangle rect;
+  GdkRectangle rubber_rect;
+
+  rubber_rect.x = MIN (tree_view->priv->press_start_x, tree_view->priv->rubber_band_x);
+  rubber_rect.y = MIN (tree_view->priv->press_start_y, tree_view->priv->rubber_band_y) - tree_view->priv->dy;
+  rubber_rect.width = ABS (tree_view->priv->press_start_x - tree_view->priv->rubber_band_x) + 1;
+  rubber_rect.height = ABS (tree_view->priv->press_start_y - tree_view->priv->rubber_band_y) + 1;
+
+  if (!gdk_rectangle_intersect (&rubber_rect, area, &rect))
+    return;
+
+  cr = gdk_cairo_create (tree_view->priv->bin_window);
+  cairo_set_line_width (cr, 1.0);
+
+  cairo_set_source_rgba (cr,
+                        GTK_WIDGET (tree_view)->style->fg[GTK_STATE_NORMAL].red / 65535.,
+                        GTK_WIDGET (tree_view)->style->fg[GTK_STATE_NORMAL].green / 65535.,
+                        GTK_WIDGET (tree_view)->style->fg[GTK_STATE_NORMAL].blue / 65535.,
+                        .25);
+
+  gdk_cairo_rectangle (cr, &rect);
+  cairo_clip (cr);
+  cairo_paint (cr);
+
+  cairo_set_source_rgb (cr,
+                       GTK_WIDGET (tree_view)->style->fg[GTK_STATE_NORMAL].red / 65535.,
+                       GTK_WIDGET (tree_view)->style->fg[GTK_STATE_NORMAL].green / 65535.,
+                       GTK_WIDGET (tree_view)->style->fg[GTK_STATE_NORMAL].blue / 65535.);
+
+  cairo_rectangle (cr,
+                  rubber_rect.x + 0.5, rubber_rect.y + 0.5,
+                  rubber_rect.width - 1, rubber_rect.height - 1);
+  cairo_stroke (cr);
+
+  cairo_destroy (cr);
+}
+
 static gboolean
 gtk_tree_view_motion_bin_window (GtkWidget      *widget,
                                 GdkEventMotion *event)
@@ -3384,8 +3891,26 @@ gtk_tree_view_motion_bin_window (GtkWidget      *widget,
   if (tree_view->priv->tree == NULL)
     return FALSE;
 
+  if (tree_view->priv->rubber_band_status == RUBBER_BAND_MAYBE_START)
+    {
+      gtk_grab_add (GTK_WIDGET (tree_view));
+      gtk_tree_view_update_rubber_band (tree_view);
+
+      tree_view->priv->rubber_band_status = RUBBER_BAND_ACTIVE;
+    }
+  else if (tree_view->priv->rubber_band_status == RUBBER_BAND_ACTIVE)
+    {
+      gtk_tree_view_update_rubber_band (tree_view);
+
+      if (tree_view->priv->scroll_timeout == 0)
+        {
+         tree_view->priv->scroll_timeout = g_timeout_add (150, scroll_row_timeout, tree_view);
+       }
+    }
+
   /* only check for an initiated drag when a button is pressed */
-  if (tree_view->priv->pressed_button >= 0)
+  if (tree_view->priv->pressed_button >= 0
+      && !tree_view->priv->rubber_band_status)
     gtk_tree_view_maybe_begin_dragging_row (tree_view, event);
 
   new_y = TREE_WINDOW_Y_TO_RBTREE_Y(tree_view, event->y);
@@ -3470,6 +3995,40 @@ draw_empty_focus (GtkTreeView *tree_view, GdkRectangle *clip_area)
                     1, 1, w, h);
 }
 
+static void
+gtk_tree_view_draw_grid_lines (GtkTreeView    *tree_view,
+                              GdkEventExpose *event,
+                              gint            n_visible_columns)
+{
+  GList *list = tree_view->priv->columns;
+  gint i = 0;
+  gint current_x = 0;
+
+  if (tree_view->priv->grid_lines != GTK_TREE_VIEW_GRID_LINES_VERTICAL
+      && tree_view->priv->grid_lines != GTK_TREE_VIEW_GRID_LINES_BOTH)
+    return;
+
+  /* Only draw the lines for visible rows and columns */
+  for (list = tree_view->priv->columns; list; list = list->next, i++)
+    {
+      GtkTreeViewColumn *column = list->data;
+
+      /* We don't want a line for the list column */
+      if (i == n_visible_columns - 1)
+       break;
+
+      if (! column->visible)
+       continue;
+
+      current_x += column->width;
+
+      gdk_draw_line (event->window,
+                    tree_view->priv->grid_line_gc,
+                    current_x - 1, 0,
+                    current_x - 1, tree_view->priv->height);
+    }
+}
+
 /* Warning: Very scary function.
  * Modify at your own risk
  *
@@ -3513,6 +4072,7 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
   gint n_visible_columns;
   gint pointer_x, pointer_y;
   gboolean got_pointer = FALSE;
+  gboolean row_ending_details;
 
   g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE);
 
@@ -3525,6 +4085,7 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
                        "vertical-separator", &vertical_separator,
                        "allow-rules", &allow_rules,
                        "focus-line-width", &focus_line_width,
+                       "row-ending-details", &row_ending_details,
                        NULL);
 
   if (tree_view->priv->tree == NULL)
@@ -3616,6 +4177,8 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
     {
       gboolean parity;
       gboolean is_separator = FALSE;
+      gboolean is_first = FALSE;
+      gboolean is_last = FALSE;
       
       if (tree_view->priv->row_separator_func)
        {
@@ -3761,24 +4324,138 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
            state = GTK_STATE_NORMAL;
 
          /* Draw background */
-          gtk_paint_flat_box (widget->style,
-                              event->window,
-                             state,
-                              GTK_SHADOW_NONE,
-                              &event->area,
-                              widget,
-                              detail,
-                              background_area.x,
-                              background_area.y,
-                              background_area.width,
-                              background_area.height);
+         if (row_ending_details)
+           {
+             char new_detail[128];
+
+             is_first = (rtl ? !list->next : !list->prev);
+             is_last = (rtl ? !list->prev : !list->next);
+
+             /* (I don't like the snprintfs either, but couldn't find a
+              * less messy way).
+              */
+             if (is_first && is_last)
+               snprintf (new_detail, 127, "%s", detail);
+             else if (is_first)
+               snprintf (new_detail, 127, "%s_start", detail);
+             else if (is_last)
+               snprintf (new_detail, 127, "%s_end", detail);
+             else
+               snprintf (new_detail, 128, "%s_middle", detail);
+
+             gtk_paint_flat_box (widget->style,
+                                 event->window,
+                                 state,
+                                 GTK_SHADOW_NONE,
+                                 &event->area,
+                                 widget,
+                                 new_detail,
+                                 background_area.x,
+                                 background_area.y,
+                                 background_area.width,
+                                 background_area.height);
+           }
+         else
+           {
+             gtk_paint_flat_box (widget->style,
+                                 event->window,
+                                 state,
+                                 GTK_SHADOW_NONE,
+                                 &event->area,
+                                 widget,
+                                 detail,
+                                 background_area.x,
+                                 background_area.y,
+                                 background_area.width,
+                                 background_area.height);
+           }
+
+         if (tree_view->priv->grid_lines == GTK_TREE_VIEW_GRID_LINES_HORIZONTAL
+             || tree_view->priv->grid_lines == GTK_TREE_VIEW_GRID_LINES_BOTH)
+           {
+             if (background_area.y > 0)
+               gdk_draw_line (event->window,
+                              tree_view->priv->grid_line_gc,
+                              background_area.x, background_area.y,
+                              background_area.x + background_area.width,
+                              background_area.y);
+           }
 
          if (gtk_tree_view_is_expander_column (tree_view, column) &&
-              TREE_VIEW_DRAW_EXPANDERS(tree_view))
+             tree_view->priv->tree_lines_enabled)
+           {
+             if ((node->flags & GTK_RBNODE_IS_PARENT) == GTK_RBNODE_IS_PARENT
+                 && depth > 1)
+               {
+                 gdk_draw_line (event->window,
+                                tree_view->priv->tree_line_gc,
+                                background_area.x + tree_view->priv->expander_size * (depth - 1.5),
+                                background_area.y + background_area.height / 2,
+                                background_area.x + tree_view->priv->expander_size * (depth - 1.1),
+                                background_area.y + background_area.height / 2);
+               }
+             else if (depth > 1)
+               {
+                 gdk_draw_line (event->window,
+                                tree_view->priv->tree_line_gc,
+                                background_area.x + tree_view->priv->expander_size * (depth - 1.5),
+                                background_area.y + background_area.height / 2,
+                                background_area.x + tree_view->priv->expander_size * (depth - 0.5),
+                                background_area.y + background_area.height / 2);
+               }
+
+             if (depth > 1)
+               {
+                 gint i;
+                 GtkRBNode *tmp_node;
+                 GtkRBTree *tmp_tree;
+
+                 if (!_gtk_rbtree_next (tree, node))
+                   gdk_draw_line (event->window,
+                                  tree_view->priv->tree_line_gc,
+                                  background_area.x + tree_view->priv->expander_size * (depth - 1.5),
+                                  background_area.y,
+                                  background_area.x + tree_view->priv->expander_size * (depth - 1.5),
+                                  background_area.y + background_area.height / 2);
+                 else
+                   gdk_draw_line (event->window,
+                                  tree_view->priv->tree_line_gc,
+                                  background_area.x + tree_view->priv->expander_size * (depth - 1.5),
+                                  background_area.y,
+                                  background_area.x + tree_view->priv->expander_size * (depth - 1.5),
+                                  background_area.y + background_area.height);
+
+                 tmp_node = tree->parent_node;
+                 tmp_tree = tree->parent_tree;
+
+                 for (i = depth - 2; i > 0; i--)
+                   {
+                     if (_gtk_rbtree_next (tmp_tree, tmp_node))
+                       gdk_draw_line (event->window,
+                                      tree_view->priv->tree_line_gc,
+                                      background_area.x + tree_view->priv->expander_size * (i - 0.5),
+                                      background_area.y,
+                                      background_area.x + tree_view->priv->expander_size * (i - 0.5),
+                                      background_area.y + background_area.height);
+
+                     tmp_node = tmp_tree->parent_node;
+                     tmp_tree = tmp_tree->parent_tree;
+                   }
+               }
+           }
+
+         if (gtk_tree_view_is_expander_column (tree_view, column))
            {
              if (!rtl)
-               cell_area.x += depth * tree_view->priv->expander_size;
-             cell_area.width -= depth * tree_view->priv->expander_size;
+               cell_area.x += (depth - 1) * tree_view->priv->level_indentation;
+             cell_area.width -= (depth - 1) * tree_view->priv->level_indentation;
+
+              if (TREE_VIEW_DRAW_EXPANDERS(tree_view))
+               {
+                 if (!rtl)
+                   cell_area.x += depth * tree_view->priv->expander_size;
+                 cell_area.width -= depth * tree_view->priv->expander_size;
+               }
 
               /* If we have an expander column, the highlight underline
                * starts with that column, so that it indicates which
@@ -3804,7 +4481,8 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
                                                   &cell_area,
                                                   &event->area,
                                                   flags);
-             if ((node->flags & GTK_RBNODE_IS_PARENT) == GTK_RBNODE_IS_PARENT)
+             if (TREE_VIEW_DRAW_EXPANDERS(tree_view)
+                 && (node->flags & GTK_RBNODE_IS_PARENT) == GTK_RBNODE_IS_PARENT)
                {
                  if (!got_pointer)
                    {
@@ -3884,16 +4562,31 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
                break;
              gdk_drawable_get_size (tree_view->priv->bin_window,
                                     &width, NULL);
-             gtk_paint_focus (widget->style,
-                              tree_view->priv->bin_window,
-                              GTK_WIDGET_STATE (widget),
-                              NULL,
-                              widget,
-                              "treeview-drop-indicator",
-                              0, BACKGROUND_FIRST_PIXEL (tree_view, tree, node)
-                              - focus_line_width / 2,
-                              width, ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node))
+
+             if (row_ending_details)
+               gtk_paint_focus (widget->style,
+                                tree_view->priv->bin_window,
+                                GTK_WIDGET_STATE (widget),
+                                NULL,
+                                widget,
+                                (is_first
+                                 ? (is_last ? "treeview-drop-indicator" : "treeview-drop-indicator-left" )
+                                 : (is_last ? "treeview-drop-indicator-right" : "tree-view-drop-indicator-middle" )),
+                                0, BACKGROUND_FIRST_PIXEL (tree_view, tree, node)
+                                - focus_line_width / 2,
+                                width, ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node))
                               - focus_line_width + 1);
+             else
+               gtk_paint_focus (widget->style,
+                                tree_view->priv->bin_window,
+                                GTK_WIDGET_STATE (widget),
+                                NULL,
+                                widget,
+                                "treeview-drop-indicator",
+                                0, BACKGROUND_FIRST_PIXEL (tree_view, tree, node)
+                                - focus_line_width / 2,
+                                width, ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node))
+                                - focus_line_width + 1);
               break;
             }
 
@@ -3924,16 +4617,31 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
 
          gdk_drawable_get_size (tree_view->priv->bin_window,
                                 &width, NULL);
-         gtk_paint_focus (widget->style,
-                          tree_view->priv->bin_window,
-                          focus_rect_state,
-                          NULL,
-                          widget,
-                          "treeview",
-                          0,
-                          BACKGROUND_FIRST_PIXEL (tree_view, tree, node),
-                          width,
-                          ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node)));
+         
+         if (row_ending_details)
+           gtk_paint_focus (widget->style,
+                            tree_view->priv->bin_window,
+                            focus_rect_state,
+                            NULL,
+                            widget,
+                            (is_first
+                             ? (is_last ? "treeview" : "treeview-left" )
+                             : (is_last ? "treeview-right" : "treeview-middle" )),
+                            0,
+                            BACKGROUND_FIRST_PIXEL (tree_view, tree, node),
+                            width,
+                            ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node)));
+         else
+           gtk_paint_focus (widget->style,
+                            tree_view->priv->bin_window,
+                            focus_rect_state,
+                            NULL,
+                            widget,
+                            "treeview",
+                            0,
+                            BACKGROUND_FIRST_PIXEL (tree_view, tree, node),
+                            width,
+                            ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node)));
        }
 
       y_offset += max_height;
@@ -3960,6 +4668,7 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
       else
        {
          gboolean done = FALSE;
+
          do
            {
              node = _gtk_rbtree_next (tree, node);
@@ -3995,7 +4704,24 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
     }
   while (y_offset < event->area.height);
 
- done:
+done:
+  gtk_tree_view_draw_grid_lines (tree_view, event, n_visible_columns);
+
+ if (tree_view->priv->rubber_band_status == RUBBER_BAND_ACTIVE)
+   {
+     GdkRectangle *rectangles;
+     gint n_rectangles;
+
+     gdk_region_get_rectangles (event->region,
+                               &rectangles,
+                               &n_rectangles);
+
+     while (n_rectangles--)
+       gtk_tree_view_paint_rubber_band (tree_view, &rectangles[n_rectangles]);
+
+     g_free (rectangles);
+   }
+
   if (cursor_path)
     gtk_tree_path_free (cursor_path);
 
@@ -4457,7 +5183,7 @@ gtk_tree_view_key_press (GtkWidget   *widget,
     }
 
   /* Chain up to the parent class.  It handles the keybindings. */
-  if ((* GTK_WIDGET_CLASS (parent_class)->key_press_event) (widget, event))
+  if ((* GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->key_press_event) (widget, event))
     return TRUE;
                                                            
   /* We pass the event to the search_entry.  If its text changes, then we start
@@ -4531,7 +5257,7 @@ static gboolean
 gtk_tree_view_key_release (GtkWidget   *widget,
                           GdkEventKey *event)
 {
-  return (* GTK_WIDGET_CLASS (parent_class)->key_release_event) (widget, event);
+  return (* GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->key_release_event) (widget, event);
 }
 
 /* FIXME Is this function necessary? Can I get an enter_notify event
@@ -4576,12 +5302,11 @@ gtk_tree_view_leave_notify (GtkWidget        *widget,
 {
   GtkTreeView *tree_view;
 
-  tree_view = GTK_TREE_VIEW (widget);
-  tree_view->priv->pressed_button = -1;
-
   if (event->mode == GDK_CROSSING_GRAB)
     return TRUE;
 
+  tree_view = GTK_TREE_VIEW (widget);
+
   if (tree_view->priv->prelight_node)
     _gtk_tree_view_queue_draw_node (tree_view,
                                    tree_view->priv->prelight_tree,
@@ -4634,6 +5359,25 @@ gtk_tree_view_node_queue_redraw (GtkTreeView *tree_view,
                              GTK_RBNODE_GET_HEIGHT (node));
 }
 
+static gboolean
+node_is_visible (GtkTreeView *tree_view,
+                GtkRBTree   *tree,
+                GtkRBNode   *node)
+{
+  int y;
+  int height;
+
+  y = _gtk_rbtree_node_find_offset (tree, node);
+  height = ROW_HEIGHT (tree_view, GTK_RBNODE_GET_HEIGHT (node));
+
+  if (y >= tree_view->priv->vadjustment->value &&
+      y + height <= (tree_view->priv->vadjustment->value
+                    + tree_view->priv->vadjustment->page_size))
+    return TRUE;
+
+  return FALSE;
+}
+
 /* Returns TRUE if it updated the size
  */
 static gboolean
@@ -4702,9 +5446,12 @@ validate_row (GtkTreeView *tree_view,
       else
        height = 2 + 2 * focus_pad;
 
-      if (gtk_tree_view_is_expander_column (tree_view, column) && TREE_VIEW_DRAW_EXPANDERS (tree_view))
+      if (gtk_tree_view_is_expander_column (tree_view, column))
         {
-         tmp_width = tmp_width + horizontal_separator + depth * (tree_view->priv->expander_size);
+         tmp_width = tmp_width + horizontal_separator + (depth - 1) * tree_view->priv->level_indentation;
+
+         if (TREE_VIEW_DRAW_EXPANDERS (tree_view))
+           tmp_width += depth * tree_view->priv->expander_size;
        }
       else
        tmp_width = tmp_width + horizontal_separator;
@@ -4768,7 +5515,7 @@ validate_visible_area (GtkTreeView *tree_view)
          if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID) ||
              GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID))
            {
-             need_redraw = TRUE;
+             _gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
              if (validate_row (tree_view, tree, node, &iter, path))
                size_changed = TRUE;
            }
@@ -4883,7 +5630,7 @@ validate_visible_area (GtkTreeView *tree_view)
       if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID) ||
          GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID))
        {
-         need_redraw = TRUE;
+         _gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
          if (validate_row (tree_view, tree, node, &iter, path))
            size_changed = TRUE;
        }
@@ -4921,7 +5668,7 @@ validate_visible_area (GtkTreeView *tree_view)
       if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID) ||
           GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID))
         {
-          need_redraw = TRUE;
+         _gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
           if (validate_row (tree_view, tree, node, &iter, path))
             size_changed = TRUE;
         }
@@ -5002,7 +5749,7 @@ validate_visible_area (GtkTreeView *tree_view)
        {
           gint old_height = new_height;
 
-         need_redraw = TRUE;
+         _gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
          if (validate_row (tree_view, tree, node, &iter, path))
             {
               new_height = GTK_RBNODE_GET_HEIGHT (node);
@@ -5046,7 +5793,7 @@ validate_visible_area (GtkTreeView *tree_view)
        {
           gint old_height = new_height;
 
-         need_redraw = TRUE;
+         _gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
          if (validate_row (tree_view, tree, node, &iter, above_path))
             {
               new_height = GTK_RBNODE_GET_HEIGHT (node);
@@ -5292,7 +6039,7 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
       gtk_adjustment_changed (tree_view->priv->vadjustment);
 
       if (queue_resize)
-        gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+        gtk_widget_queue_resize_no_redraw (GTK_WIDGET (tree_view));
     }
 
   if (path) gtk_tree_path_free (path);
@@ -5496,6 +6243,10 @@ gtk_tree_view_top_row_to_dy (GtkTreeView *tree_view)
 
   tree_view->priv->dy = _gtk_rbtree_node_find_offset (tree, node);
   tree_view->priv->dy += tree_view->priv->top_row_dy;
+
+  if (tree_view->priv->dy + tree_view->priv->vadjustment->page_size > tree_view->priv->height)
+    tree_view->priv->dy = tree_view->priv->height - tree_view->priv->vadjustment->page_size;
+
   gtk_adjustment_set_value (tree_view->priv->vadjustment,
                            (gdouble)tree_view->priv->dy);
 }
@@ -5772,6 +6523,7 @@ remove_scroll_timeout (GtkTreeView *tree_view)
       tree_view->priv->scroll_timeout = 0;
     }
 }
+
 static gboolean
 check_model_dnd (GtkTreeModel *model,
                  GType         required_iface,
@@ -5852,6 +6604,9 @@ scroll_row_timeout (gpointer data)
 
   gtk_tree_view_vertical_autoscroll (tree_view);
 
+  if (tree_view->priv->rubber_band_status == RUBBER_BAND_ACTIVE)
+    gtk_tree_view_update_rubber_band (tree_view);
+
   GDK_THREADS_LEAVE ();
 
   return TRUE;
@@ -6123,11 +6878,14 @@ gtk_tree_view_drag_begin (GtkWidget      *widget,
   GtkTreePath *path = NULL;
   gint cell_x, cell_y;
   GdkPixmap *row_pix;
+  TreeViewDragInfo *di;
 
   tree_view = GTK_TREE_VIEW (widget);
 
-  /* if the user uses a custom DnD impl, we don't set the icon here */
-  if (!get_info (tree_view))
+  /* if the user uses a custom DND source impl, we don't set the icon here */
+  di = get_info (tree_view);
+
+  if (di == NULL || !di->source_set)
     return;
 
   gtk_tree_view_get_path_at_pos (tree_view,
@@ -6855,9 +7613,10 @@ gtk_tree_view_header_focus (GtkTreeView      *tree_view,
     {
       for (tmp_list = tree_view->priv->columns; tmp_list; tmp_list = tmp_list->next)
        if (GTK_TREE_VIEW_COLUMN (tmp_list->data)->button == focus_child)
-         break;
-
-      tree_view->priv->focus_column = GTK_TREE_VIEW_COLUMN (tmp_list->data);
+         {
+           tree_view->priv->focus_column = GTK_TREE_VIEW_COLUMN (tmp_list->data);
+           break;
+         }
 
       /* If the following isn't true, then the view is smaller then the scrollpane.
        */
@@ -6943,7 +7702,7 @@ gtk_tree_view_focus (GtkWidget        *widget,
 static void
 gtk_tree_view_grab_focus (GtkWidget *widget)
 {
-  (* GTK_WIDGET_CLASS (parent_class)->grab_focus) (widget);
+  (* GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->grab_focus) (widget);
 
   gtk_tree_view_focus_to_cursor (GTK_TREE_VIEW (widget));
 }
@@ -6962,8 +7721,11 @@ gtk_tree_view_style_set (GtkWidget *widget,
 
   if (GTK_WIDGET_REALIZED (widget))
     {
-      gdk_window_set_background (widget->window, &widget->style->base[widget->state]);
+      gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
       gdk_window_set_background (tree_view->priv->bin_window, &widget->style->base[widget->state]);
+
+      gtk_tree_view_set_grid_lines (tree_view, tree_view->priv->grid_lines);
+      gtk_tree_view_set_enable_tree_lines (tree_view, tree_view->priv->tree_lines_enabled);
     }
 
   gtk_widget_style_get (widget,
@@ -7000,7 +7762,7 @@ gtk_tree_view_set_focus_child (GtkContainer *container,
        }
     }
 
-  (* parent_class->set_focus_child) (container, child);
+  GTK_CONTAINER_CLASS (gtk_tree_view_parent_class)->set_focus_child (container, child);
 }
 
 static void
@@ -7243,11 +8005,6 @@ gtk_tree_view_row_changed (GtkTreeModel *model,
   if (tree == NULL)
     goto done;
 
-  /* Check if the node became insensitive, and if so, unselect it */
-  if (!_gtk_tree_selection_row_is_selectable (tree_view->priv->selection,
-                                             node, path))
-    gtk_tree_selection_unselect_path (tree_view->priv->selection, path);
-
   if (tree_view->priv->fixed_height_mode
       && tree_view->priv->fixed_height >= 0)
     {
@@ -7293,6 +8050,7 @@ gtk_tree_view_row_inserted (GtkTreeModel *model,
   gint i = 0;
   gint height;
   gboolean free_path = FALSE;
+  gboolean node_visible = TRUE;
 
   g_return_if_fail (path != NULL || iter != NULL);
 
@@ -7326,6 +8084,7 @@ gtk_tree_view_row_inserted (GtkTreeModel *model,
       if (tmptree == NULL)
        {
          /* We aren't showing the node */
+         node_visible = FALSE;
           goto done;
        }
 
@@ -7357,19 +8116,22 @@ gtk_tree_view_row_inserted (GtkTreeModel *model,
     }
 
   if (tree == NULL)
-    goto done;
+    {
+      node_visible = FALSE;
+      goto done;
+    }
 
   /* ref the node */
   gtk_tree_model_ref_node (tree_view->priv->model, iter);
   if (indices[depth - 1] == 0)
     {
       tmpnode = _gtk_rbtree_find_count (tree, 1);
-      _gtk_rbtree_insert_before (tree, tmpnode, height, FALSE);
+      tmpnode = _gtk_rbtree_insert_before (tree, tmpnode, height, FALSE);
     }
   else
     {
       tmpnode = _gtk_rbtree_find_count (tree, indices[depth - 1]);
-      _gtk_rbtree_insert_after (tree, tmpnode, height, FALSE);
+      tmpnode = _gtk_rbtree_insert_after (tree, tmpnode, height, FALSE);
     }
 
  done:
@@ -7377,7 +8139,11 @@ gtk_tree_view_row_inserted (GtkTreeModel *model,
     {
       if (tree)
         _gtk_rbtree_node_mark_valid (tree, tmpnode);
-      gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+
+      if (node_visible && node_is_visible (tree_view, tree, tmpnode))
+       gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+      else
+       gtk_widget_queue_resize_no_redraw (GTK_WIDGET (tree_view));
     }
   else
     install_presize_handler (tree_view);
@@ -7731,23 +8497,14 @@ gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view,
       else
        x_offset += tree_view->priv->expander_size * _gtk_rbtree_get_depth (tree);
     }
-  if (x1)
-    {
-      *x1 = x_offset;
-    }
 
+  *x1 = x_offset;
+  
   if (tmp_column && tmp_column->visible)
-    {
-      /* +1 because x2 isn't included in the range. */
-      if (x2)
-        *x2 = *x1 + tree_view->priv->expander_size + 1;
-    }
+    /* +1 because x2 isn't included in the range. */
+    *x2 = *x1 + tree_view->priv->expander_size + 1;
   else
-    {
-      /* return an empty range, the expander column is hidden */
-      if (x2)
-        *x2 = *x1;
-    }
+    *x2 = *x1;
 }
 
 static void
@@ -7758,6 +8515,7 @@ gtk_tree_view_build_tree (GtkTreeView *tree_view,
                          gboolean     recurse)
 {
   GtkRBNode *temp = NULL;
+  GtkTreePath *path = NULL;
   gboolean is_list = GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_IS_LIST);
 
   do
@@ -7781,14 +8539,27 @@ gtk_tree_view_build_tree (GtkTreeView *tree_view,
        {
          GtkTreeIter child;
 
+         if (!path)
+           path = gtk_tree_model_get_path (tree_view->priv->model, iter);
+         else
+           gtk_tree_path_next (path);
+
          if (gtk_tree_model_iter_children (tree_view->priv->model, &child, iter))
            {
-             temp->children = _gtk_rbtree_new ();
-             temp->children->parent_tree = tree;
-             temp->children->parent_node = temp;
-             gtk_tree_view_build_tree (tree_view, temp->children, &child, depth + 1, recurse);
+             gboolean expand;
+
+             g_signal_emit (tree_view, tree_view_signals[TEST_EXPAND_ROW], 0, &iter, path, &expand);
+
+             if (!expand)
+               {
+                 temp->children = _gtk_rbtree_new ();
+                 temp->children->parent_tree = tree;
+                 temp->children->parent_node = temp;
+                 gtk_tree_view_build_tree (tree_view, temp->children, &child, depth + 1, recurse);
+               }
            }
        }
+
       if (gtk_tree_model_iter_has_child (tree_view->priv->model, iter))
        {
          if ((temp->flags&GTK_RBNODE_IS_PARENT) != GTK_RBNODE_IS_PARENT)
@@ -7796,6 +8567,9 @@ gtk_tree_view_build_tree (GtkTreeView *tree_view,
        }
     }
   while (gtk_tree_model_iter_next (tree_view->priv->model, iter));
+
+  if (path)
+    gtk_tree_path_free (path);
 }
 
 /* If height is non-NULL, then we set it to be the new height.  if it's all
@@ -7850,10 +8624,15 @@ gtk_tree_view_discover_dirty_iter (GtkTreeView *tree_view,
                                              &width, NULL);
        }
 
-      if (gtk_tree_view_is_expander_column (tree_view, column) &&
-          TREE_VIEW_DRAW_EXPANDERS (tree_view))
+      if (gtk_tree_view_is_expander_column (tree_view, column))
        {
-         if (depth * tree_view->priv->expander_size + horizontal_separator + width > column->requested_width)
+         int tmp = 0;
+
+         tmp = horizontal_separator + width + (depth - 1) * tree_view->priv->level_indentation;
+         if (TREE_VIEW_DRAW_EXPANDERS (tree_view))
+           tmp += depth * tree_view->priv->expander_size;
+
+         if (tmp > column->requested_width)
            {
              _gtk_tree_view_column_cell_set_dirty (column, TRUE);
              retval = TRUE;
@@ -8249,9 +9028,10 @@ gtk_tree_view_set_column_drag_info (GtkTreeView       *tree_view,
 
   /* We know there are always 2 slots possbile, as you can always return column. */
   /* If that's all there is, return */
-  if (tree_view->priv->column_drag_info->next->next == NULL &&
-      ((GtkTreeViewColumnReorder *)tree_view->priv->column_drag_info->data)->right_column == column &&
-      ((GtkTreeViewColumnReorder *)tree_view->priv->column_drag_info->next->data)->left_column == column)
+  if (tree_view->priv->column_drag_info->next == NULL || 
+      (tree_view->priv->column_drag_info->next->next == NULL &&
+       ((GtkTreeViewColumnReorder *)tree_view->priv->column_drag_info->data)->right_column == column &&
+       ((GtkTreeViewColumnReorder *)tree_view->priv->column_drag_info->next->data)->left_column == column))
     {
       for (tmp_list = tree_view->priv->column_drag_info; tmp_list; tmp_list = tmp_list->next)
        g_free (tmp_list->data);
@@ -8402,7 +9182,7 @@ gtk_tree_view_queue_draw_arrow (GtkTreeView      *tree_view,
     return;
 
   rect.x = 0;
-  rect.width = MAX (tree_view->priv->expander_size, GTK_WIDGET (tree_view)->allocation.width);
+  rect.width = MAX (tree_view->priv->expander_size, MAX (tree_view->priv->width, GTK_WIDGET (tree_view)->allocation.width));
 
   rect.y = BACKGROUND_FIRST_PIXEL (tree_view, tree, node);
   rect.height = ROW_HEIGHT (tree_view, BACKGROUND_HEIGHT (node));
@@ -8479,6 +9259,7 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
   GtkStateType state;
   GtkWidget *widget;
   gint x_offset = 0;
+  gint x2;
   gint vertical_separator;
   gint expander_size;
   GtkExpanderStyle expander_style;
@@ -8493,7 +9274,7 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
 
   widget = GTK_WIDGET (tree_view);
 
-  gtk_tree_view_get_arrow_xrange (tree_view, tree, &x_offset, NULL);
+  gtk_tree_view_get_arrow_xrange (tree_view, tree, &x_offset, &x2);
 
   area.x = x_offset;
   area.y = CELL_FIRST_PIXEL (tree_view, tree, node, vertical_separator);
@@ -8604,6 +9385,7 @@ static void
 gtk_tree_view_move_cursor_up_down (GtkTreeView *tree_view,
                                   gint         count)
 {
+  gint selection_count;
   GtkRBTree *cursor_tree = NULL;
   GtkRBNode *cursor_node = NULL;
   GtkRBTree *new_cursor_tree = NULL;
@@ -8626,12 +9408,23 @@ gtk_tree_view_move_cursor_up_down (GtkTreeView *tree_view,
   if (cursor_tree == NULL)
     /* FIXME: we lost the cursor; should we get the first? */
     return;
-  if (count == -1)
-    _gtk_rbtree_prev_full (cursor_tree, cursor_node,
-                          &new_cursor_tree, &new_cursor_node);
+
+  selection_count = gtk_tree_selection_count_selected_rows (tree_view->priv->selection);
+
+  if (selection_count == 0 && !tree_view->priv->ctrl_pressed)
+    {
+      new_cursor_tree = cursor_tree;
+      new_cursor_node = cursor_node;
+    }
   else
-    _gtk_rbtree_next_full (cursor_tree, cursor_node,
-                          &new_cursor_tree, &new_cursor_node);
+    {
+      if (count == -1)
+       _gtk_rbtree_prev_full (cursor_tree, cursor_node,
+                              &new_cursor_tree, &new_cursor_node);
+      else
+       _gtk_rbtree_next_full (cursor_tree, cursor_node,
+                              &new_cursor_tree, &new_cursor_node);
+    }
 
   /*
    * If the list has only one item and multi-selection is set then select
@@ -8754,10 +9547,10 @@ gtk_tree_view_move_cursor_left_right (GtkTreeView *tree_view,
     }
   gtk_tree_path_free (cursor_path);
 
-  list = tree_view->priv->columns;
+  list = rtl ? g_list_last (tree_view->priv->columns) : g_list_first (tree_view->priv->columns);
   if (tree_view->priv->focus_column)
     {
-      for (list = tree_view->priv->columns; list; list = list->next)
+      for (; list; list = (rtl ? list->prev : list->next))
        {
          if (list->data == tree_view->priv->focus_column)
            break;
@@ -8766,6 +9559,8 @@ gtk_tree_view_move_cursor_left_right (GtkTreeView *tree_view,
 
   while (list)
     {
+      gboolean left, right;
+
       column = list->data;
       if (column->visible == FALSE)
        goto loop_end;
@@ -8775,9 +9570,19 @@ gtk_tree_view_move_cursor_left_right (GtkTreeView *tree_view,
                                               &iter,
                                               GTK_RBNODE_FLAG_SET (cursor_node, GTK_RBNODE_IS_PARENT),
                                               cursor_node->children?TRUE:FALSE);
-      if (_gtk_tree_view_column_cell_focus (column, count,
-                                           list->prev?TRUE:FALSE,
-                                           list->next?TRUE:FALSE))
+
+      if (rtl)
+        {
+         right = list->prev ? TRUE : FALSE;
+         left = list->next ? TRUE : FALSE;
+       }
+      else
+        {
+         left = list->prev ? TRUE : FALSE;
+         right = list->next ? TRUE : FALSE;
+        }
+
+      if (_gtk_tree_view_column_cell_focus (column, count, left, right))
        {
          tree_view->priv->focus_column = column;
          found_column = TRUE;
@@ -9070,7 +9875,6 @@ gtk_tree_view_real_select_cursor_parent (GtkTreeView *tree_view)
 
   return TRUE;
 }
-
 static gboolean
 gtk_tree_view_search_entry_flush_timeout (GtkTreeView *tree_view)
 {
@@ -9860,6 +10664,8 @@ gtk_tree_view_set_headers_clickable (GtkTreeView *tree_view,
  * gtk_tree_view_get_headers_clickable:
  * @tree_view: A #GtkTreeView.
  *
+ * Returns whether all header columns are clickable.
+ *
  * Return value: %TRUE if all header columns are clickable, otherwise %FALSE
  *
  * Since: 2.10
@@ -10095,7 +10901,7 @@ gtk_tree_view_insert_column (GtkTreeView       *tree_view,
  * Creates a new #GtkTreeViewColumn and inserts it into the @tree_view at
  * @position.  If @position is -1, then the newly created column is inserted at
  * the end.  The column is initialized with the attributes given. If @tree_view
- * has "fixed_height" mode enabled, then @column must have its sizing
+ * has "fixed_height" mode enabled, then the new column will have its sizing
  * property set to be GTK_TREE_VIEW_COLUMN_FIXED.
  *
  * Return value: The number of columns in @tree_view after insertion.
@@ -10115,6 +10921,8 @@ gtk_tree_view_insert_column_with_attributes (GtkTreeView     *tree_view,
   g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
 
   column = gtk_tree_view_column_new ();
+  if (tree_view->priv->fixed_height_mode)
+    gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
 
   gtk_tree_view_column_set_title (column, title);
   gtk_tree_view_column_pack_start (column, cell, TRUE);
@@ -10151,7 +10959,7 @@ gtk_tree_view_insert_column_with_attributes (GtkTreeView     *tree_view,
  * with the given cell renderer and a #GtkCellDataFunc to set cell renderer
  * attributes (normally using data from the model). See also
  * gtk_tree_view_column_set_cell_data_func(), gtk_tree_view_column_pack_start().
- * If @tree_view has "fixed_height" mode enabled, then @column must have its
+ * If @tree_view has "fixed_height" mode enabled, then the new column will have its
  * "sizing" property set to be GTK_TREE_VIEW_COLUMN_FIXED.
  *
  * Return value: number of columns in the tree view post-insert
@@ -10170,6 +10978,8 @@ gtk_tree_view_insert_column_with_data_func  (GtkTreeView               *tree_vie
   g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
 
   column = gtk_tree_view_column_new ();
+  if (tree_view->priv->fixed_height_mode)
+    gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
 
   gtk_tree_view_column_set_title (column, title);
   gtk_tree_view_column_pack_start (column, cell, TRUE);
@@ -11685,13 +12495,24 @@ gtk_tree_view_get_cell_area (GtkTreeView        *tree_view,
       rect->height = MAX (CELL_HEIGHT (node, vertical_separator), tree_view->priv->expander_size - vertical_separator);
 
       if (column &&
-         gtk_tree_view_is_expander_column (tree_view, column) &&
-         TREE_VIEW_DRAW_EXPANDERS (tree_view))
+         gtk_tree_view_is_expander_column (tree_view, column))
        {
-         gint depth = gtk_tree_path_get_depth (path) - 1;
+         gint depth = gtk_tree_path_get_depth (path);
+         gboolean rtl;
+
+         rtl = gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL;
+
+         if (!rtl)
+           rect->x += (depth - 1) * tree_view->priv->level_indentation;
+         rect->width -= (depth - 1) * tree_view->priv->level_indentation;
+
+         if (TREE_VIEW_DRAW_EXPANDERS (tree_view))
+           {
+             if (!rtl)
+               rect->x += depth * tree_view->priv->expander_size;
+             rect->width -= depth * tree_view->priv->expander_size;
+           }
 
-         rect->x += depth * tree_view->priv->expander_size;
-         rect->width -= depth * tree_view->priv->expander_size;
          rect->width = MAX (rect->width, 0);
        }
     }
@@ -12290,6 +13111,7 @@ gtk_tree_view_create_row_drag_icon (GtkTreeView  *tree_view,
   GdkDrawable *drawable;
   gint bin_window_width;
   gboolean is_separator = FALSE;
+  gboolean rtl;
 
   g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), NULL);
   g_return_val_if_fail (path != NULL, NULL);
@@ -12346,7 +13168,11 @@ gtk_tree_view_create_row_drag_icon (GtkTreeView  *tree_view,
                       bin_window_width + 2,
                       background_area.height + 2);
 
-  for (list = tree_view->priv->columns; list; list = list->next)
+  rtl = gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL;
+
+  for (list = (rtl ? g_list_last (tree_view->priv->columns) : g_list_first (tree_view->priv->columns));
+      list;
+      list = (rtl ? list->prev : list->next))
     {
       GtkTreeViewColumn *column = list->data;
       GdkRectangle cell_area;
@@ -12362,17 +13188,27 @@ gtk_tree_view_create_row_drag_icon (GtkTreeView  *tree_view,
       background_area.x = cell_offset;
       background_area.width = column->width;
 
+      gtk_widget_style_get (widget,
+                           "vertical-separator", &vertical_separator,
+                           NULL);
+
       cell_area = background_area;
 
-      gtk_widget_style_get (widget, "vertical-separator", &vertical_separator, NULL);
       cell_area.y += vertical_separator / 2;
       cell_area.height -= vertical_separator;
 
-      if (gtk_tree_view_is_expander_column (tree_view, column) &&
-          TREE_VIEW_DRAW_EXPANDERS(tree_view))
+      if (gtk_tree_view_is_expander_column (tree_view, column))
         {
-          cell_area.x += depth * tree_view->priv->expander_size;
-          cell_area.width -= depth * tree_view->priv->expander_size;
+         if (!rtl)
+           cell_area.x += (depth - 1) * tree_view->priv->level_indentation;
+         cell_area.width -= (depth - 1) * tree_view->priv->level_indentation;
+
+          if (TREE_VIEW_DRAW_EXPANDERS(tree_view))
+           {
+             if (!rtl)
+               cell_area.x += depth * tree_view->priv->expander_size;
+             cell_area.width -= depth * tree_view->priv->expander_size;
+           }
         }
 
       if (gtk_tree_view_column_cell_is_visible (column))
@@ -12564,7 +13400,7 @@ gtk_tree_view_set_search_equal_func (GtkTreeView                *tree_view,
                                     GtkDestroyNotify            search_destroy)
 {
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
-  g_return_if_fail (search_equal_func !=NULL);
+  g_return_if_fail (search_equal_func != NULL);
 
   if (tree_view->priv->search_destroy)
     (* tree_view->priv->search_destroy) (tree_view->priv->search_user_data);
@@ -12670,9 +13506,10 @@ gtk_tree_view_set_search_entry (GtkTreeView *tree_view,
 /**
  * gtk_tree_view_set_search_position_func:
  * @tree_view: A #GtkTreeView
- * @search_position_func: the function to use to position the search dialog
- * @ser_data: user data to pass to @search_position_func, or %NULL
- * @destroy: Destroy notifier for @search_position_data, or %NULL
+ * @func: the function to use to position the search dialog, or %NULL
+ *    to use the default search position function
+ * @data: user data to pass to @func, or %NULL
+ * @destroy: Destroy notifier for @data, or %NULL
  *
  * Sets the function to use when positioning the seach dialog.
  *
@@ -12685,7 +13522,6 @@ gtk_tree_view_set_search_position_func (GtkTreeView                   *tree_view
                                        GDestroyNotify                 destroy)
 {
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
-  g_return_if_fail (func !=NULL);
 
   if (tree_view->priv->search_position_destroy)
     (* tree_view->priv->search_position_destroy) (tree_view->priv->search_position_user_data);
@@ -13300,12 +14136,6 @@ gtk_tree_view_start_editing (GtkTreeView *tree_view,
                               tree_view->priv->focus_column,
                               &cell_area);
 
-  if (gtk_tree_view_is_expander_column (tree_view, tree_view->priv->focus_column) && TREE_VIEW_DRAW_EXPANDERS (tree_view))
-    {
-      cell_area.x += tree_view->priv->expander_size;
-      cell_area.width -= tree_view->priv->expander_size;
-    }
-
   if (_gtk_tree_view_column_cell_event (tree_view->priv->focus_column,
                                        &editable_widget,
                                        NULL,
@@ -13323,6 +14153,7 @@ gtk_tree_view_start_editing (GtkTreeView *tree_view,
 
          area = cell_area;
          cell = _gtk_tree_view_column_get_edited_cell (tree_view->priv->focus_column);
+
          _gtk_tree_view_column_get_neighbor_sizes (tree_view->priv->focus_column, cell, &left, &right);
 
          area.x += left;
@@ -13489,6 +14320,49 @@ gtk_tree_view_get_hover_expand (GtkTreeView *tree_view)
   return tree_view->priv->hover_expand;
 }
 
+/**
+ * gtk_tree_view_set_rubber_banding:
+ * @tree_view: a #GtkTreeView
+ * @enable: %TRUE to enable rubber banding
+ *
+ * Enables or disables rubber banding in @tree_view.  If the selection mode
+ * is #GTK_SELECTION_MULTIPLE, rubber banding will allow the user to select
+ * multiple rows by dragging the mouse.
+ * 
+ * Since: 2.10
+ **/
+void
+gtk_tree_view_set_rubber_banding (GtkTreeView *tree_view,
+                                 gboolean     enable)
+{
+  enable = enable != FALSE;
+
+  if (enable != tree_view->priv->rubber_banding_enable)
+    {
+      tree_view->priv->rubber_banding_enable = enable;
+
+      g_object_notify (G_OBJECT (tree_view), "rubber-banding");
+    }
+}
+
+/**
+ * gtk_tree_view_get_rubber_banding:
+ * @tree_view: a #GtkTreeView
+ * 
+ * Returns whether rubber banding is turned on for @tree_view.  If the
+ * selection mode is #GTK_SELECTION_MULTIPLE, rubber banding will allow the
+ * user to select multiple rows by dragging the mouse.
+ * 
+ * Return value: %TRUE if rubber banding in @tree_view is enabled.
+ *
+ * Since: 2.10
+ **/
+gboolean
+gtk_tree_view_get_rubber_banding (GtkTreeView *tree_view)
+{
+  return tree_view->priv->rubber_banding_enable;
+}
+
 /**
  * gtk_tree_view_get_row_separator_func:
  * @tree_view: a #GtkTreeView
@@ -13555,12 +14429,161 @@ gtk_tree_view_state_changed (GtkWidget      *widget,
 
   if (GTK_WIDGET_REALIZED (widget))
     {
-      gdk_window_set_background (widget->window, &widget->style->base[widget->state]);
+      gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
       gdk_window_set_background (tree_view->priv->bin_window, &widget->style->base[widget->state]);
     }
 
   gtk_widget_queue_draw (widget);
 }
 
+/**
+ * gtk_tree_view_get_grid_lines:
+ * @tree_view: a #GtkTreeView
+ *
+ * Returns which grid lines are enabled in @tree_view.
+ *
+ * Return value: a #GtkTreeViewGridLines value indicating which grid lines
+ * are enabled.
+ *
+ * Since: 2.10
+ */
+GtkTreeViewGridLines
+gtk_tree_view_get_grid_lines (GtkTreeView *tree_view)
+{
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), 0);
+
+  return tree_view->priv->grid_lines;
+}
+
+/**
+ * gtk_tree_view_set_grid_lines:
+ * @tree_view: a #GtkTreeView
+ * @grid_lines: a #GtkTreeViewGridLines value indicating which grid lines to
+ * enable.
+ *
+ * Sets which grid lines to draw in @tree_view.
+ *
+ * Since: 2.10
+ */
+void
+gtk_tree_view_set_grid_lines (GtkTreeView           *tree_view,
+                             GtkTreeViewGridLines   grid_lines)
+{
+  gint line_width;
+  guint8 *dash_list;
+  GtkWidget *widget;
+
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+
+  widget = GTK_WIDGET (tree_view);
+
+  if (!GTK_WIDGET_REALIZED (widget))
+    {
+      tree_view->priv->grid_lines = grid_lines;
+      return;
+    }
+
+  gtk_widget_style_get (widget,
+                       "grid-line-width", &line_width,
+                       "grid-line-pattern", (gchar *)&dash_list,
+                       NULL);
+
+  if (tree_view->priv->grid_line_gc)
+    g_object_unref (tree_view->priv->grid_line_gc);
+
+  tree_view->priv->grid_lines = grid_lines;
+  if (grid_lines == GTK_TREE_VIEW_GRID_LINES_NONE)
+    {
+      tree_view->priv->grid_line_gc = NULL;
+      g_free (dash_list);
+      return;
+    }
+
+  tree_view->priv->grid_line_gc = gdk_gc_new (widget->window);
+  gdk_gc_copy (tree_view->priv->grid_line_gc,
+              widget->style->black_gc);
+
+  gdk_gc_set_line_attributes (tree_view->priv->grid_line_gc, line_width,
+                             GDK_LINE_ON_OFF_DASH,
+                             GDK_CAP_BUTT, GDK_JOIN_MITER);
+  gdk_gc_set_dashes (tree_view->priv->grid_line_gc, 0, dash_list, 2);
+  g_free (dash_list);
+
+  gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+}
+
+/**
+ * gtk_tree_view_get_enable_tree_lines:
+ * @tree_view: a #GtkTreeView.
+ *
+ * Returns whether or not tree lines are drawn in @tree_view.
+ *
+ * Return value: %TRUE if tree lines are drawn in @tree_view, %FALSE
+ * otherwise.
+ *
+ * Since: 2.10
+ */
+gboolean
+gtk_tree_view_get_enable_tree_lines (GtkTreeView *tree_view)
+{
+  g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
+
+  return tree_view->priv->tree_lines_enabled;
+}
+
+/**
+ * gtk_tree_view_set_enable_tree_lines:
+ * @tree_view: a #GtkTreeView
+ * @enabled: %TRUE to enable tree line drawing, %FALSE otherwise.
+ *
+ * Sets whether to draw lines interconnecting the expanders in @tree_view.
+ * This does not have any visible effects for lists.
+ *
+ * Since: 2.10
+ */
+void
+gtk_tree_view_set_enable_tree_lines (GtkTreeView *tree_view,
+                                    gboolean     enabled)
+{
+  gint line_width;
+  guint8 *dash_list;
+  GtkWidget *widget;
+
+  g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+
+  widget = GTK_WIDGET (tree_view);
+
+  if (!GTK_WIDGET_REALIZED (widget))
+    {
+      tree_view->priv->tree_lines_enabled = enabled;
+      return;
+    }
+
+  gtk_widget_style_get (widget,
+                       "tree-line-width", &line_width,
+                       "tree-line-pattern", (gchar *)&dash_list,
+                       NULL);
+
+  if (tree_view->priv->tree_line_gc)
+    g_object_unref (tree_view->priv->tree_line_gc);
+
+  if (!enabled)
+    {
+      tree_view->priv->tree_line_gc = NULL;
+      return;
+    }
+
+  tree_view->priv->tree_line_gc = gdk_gc_new (widget->window);
+  gdk_gc_copy (tree_view->priv->tree_line_gc,
+              widget->style->black_gc);
+
+  gdk_gc_set_line_attributes (tree_view->priv->tree_line_gc, line_width,
+                             GDK_LINE_ON_OFF_DASH,
+                             GDK_CAP_BUTT, GDK_JOIN_MITER);
+  gdk_gc_set_dashes (tree_view->priv->tree_line_gc, 0, dash_list, 2);
+
+  gtk_widget_queue_draw (GTK_WIDGET (tree_view));
+}
+
 #define __GTK_TREE_VIEW_C__
 #include "gtkaliasdef.c"