1 files changed, 874 insertions, 101 deletions

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 9d3d5e36b3..7d3f2e879b 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -33,6 +33,8 @@
 #include "gtkmenuitem.h"
 #include "gtksignal.h"
 #include "gtkwindow.h"
+#include "gtkhbox.h"
+#include "gtkvscrollbar.h"
 
 
 #define MENU_ITEM_CLASS(w)   GTK_MENU_ITEM_GET_CLASS (w)
@@ -41,6 +43,12 @@
 #define SUBMENU_NAV_REGION_PADDING 2
 #define SUBMENU_NAV_HYSTERESIS_TIMEOUT 333
 
+#define MENU_SCROLL_STEP 10
+#define MENU_SCROLL_ARROW_HEIGHT 16
+#define MENU_SCROLL_FAST_ZONE 4
+#define MENU_SCROLL_TIMEOUT1 150
+#define MENU_SCROLL_TIMEOUT2 50
+
 typedef struct _GtkMenuAttachData	GtkMenuAttachData;
 
 struct _GtkMenuAttachData
@@ -50,27 +58,43 @@ struct _GtkMenuAttachData
 };
 
 
-static void	gtk_menu_class_init    (GtkMenuClass	  *klass);
-static void	gtk_menu_init	       (GtkMenu		  *menu);
-static void	gtk_menu_destroy       (GtkObject	  *object);
-static void	gtk_menu_realize       (GtkWidget	  *widget);
-static void	gtk_menu_size_request  (GtkWidget	  *widget,
-					GtkRequisition    *requisition);
-static void	gtk_menu_size_allocate (GtkWidget	  *widget,
-					GtkAllocation     *allocation);
-static void	gtk_menu_paint	       (GtkWidget	  *widget);
-static void	gtk_menu_draw	       (GtkWidget	  *widget,
-					GdkRectangle      *area);
-static gboolean gtk_menu_expose	       (GtkWidget	  *widget,
-					GdkEventExpose    *event);
-static gboolean gtk_menu_key_press     (GtkWidget	  *widget,
-					GdkEventKey       *event);
-static gboolean gtk_menu_motion_notify (GtkWidget	  *widget,
-					GdkEventMotion    *event);
-static gboolean gtk_menu_enter_notify  (GtkWidget         *widget,
-					GdkEventCrossing  *event); 
-static gboolean gtk_menu_leave_notify  (GtkWidget         *widget,
-					GdkEventCrossing  *event);
+static void     gtk_menu_class_init        (GtkMenuClass     *klass);
+static void     gtk_menu_init              (GtkMenu          *menu);
+static void     gtk_menu_destroy           (GtkObject        *object);
+static void     gtk_menu_realize           (GtkWidget        *widget);
+static void     gtk_menu_unrealize         (GtkWidget        *widget);
+static void     gtk_menu_size_request      (GtkWidget        *widget,
+					    GtkRequisition   *requisition);
+static void     gtk_menu_size_allocate     (GtkWidget        *widget,
+					    GtkAllocation    *allocation);
+static void     gtk_menu_paint             (GtkWidget        *widget);
+static void     gtk_menu_draw              (GtkWidget        *widget,
+					    GdkRectangle     *area);
+static gboolean gtk_menu_expose            (GtkWidget        *widget,
+					    GdkEventExpose   *event);
+static gboolean gtk_menu_key_press         (GtkWidget        *widget,
+					    GdkEventKey      *event);
+static gboolean gtk_menu_motion_notify     (GtkWidget        *widget,
+					    GdkEventMotion   *event);
+static gboolean gtk_menu_enter_notify      (GtkWidget        *widget,
+					    GdkEventCrossing *event);
+static gboolean gtk_menu_leave_notify      (GtkWidget        *widget,
+					    GdkEventCrossing *event);
+static void     gtk_menu_scroll_to         (GtkMenu          *menu,
+					    gint              offset);
+static void     gtk_menu_stop_scrolling    (GtkMenu          *menu);
+static gboolean gtk_menu_scroll_timeout    (gpointer          data);
+static void     gtk_menu_select_item       (GtkMenuShell     *menu_shell,
+					    GtkWidget        *menu_item);
+static void     gtk_menu_insert            (GtkMenuShell     *menu_shell,
+					    GtkWidget        *child,
+					    gint              position);
+static void     gtk_menu_scrollbar_changed (GtkAdjustment    *adjustment,
+					    GtkMenu          *menu);
+static void     gtk_menu_handle_scrolling  (GtkMenu          *menu,
+					    gboolean         enter);
+static void     gtk_menu_set_tearoff_hints (GtkMenu          *menu,
+					    gint             width);
 
 static void     gtk_menu_stop_navigating_submenu       (GtkMenu          *menu);
 static gboolean gtk_menu_stop_navigating_submenu_cb    (gpointer          user_data);
@@ -137,6 +161,7 @@ gtk_menu_class_init (GtkMenuClass *class)
   object_class->destroy = gtk_menu_destroy;
   
   widget_class->realize = gtk_menu_realize;
+  widget_class->unrealize = gtk_menu_unrealize;
   widget_class->draw = gtk_menu_draw;
   widget_class->size_request = gtk_menu_size_request;
   widget_class->size_allocate = gtk_menu_size_allocate;
@@ -150,6 +175,8 @@ gtk_menu_class_init (GtkMenuClass *class)
   
   menu_shell_class->submenu_placement = GTK_LEFT_RIGHT;
   menu_shell_class->deactivate = gtk_menu_deactivate;
+  menu_shell_class->select_item = gtk_menu_select_item;
+  menu_shell_class->insert = gtk_menu_insert;
 
   binding_set = gtk_binding_set_by_class (class);
   gtk_binding_entry_add_signal (binding_set,
@@ -188,8 +215,7 @@ gtk_menu_window_event (GtkWidget *window,
     {
     case GDK_KEY_PRESS:
     case GDK_KEY_RELEASE:
-      gtk_widget_event (menu, event);
-      handled = TRUE;
+      handled = gtk_widget_event (menu, event);
       break;
     default:
       break;
@@ -209,6 +235,7 @@ gtk_menu_init (GtkMenu *menu)
   menu->accel_group = NULL;
   menu->position_func = NULL;
   menu->position_func_data = NULL;
+  menu->toggle_size = 0;
 
   menu->toplevel = gtk_widget_new (GTK_TYPE_WINDOW,
 				   "type", GTK_WINDOW_POPUP,
@@ -225,9 +252,26 @@ gtk_menu_init (GtkMenu *menu)
   GTK_WIDGET_SET_FLAGS (menu, GTK_FLOATING);
   menu->needs_destruction_ref_count = TRUE;
 
+  menu->view_window = NULL;
+  menu->bin_window = NULL;
+
+  menu->scroll_offset = 0;
+  menu->scroll_step  = 0;
+  menu->timeout_id = 0;
+  menu->scroll_fast = FALSE;
+  
   menu->tearoff_window = NULL;
+  menu->tearoff_hbox = NULL;
   menu->torn_off = FALSE;
+  menu->tearoff_active = FALSE;
+  menu->tearoff_adjustment = NULL;
+  menu->tearoff_scrollbar = NULL;
 
+  menu->upper_arrow_visible = FALSE;
+  menu->lower_arrow_visible = FALSE;
+  menu->upper_arrow_prelight = FALSE;
+  menu->lower_arrow_prelight = FALSE;
+  
   MENU_NEEDS_RESIZE (menu) = TRUE;
 }
 
@@ -236,10 +280,12 @@ gtk_menu_destroy (GtkObject *object)
 {
   GtkMenu *menu;
   GtkMenuAttachData *data;
-  
+
   g_return_if_fail (GTK_IS_MENU (object));
 
   menu = GTK_MENU (object);
+
+  gtk_menu_stop_scrolling (menu);
   
   data = gtk_object_get_data (object, attach_data_key);
   if (data)
@@ -359,32 +405,21 @@ gtk_menu_new (void)
   return GTK_WIDGET (gtk_type_new (gtk_menu_get_type ()));
 }
 
-void
-gtk_menu_append (GtkMenu   *menu,
-		 GtkWidget *child)
-{
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), child);
-}
-
-void
-gtk_menu_prepend (GtkMenu   *menu,
-		  GtkWidget *child)
-{
-  gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), child);
-}
-
-void
-gtk_menu_insert (GtkMenu   *menu,
-		 GtkWidget *child,
-		 gint	    position)
+static void
+gtk_menu_insert (GtkMenuShell     *menu_shell,
+		 GtkWidget        *child,
+		 gint              position)
 {
-  gtk_menu_shell_insert (GTK_MENU_SHELL (menu), child, position);
+  GTK_MENU_SHELL_CLASS (parent_class)->insert (menu_shell, child, position);
+  
+  gtk_widget_set_parent_window (child, GTK_MENU (menu_shell)->bin_window);
 }
 
 static void
 gtk_menu_tearoff_bg_copy (GtkMenu *menu)
 {
   GtkWidget *widget;
+  gint width, height;
 
   widget = GTK_WIDGET (menu);
 
@@ -393,25 +428,30 @@ gtk_menu_tearoff_bg_copy (GtkMenu *menu)
       GdkPixmap *pixmap;
       GdkGC *gc;
       GdkGCValues gc_values;
+
+      menu->tearoff_active = FALSE;
+      menu->saved_scroll_offset = menu->scroll_offset;
       
       gc_values.subwindow_mode = GDK_INCLUDE_INFERIORS;
       gc = gdk_gc_new_with_values (widget->window,
 				   &gc_values, GDK_GC_SUBWINDOW);
       
-      pixmap = gdk_pixmap_new (widget->window,
-			       widget->requisition.width,
-			       widget->requisition.height,
+      gdk_window_get_size (menu->tearoff_window->window, &width, &height);
+      
+      pixmap = gdk_pixmap_new (menu->tearoff_window->window,
+			       width,
+			       height,
 			       -1);
 
       gdk_draw_pixmap (pixmap, gc,
-		       widget->window,
+		       menu->tearoff_window->window,
 		       0, 0, 0, 0, -1, -1);
       gdk_gc_unref (gc);
-      
+
       gtk_widget_set_usize (menu->tearoff_window,
-			    widget->requisition.width,
-			    widget->requisition.height);
-      
+			    width,
+			    height);
+
       gdk_window_set_back_pixmap (menu->tearoff_window->window, pixmap, FALSE);
       gdk_pixmap_unref (pixmap);
     }
@@ -431,7 +471,7 @@ gtk_menu_popup (GtkMenu		    *menu,
   GtkWidget *parent;
   GdkEvent *current_event;
   GtkMenuShell *menu_shell;
-  
+
   g_return_if_fail (menu != NULL);
   g_return_if_fail (GTK_IS_MENU (menu));
   
@@ -460,10 +500,7 @@ gtk_menu_popup (GtkMenu		    *menu,
     {
       gtk_menu_tearoff_bg_copy (menu);
 
-      /* We force an unrealize here so that we don't trigger redrawing/
-       * clearing code - we just want to reveal our backing pixmap.
-       */
-      gtk_menu_reparent (menu, menu->toplevel, TRUE);
+      gtk_menu_reparent (menu, menu->toplevel, FALSE);
     }
   
   menu->parent_menu_item = parent_menu_item;
@@ -479,7 +516,7 @@ gtk_menu_popup (GtkMenu		    *menu,
    */
   gtk_widget_show (GTK_WIDGET (menu));
   gtk_widget_show (menu->toplevel);
-  
+
   /* Find the last viewable ancestor, and make an X grab on it
    */
   parent = GTK_WIDGET (menu);
@@ -526,7 +563,9 @@ gtk_menu_popup (GtkMenu		    *menu,
 
       gdk_cursor_destroy (cursor);
     }
-  
+
+  gtk_menu_scroll_to (menu, menu->scroll_offset);
+
   gtk_grab_add (GTK_WIDGET (menu));
 }
 
@@ -534,7 +573,7 @@ void
 gtk_menu_popdown (GtkMenu *menu)
 {
   GtkMenuShell *menu_shell;
-  
+
   g_return_if_fail (menu != NULL);
   g_return_if_fail (GTK_IS_MENU (menu));
   
@@ -543,6 +582,8 @@ gtk_menu_popdown (GtkMenu *menu)
   menu_shell->parent_menu_shell = NULL;
   menu_shell->active = FALSE;
   menu_shell->ignore_enter = FALSE;
+
+  gtk_menu_stop_scrolling (menu);
   
   gtk_menu_stop_navigating_submenu (menu);
   
@@ -562,9 +603,15 @@ gtk_menu_popdown (GtkMenu *menu)
 
   if (menu->torn_off)
     {
+      gint width, height;
+      gdk_window_get_size (menu->tearoff_window->window, &width, &height);
+      gtk_widget_set_usize (menu->tearoff_window,
+			    -1,
+			    height);
+      
       if (GTK_BIN (menu->toplevel)->child) 
 	{
-	  gtk_menu_reparent (menu, menu->tearoff_window, FALSE);
+	  gtk_menu_reparent (menu, menu->tearoff_hbox, TRUE);
 	} 
       else
 	{
@@ -577,6 +624,14 @@ gtk_menu_popdown (GtkMenu *menu)
 	      gdk_keyboard_ungrab (GDK_CURRENT_TIME);
 	    }
 	}
+
+      /* gtk_menu_popdown is called each time a menu item is selected from
+       * a torn off menu. Only scroll back to the saved position if the
+       * non-tearoff menu was popped down.
+       */
+      if (!menu->tearoff_active)
+	gtk_menu_scroll_to (menu, menu->saved_scroll_offset);
+      menu->tearoff_active = TRUE;
     }
   else
     gtk_widget_hide (GTK_WIDGET (menu));
@@ -707,17 +762,51 @@ gtk_menu_reposition (GtkMenu *menu)
     gtk_menu_position (menu);
 }
 
+static void
+gtk_menu_scrollbar_changed (GtkAdjustment *adjustment,
+			    GtkMenu       *menu)
+{
+  g_return_if_fail (menu != NULL);
+  g_return_if_fail (GTK_IS_MENU (menu));
+
+  if (adjustment->value != menu->scroll_offset)
+    gtk_menu_scroll_to (menu, adjustment->value);
+}
+
+static void
+gtk_menu_set_tearoff_hints(GtkMenu *menu,
+			   gint     width)
+{
+  GdkGeometry geometry_hints;
+  
+  if (!menu->tearoff_window)
+    return;
+
+  geometry_hints.min_width = width;
+  geometry_hints.max_width = width;
+    
+  geometry_hints.min_height = 0;
+  geometry_hints.max_height = GTK_WIDGET (menu)->requisition.height;
+  gtk_window_set_geometry_hints (GTK_WINDOW (menu->tearoff_window),
+				 NULL,
+				 &geometry_hints,
+				 GDK_HINT_MAX_SIZE|GDK_HINT_MIN_SIZE);
+}
+
 
 void       
 gtk_menu_set_tearoff_state (GtkMenu  *menu,
 			    gboolean  torn_off)
 {
+  gint width, height;
+  
   g_return_if_fail (menu != NULL);
   g_return_if_fail (GTK_IS_MENU (menu));
 
   if (menu->torn_off != torn_off)
     {
       menu->torn_off = torn_off;
+      menu->tearoff_active = torn_off;
       
       if (menu->torn_off)
 	{
@@ -762,13 +851,49 @@ gtk_menu_set_tearoff_state (GtkMenu  *menu,
 					  GDK_DECOR_MAXIMIZE);
 	      gtk_window_set_policy (GTK_WINDOW (menu->tearoff_window),
 				     FALSE, FALSE, TRUE);
-	    }
-	  gtk_menu_reparent (menu, menu->tearoff_window, FALSE);
 
+	      menu->tearoff_hbox = gtk_hbox_new (FALSE, FALSE);
+	      gtk_container_add (GTK_CONTAINER (menu->tearoff_window), menu->tearoff_hbox);
+
+	      gdk_window_get_size (GTK_WIDGET (menu)->window, &width, &height);
+	      menu->tearoff_adjustment =
+		GTK_ADJUSTMENT (gtk_adjustment_new (0,
+						    0,
+						    GTK_WIDGET (menu)->requisition.height,
+						    MENU_SCROLL_STEP,
+						    height/2,
+						    height));
+	      gtk_signal_connect (GTK_OBJECT (menu->tearoff_adjustment), "value_changed",
+				  gtk_menu_scrollbar_changed,
+				  menu);
+	      menu->tearoff_scrollbar = gtk_vscrollbar_new (menu->tearoff_adjustment);
+
+	      gtk_box_pack_end (GTK_BOX (menu->tearoff_hbox),
+				menu->tearoff_scrollbar,
+				FALSE, FALSE, 0);
+	      
+	      if (menu->tearoff_adjustment->upper > height)
+		gtk_widget_show (menu->tearoff_scrollbar);
+	      
+	      gtk_widget_show (menu->tearoff_hbox);
+	    }
+	  
+	  gtk_menu_reparent (menu, menu->tearoff_hbox, FALSE);
+	  
+	  gdk_window_get_size (GTK_WIDGET (menu)->window, &width, &height);
+	  if (GTK_WIDGET_VISIBLE (menu->tearoff_scrollbar))
+	    width += menu->tearoff_scrollbar->requisition.width;
+	    
+	  gtk_menu_set_tearoff_hints (menu, width);
+	    
+	  gtk_widget_realize (menu->tearoff_window);
 	  gtk_menu_position (menu);
 	  
 	  gtk_widget_show (GTK_WIDGET (menu));
 	  gtk_widget_show (menu->tearoff_window);
+
+	  gtk_menu_scroll_to (menu, 0);
+
 	}
       else
 	{
@@ -812,9 +937,15 @@ gtk_menu_realize (GtkWidget *widget)
 {
   GdkWindowAttr attributes;
   gint attributes_mask;
-  
+  gint border_width;
+  GtkMenu *menu;
+  GtkWidget *child;
+  GList *children;
+
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_MENU (widget));
+
+  menu = GTK_MENU (widget);
   
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
   
@@ -826,16 +957,79 @@ gtk_menu_realize (GtkWidget *widget)
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.visual = gtk_widget_get_visual (widget);
   attributes.colormap = gtk_widget_get_colormap (widget);
+  
   attributes.event_mask = gtk_widget_get_events (widget);
-  attributes.event_mask |= (GDK_EXPOSURE_MASK | GDK_KEY_PRESS_MASK);
+  attributes.event_mask |= (GDK_EXPOSURE_MASK | GDK_KEY_PRESS_MASK |
+			    GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK );
   
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
   widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
   gdk_window_set_user_data (widget->window, widget);
   
+  border_width = GTK_CONTAINER (widget)->border_width;
+  
+  attributes.x = border_width + widget->style->xthickness;
+  attributes.y = border_width + widget->style->ythickness;
+  attributes.width = MAX (1, widget->allocation.width - attributes.x * 2);
+  attributes.height = MAX (1, widget->allocation.height - attributes.y * 2);
+
+  if (menu->upper_arrow_visible)
+    {
+      attributes.y += MENU_SCROLL_ARROW_HEIGHT;
+      attributes.height -= MENU_SCROLL_ARROW_HEIGHT;
+    }
+  if (menu->lower_arrow_visible)
+    attributes.height -= MENU_SCROLL_ARROW_HEIGHT;
+
+  menu->view_window = gdk_window_new (widget->window, &attributes, attributes_mask);
+  gdk_window_set_user_data (menu->view_window, menu);
+
+  attributes.x = 0;
+  attributes.y = 0;
+  attributes.height = MAX (1, widget->requisition.height - (border_width + widget->style->ythickness) * 2);
+  
+  menu->bin_window = gdk_window_new (menu->view_window, &attributes, attributes_mask);
+  gdk_window_set_user_data (menu->bin_window, menu);
+
+  children = GTK_MENU_SHELL (menu)->children;
+  while (children)
+    {
+      child = children->data;
+      children = children->next;
+	  
+      gtk_widget_set_parent_window (child, menu->bin_window);
+    }
+  
   widget->style = gtk_style_attach (widget->style, widget->window);
+  gtk_style_set_background (widget->style, menu->bin_window, GTK_STATE_NORMAL);
+  gtk_style_set_background (widget->style, menu->view_window, GTK_STATE_NORMAL);
   gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
-  gtk_menu_paint(widget);
+
+  gtk_menu_paint (widget);
+  
+  gdk_window_show (menu->bin_window);
+  gdk_window_show (menu->view_window);
+}
+
+static void
+gtk_menu_unrealize (GtkWidget *widget)
+{
+  GtkMenu *menu;
+
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_MENU (widget));
+
+  menu = GTK_MENU (widget);
+
+  gdk_window_set_user_data (menu->view_window, NULL);
+  gdk_window_destroy (menu->view_window);
+  menu->view_window = NULL;
+
+  gdk_window_set_user_data (menu->bin_window, NULL);
+  gdk_window_destroy (menu->bin_window);
+  menu->bin_window = NULL;
+
+  (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
 }
 
 static void
@@ -849,6 +1043,7 @@ gtk_menu_size_request (GtkWidget      *widget,
   guint max_toggle_size;
   guint max_accel_width;
   GtkRequisition child_requisition;
+  gint width;
   
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_MENU (widget));
@@ -871,13 +1066,16 @@ gtk_menu_size_request (GtkWidget      *widget,
       
       if (GTK_WIDGET_VISIBLE (child))
 	{
+	  guint16 toggle_size;
+
 	  GTK_MENU_ITEM (child)->show_submenu_indicator = TRUE;
 	  gtk_widget_size_request (child, &child_requisition);
 	  
 	  requisition->width = MAX (requisition->width, child_requisition.width);
 	  requisition->height += child_requisition.height;
-	  
-	  max_toggle_size = MAX (max_toggle_size, MENU_ITEM_CLASS (child)->toggle_size);
+
+	  gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child), &toggle_size);
+	  max_toggle_size = MAX (max_toggle_size, toggle_size);
 	  max_accel_width = MAX (max_accel_width, GTK_MENU_ITEM (child)->accelerator_width);
 	}
     }
@@ -888,13 +1086,18 @@ gtk_menu_size_request (GtkWidget      *widget,
   requisition->height += (GTK_CONTAINER (menu)->border_width +
 			  widget->style->ythickness) * 2;
   
-  children = menu_shell->children;
-  while (children)
+  menu->toggle_size = max_toggle_size;
+
+  /* If the requested width was different than the allocated width, we need to change
+   * the geometry hints for the tear off window so that the window can actually be resized.
+   * Don't resize the tearoff if it is not active, beacuse it won't redraw (it is only a background pixmap).
+   */
+  if ((requisition->width != GTK_WIDGET (menu)->allocation.width) && menu->tearoff_active)
     {
-      child = children->data;
-      children = children->next;
-      
-      GTK_MENU_ITEM (child)->toggle_size = max_toggle_size;
+      width = requisition->width;
+      if (menu->tearoff_scrollbar && GTK_WIDGET_VISIBLE (menu->tearoff_scrollbar))
+	width += menu->tearoff_scrollbar->requisition.width;
+      gtk_menu_set_tearoff_hints (menu, width);
     }
 }
 
@@ -907,28 +1110,51 @@ gtk_menu_size_allocate (GtkWidget     *widget,
   GtkWidget *child;
   GtkAllocation child_allocation;
   GList *children;
-  
+  gint x, y;
+  gint width, height;
+
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_MENU (widget));
   g_return_if_fail (allocation != NULL);
   
   menu = GTK_MENU (widget);
   menu_shell = GTK_MENU_SHELL (widget);
-  
+
   widget->allocation = *allocation;
-  if (GTK_WIDGET_REALIZED (widget))
-    gdk_window_move_resize (widget->window,
-			    allocation->x, allocation->y,
-			    allocation->width, allocation->height);
 
+  x = GTK_CONTAINER (menu)->border_width + widget->style->xthickness;
+  y = GTK_CONTAINER (menu)->border_width + widget->style->ythickness;
+  
+  width = MAX (1, allocation->width - x * 2);
+  height = MAX (1, allocation->height - y * 2);
+  
+  if (menu->upper_arrow_visible && !menu->tearoff_active)
+    {
+      y += MENU_SCROLL_ARROW_HEIGHT;
+      height -= MENU_SCROLL_ARROW_HEIGHT;
+    }
+  
+  if (menu->lower_arrow_visible && !menu->tearoff_active)
+    height -= MENU_SCROLL_ARROW_HEIGHT;
+  
+  if (GTK_WIDGET_REALIZED (widget))
+    {
+      gdk_window_move_resize (widget->window,
+			      allocation->x, allocation->y,
+			      allocation->width, allocation->height);
+
+      gdk_window_move_resize (menu->view_window,
+			      x,
+			      y,
+			      width,
+			      height);
+    }
 
   if (menu_shell->children)
     {
-      child_allocation.x = (GTK_CONTAINER (menu)->border_width +
-			    widget->style->xthickness);
-      child_allocation.y = (GTK_CONTAINER (menu)->border_width +
-			    widget->style->ythickness);
-      child_allocation.width = MAX (1, (gint)allocation->width - child_allocation.x * 2);
+      child_allocation.x = 0;
+      child_allocation.y = 0;
+      child_allocation.width = width;
       
       children = menu_shell->children;
       while (children)
@@ -942,21 +1168,81 @@ gtk_menu_size_allocate (GtkWidget     *widget,
 	      gtk_widget_get_child_requisition (child, &child_requisition);
 	      
 	      child_allocation.height = child_requisition.height;
-	      
+
+	      gtk_menu_item_toggle_size_allocate (GTK_MENU_ITEM (child),
+						  menu->toggle_size);
 	      gtk_widget_size_allocate (child, &child_allocation);
 	      gtk_widget_queue_draw (child);
 	      
 	      child_allocation.y += child_allocation.height;
 	    }
 	}
+      
+      /* Resize the item window */
+      if (GTK_WIDGET_REALIZED (widget))
+	{
+	  gdk_window_resize (menu->bin_window,
+			     child_allocation.width,
+			     child_allocation.y);
+	}
+
+
+      if (menu->tearoff_active)
+	{
+	  if (allocation->height >= widget->requisition.height)
+	    {
+	      if (GTK_WIDGET_VISIBLE (menu->tearoff_scrollbar))
+		{
+		  gtk_widget_hide (menu->tearoff_scrollbar);
+		  gtk_menu_set_tearoff_hints (menu, allocation->width);
+		  gtk_widget_set_usize (menu->tearoff_window, -1, allocation->height);
+
+		  gtk_menu_scroll_to (menu, 0);
+		}
+	    }
+	  else
+	    {
+	      menu->tearoff_adjustment->upper = widget->requisition.height;
+	      menu->tearoff_adjustment->page_size = allocation->height;
+	      
+	      if (menu->tearoff_adjustment->value + menu->tearoff_adjustment->page_size >
+		  menu->tearoff_adjustment->upper)
+		{
+		  gint value;
+		  value = menu->tearoff_adjustment->upper - menu->tearoff_adjustment->page_size;
+		  if (value < 0)
+		    value = 0;
+		  gtk_menu_scroll_to (menu, value);
+		}
+	      
+	      gtk_adjustment_changed (menu->tearoff_adjustment);
+	      
+	      if (!GTK_WIDGET_VISIBLE (menu->tearoff_scrollbar))
+		{
+		  gtk_menu_set_tearoff_hints (menu,
+					      allocation->width + menu->tearoff_scrollbar->requisition.width);
+		  gtk_widget_show (menu->tearoff_scrollbar);
+		  gtk_widget_set_usize (menu->tearoff_window, -1, allocation->height);
+		}
+	    }
+	}
     }
 }
 
 static void
 gtk_menu_paint (GtkWidget *widget)
 {
+  gint border_x;
+  gint border_y;
+  gint width, height;
+  gint menu_height;
+  gint top_pos;
+  GtkMenu *menu;
+  
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_MENU (widget));
+
+  menu = GTK_MENU (widget);
   
   if (GTK_WIDGET_DRAWABLE (widget))
     {
@@ -966,6 +1252,88 @@ gtk_menu_paint (GtkWidget *widget)
 		     GTK_SHADOW_OUT,
 		     NULL, widget, "menu",
 		     0, 0, -1, -1);
+
+      border_x = GTK_CONTAINER (widget)->border_width + widget->style->xthickness;
+      border_y = GTK_CONTAINER (widget)->border_width + widget->style->ythickness;
+      gdk_window_get_size (widget->window, &width, &height);
+
+      if (menu->upper_arrow_visible && !menu->tearoff_active)
+	{
+	  gtk_paint_box (widget->style,
+			 widget->window,
+			 menu->upper_arrow_prelight ?
+			 GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
+			 GTK_SHADOW_OUT,
+			 NULL, widget, "menu",
+			 border_x,
+			 border_y,
+			 width - 2*border_x,
+			 MENU_SCROLL_ARROW_HEIGHT);
+	  
+	  gtk_paint_arrow (widget->style,
+			   widget->window,
+			   menu->upper_arrow_prelight ?
+			   GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
+			   GTK_SHADOW_OUT,
+			   NULL, widget, "menu",
+			   GTK_ARROW_UP,
+			   TRUE,
+			   width / 2 - MENU_SCROLL_ARROW_HEIGHT / 2 + 1,
+			   2 * border_y + 1,
+			   MENU_SCROLL_ARROW_HEIGHT - 2 * border_y - 2,
+			   MENU_SCROLL_ARROW_HEIGHT - 2 * border_y - 2);
+	}
+  
+      if (menu->lower_arrow_visible && !menu->tearoff_active)
+	{
+	  gtk_paint_box (widget->style,
+			 widget->window,
+			 menu->lower_arrow_prelight ?
+			 GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
+			 GTK_SHADOW_OUT,
+			 NULL, widget, "menu",
+			 border_x,
+			 height - border_y - MENU_SCROLL_ARROW_HEIGHT + 1,
+			 width - 2*border_x,
+			 MENU_SCROLL_ARROW_HEIGHT);
+	  
+	  gtk_paint_arrow (widget->style,
+			   widget->window,
+			   menu->lower_arrow_prelight ?
+			   GTK_STATE_PRELIGHT : GTK_STATE_NORMAL,
+			   GTK_SHADOW_OUT,
+			   NULL, widget, "menu",
+			   GTK_ARROW_DOWN,
+			   TRUE,
+			   width / 2 - MENU_SCROLL_ARROW_HEIGHT / 2 + 1,
+			   height - MENU_SCROLL_ARROW_HEIGHT + 1,
+			   MENU_SCROLL_ARROW_HEIGHT - 2 * border_y - 2,
+			   MENU_SCROLL_ARROW_HEIGHT - 2 * border_y - 2);
+	}
+
+      if (menu->scroll_offset < 0)
+	gtk_paint_box (widget->style,
+		       menu->view_window,
+		       GTK_STATE_ACTIVE,
+		       GTK_SHADOW_IN,
+		       NULL, widget, "menu",
+		       0, 0,
+		       -1,
+		       -menu->scroll_offset);
+
+      menu_height = widget->requisition.height - 2*border_y;
+      top_pos = height - 2*border_y - (menu->upper_arrow_visible ? MENU_SCROLL_ARROW_HEIGHT : 0);
+
+      if (menu_height - menu->scroll_offset < top_pos)
+	gtk_paint_box (widget->style,
+		       menu->view_window,
+		       GTK_STATE_ACTIVE,
+		       GTK_SHADOW_IN,
+		       NULL, widget, "menu",
+		       0,
+		       menu_height - menu->scroll_offset,
+		       -1,
+		       top_pos - (menu_height - menu->scroll_offset));
     }
 }
 
@@ -1044,7 +1412,7 @@ gtk_menu_key_press (GtkWidget	*widget,
 {
   GtkMenuShell *menu_shell;
   gboolean delete = FALSE;
-  
+
   g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_MENU (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
@@ -1136,6 +1504,10 @@ gtk_menu_motion_notify  (GtkWidget	   *widget,
 
   gboolean need_enter;
 
+
+  if (GTK_IS_MENU (widget))
+    gtk_menu_handle_scrolling (GTK_MENU (widget), TRUE);
+  
   /* We received the event for one of two reasons:
    *
    * a) We are the active menu, and did gtk_grab_add()
@@ -1145,7 +1517,6 @@ gtk_menu_motion_notify  (GtkWidget	   *widget,
    * is the parent of the menu item, for a), we need to find that menu,
    * which may be different from 'widget'.
    */
-  
   menu_item = gtk_get_event_widget ((GdkEvent*) event);
   if (!menu_item || !GTK_IS_MENU_ITEM (menu_item) || !GTK_WIDGET_IS_SENSITIVE (menu_item) ||
       !GTK_IS_MENU (menu_item->parent))
@@ -1199,11 +1570,153 @@ gtk_menu_motion_notify  (GtkWidget	   *widget,
 }
 
 static gboolean
+gtk_menu_scroll_timeout (gpointer  data)
+{
+  GtkMenu *menu;
+  GtkWidget *widget;
+  gint offset;
+  gint view_width, view_height;
+
+  menu = GTK_MENU (data);
+  widget = GTK_WIDGET (menu);
+
+  offset = menu->scroll_offset + menu->scroll_step;
+
+  /* If we scroll upward and the non-visible top part
+   * is smaller than the scroll arrow it would be
+   * pretty stupid to show the arrow and taking more
+   * screen space than just scrolling to the top.
+   */
+  if ((menu->scroll_step < 0) && (offset < MENU_SCROLL_ARROW_HEIGHT))
+    offset = 0;
+
+  /* Don't scroll over the top if we weren't before: */
+  if ((menu->scroll_offset >= 0) && (offset < 0))
+    offset = 0;
+
+  gdk_window_get_size (widget->window, &view_width, &view_height);
+
+  /* Don't scroll past the bottom if we weren't before: */
+  if (menu->scroll_offset > 0)
+    view_height -= MENU_SCROLL_ARROW_HEIGHT;
+  
+  if ((menu->scroll_offset + view_height <= widget->requisition.height) &&
+      (offset + view_height > widget->requisition.height))
+    offset = widget->requisition.height - view_height;
+
+  gtk_menu_scroll_to (menu, offset);
+
+  return TRUE;
+}
+
+static void
+gtk_menu_handle_scrolling (GtkMenu *menu, gboolean enter)
+{
+  GtkMenuShell *menu_shell;
+  gint width, height;
+  gint x, y;
+  gint border;
+  GdkRectangle rect;
+  gboolean in_arrow;
+  gboolean scroll_fast = FALSE;
+
+  menu_shell = GTK_MENU_SHELL (menu);
+
+  gdk_window_get_pointer (GTK_WIDGET (menu)->window, &x, &y, NULL);
+  gdk_window_get_size (GTK_WIDGET (menu)->window, &width, &height);
+
+  border = GTK_CONTAINER (menu)->border_width + GTK_WIDGET (menu)->style->ythickness;
+
+  if (menu->upper_arrow_visible && !menu->tearoff_active)
+    {
+      rect.x = 0;
+      rect.y = 0;
+      rect.width = width;
+      rect.height = MENU_SCROLL_ARROW_HEIGHT + border;
+      
+      in_arrow = FALSE;
+      if ((x >= rect.x) && (x < rect.x + rect.width) &&
+	  (y >= rect.y) && (y < rect.y + rect.height))
+	{
+	  in_arrow = TRUE;
+	  scroll_fast = (y < rect.y + MENU_SCROLL_FAST_ZONE);
+	}
+	
+      if (enter && in_arrow &&
+	  (!menu->upper_arrow_prelight || menu->scroll_fast != scroll_fast))
+	{
+	  menu->upper_arrow_prelight = TRUE;
+	  menu->scroll_fast = scroll_fast;
+	  gdk_window_invalidate_rect (GTK_WIDGET (menu)->window, &rect, FALSE);
+	  
+	  /* Deselect the active item so that any submenus are poped down */
+	  gtk_menu_shell_deselect (menu_shell);
+
+	  gtk_menu_stop_scrolling (menu);
+	  menu->scroll_step = -MENU_SCROLL_STEP;
+	  menu->timeout_id = g_timeout_add ((scroll_fast) ? MENU_SCROLL_TIMEOUT2 : MENU_SCROLL_TIMEOUT1,
+					    gtk_menu_scroll_timeout,
+					    menu);
+	}
+      else if (!enter && !in_arrow && menu->upper_arrow_prelight)
+	{
+	  menu->upper_arrow_prelight = FALSE;
+	  gdk_window_invalidate_rect (GTK_WIDGET (menu)->window, &rect, FALSE);
+	  
+	  gtk_menu_stop_scrolling (menu);
+	}
+    }
+  
+  if (menu->lower_arrow_visible && !menu->tearoff_active)
+    {
+      rect.x = 0;
+      rect.y = height - border - MENU_SCROLL_ARROW_HEIGHT;
+      rect.width = width;
+      rect.height = MENU_SCROLL_ARROW_HEIGHT + border;
+
+      in_arrow = FALSE;
+      if ((x >= rect.x) && (x < rect.x + rect.width) &&
+	  (y >= rect.y) && (y < rect.y + rect.height))
+	{
+	  in_arrow = TRUE;
+	  scroll_fast = (y > rect.y + rect.height - MENU_SCROLL_FAST_ZONE);
+	}
+
+      if (enter && in_arrow &&
+	  (!menu->lower_arrow_prelight || menu->scroll_fast != scroll_fast))
+	{
+	  menu->lower_arrow_prelight = TRUE;
+	  menu->scroll_fast = scroll_fast;
+	  gdk_window_invalidate_rect (GTK_WIDGET (menu)->window, &rect, FALSE);
+
+	  /* Deselect the active item so that any submenus are poped down */
+	  gtk_menu_shell_deselect (menu_shell);
+
+	  gtk_menu_stop_scrolling (menu);
+	  menu->scroll_step = MENU_SCROLL_STEP;
+	  menu->timeout_id = g_timeout_add ((scroll_fast) ? MENU_SCROLL_TIMEOUT2 : MENU_SCROLL_TIMEOUT1,
+					    gtk_menu_scroll_timeout,
+					    menu);
+	}
+      else if (!enter && !in_arrow && menu->lower_arrow_prelight)
+	{
+	  menu->lower_arrow_prelight = FALSE;
+	  gdk_window_invalidate_rect (GTK_WIDGET (menu)->window, &rect, FALSE);
+	  
+	  gtk_menu_stop_scrolling (menu);
+	}
+    }
+}
+
+static gboolean
 gtk_menu_enter_notify (GtkWidget        *widget,
 		       GdkEventCrossing *event)
 {
   GtkWidget *menu_item;
 
+  if (widget && GTK_IS_MENU (widget))
+    gtk_menu_handle_scrolling (GTK_MENU (widget), TRUE);
+      
   /* If this is a faked enter (see gtk_menu_motion_notify), 'widget'
    * will not correspond to the event widget's parent.  Check to see
    * if we are in the parent's navigation region.
@@ -1211,7 +1724,7 @@ gtk_menu_enter_notify (GtkWidget        *widget,
   menu_item = gtk_get_event_widget ((GdkEvent*) event);
   if (menu_item && GTK_IS_MENU_ITEM (menu_item) && GTK_IS_MENU (menu_item->parent) &&
       gtk_menu_navigating_submenu (GTK_MENU (menu_item->parent), event->x_root, event->y_root))
-    return TRUE; 
+    return TRUE;
 
   return GTK_WIDGET_CLASS (parent_class)->enter_notify_event (widget, event); 
 }
@@ -1223,13 +1736,15 @@ gtk_menu_leave_notify (GtkWidget        *widget,
   GtkMenuShell *menu_shell;
   GtkMenu *menu;
   GtkMenuItem *menu_item;
-  GtkWidget *event_widget; 
+  GtkWidget *event_widget;
 
   menu = GTK_MENU (widget);
   menu_shell = GTK_MENU_SHELL (widget); 
   
   if (gtk_menu_navigating_submenu (menu, event->x_root, event->y_root))
     return TRUE; 
+
+  gtk_menu_handle_scrolling (menu, FALSE);
   
   event_widget = gtk_get_event_widget ((GdkEvent*) event);
   
@@ -1416,12 +1931,20 @@ gtk_menu_position (GtkMenu *menu)
   GtkWidget *widget;
   GtkRequisition requisition;
   gint x, y;
- 
+  gint screen_width;
+  gint screen_height;
+  gint scroll_offset;
+  gint menu_height;
+  gboolean push_in;
+  
   g_return_if_fail (menu != NULL);
   g_return_if_fail (GTK_IS_MENU (menu));
 
   widget = GTK_WIDGET (menu);
 
+  screen_width = gdk_screen_width ();
+  screen_height = gdk_screen_height ();
+
   gdk_window_get_pointer (NULL, &x, &y, NULL);
 
   /* We need the requisition to figure out the right place to
@@ -1430,31 +1953,281 @@ gtk_menu_position (GtkMenu *menu)
    * the requisition won't have been recomputed yet.
    */
   gtk_widget_size_request (widget, &requisition);
-      
+
+  push_in = FALSE;
+  
   if (menu->position_func)
-    (* menu->position_func) (menu, &x, &y, menu->position_func_data);
+    (* menu->position_func) (menu, &x, &y, &push_in, menu->position_func_data);
   else
     {
-      gint screen_width;
-      gint screen_height;
-      
-      screen_width = gdk_screen_width ();
-      screen_height = gdk_screen_height ();
-	  
       x = CLAMP (x - 2, 0, MAX (0, screen_width - requisition.width));
       y = CLAMP (y - 2, 0, MAX (0, screen_height - requisition.height));
     }
 
+  scroll_offset = 0;
+
+  if (push_in)
+    {
+      menu_height = GTK_WIDGET (menu)->requisition.height;
+
+      if (y + menu_height > screen_height)
+	{
+	  scroll_offset -= y + menu_height - screen_height;
+	  y = screen_height - menu_height;
+	}
+  
+      if (y < 0)
+	{
+	  scroll_offset -= y;
+	  y = 0;
+	}
+    }
+
+  if (y + requisition.height > screen_height)
+    requisition.height = screen_height - y;
+  
+  if (y < 0)
+    {
+      scroll_offset -= y;
+      requisition.height -= -y;
+      y = 0;
+    }
+
+  if (scroll_offset > 0)
+    scroll_offset += MENU_SCROLL_ARROW_HEIGHT;
+  
   /* FIXME: The MAX() here is because gtk_widget_set_uposition
    * is broken. Once we provide an alternate interface that
    * allows negative values, then we can remove them.
    */
+  x = MAX (x, 0);
   gtk_widget_set_uposition (GTK_MENU_SHELL (menu)->active ?
-			        menu->toplevel : menu->tearoff_window, 
-			    MAX (x, 0), MAX (y, 0));
+			    menu->toplevel : menu->tearoff_window, 
+			    x, y);
+  gtk_widget_set_usize (GTK_MENU_SHELL (menu)->active ?
+			menu->toplevel : menu->tearoff_hbox,
+			-1, requisition.height);
+  menu->scroll_offset = scroll_offset;
+}
+
+static void
+gtk_menu_stop_scrolling (GtkMenu *menu)
+{
+  if (menu->timeout_id)
+    {
+      g_source_remove (menu->timeout_id);
+      menu->timeout_id = 0;
+    }
+}
+
+
+static void
+gtk_menu_scroll_to (GtkMenu *menu,
+		    gint    offset)
+{
+  GtkWidget *widget;
+  gint x, y;
+  gint view_width, view_height;
+  gint border_width;
+  gboolean last_visible;
+  gint menu_height;
+
+  widget = GTK_WIDGET (menu);
+
+  if (menu->tearoff_active &&
+      menu->tearoff_adjustment &&
+      (menu->tearoff_adjustment->value != offset))
+    {
+      menu->tearoff_adjustment->value = offset;
+      gtk_adjustment_value_changed (menu->tearoff_adjustment);
+    }
+  
+  /* Scroll the menu: */
+  gdk_window_move (menu->bin_window, 0, -offset);
+
+  /* Move/resize the viewport according to arrows: */
+  gdk_window_get_size (widget->window, &view_width, &view_height);
+
+  border_width = GTK_CONTAINER (menu)->border_width;
+  view_width -= (border_width + widget->style->xthickness) * 2;
+  view_height -= (border_width + widget->style->ythickness) * 2;
+  menu_height = widget->requisition.height - (border_width + widget->style->ythickness) * 2;
+
+  x = border_width + widget->style->xthickness;
+  y = border_width + widget->style->ythickness;
+  
+  if (!menu->tearoff_active)
+    {
+      last_visible = menu->upper_arrow_visible;
+      menu->upper_arrow_visible = (offset > 0);
+
+      if (menu->upper_arrow_visible)
+	view_height -= MENU_SCROLL_ARROW_HEIGHT;
+      
+      if ( (last_visible != menu->upper_arrow_visible) &&
+	   !menu->upper_arrow_visible)
+	{
+	  menu->upper_arrow_prelight = FALSE;
+	  
+	  /* If we hid the upper arrow, possibly remove timeout */
+	  if (menu->scroll_step < 0)
+	    gtk_menu_stop_scrolling (menu);
+	}
+      
+      last_visible = menu->lower_arrow_visible;
+      menu->lower_arrow_visible = (view_height + offset < menu_height);
+      
+      if (menu->lower_arrow_visible)
+	view_height -= MENU_SCROLL_ARROW_HEIGHT;
+      
+      if ( (last_visible != menu->lower_arrow_visible) &&
+	   !menu->lower_arrow_visible)
+	{
+	  menu->lower_arrow_prelight = FALSE;
+	  
+	  /* If we hid the lower arrow, possibly remove timeout */
+	  if (menu->scroll_step > 0)
+	    gtk_menu_stop_scrolling (menu);
+	}
+      
+      if (menu->upper_arrow_visible)
+	y += MENU_SCROLL_ARROW_HEIGHT;
+    }
+  
+  
+  gdk_window_move_resize (menu->view_window,
+			  x,
+			  y,
+			  view_width,
+			  view_height);
+
+  menu->scroll_offset = offset;
 }
 
+static void
+gtk_menu_select_item (GtkMenuShell  *menu_shell,
+		      GtkWidget     *menu_item)
+{
+  GtkMenu *menu;
+  GtkWidget *child;
+  GList *children;
+  GtkRequisition child_requisition;
+  gint child_offset, child_height;
+  gint width, height;
+  gint y;
+  gint arrow_height;
+  gboolean last_child = 0;
+  
+  g_return_if_fail (menu_shell != NULL);
+  g_return_if_fail (GTK_IS_MENU (menu_shell));
+
+  menu = GTK_MENU (menu_shell);
+
+  /* We need to check if the selected item fully visible.
+   * If not we need to scroll the menu so that it becomes fully
+   * visible.
+   */
+
+  child = NULL;
+  child_offset = 0;
+  child_height = 0;
+  children = menu_shell->children;
+  while (children)
+    {
+      child = children->data;
+      children = children->next;
+      
+      if (GTK_WIDGET_VISIBLE (child))
+	{
+	  gtk_widget_size_request (child, &child_requisition);
+	  child_offset += child_height;
+	  child_height = child_requisition.height;
+	}
+      
+      if (child == menu_item)
+	{
+	  last_child = (children == NULL);
+	  break;
+	}
+    }
+
+  if (child == menu_item)
+    {
+      y = menu->scroll_offset;
+      gdk_window_get_size (GTK_WIDGET (menu)->window, &width, &height);
+
+      height -= 2*GTK_CONTAINER (menu)->border_width + 2*GTK_WIDGET (menu)->style->ythickness;
+      
+      if (child_offset + child_height <= y)
+	{
+	  /* Ignore the enter event we might get if the pointer is on the menu
+	   */
+	  menu_shell->ignore_enter = TRUE;
+	  gtk_menu_scroll_to (menu, child_offset);
+	}
+      else
+	{
+	  arrow_height = 0;
+	  if (menu->upper_arrow_visible && !menu->tearoff_active)
+	    arrow_height += MENU_SCROLL_ARROW_HEIGHT;
+	  if (menu->lower_arrow_visible && !menu->tearoff_active)
+	    arrow_height += MENU_SCROLL_ARROW_HEIGHT;
+	  
+	  if (child_offset >= y + height - arrow_height)
+	    {
+	      arrow_height = 0;
+	      if (!last_child && !menu->tearoff_active)
+		arrow_height += MENU_SCROLL_ARROW_HEIGHT;
+	      
+	      y = child_offset + child_height - height + arrow_height;
+	      if ((y > 0) && !menu->tearoff_active)
+		{
+		  /* Need upper arrow */
+		  arrow_height += MENU_SCROLL_ARROW_HEIGHT;
+		  y = child_offset + child_height - height + arrow_height;
+		}
+	      /* Ignore the enter event we might get if the pointer is on the menu
+	       */
+	      menu_shell->ignore_enter = TRUE;
+	      gtk_menu_scroll_to (menu, y);
+	    }
+	}    
+      
+    }
+
+  GTK_MENU_SHELL_CLASS (parent_class)->select_item (menu_shell, menu_item);
+}
+
+
 /* Reparent the menu, taking care of the refcounting
+ *
+ * If unrealize is true we force a unrealize while reparenting the parent.
+ * This can help eliminate flicker in some cases.
+ *
+ * What happens is that when the menu is unrealized and then re-realized,
+ * the allocations are as follows:
+ *
+ *  parent - 1x1 at (0,0) 
+ *  child1 - 100x20 at (0,0)
+ *  child2 - 100x20 at (0,20)
+ *  child3 - 100x20 at (0,40)
+ *
+ * That is, the parent is small but the children are full sized. Then,
+ * when the queued_resize gets processed, the parent gets resized to
+ * full size. 
+ *
+ * But in order to eliminate flicker when scrolling, gdkgeometry-x11.c
+ * contains the following logic:
+ * 
+ * - if a move or resize operation on a window would change the clip 
+ *   region on the children, then before the window is resized
+ *   the background for children is temporarily set to None, the
+ *   move/resize done, and the background for the children restored.
+ *
+ * So, at the point where the parent is resized to final size, the
+ * background for the children is temporarily None, and thus they
+ * are not cleared to the background color and the previous background
+ * (the image of the menu) is left in place.
  */
 static void 
 gtk_menu_reparent (GtkMenu      *menu, 
@@ -1477,7 +2250,6 @@ gtk_menu_reparent (GtkMenu      *menu,
     }
   else
     gtk_widget_reparent (GTK_WIDGET (menu), new_parent);
-  gtk_widget_set_usize (new_parent, -1, -1);
   
   if (was_floating)
     GTK_OBJECT_SET_FLAGS (object, GTK_FLOATING);
@@ -1506,3 +2278,4 @@ gtk_menu_hide_all (GtkWidget *widget)
   gtk_container_foreach (GTK_CONTAINER (widget), (GtkCallback) gtk_widget_hide_all, NULL);
 }
 
+