X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkhandlebox.c;h=46e9592bf2833e725ca277e40b63f631ccd7df25;hb=c229306a18f6453c144397bfbbf2284afa9731eb;hp=00ca124d7c8951415ed693215a9d995453656966;hpb=35af5c4eba6c95646a5719bae796ece1dbf92275;p=~andy%2Fgtk

diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 00ca124d7..46e9592bf 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -25,17 +25,33 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include "config.h"
 #include <stdlib.h>
 #include "gtkhandlebox.h"
+#include "gtkinvisible.h"
 #include "gtkmain.h"
-#include "gtksignal.h"
+#include "gtkmarshalers.h"
 #include "gtkwindow.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
+
+typedef struct _GtkHandleBoxPrivate GtkHandleBoxPrivate;
+
+struct _GtkHandleBoxPrivate
+{
+  gint orig_x;
+  gint orig_y;
+};
 
 enum {
-  ARG_0,
-  ARG_SHADOW,
-  ARG_HANDLE_POSITION,
-  ARG_SNAP_EDGE
+  PROP_0,
+  PROP_SHADOW,
+  PROP_SHADOW_TYPE,
+  PROP_HANDLE_POSITION,
+  PROP_SNAP_EDGE,
+  PROP_SNAP_EDGE_SET,
+  PROP_CHILD_DETACHED
 };
 
 #define DRAG_HANDLE_SIZE 10
@@ -89,95 +105,111 @@ enum {
  *          <--------bin_window-------------------->
  */
 
-static void gtk_handle_box_class_init     (GtkHandleBoxClass *klass);
-static void gtk_handle_box_init           (GtkHandleBox      *handle_box);
-static void gtk_handle_box_set_arg        (GtkObject         *object,
-					   GtkArg            *arg,
-					   guint              arg_id);
-static void gtk_handle_box_get_arg        (GtkObject         *object,
-					   GtkArg            *arg,
-					   guint              arg_id);
-static void gtk_handle_box_destroy        (GtkObject         *object);
-static void gtk_handle_box_map            (GtkWidget         *widget);
-static void gtk_handle_box_unmap          (GtkWidget         *widget);
-static void gtk_handle_box_realize        (GtkWidget         *widget);
-static void gtk_handle_box_unrealize      (GtkWidget         *widget);
-static void gtk_handle_box_style_set      (GtkWidget         *widget,
-					   GtkStyle          *previous_style);
-static void gtk_handle_box_size_request   (GtkWidget         *widget,
-					   GtkRequisition    *requisition);
-static void gtk_handle_box_size_allocate  (GtkWidget         *widget,
-					   GtkAllocation     *real_allocation);
-static void gtk_handle_box_add            (GtkContainer      *container,
-					   GtkWidget         *widget);
-static void gtk_handle_box_remove         (GtkContainer      *container,
-					   GtkWidget         *widget);
-static void gtk_handle_box_draw_ghost     (GtkHandleBox      *hb);
-static void gtk_handle_box_paint          (GtkWidget         *widget,
-					   GdkEventExpose    *event,
-					   GdkRectangle      *area);
-static gint gtk_handle_box_expose         (GtkWidget         *widget,
-					   GdkEventExpose    *event);
-static gint gtk_handle_box_button_changed (GtkWidget         *widget,
-					   GdkEventButton    *event);
-static gint gtk_handle_box_motion         (GtkWidget         *widget,
-					   GdkEventMotion    *event);
-static gint gtk_handle_box_delete_event   (GtkWidget         *widget,
-					   GdkEventAny       *event);
-static void gtk_handle_box_reattach       (GtkHandleBox      *hb);
-
-
-static GtkBinClass *parent_class;
-static guint        handle_box_signals[SIGNAL_LAST] = { 0 };
-
-
-GtkType
-gtk_handle_box_get_type (void)
-{
-  static GtkType handle_box_type = 0;
-
-  if (!handle_box_type)
-    {
-      static const GtkTypeInfo handle_box_info =
-      {
-	"GtkHandleBox",
-	sizeof (GtkHandleBox),
-	sizeof (GtkHandleBoxClass),
-	(GtkClassInitFunc) gtk_handle_box_class_init,
-	(GtkObjectInitFunc) gtk_handle_box_init,
-	/* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      handle_box_type = gtk_type_unique (GTK_TYPE_BIN, &handle_box_info);
-    }
-
-  return handle_box_type;
-}
+static void     gtk_handle_box_set_property  (GObject        *object,
+                                              guint           param_id,
+                                              const GValue   *value,
+                                              GParamSpec     *pspec);
+static void     gtk_handle_box_get_property  (GObject        *object,
+                                              guint           param_id,
+                                              GValue         *value,
+                                              GParamSpec     *pspec);
+static void     gtk_handle_box_map           (GtkWidget      *widget);
+static void     gtk_handle_box_unmap         (GtkWidget      *widget);
+static void     gtk_handle_box_realize       (GtkWidget      *widget);
+static void     gtk_handle_box_unrealize     (GtkWidget      *widget);
+static void     gtk_handle_box_style_set     (GtkWidget      *widget,
+                                              GtkStyle       *previous_style);
+static void     gtk_handle_box_size_request  (GtkWidget      *widget,
+                                              GtkRequisition *requisition);
+static void     gtk_handle_box_size_allocate (GtkWidget      *widget,
+                                              GtkAllocation  *real_allocation);
+static void     gtk_handle_box_add           (GtkContainer   *container,
+                                              GtkWidget      *widget);
+static void     gtk_handle_box_remove        (GtkContainer   *container,
+                                              GtkWidget      *widget);
+static void     gtk_handle_box_draw_ghost    (GtkHandleBox   *hb);
+static void     gtk_handle_box_paint         (GtkWidget      *widget,
+                                              GdkEventExpose *event,
+                                              GdkRectangle   *area);
+static gboolean gtk_handle_box_expose        (GtkWidget      *widget,
+                                              GdkEventExpose *event);
+static gboolean gtk_handle_box_button_press  (GtkWidget      *widget,
+                                              GdkEventButton *event);
+static gboolean gtk_handle_box_motion        (GtkWidget      *widget,
+                                              GdkEventMotion *event);
+static gboolean gtk_handle_box_delete_event  (GtkWidget      *widget,
+                                              GdkEventAny    *event);
+static void     gtk_handle_box_reattach      (GtkHandleBox   *hb);
+static void     gtk_handle_box_end_drag      (GtkHandleBox   *hb,
+                                              guint32         time);
+
+static guint handle_box_signals[SIGNAL_LAST] = { 0 };
+
+G_DEFINE_TYPE (GtkHandleBox, gtk_handle_box, GTK_TYPE_BIN)
 
 static void
 gtk_handle_box_class_init (GtkHandleBoxClass *class)
 {
-  GtkObjectClass *object_class;
+  GObjectClass *gobject_class;
   GtkWidgetClass *widget_class;
   GtkContainerClass *container_class;
 
-  object_class = (GtkObjectClass *) class;
+  gobject_class = (GObjectClass *) class;
   widget_class = (GtkWidgetClass *) class;
   container_class = (GtkContainerClass *) class;
 
-  parent_class = gtk_type_class (GTK_TYPE_BIN);
+  gobject_class->set_property = gtk_handle_box_set_property;
+  gobject_class->get_property = gtk_handle_box_get_property;
   
-  gtk_object_add_arg_type ("GtkHandleBox::shadow", GTK_TYPE_SHADOW_TYPE, GTK_ARG_READWRITE, ARG_SHADOW);
-  gtk_object_add_arg_type ("GtkHandleBox::handle_position", GTK_TYPE_POSITION_TYPE, GTK_ARG_READWRITE, ARG_HANDLE_POSITION);
-  gtk_object_add_arg_type ("GtkHandleBox::snap_edge", GTK_TYPE_POSITION_TYPE, GTK_ARG_READWRITE, ARG_SNAP_EDGE);
-
-  object_class->set_arg = gtk_handle_box_set_arg;
-  object_class->get_arg = gtk_handle_box_get_arg;
+  g_object_class_install_property (gobject_class,
+                                   PROP_SHADOW,
+                                   g_param_spec_enum ("shadow", NULL,
+                                                      P_("Deprecated property, use shadow_type instead"),
+						      GTK_TYPE_SHADOW_TYPE,
+						      GTK_SHADOW_OUT,
+                                                      GTK_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class,
+                                   PROP_SHADOW_TYPE,
+                                   g_param_spec_enum ("shadow-type",
+                                                      P_("Shadow type"),
+                                                      P_("Appearance of the shadow that surrounds the container"),
+						      GTK_TYPE_SHADOW_TYPE,
+						      GTK_SHADOW_OUT,
+                                                      GTK_PARAM_READWRITE));
   
+  g_object_class_install_property (gobject_class,
+                                   PROP_HANDLE_POSITION,
+                                   g_param_spec_enum ("handle-position",
+                                                      P_("Handle position"),
+                                                      P_("Position of the handle relative to the child widget"),
+						      GTK_TYPE_POSITION_TYPE,
+						      GTK_POS_LEFT,
+                                                      GTK_PARAM_READWRITE));
   
-  object_class->destroy = gtk_handle_box_destroy;
+  g_object_class_install_property (gobject_class,
+                                   PROP_SNAP_EDGE,
+                                   g_param_spec_enum ("snap-edge",
+                                                      P_("Snap edge"),
+                                                      P_("Side of the handlebox that's lined up with the docking point to dock the handlebox"),
+						      GTK_TYPE_POSITION_TYPE,
+						      GTK_POS_TOP,
+                                                      GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_SNAP_EDGE_SET,
+                                   g_param_spec_boolean ("snap-edge-set",
+							 P_("Snap edge set"),
+							 P_("Whether to use the value from the snap_edge property or a value derived from handle_position"),
+							 FALSE,
+							 GTK_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_CHILD_DETACHED,
+                                   g_param_spec_boolean ("child-detached",
+							 P_("Child Detached"),
+							 P_("A boolean value indicating whether the handlebox's child is attached or detached."),
+							 FALSE,
+							 GTK_PARAM_READABLE));
 
   widget_class->map = gtk_handle_box_map;
   widget_class->unmap = gtk_handle_box_unmap;
@@ -187,9 +219,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
   widget_class->size_request = gtk_handle_box_size_request;
   widget_class->size_allocate = gtk_handle_box_size_allocate;
   widget_class->expose_event = gtk_handle_box_expose;
-  widget_class->button_press_event = gtk_handle_box_button_changed;
-  widget_class->button_release_event = gtk_handle_box_button_changed;
-  widget_class->motion_notify_event = gtk_handle_box_motion;
+  widget_class->button_press_event = gtk_handle_box_button_press;
   widget_class->delete_event = gtk_handle_box_delete_event;
 
   container_class->add = gtk_handle_box_add;
@@ -199,21 +229,31 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
   class->child_detached = NULL;
 
   handle_box_signals[SIGNAL_CHILD_ATTACHED] =
-    gtk_signal_new ("child_attached",
-		    GTK_RUN_FIRST,
-		    GTK_CLASS_TYPE (object_class),
-		    GTK_SIGNAL_OFFSET (GtkHandleBoxClass, child_attached),
-		    gtk_marshal_VOID__OBJECT,
-		    GTK_TYPE_NONE, 1,
-		    GTK_TYPE_WIDGET);
+    g_signal_new (I_("child-attached"),
+		  G_OBJECT_CLASS_TYPE (gobject_class),
+		  G_SIGNAL_RUN_FIRST,
+		  G_STRUCT_OFFSET (GtkHandleBoxClass, child_attached),
+		  NULL, NULL,
+		  _gtk_marshal_VOID__OBJECT,
+		  G_TYPE_NONE, 1,
+		  GTK_TYPE_WIDGET);
   handle_box_signals[SIGNAL_CHILD_DETACHED] =
-    gtk_signal_new ("child_detached",
-		    GTK_RUN_FIRST,
-		    GTK_CLASS_TYPE (object_class),
-		    GTK_SIGNAL_OFFSET (GtkHandleBoxClass, child_detached),
-		    gtk_marshal_VOID__OBJECT,
-		    GTK_TYPE_NONE, 1,
-		    GTK_TYPE_WIDGET);
+    g_signal_new (I_("child-detached"),
+		  G_OBJECT_CLASS_TYPE (gobject_class),
+		  G_SIGNAL_RUN_FIRST,
+		  G_STRUCT_OFFSET (GtkHandleBoxClass, child_detached),
+		  NULL, NULL,
+		  _gtk_marshal_VOID__OBJECT,
+		  G_TYPE_NONE, 1,
+		  GTK_TYPE_WIDGET);
+
+  g_type_class_add_private (gobject_class, sizeof (GtkHandleBoxPrivate));    
+}
+
+static GtkHandleBoxPrivate *
+gtk_handle_box_get_private (GtkHandleBox *hb)
+{
+  return G_TYPE_INSTANCE_GET_PRIVATE (hb, GTK_TYPE_HANDLE_BOX, GtkHandleBoxPrivate);
 }
 
 static void
@@ -232,47 +272,66 @@ gtk_handle_box_init (GtkHandleBox *handle_box)
   handle_box->snap_edge = -1;
 }
 
-static void
-gtk_handle_box_set_arg (GtkObject *object,
-			GtkArg    *arg,
-			guint      arg_id)
+static void 
+gtk_handle_box_set_property (GObject         *object,
+			     guint            prop_id,
+			     const GValue    *value,
+			     GParamSpec      *pspec)
 {
   GtkHandleBox *handle_box = GTK_HANDLE_BOX (object);
 
-  switch (arg_id)
+  switch (prop_id)
     {
-    case ARG_SHADOW:
-      gtk_handle_box_set_shadow_type (handle_box, GTK_VALUE_ENUM (*arg));
+    case PROP_SHADOW:
+    case PROP_SHADOW_TYPE:
+      gtk_handle_box_set_shadow_type (handle_box, g_value_get_enum (value));
+      break;
+    case PROP_HANDLE_POSITION:
+      gtk_handle_box_set_handle_position (handle_box, g_value_get_enum (value));
       break;
-    case ARG_HANDLE_POSITION:
-      gtk_handle_box_set_handle_position (handle_box, GTK_VALUE_ENUM (*arg));
+    case PROP_SNAP_EDGE:
+      gtk_handle_box_set_snap_edge (handle_box, g_value_get_enum (value));
       break;
-    case ARG_SNAP_EDGE:
-      gtk_handle_box_set_snap_edge (handle_box, GTK_VALUE_ENUM (*arg));
+    case PROP_SNAP_EDGE_SET:
+      if (!g_value_get_boolean (value))
+	gtk_handle_box_set_snap_edge (handle_box, (GtkPositionType)-1);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
     }
 }
 
-static void
-gtk_handle_box_get_arg (GtkObject *object,
-			GtkArg    *arg,
-			guint      arg_id)
+static void 
+gtk_handle_box_get_property (GObject         *object,
+			     guint            prop_id,
+			     GValue          *value,
+			     GParamSpec      *pspec)
 {
   GtkHandleBox *handle_box = GTK_HANDLE_BOX (object);
   
-  switch (arg_id)
+  switch (prop_id)
     {
-    case ARG_SHADOW:
-      GTK_VALUE_ENUM (*arg) = handle_box->shadow_type;
+    case PROP_SHADOW:
+    case PROP_SHADOW_TYPE:
+      g_value_set_enum (value, handle_box->shadow_type);
+      break;
+    case PROP_HANDLE_POSITION:
+      g_value_set_enum (value, handle_box->handle_position);
       break;
-    case ARG_HANDLE_POSITION:
-      GTK_VALUE_ENUM (*arg) = handle_box->handle_position;
+    case PROP_SNAP_EDGE:
+      g_value_set_enum (value,
+			(handle_box->snap_edge == -1 ?
+			 GTK_POS_TOP : handle_box->snap_edge));
       break;
-    case ARG_SNAP_EDGE:
-      GTK_VALUE_ENUM (*arg) = handle_box->snap_edge;
+    case PROP_SNAP_EDGE_SET:
+      g_value_set_boolean (value, handle_box->snap_edge != -1);
+      break;
+    case PROP_CHILD_DETACHED:
+      g_value_set_boolean (value, handle_box->child_detached);
       break;
     default:
-      arg->type = GTK_TYPE_INVALID;
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
     }
 }
@@ -280,21 +339,7 @@ gtk_handle_box_get_arg (GtkObject *object,
 GtkWidget*
 gtk_handle_box_new (void)
 {
-  return GTK_WIDGET (gtk_type_new (gtk_handle_box_get_type ()));
-}
-
-static void
-gtk_handle_box_destroy (GtkObject *object)
-{
-  GtkHandleBox *hb;
-
-  g_return_if_fail (object != NULL);
-  g_return_if_fail (GTK_IS_HANDLE_BOX (object));
-
-  hb = GTK_HANDLE_BOX (object);
-
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-    (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+  return g_object_new (GTK_TYPE_HANDLE_BOX, NULL);
 }
 
 static void
@@ -303,9 +348,6 @@ gtk_handle_box_map (GtkWidget *widget)
   GtkBin *bin;
   GtkHandleBox *hb;
 
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
-
   GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
 
   bin = GTK_BIN (widget);
@@ -331,9 +373,6 @@ gtk_handle_box_unmap (GtkWidget *widget)
 {
   GtkHandleBox *hb;
 
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
-
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
 
   hb = GTK_HANDLE_BOX (widget);
@@ -353,9 +392,6 @@ gtk_handle_box_realize (GtkWidget *widget)
   gint attributes_mask;
   GtkHandleBox *hb;
 
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
-
   hb = GTK_HANDLE_BOX (widget);
 
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
@@ -379,11 +415,11 @@ gtk_handle_box_realize (GtkWidget *widget)
   attributes.width = widget->allocation.width;
   attributes.height = widget->allocation.height;
   attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.event_mask |= (gtk_widget_get_events (widget) |
-			    GDK_EXPOSURE_MASK |
-			    GDK_BUTTON1_MOTION_MASK |
-			    GDK_POINTER_MOTION_HINT_MASK |
-			    GDK_BUTTON_PRESS_MASK |
+  attributes.event_mask = (gtk_widget_get_events (widget) |
+			   GDK_EXPOSURE_MASK |
+			   GDK_BUTTON1_MOTION_MASK |
+			   GDK_POINTER_MOTION_HINT_MASK |
+			   GDK_BUTTON_PRESS_MASK |
 			    GDK_BUTTON_RELEASE_MASK);
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
   hb->bin_window = gdk_window_new (widget->window, &attributes, attributes_mask);
@@ -405,8 +441,10 @@ gtk_handle_box_realize (GtkWidget *widget)
 			   GDK_LEAVE_NOTIFY_MASK |
 			   GDK_FOCUS_CHANGE_MASK |
 			   GDK_STRUCTURE_MASK);
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-  hb->float_window = gdk_window_new (NULL, &attributes, attributes_mask);
+  attributes.type_hint = GDK_WINDOW_TYPE_HINT_TOOLBAR;
+  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_TYPE_HINT;
+  hb->float_window = gdk_window_new (gtk_widget_get_root_window (widget),
+				     &attributes, attributes_mask);
   gdk_window_set_user_data (hb->float_window, widget);
   gdk_window_set_decorations (hb->float_window, 0);
   gdk_window_set_type_hint (hb->float_window, GDK_WINDOW_TYPE_HINT_TOOLBAR);
@@ -421,12 +459,7 @@ gtk_handle_box_realize (GtkWidget *widget)
 static void
 gtk_handle_box_unrealize (GtkWidget *widget)
 {
-  GtkHandleBox *hb;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
-
-  hb = GTK_HANDLE_BOX (widget);
+  GtkHandleBox *hb = GTK_HANDLE_BOX (widget);
 
   gdk_window_set_user_data (hb->bin_window, NULL);
   gdk_window_destroy (hb->bin_window);
@@ -435,32 +468,51 @@ gtk_handle_box_unrealize (GtkWidget *widget)
   gdk_window_destroy (hb->float_window);
   hb->float_window = NULL;
 
-  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+  GTK_WIDGET_CLASS (gtk_handle_box_parent_class)->unrealize (widget);
 }
 
 static void
 gtk_handle_box_style_set (GtkWidget *widget,
 			  GtkStyle  *previous_style)
 {
-  GtkHandleBox *hb;
-  GdkRectangle new_area;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
-
-  hb = GTK_HANDLE_BOX (widget);
+  GtkHandleBox *hb = GTK_HANDLE_BOX (widget);
 
   if (GTK_WIDGET_REALIZED (widget) &&
       !GTK_WIDGET_NO_WINDOW (widget))
     {
       gtk_style_set_background (widget->style, widget->window,
-widget->state);
+				widget->state);
       gtk_style_set_background (widget->style, hb->bin_window, widget->state);
       gtk_style_set_background (widget->style, hb->float_window, widget->state);
     }
 }
 
+static int
+effective_handle_position (GtkHandleBox *hb)
+{
+  int handle_position;
+
+  if (gtk_widget_get_direction (GTK_WIDGET (hb)) == GTK_TEXT_DIR_LTR)
+    handle_position = hb->handle_position;
+  else
+    {
+      switch (hb->handle_position) 
+	{
+	case GTK_POS_LEFT:
+	  handle_position = GTK_POS_RIGHT;
+	  break;
+	case GTK_POS_RIGHT:
+	  handle_position = GTK_POS_LEFT;
+	  break;
+	default:
+	  handle_position = hb->handle_position;
+	  break;
+	}
+    }
+
+  return handle_position;
+}
+
 static void
 gtk_handle_box_size_request (GtkWidget      *widget,
 			     GtkRequisition *requisition)
@@ -468,16 +520,15 @@ gtk_handle_box_size_request (GtkWidget      *widget,
   GtkBin *bin;
   GtkHandleBox *hb;
   GtkRequisition child_requisition;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
-  g_return_if_fail (requisition != NULL);
+  gint handle_position;
 
   bin = GTK_BIN (widget);
   hb = GTK_HANDLE_BOX (widget);
 
-  if (hb->handle_position == GTK_POS_LEFT ||
-      hb->handle_position == GTK_POS_RIGHT)
+  handle_position = effective_handle_position (hb);
+
+  if (handle_position == GTK_POS_LEFT ||
+      handle_position == GTK_POS_RIGHT)
     {
       requisition->width = DRAG_HANDLE_SIZE;
       requisition->height = 0;
@@ -489,7 +540,7 @@ gtk_handle_box_size_request (GtkWidget      *widget,
     }
 
   /* if our child is not visible, we still request its size, since we
-   * won't have any usefull hint for our size otherwise.
+   * won't have any useful hint for our size otherwise.
    */
   if (bin->child)
     gtk_widget_size_request (bin->child, &child_requisition);
@@ -504,16 +555,16 @@ gtk_handle_box_size_request (GtkWidget      *widget,
       /* FIXME: This doesn't work currently */
       if (!hb->shrink_on_detach)
 	{
-	  if (hb->handle_position == GTK_POS_LEFT ||
-	      hb->handle_position == GTK_POS_RIGHT)
+	  if (handle_position == GTK_POS_LEFT ||
+	      handle_position == GTK_POS_RIGHT)
 	    requisition->height += child_requisition.height;
 	  else
 	    requisition->width += child_requisition.width;
 	}
       else
 	{
-	  if (hb->handle_position == GTK_POS_LEFT ||
-	      hb->handle_position == GTK_POS_RIGHT)
+	  if (handle_position == GTK_POS_LEFT ||
+	      handle_position == GTK_POS_RIGHT)
 	    requisition->height += widget->style->ythickness;
 	  else
 	    requisition->width += widget->style->xthickness;
@@ -544,14 +595,13 @@ gtk_handle_box_size_allocate (GtkWidget     *widget,
   GtkBin *bin;
   GtkHandleBox *hb;
   GtkRequisition child_requisition;
-  
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_HANDLE_BOX (widget));
-  g_return_if_fail (allocation != NULL);
+  gint handle_position;
   
   bin = GTK_BIN (widget);
   hb = GTK_HANDLE_BOX (widget);
   
+  handle_position = effective_handle_position (hb);
+
   if (bin->child)
     gtk_widget_get_child_requisition (bin->child, &child_requisition);
   else
@@ -572,18 +622,16 @@ gtk_handle_box_size_allocate (GtkWidget     *widget,
 
   if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     {
-      GtkWidget *child;
       GtkAllocation child_allocation;
       guint border_width;
 
-      child = bin->child;
       border_width = GTK_CONTAINER (widget)->border_width;
 
       child_allocation.x = border_width;
       child_allocation.y = border_width;
-      if (hb->handle_position == GTK_POS_LEFT)
+      if (handle_position == GTK_POS_LEFT)
 	child_allocation.x += DRAG_HANDLE_SIZE;
-      else if (hb->handle_position == GTK_POS_TOP)
+      else if (handle_position == GTK_POS_TOP)
 	child_allocation.y += DRAG_HANDLE_SIZE;
 
       if (hb->child_detached)
@@ -597,8 +645,8 @@ gtk_handle_box_size_allocate (GtkWidget     *widget,
 	  float_width = child_allocation.width + 2 * border_width;
 	  float_height = child_allocation.height + 2 * border_width;
 	  
-	  if (hb->handle_position == GTK_POS_LEFT ||
-	      hb->handle_position == GTK_POS_RIGHT)
+	  if (handle_position == GTK_POS_LEFT ||
+	      handle_position == GTK_POS_RIGHT)
 	    float_width += DRAG_HANDLE_SIZE;
 	  else
 	    float_height += DRAG_HANDLE_SIZE;
@@ -620,8 +668,8 @@ gtk_handle_box_size_allocate (GtkWidget     *widget,
 	  child_allocation.width = MAX (1, (gint)widget->allocation.width - 2 * border_width);
 	  child_allocation.height = MAX (1, (gint)widget->allocation.height - 2 * border_width);
 
-	  if (hb->handle_position == GTK_POS_LEFT ||
-	      hb->handle_position == GTK_POS_RIGHT)
+	  if (handle_position == GTK_POS_LEFT ||
+	      handle_position == GTK_POS_RIGHT)
 	    child_allocation.width -= DRAG_HANDLE_SIZE;
 	  else
 	    child_allocation.height -= DRAG_HANDLE_SIZE;
@@ -646,13 +694,15 @@ gtk_handle_box_draw_ghost (GtkHandleBox *hb)
   guint y;
   guint width;
   guint height;
+  gint handle_position;
 
   widget = GTK_WIDGET (hb);
-
-  if (hb->handle_position == GTK_POS_LEFT ||
-      hb->handle_position == GTK_POS_RIGHT)
+  
+  handle_position = effective_handle_position (hb);
+  if (handle_position == GTK_POS_LEFT ||
+      handle_position == GTK_POS_RIGHT)
     {
-      x = hb->handle_position == GTK_POS_LEFT ? 0 : widget->allocation.width - DRAG_HANDLE_SIZE;
+      x = handle_position == GTK_POS_LEFT ? 0 : widget->allocation.width - DRAG_HANDLE_SIZE;
       y = 0;
       width = DRAG_HANDLE_SIZE;
       height = widget->allocation.height;
@@ -660,7 +710,7 @@ gtk_handle_box_draw_ghost (GtkHandleBox *hb)
   else
     {
       x = 0;
-      y = hb->handle_position == GTK_POS_TOP ? 0 : widget->allocation.height - DRAG_HANDLE_SIZE;
+      y = handle_position == GTK_POS_TOP ? 0 : widget->allocation.height - DRAG_HANDLE_SIZE;
       width = widget->allocation.width;
       height = DRAG_HANDLE_SIZE;
     }
@@ -673,101 +723,184 @@ gtk_handle_box_draw_ghost (GtkHandleBox *hb)
 		    y,
 		    width,
 		    height);
-   if (hb->handle_position == GTK_POS_LEFT ||
-       hb->handle_position == GTK_POS_RIGHT)
+   if (handle_position == GTK_POS_LEFT ||
+       handle_position == GTK_POS_RIGHT)
      gtk_paint_hline (widget->style,
 		      widget->window,
 		      GTK_WIDGET_STATE (widget),
 		      NULL, widget, "handlebox",
-		      hb->handle_position == GTK_POS_LEFT ? DRAG_HANDLE_SIZE : 0,
-		      hb->handle_position == GTK_POS_LEFT ? widget->allocation.width : widget->allocation.width - DRAG_HANDLE_SIZE,
+		      handle_position == GTK_POS_LEFT ? DRAG_HANDLE_SIZE : 0,
+		      handle_position == GTK_POS_LEFT ? widget->allocation.width : widget->allocation.width - DRAG_HANDLE_SIZE,
 		      widget->allocation.height / 2);
    else
      gtk_paint_vline (widget->style,
 		      widget->window,
 		      GTK_WIDGET_STATE (widget),
 		      NULL, widget, "handlebox",
-		      hb->handle_position == GTK_POS_TOP ? DRAG_HANDLE_SIZE : 0,
-		      hb->handle_position == GTK_POS_TOP ? widget->allocation.height : widget->allocation.height - DRAG_HANDLE_SIZE,
+		      handle_position == GTK_POS_TOP ? DRAG_HANDLE_SIZE : 0,
+		      handle_position == GTK_POS_TOP ? widget->allocation.height : widget->allocation.height - DRAG_HANDLE_SIZE,
 		      widget->allocation.width / 2);
 }
 
 static void
 draw_textured_frame (GtkWidget *widget, GdkWindow *window, GdkRectangle *rect, GtkShadowType shadow,
-		     GdkRectangle *clip)
+		     GdkRectangle *clip, GtkOrientation orientation)
 {
-   gtk_paint_handle(widget->style, window, GTK_STATE_NORMAL, shadow,
-		    clip, widget, "handlebox",
-		    rect->x, rect->y, rect->width, rect->height, 
-		    GTK_ORIENTATION_VERTICAL);
+   gtk_paint_handle (widget->style, window, GTK_STATE_NORMAL, shadow,
+		     clip, widget, "handlebox",
+		     rect->x, rect->y, rect->width, rect->height, 
+		     orientation);
 }
 
 void
 gtk_handle_box_set_shadow_type (GtkHandleBox  *handle_box,
 				GtkShadowType  type)
 {
-  g_return_if_fail (handle_box != NULL);
   g_return_if_fail (GTK_IS_HANDLE_BOX (handle_box));
 
   if ((GtkShadowType) handle_box->shadow_type != type)
     {
       handle_box->shadow_type = type;
+      g_object_notify (G_OBJECT (handle_box), "shadow-type");
       gtk_widget_queue_resize (GTK_WIDGET (handle_box));
     }
 }
 
+/**
+ * gtk_handle_box_get_shadow_type:
+ * @handle_box: a #GtkHandleBox
+ * 
+ * Gets the type of shadow drawn around the handle box. See
+ * gtk_handle_box_set_shadow_type().
+ *
+ * Return value: the type of shadow currently drawn around the handle box.
+ **/
+GtkShadowType
+gtk_handle_box_get_shadow_type (GtkHandleBox *handle_box)
+{
+  g_return_val_if_fail (GTK_IS_HANDLE_BOX (handle_box), GTK_SHADOW_ETCHED_OUT);
+
+  return handle_box->shadow_type;
+}
+
 void        
 gtk_handle_box_set_handle_position  (GtkHandleBox    *handle_box,
 				     GtkPositionType  position)
 {
+  g_return_if_fail (GTK_IS_HANDLE_BOX (handle_box));
+
   if ((GtkPositionType) handle_box->handle_position != position)
     {
       handle_box->handle_position = position;
+      g_object_notify (G_OBJECT (handle_box), "handle-position");
       gtk_widget_queue_resize (GTK_WIDGET (handle_box));
     }
 }
 
+/**
+ * gtk_handle_box_get_handle_position:
+ * @handle_box: a #GtkHandleBox
+ *
+ * Gets the handle position of the handle box. See
+ * gtk_handle_box_set_handle_position().
+ *
+ * Return value: the current handle position.
+ **/
+GtkPositionType
+gtk_handle_box_get_handle_position (GtkHandleBox *handle_box)
+{
+  g_return_val_if_fail (GTK_IS_HANDLE_BOX (handle_box), GTK_POS_LEFT);
+
+  return handle_box->handle_position;
+}
+
 void        
 gtk_handle_box_set_snap_edge        (GtkHandleBox    *handle_box,
 				     GtkPositionType  edge)
 {
-  g_return_if_fail (handle_box != NULL);
   g_return_if_fail (GTK_IS_HANDLE_BOX (handle_box));
 
-  handle_box->snap_edge = edge;
+  if (handle_box->snap_edge != edge)
+    {
+      handle_box->snap_edge = edge;
+      
+      g_object_freeze_notify (G_OBJECT (handle_box));
+      g_object_notify (G_OBJECT (handle_box), "snap-edge");
+      g_object_notify (G_OBJECT (handle_box), "snap-edge-set");
+      g_object_thaw_notify (G_OBJECT (handle_box));
+    }
+}
+
+/**
+ * gtk_handle_box_get_snap_edge:
+ * @handle_box: a #GtkHandleBox
+ * 
+ * Gets the edge used for determining reattachment of the handle box. See
+ * gtk_handle_box_set_snap_edge().
+ *
+ * Return value: the edge used for determining reattachment, or (GtkPositionType)-1 if this
+ *               is determined (as per default) from the handle position. 
+ **/
+GtkPositionType
+gtk_handle_box_get_snap_edge (GtkHandleBox *handle_box)
+{
+  g_return_val_if_fail (GTK_IS_HANDLE_BOX (handle_box), (GtkPositionType)-1);
+
+  return handle_box->snap_edge;
+}
+
+/**
+ * gtk_handle_box_get_child_detached:
+ * @handle_box: a #GtkHandleBox
+ *
+ * Whether the handlebox's child is currently detached.
+ *
+ * Return value: %TRUE if the child is currently detached, otherwise %FALSE
+ *
+ * Since: 2.14
+ **/
+gboolean
+gtk_handle_box_get_child_detached (GtkHandleBox *handle_box)
+{
+  g_return_val_if_fail (GTK_IS_HANDLE_BOX (handle_box), FALSE);
+
+  return handle_box->child_detached;
 }
 
 static void
 gtk_handle_box_paint (GtkWidget      *widget,
-		      GdkEventExpose *event,
+                      GdkEventExpose *event,
 		      GdkRectangle   *area)
 {
   GtkBin *bin;
   GtkHandleBox *hb;
-  guint width;
-  guint height;
+  gint width, height;
   GdkRectangle rect;
   GdkRectangle dest;
+  gint handle_position;
+  GtkOrientation handle_orientation;
 
   bin = GTK_BIN (widget);
   hb = GTK_HANDLE_BOX (widget);
 
-  gdk_window_get_size (hb->bin_window, &width, &height);
+  handle_position = effective_handle_position (hb);
+
+  gdk_drawable_get_size (hb->bin_window, &width, &height);
   
   if (!event)
-   gtk_paint_box(widget->style,
-		 hb->bin_window,
-		 GTK_WIDGET_STATE (widget),
-		 hb->shadow_type,
-		 area, widget, "handlebox_bin",
-		 0, 0, -1, -1);
+    gtk_paint_box (widget->style,
+		   hb->bin_window,
+		   GTK_WIDGET_STATE (widget),
+		   hb->shadow_type,
+		   area, widget, "handlebox_bin",
+		   0, 0, -1, -1);
   else
-   gtk_paint_box(widget->style,
-		 hb->bin_window,
-		 GTK_WIDGET_STATE (widget),
-		 hb->shadow_type,
-		 &event->area, widget, "handlebox_bin",
-		 0, 0, -1, -1);
+   gtk_paint_box (widget->style,
+		  hb->bin_window,
+		  GTK_WIDGET_STATE (widget),
+		  hb->shadow_type,
+		  &event->area, widget, "handlebox_bin",
+		  0, 0, -1, -1);
 
 /* We currently draw the handle _above_ the relief of the handlebox.
  * it could also be drawn on the same level...
@@ -777,70 +910,57 @@ gtk_handle_box_paint (GtkWidget      *widget,
 		 width,
 		 height);*/
 
-  switch (hb->handle_position)
+  switch (handle_position)
     {
     case GTK_POS_LEFT:
       rect.x = 0;
       rect.y = 0; 
       rect.width = DRAG_HANDLE_SIZE;
       rect.height = height;
+      handle_orientation = GTK_ORIENTATION_VERTICAL;
       break;
     case GTK_POS_RIGHT:
       rect.x = width - DRAG_HANDLE_SIZE; 
       rect.y = 0;
       rect.width = DRAG_HANDLE_SIZE;
       rect.height = height;
+      handle_orientation = GTK_ORIENTATION_VERTICAL;
       break;
     case GTK_POS_TOP:
       rect.x = 0;
       rect.y = 0; 
       rect.width = width;
       rect.height = DRAG_HANDLE_SIZE;
+      handle_orientation = GTK_ORIENTATION_HORIZONTAL;
       break;
     case GTK_POS_BOTTOM:
       rect.x = 0;
       rect.y = height - DRAG_HANDLE_SIZE;
       rect.width = width;
       rect.height = DRAG_HANDLE_SIZE;
+      handle_orientation = GTK_ORIENTATION_HORIZONTAL;
+      break;
+    default: 
+      g_assert_not_reached ();
       break;
     }
 
   if (gdk_rectangle_intersect (event ? &event->area : area, &rect, &dest))
     draw_textured_frame (widget, hb->bin_window, &rect,
 			 GTK_SHADOW_OUT,
-			 event ? &event->area : area);
+			 event ? &event->area : area,
+			 handle_orientation);
 
   if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
-    {
-      GdkRectangle child_area;
-      GdkEventExpose child_event;
-
-      if (!event) /* we were called from draw() */
-	{
-	  if (gtk_widget_intersect (bin->child, area, &child_area))
-	    gtk_widget_draw (bin->child, &child_area);
-	}
-      else /* we were called from expose() */
-	{
-	  child_event = *event;
-	  
-	  if (GTK_WIDGET_NO_WINDOW (bin->child) &&
-	      gtk_widget_intersect (bin->child, &event->area, &child_event.area))
-	    gtk_widget_event (bin->child, (GdkEvent *) &child_event);
-	}
-    }
+    GTK_WIDGET_CLASS (gtk_handle_box_parent_class)->expose_event (widget, event);
 }
 
-static gint
+static gboolean
 gtk_handle_box_expose (GtkWidget      *widget,
 		       GdkEventExpose *event)
 {
   GtkHandleBox *hb;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_HANDLE_BOX (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
   if (GTK_WIDGET_DRAWABLE (widget))
     {
       hb = GTK_HANDLE_BOX (widget);
@@ -857,20 +977,59 @@ gtk_handle_box_expose (GtkWidget      *widget,
   return FALSE;
 }
 
-static gint
-gtk_handle_box_button_changed (GtkWidget      *widget,
-			       GdkEventButton *event)
+static GtkWidget *
+gtk_handle_box_get_invisible (void)
+{
+  static GtkWidget *handle_box_invisible = NULL;
+
+  if (!handle_box_invisible)
+    {
+      handle_box_invisible = gtk_invisible_new ();
+      gtk_widget_show (handle_box_invisible);
+    }
+  
+  return handle_box_invisible;
+}
+
+static gboolean
+gtk_handle_box_grab_event (GtkWidget    *widget,
+			   GdkEvent     *event,
+			   GtkHandleBox *hb)
+{
+  switch (event->type)
+    {
+    case GDK_BUTTON_RELEASE:
+      if (hb->in_drag)		/* sanity check */
+	{
+	  gtk_handle_box_end_drag (hb, event->button.time);
+	  return TRUE;
+	}
+      break;
+
+    case GDK_MOTION_NOTIFY:
+      return gtk_handle_box_motion (GTK_WIDGET (hb), (GdkEventMotion *)event);
+      break;
+
+    default:
+      break;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+gtk_handle_box_button_press (GtkWidget      *widget,
+                             GdkEventButton *event)
 {
   GtkHandleBox *hb;
   gboolean event_handled;
   GdkCursor *fleur;
-  
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_HANDLE_BOX (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
+  gint handle_position;
 
   hb = GTK_HANDLE_BOX (widget);
 
+  handle_position = effective_handle_position (hb);
+
   event_handled = FALSE;
   if ((event->button == 1) && 
       (event->type == GDK_BUTTON_PRESS || event->type == GDK_2BUTTON_PRESS))
@@ -885,7 +1044,7 @@ gtk_handle_box_button_changed (GtkWidget      *widget,
 
       if (child)
 	{
-	  switch (hb->handle_position)
+	  switch (handle_position)
 	    {
 	    case GTK_POS_LEFT:
 	      in_handle = event->x < DRAG_HANDLE_SIZE;
@@ -914,14 +1073,21 @@ gtk_handle_box_button_changed (GtkWidget      *widget,
 	{
 	  if (event->type == GDK_BUTTON_PRESS) /* Start a drag */
 	    {
+	      GtkHandleBoxPrivate *private = gtk_handle_box_get_private (hb);
+	      GtkWidget *invisible = gtk_handle_box_get_invisible ();
 	      gint desk_x, desk_y;
 	      gint root_x, root_y;
 	      gint width, height;
-	      
+
+              gtk_invisible_set_screen (GTK_INVISIBLE (invisible),
+                                        gtk_widget_get_screen (GTK_WIDGET (hb)));
 	      gdk_window_get_deskrelative_origin (hb->bin_window, &desk_x, &desk_y);
 	      gdk_window_get_origin (hb->bin_window, &root_x, &root_y);
-	      gdk_window_get_size (hb->bin_window, &width, &height);
-	      
+	      gdk_drawable_get_size (hb->bin_window, &width, &height);
+		  
+	      private->orig_x = event->x_root;
+	      private->orig_y = event->y_root;
+		  
 	      hb->float_allocation.x = root_x - event->x_root;
 	      hb->float_allocation.y = root_y - event->y_root;
 	      hb->float_allocation.width = width;
@@ -930,29 +1096,45 @@ gtk_handle_box_button_changed (GtkWidget      *widget,
 	      hb->deskoff_x = desk_x - root_x;
 	      hb->deskoff_y = desk_y - root_y;
 	      
-	      gdk_window_get_origin (widget->window, &root_x, &root_y);
-	      gdk_window_get_size (widget->window, &width, &height);
+	      if (gdk_window_is_viewable (widget->window))
+		{
+		  gdk_window_get_origin (widget->window, &root_x, &root_y);
+		  gdk_drawable_get_size (widget->window, &width, &height);
 	      
-	      hb->attach_allocation.x = root_x;
-	      hb->attach_allocation.y = root_y;
-	      hb->attach_allocation.width = width;
-	      hb->attach_allocation.height = height;
-
+		  hb->attach_allocation.x = root_x;
+		  hb->attach_allocation.y = root_y;
+		  hb->attach_allocation.width = width;
+		  hb->attach_allocation.height = height;
+		}
+	      else
+		{
+		  hb->attach_allocation.x = -1;
+		  hb->attach_allocation.y = -1;
+		  hb->attach_allocation.width = 0;
+		  hb->attach_allocation.height = 0;
+		}
 	      hb->in_drag = TRUE;
-	      fleur = gdk_cursor_new (GDK_FLEUR);
-	      if (gdk_pointer_grab (widget->window,
+	      fleur = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
+						  GDK_FLEUR);
+	      if (gdk_pointer_grab (invisible->window,
 				    FALSE,
 				    (GDK_BUTTON1_MOTION_MASK |
 				     GDK_POINTER_MOTION_HINT_MASK |
 				     GDK_BUTTON_RELEASE_MASK),
 				    NULL,
 				    fleur,
-				    GDK_CURRENT_TIME) != 0)
+				    event->time) != 0)
 		{
 		  hb->in_drag = FALSE;
 		}
+	      else
+		{
+		  gtk_grab_add (invisible);
+		  g_signal_connect (invisible, "event",
+				    G_CALLBACK (gtk_handle_box_grab_event), hb);
+		}
 	      
-	      gdk_cursor_destroy (fleur);
+	      gdk_cursor_unref (fleur);
 	      event_handled = TRUE;
 	    }
 	  else if (hb->child_detached) /* Double click */
@@ -961,55 +1143,65 @@ gtk_handle_box_button_changed (GtkWidget      *widget,
 	    }
 	}
     }
-  else if (event->type == GDK_BUTTON_RELEASE &&
-	   hb->in_drag)
-    {
-      if (event->window != widget->window)
-	return FALSE;
-      
-      gdk_pointer_ungrab (GDK_CURRENT_TIME);
-      hb->in_drag = FALSE;
-      event_handled = TRUE;
-    }
   
   return event_handled;
 }
 
-static gint
+static gboolean
 gtk_handle_box_motion (GtkWidget      *widget,
 		       GdkEventMotion *event)
 {
-  GtkHandleBox *hb;
+  GtkHandleBox *hb = GTK_HANDLE_BOX (widget);
   gint new_x, new_y;
   gint snap_edge;
   gboolean is_snapped = FALSE;
+  gint handle_position;
+  GdkGeometry geometry;
+  GdkScreen *screen, *pointer_screen;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_HANDLE_BOX (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  hb = GTK_HANDLE_BOX (widget);
   if (!hb->in_drag)
     return FALSE;
+  handle_position = effective_handle_position (hb);
 
-  if (!hb->in_drag || (event->window != widget->window))
-    return FALSE;
-  
   /* Calculate the attachment point on the float, if the float
    * were detached
    */
   new_x = 0;
   new_y = 0;
-  gdk_window_get_pointer (NULL, &new_x, &new_y, NULL);
+  screen = gtk_widget_get_screen (widget);
+  gdk_display_get_pointer (gdk_screen_get_display (screen),
+			   &pointer_screen, 
+			   &new_x, &new_y, NULL);
+  if (pointer_screen != screen)
+    {
+      GtkHandleBoxPrivate *private = gtk_handle_box_get_private (hb);
+
+      new_x = private->orig_x;
+      new_y = private->orig_y;
+    }
+  
   new_x += hb->float_allocation.x;
   new_y += hb->float_allocation.y;
 
   snap_edge = hb->snap_edge;
   if (snap_edge == -1)
-    snap_edge = (hb->handle_position == GTK_POS_LEFT ||
-		  hb->handle_position == GTK_POS_RIGHT) ?
+    snap_edge = (handle_position == GTK_POS_LEFT ||
+		 handle_position == GTK_POS_RIGHT) ?
       GTK_POS_TOP : GTK_POS_LEFT;
 
+  if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) 
+    switch (snap_edge) 
+      {
+      case GTK_POS_LEFT:
+	snap_edge = GTK_POS_RIGHT;
+	break;
+      case GTK_POS_RIGHT:
+	snap_edge = GTK_POS_LEFT;
+	break;
+      default:
+	break;
+      }
+
   /* First, check if the snapped edge is aligned
    */
   switch (snap_edge)
@@ -1072,9 +1264,10 @@ gtk_handle_box_motion (GtkWidget      *widget,
 	  gdk_window_hide (hb->float_window);
 	  gdk_window_reparent (hb->bin_window, widget->window, 0, 0);
 	  hb->float_window_mapped = FALSE;
-	  gtk_signal_emit (GTK_OBJECT (hb),
-			   handle_box_signals[SIGNAL_CHILD_ATTACHED],
-			   GTK_BIN (hb)->child);
+	  g_signal_emit (hb,
+			 handle_box_signals[SIGNAL_CHILD_ATTACHED],
+			 0,
+			 GTK_BIN (hb)->child);
 	  
 	  gtk_widget_queue_resize (widget);
 	}
@@ -1083,11 +1276,11 @@ gtk_handle_box_motion (GtkWidget      *widget,
     {
       gint width, height;
 
-      gdk_window_get_size (hb->float_window, &width, &height);
+      gdk_drawable_get_size (hb->float_window, &width, &height);
       new_x += hb->deskoff_x;
       new_y += hb->deskoff_y;
 
-      switch (hb->handle_position)
+      switch (handle_position)
 	{
 	case GTK_POS_LEFT:
 	  new_y += ((gint)hb->float_allocation.height - height) / 2;
@@ -1128,22 +1321,29 @@ gtk_handle_box_motion (GtkWidget      *widget,
 
 	  width = child_requisition.width + 2 * GTK_CONTAINER (hb)->border_width;
 	  height = child_requisition.height + 2 * GTK_CONTAINER (hb)->border_width;
+
+	  if (handle_position == GTK_POS_LEFT || handle_position == GTK_POS_RIGHT)
+	    width += DRAG_HANDLE_SIZE;
+	  else
+	    height += DRAG_HANDLE_SIZE;
+	  
 	  gdk_window_move_resize (hb->float_window, new_x, new_y, width, height);
 	  gdk_window_reparent (hb->bin_window, hb->float_window, 0, 0);
-	  gdk_window_set_hints (hb->float_window, new_x, new_y, 0, 0, 0, 0, GDK_HINT_POS);
+	  gdk_window_set_geometry_hints (hb->float_window, &geometry, GDK_HINT_POS);
 	  gdk_window_show (hb->float_window);
 	  hb->float_window_mapped = TRUE;
 #if	0
-	  /* this extra move is neccessary if we use decorations, or our
+	  /* this extra move is necessary if we use decorations, or our
 	   * window manager insists on decorations.
 	   */
-	  gdk_flush ();
+	  gdk_display_sync (gtk_widget_get_display (widget));
 	  gdk_window_move (hb->float_window, new_x, new_y);
-	  gdk_flush ();
+	  gdk_display_sync (gtk_widget_get_display (widget));
 #endif	/* 0 */
-	  gtk_signal_emit (GTK_OBJECT (hb),
-			   handle_box_signals[SIGNAL_CHILD_DETACHED],
-			   GTK_BIN (hb)->child);
+	  g_signal_emit (hb,
+			 handle_box_signals[SIGNAL_CHILD_DETACHED],
+			 0,
+			 GTK_BIN (hb)->child);
 	  gtk_handle_box_draw_ghost (hb);
 	  
 	  gtk_widget_queue_resize (widget);
@@ -1157,22 +1357,15 @@ static void
 gtk_handle_box_add (GtkContainer *container,
 		    GtkWidget    *widget)
 {
-  g_return_if_fail (GTK_IS_HANDLE_BOX (container));
-  g_return_if_fail (GTK_BIN (container)->child == NULL);
-  g_return_if_fail (widget->parent == NULL);
-
   gtk_widget_set_parent_window (widget, GTK_HANDLE_BOX (container)->bin_window);
-  GTK_CONTAINER_CLASS (parent_class)->add (container, widget);
+  GTK_CONTAINER_CLASS (gtk_handle_box_parent_class)->add (container, widget);
 }
 
 static void
 gtk_handle_box_remove (GtkContainer *container,
 		       GtkWidget    *widget)
 {
-  g_return_if_fail (GTK_IS_HANDLE_BOX (container));
-  g_return_if_fail (GTK_BIN (container)->child == widget);
-
-  GTK_CONTAINER_CLASS (parent_class)->remove (container, widget);
+  GTK_CONTAINER_CLASS (gtk_handle_box_parent_class)->remove (container, widget);
 
   gtk_handle_box_reattach (GTK_HANDLE_BOX (container));
 }
@@ -1181,13 +1374,7 @@ static gint
 gtk_handle_box_delete_event (GtkWidget *widget,
 			     GdkEventAny  *event)
 {
-  GtkHandleBox *hb;
-
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GTK_IS_HANDLE_BOX (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  hb = GTK_HANDLE_BOX (widget);
+  GtkHandleBox *hb = GTK_HANDLE_BOX (widget);
 
   if (event->window == hb->float_window)
     {
@@ -1202,27 +1389,45 @@ gtk_handle_box_delete_event (GtkWidget *widget,
 static void
 gtk_handle_box_reattach (GtkHandleBox *hb)
 {
+  GtkWidget *widget = GTK_WIDGET (hb);
+  
   if (hb->child_detached)
     {
       hb->child_detached = FALSE;
       if (GTK_WIDGET_REALIZED (hb))
 	{
 	  gdk_window_hide (hb->float_window);
-	  gdk_window_reparent (hb->bin_window, GTK_WIDGET (hb)->window, 0, 0);
+	  gdk_window_reparent (hb->bin_window, widget->window, 0, 0);
 
 	  if (GTK_BIN (hb)->child)
-	    gtk_signal_emit (GTK_OBJECT (hb),
-			     handle_box_signals[SIGNAL_CHILD_ATTACHED],
-			     GTK_BIN (hb)->child);
+	    g_signal_emit (hb,
+			   handle_box_signals[SIGNAL_CHILD_ATTACHED],
+			   0,
+			   GTK_BIN (hb)->child);
 
 	}
       hb->float_window_mapped = FALSE;
     }
   if (hb->in_drag)
-    {
-      gdk_pointer_ungrab (GDK_CURRENT_TIME);
-      hb->in_drag = FALSE;
-    }
+    gtk_handle_box_end_drag (hb, GDK_CURRENT_TIME);
 
   gtk_widget_queue_resize (GTK_WIDGET (hb));
 }
+
+static void
+gtk_handle_box_end_drag (GtkHandleBox *hb,
+			 guint32       time)
+{
+  GtkWidget *invisible = gtk_handle_box_get_invisible ();
+		
+  hb->in_drag = FALSE;
+
+  gtk_grab_remove (invisible);
+  gdk_pointer_ungrab (time);
+  g_signal_handlers_disconnect_by_func (invisible,
+					G_CALLBACK (gtk_handle_box_grab_event),
+					hb);
+}
+
+#define __GTK_HANDLE_BOX_C__
+#include "gtkaliasdef.c"