]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtksocket.c
Add _gtk_toggle_action_set_active() internal function
[~andy/gtk] / gtk / gtksocket.c
index 7469a4745f55a9975b7f4bba7a4c00385731e1fc..08f0cd18904b4044808dfe510d5f02b35e83565e 100644 (file)
@@ -25,6 +25,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include "config.h"
 #include <string.h>
 
 #include "gdk/gdkkeysyms.h"
 #include "gtkplug.h"
 #include "gtkprivate.h"
 #include "gtksocket.h"
+#include "gtksocketprivate.h"
 #include "gtkdnd.h"
+#include "gtkintl.h"
 
-#include "x11/gdkx.h"
 
-#include "xembed.h"
-
-typedef struct _GtkSocketPrivate GtkSocketPrivate;
-
-struct _GtkSocketPrivate
-{
-  gint resize_count;
-};
+/**
+ * SECTION:gtksocket
+ * @Short_description: Container for widgets from other processes
+ * @Title: GtkSocket
+ * @See_also: #GtkPlug, <ulink url="http://www.freedesktop.org/Standards/xembed-spec">XEmbed</ulink>
+ *
+ * Together with #GtkPlug, #GtkSocket provides the ability
+ * to embed widgets from one process into another process
+ * in a fashion that is transparent to the user. One
+ * process creates a #GtkSocket widget and passes
+ * that widget's window ID to the other process,
+ * which then creates a #GtkPlug with that window ID.
+ * Any widgets contained in the #GtkPlug then will appear
+ * inside the first application's window.
+ *
+ * The socket's window ID is obtained by using
+ * gtk_socket_get_id(). Before using this function,
+ * the socket must have been realized, and for hence,
+ * have been added to its parent.
+ *
+ * <example>
+ * <title>Obtaining the window ID of a socket.</title>
+ * <programlisting>
+ * GtkWidget *socket = gtk_socket_new (<!-- -->);
+ * gtk_widget_show (socket);
+ * gtk_container_add (GTK_CONTAINER (parent), socket);
+ *
+ * /<!---->* The following call is only necessary if one of
+ *  * the ancestors of the socket is not yet visible.
+ *  *<!---->/
+ * gtk_widget_realize (socket);
+ * g_print ("The ID of the sockets window is %#x\n",
+ *          gtk_socket_get_id (socket));
+ * </programlisting>
+ * </example>
+ *
+ * Note that if you pass the window ID of the socket to another
+ * process that will create a plug in the socket, you
+ * must make sure that the socket widget is not destroyed
+ * until that plug is created. Violating this rule will
+ * cause unpredictable consequences, the most likely
+ * consequence being that the plug will appear as a
+ * separate toplevel window. You can check if the plug
+ * has been created by using gtk_socket_get_plug_window(). If
+ * it returns a non-%NULL value, then the plug has been
+ * successfully created inside of the socket.
+ *
+ * When GTK+ is notified that the embedded window has been
+ * destroyed, then it will destroy the socket as well. You
+ * should always, therefore, be prepared for your sockets
+ * to be destroyed at any time when the main event loop
+ * is running. To prevent this from happening, you can
+ * connect to the #GtkSocket::plug-removed signal.
+ *
+ * The communication between a #GtkSocket and a #GtkPlug follows the
+ * <ulink url="http://www.freedesktop.org/Standards/xembed-spec">XEmbed</ulink>
+ * protocol. This protocol has also been implemented in other toolkits, e.g.
+ * <application>Qt</application>, allowing the same level of integration
+ * when embedding a <application>Qt</application> widget in GTK or vice versa.
+ *
+ * A socket can also be used to swallow arbitrary
+ * pre-existing top-level windows using gtk_socket_steal(),
+ * though the integration when this is done will not be as close
+ * as between a #GtkPlug and a #GtkSocket.
+ *
+ * <note>
+ * The #GtkPlug and #GtkSocket widgets are currently not available
+ * on all platforms supported by GTK+.
+ * </note>
+ */
 
 /* Forward declararations */
 
-static void     gtk_socket_class_init           (GtkSocketClass   *klass);
-static void     gtk_socket_init                 (GtkSocket        *socket);
 static void     gtk_socket_finalize             (GObject          *object);
 static void     gtk_socket_notify               (GObject          *object,
                                                 GParamSpec       *pspec);
@@ -66,9 +128,6 @@ static void     gtk_socket_grab_notify          (GtkWidget        *widget,
                                                 gboolean          was_grabbed);
 static gboolean gtk_socket_key_event            (GtkWidget        *widget,
                                                 GdkEventKey      *event);
-static void     gtk_socket_claim_focus          (GtkSocket        *socket,
-                                                gboolean          send_event);
-static void     gtk_socket_send_configure_event (GtkSocket        *socket);
 static gboolean gtk_socket_focus                (GtkWidget        *widget,
                                                 GtkDirectionType  direction);
 static void     gtk_socket_remove               (GtkContainer     *container,
@@ -79,28 +138,14 @@ static void     gtk_socket_forall               (GtkContainer     *container,
                                                 gpointer          callback_data);
 
 
-static void            gtk_socket_add_window  (GtkSocket       *socket,
-                                              GdkNativeWindow  xid,
-                                              gboolean         need_reparent);
-static GdkFilterReturn gtk_socket_filter_func (GdkXEvent       *gdk_xevent,
-                                              GdkEvent        *event,
-                                              gpointer         data);
-
-static void     send_xembed_message (GtkSocket     *socket,
-                                    glong          message,
-                                    glong          detail,
-                                    glong          data1,
-                                    glong          data2,
-                                    guint32        time);
-static gboolean xembed_get_info     (GdkWindow     *gdk_window,
-                                    unsigned long *version,
-                                    unsigned long *flags);
-
-/* From Tk */
-#define EMBEDDED_APP_WANTS_FOCUS NotifyNormal+20
-
 /* Local data */
 
+typedef struct
+{
+  guint                         accel_key;
+  GdkModifierType       accel_mods;
+} GrabbedKey;
+
 enum {
   PLUG_ADDED,
   PLUG_REMOVED,
@@ -109,57 +154,21 @@ enum {
 
 static guint socket_signals[LAST_SIGNAL] = { 0 };
 
-static GtkWidgetClass *parent_class = NULL;
-
+/*
+ * _gtk_socket_get_private:
+ *
+ * @socket: a #GtkSocket
+ *
+ * Returns the private data associated with a GtkSocket, creating it
+ * first if necessary.
+ */
 GtkSocketPrivate *
-gtk_socket_get_private (GtkSocket *socket)
+_gtk_socket_get_private (GtkSocket *socket)
 {
-  GtkSocketPrivate *private;
-  static GQuark private_quark = 0;
-
-  if (!private_quark)
-    private_quark = g_quark_from_static_string ("gtk-socket-private");
-
-  private = g_object_get_qdata (G_OBJECT (socket), private_quark);
-
-  if (!private)
-    {
-      private = g_new0 (GtkSocketPrivate, 1);
-      private->resize_count = 0;
-      
-      g_object_set_qdata_full (G_OBJECT (socket), private_quark,
-                              private, (GDestroyNotify) g_free);
-    }
-
-  return private;
+  return G_TYPE_INSTANCE_GET_PRIVATE (socket, GTK_TYPE_SOCKET, GtkSocketPrivate);
 }
 
-GType
-gtk_socket_get_type (void)
-{
-  static GType socket_type = 0;
-
-  if (!socket_type)
-    {
-      static const GTypeInfo socket_info =
-      {
-       sizeof (GtkSocketClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_socket_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkSocket),
-       16,             /* n_preallocs */
-       (GInstanceInitFunc) gtk_socket_init,
-      };
-
-      socket_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkSocket",
-                                           &socket_info, 0);
-    }
-
-  return socket_type;
-}
+G_DEFINE_TYPE (GtkSocket, gtk_socket, GTK_TYPE_CONTAINER)
 
 static void
 gtk_socket_finalize (GObject *object)
@@ -169,7 +178,7 @@ gtk_socket_finalize (GObject *object)
   g_object_unref (socket->accel_group);
   socket->accel_group = NULL;
 
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+  G_OBJECT_CLASS (gtk_socket_parent_class)->finalize (object);
 }
 
 static void
@@ -183,8 +192,6 @@ gtk_socket_class_init (GtkSocketClass *class)
   widget_class = (GtkWidgetClass*) class;
   container_class = (GtkContainerClass*) class;
 
-  parent_class = g_type_class_peek_parent (class);
-
   gobject_class->finalize = gtk_socket_finalize;
   gobject_class->notify = gtk_socket_notify;
 
@@ -197,26 +204,52 @@ gtk_socket_class_init (GtkSocketClass *class)
   widget_class->key_press_event = gtk_socket_key_event;
   widget_class->key_release_event = gtk_socket_key_event;
   widget_class->focus = gtk_socket_focus;
+
+  /* We don't want to show_all/hide_all the in-process
+   * plug, if any.
+   */
+  widget_class->show_all = gtk_widget_show;
+  widget_class->hide_all = gtk_widget_hide;
   
   container_class->remove = gtk_socket_remove;
   container_class->forall = gtk_socket_forall;
 
+  /**
+   * GtkSocket::plug-added:
+   * @socket_: the object which received the signal
+   *
+   * This signal is emitted when a client is successfully
+   * added to the socket. 
+   */
   socket_signals[PLUG_ADDED] =
-    g_signal_new ("plug_added",
+    g_signal_new (I_("plug-added"),
                  G_OBJECT_CLASS_TYPE (class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkSocketClass, plug_added),
                  NULL, NULL,
                  _gtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
+
+  /**
+   * GtkSocket::plug-removed:
+   * @socket_: the object which received the signal
+   *
+   * This signal is emitted when a client is removed from the socket. 
+   * The default action is to destroy the #GtkSocket widget, so if you 
+   * want to reuse it you must add a signal handler that returns %TRUE. 
+   *
+   * Return value: %TRUE to stop other handlers from being invoked.
+   */
   socket_signals[PLUG_REMOVED] =
-    g_signal_new ("plug_removed",
+    g_signal_new (I_("plug-removed"),
                  G_OBJECT_CLASS_TYPE (class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkSocketClass, plug_removed),
                   _gtk_boolean_handled_accumulator, NULL,
                  _gtk_marshal_BOOLEAN__VOID,
                  G_TYPE_BOOLEAN, 0);
+
+  g_type_class_add_private (gobject_class, sizeof (GtkSocketPrivate));
 }
 
 static void
@@ -235,7 +268,7 @@ gtk_socket_init (GtkSocket *socket)
   socket->active = FALSE;
 
   socket->accel_group = gtk_accel_group_new ();
-  g_object_set_data (G_OBJECT (socket->accel_group), "gtk-socket", socket);
+  g_object_set_data (G_OBJECT (socket->accel_group), I_("gtk-socket"), socket);
 }
 
 /**
@@ -255,31 +288,6 @@ gtk_socket_new (void)
   return GTK_WIDGET (socket);
 }
 
-/**
- * gtk_socket_steal:
- * @socket_: a #GtkSocket
- * @wid: the window ID of an existing toplevel window.
- * 
- * Reparents a pre-existing toplevel window into a #GtkSocket. This is
- * meant to embed clients that do not know about embedding into a
- * #GtkSocket, however doing so is inherently unreliable, and using
- * this function is not recommended.
- *
- * The #GtkSocket must have already be added into a toplevel window
- *  before you can make this call.
- **/
-void           
-gtk_socket_steal (GtkSocket *socket, GdkNativeWindow wid)
-{
-  g_return_if_fail (GTK_IS_SOCKET (socket));
-  g_return_if_fail (GTK_WIDGET_ANCHORED (socket));
-
-  if (!GTK_WIDGET_REALIZED (socket))
-    gtk_widget_realize (GTK_WIDGET (socket));
-
-  gtk_socket_add_window (socket, wid, TRUE);
-}
-
 /**
  * gtk_socket_add_id:
  * @socket_: a #GtkSocket
@@ -299,15 +307,16 @@ gtk_socket_steal (GtkSocket *socket, GdkNativeWindow wid)
  *  before you can make this call.
  **/
 void           
-gtk_socket_add_id (GtkSocket *socket, GdkNativeWindow window_id)
+gtk_socket_add_id (GtkSocket      *socket,
+                  GdkNativeWindow window_id)
 {
   g_return_if_fail (GTK_IS_SOCKET (socket));
   g_return_if_fail (GTK_WIDGET_ANCHORED (socket));
 
-  if (!GTK_WIDGET_REALIZED (socket))
+  if (!gtk_widget_get_realized (GTK_WIDGET (socket)))
     gtk_widget_realize (GTK_WIDGET (socket));
 
-  gtk_socket_add_window (socket, window_id, TRUE);
+  _gtk_socket_add_window (socket, window_id, TRUE);
 }
 
 /**
@@ -329,24 +338,39 @@ gtk_socket_get_id (GtkSocket *socket)
   g_return_val_if_fail (GTK_IS_SOCKET (socket), 0);
   g_return_val_if_fail (GTK_WIDGET_ANCHORED (socket), 0);
 
-  if (!GTK_WIDGET_REALIZED (socket))
+  if (!gtk_widget_get_realized (GTK_WIDGET (socket)))
     gtk_widget_realize (GTK_WIDGET (socket));
 
-  return GDK_WINDOW_XWINDOW (GTK_WIDGET (socket)->window);
+  return _gtk_socket_windowing_get_id (socket);
+}
+
+/**
+ * gtk_socket_get_plug_window:
+ * @socket_: a #GtkSocket.
+ *
+ * Retrieves the window of the plug. Use this to check if the plug has
+ * been created inside of the socket.
+ *
+ * Return value: the window of the plug if available, or %NULL
+ *
+ * Since:  2.14
+ **/
+GdkWindow*
+gtk_socket_get_plug_window (GtkSocket *socket)
+{
+  g_return_val_if_fail (GTK_IS_SOCKET (socket), NULL);
+
+  return socket->plug_window;
 }
 
 static void
 gtk_socket_realize (GtkWidget *widget)
 {
-  GtkSocket *socket;
+  GtkSocket *socket = GTK_SOCKET (widget);
   GdkWindowAttr attributes;
   gint attributes_mask;
-  XWindowAttributes xattrs;
 
-  g_return_if_fail (GTK_IS_SOCKET (widget));
-
-  socket = GTK_SOCKET (widget);
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.x = widget->allocation.x;
@@ -367,18 +391,11 @@ gtk_socket_realize (GtkWidget *widget)
   widget->style = gtk_style_attach (widget->style, widget->window);
   gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
 
-  XGetWindowAttributes (GDK_WINDOW_XDISPLAY (widget->window),
-                       GDK_WINDOW_XWINDOW (widget->window),
-                       &xattrs);
-
-  XSelectInput (GDK_WINDOW_XDISPLAY (widget->window),
-               GDK_WINDOW_XWINDOW (widget->window), 
-               xattrs.your_event_mask | 
-               SubstructureNotifyMask | SubstructureRedirectMask);
+  _gtk_socket_windowing_realize_window (socket);
 
-  gdk_window_add_filter (widget->window, gtk_socket_filter_func, widget);
-
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gdk_window_add_filter (widget->window,
+                        _gtk_socket_windowing_filter_func,
+                        widget);
 
   /* We sync here so that we make sure that if the XID for
    * our window is passed to another application, SubstructureRedirectMask
@@ -387,27 +404,29 @@ gtk_socket_realize (GtkWidget *widget)
   gdk_display_sync (gtk_widget_get_display (widget));
 }
 
-static void
-gtk_socket_end_embedding (GtkSocket *socket)
+/**
+ * _gtk_socket_end_embedding:
+ *
+ * @socket: a #GtkSocket
+ *
+ * Called to end the embedding of a plug in the socket.
+ */
+void
+_gtk_socket_end_embedding (GtkSocket *socket)
 {
-  GtkSocketPrivate *private = gtk_socket_get_private (socket);
+  GtkSocketPrivate *private = _gtk_socket_get_private (socket);
   GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
-  gint i;
   
-  if (toplevel && GTK_IS_WINDOW (toplevel))
-    gtk_window_remove_embedded_xid (GTK_WINDOW (toplevel), 
-                                   GDK_WINDOW_XWINDOW (socket->plug_window));
+  if (GTK_IS_WINDOW (toplevel))
+    _gtk_socket_windowing_end_embedding_toplevel (socket);
 
   g_object_unref (socket->plug_window);
   socket->plug_window = NULL;
+  socket->current_width = 0;
+  socket->current_height = 0;
   private->resize_count = 0;
 
-  /* Remove from end to avoid indexes shifting. This is evil */
-  for (i = socket->accel_group->n_accels - 1; i >= 0; i--)
-    {
-      GtkAccelGroupEntry *accel_entry = &socket->accel_group->priv_accels[i];
-      gtk_accel_group_disconnect (socket->accel_group, accel_entry->closure);
-    }
+  gtk_accel_group_disconnect (socket->accel_group, NULL);
 }
 
 static void
@@ -415,7 +434,7 @@ gtk_socket_unrealize (GtkWidget *widget)
 {
   GtkSocket *socket = GTK_SOCKET (widget);
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, FALSE);
 
   if (socket->plug_widget)
     {
@@ -423,14 +442,13 @@ gtk_socket_unrealize (GtkWidget *widget)
     }
   else if (socket->plug_window)
     {
-      gtk_socket_end_embedding (socket);
+      _gtk_socket_end_embedding (socket);
     }
 
-  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+  GTK_WIDGET_CLASS (gtk_socket_parent_class)->unrealize (widget);
 }
-  
-static void 
+
+static void
 gtk_socket_size_request (GtkWidget      *widget,
                         GtkRequisition *requisition)
 {
@@ -443,34 +461,7 @@ gtk_socket_size_request (GtkWidget      *widget,
   else
     {
       if (socket->is_mapped && !socket->have_size && socket->plug_window)
-       {
-         XSizeHints hints;
-         long supplied;
-         
-         gdk_error_trap_push ();
-
-         socket->request_width = 1;
-         socket->request_height = 1;
-         
-         if (XGetWMNormalHints (GDK_WINDOW_XDISPLAY (socket->plug_window),
-                                GDK_WINDOW_XWINDOW (socket->plug_window),
-                                &hints, &supplied))
-           {
-             if (hints.flags & PMinSize)
-               {
-                 socket->request_width = hints.min_width;
-                 socket->request_height = hints.min_height;
-               }
-             else if (hints.flags & PBaseSize)
-               {
-                 socket->request_width = hints.base_width;
-                 socket->request_height = hints.base_height;
-               }
-           }
-         socket->have_size = TRUE;
-         
-         gdk_error_trap_pop ();
-       }
+       _gtk_socket_windowing_size_request (socket);
 
       if (socket->is_mapped && socket->have_size)
        {
@@ -489,15 +480,10 @@ static void
 gtk_socket_size_allocate (GtkWidget     *widget,
                          GtkAllocation *allocation)
 {
-  GtkSocket *socket;
-
-  g_return_if_fail (GTK_IS_SOCKET (widget));
-  g_return_if_fail (allocation != NULL);
-
-  socket = GTK_SOCKET (widget);
+  GtkSocket *socket = GTK_SOCKET (widget);
 
   widget->allocation = *allocation;
-  if (GTK_WIDGET_REALIZED (widget))
+  if (gtk_widget_get_realized (widget))
     {
       gdk_window_move_resize (widget->window,
                              allocation->x, allocation->y,
@@ -516,7 +502,7 @@ gtk_socket_size_allocate (GtkWidget     *widget,
        }
       else if (socket->plug_window)
        {
-         GtkSocketPrivate *private = gtk_socket_get_private (socket);
+         GtkSocketPrivate *private = _gtk_socket_get_private (socket);
          
          gdk_error_trap_push ();
          
@@ -529,9 +515,9 @@ gtk_socket_size_allocate (GtkWidget     *widget,
              if (private->resize_count)
                private->resize_count--;
              
-             GTK_NOTE(PLUGSOCKET,
-                      g_message ("GtkSocket - allocated: %d %d",
-                                 allocation->width, allocation->height));
+             GTK_NOTE (PLUGSOCKET,
+                       g_message ("GtkSocket - allocated: %d %d",
+                                  allocation->width, allocation->height));
              socket->current_width = allocation->width;
              socket->current_height = allocation->height;
            }
@@ -544,11 +530,11 @@ gtk_socket_size_allocate (GtkWidget     *widget,
 
          while (private->resize_count)
            {
-             gtk_socket_send_configure_event (socket);
+             _gtk_socket_windowing_send_configure_event (socket);
              private->resize_count--;
-             GTK_NOTE(PLUGSOCKET,
-                      g_message ("GtkSocket - sending synthetic configure: %d %d",
-                                 allocation->width, allocation->height));
+             GTK_NOTE (PLUGSOCKET,
+                       g_message ("GtkSocket - sending synthetic configure: %d %d",
+                                  allocation->width, allocation->height));
            }
          
          gdk_display_sync (gtk_widget_get_display (widget));
@@ -557,12 +543,6 @@ gtk_socket_size_allocate (GtkWidget     *widget,
     }
 }
 
-typedef struct
-{
-  guint                         accel_key;
-  GdkModifierType       accel_mods;
-} GrabbedKey;
-
 static gboolean
 activate_key (GtkAccelGroup  *accel_group,
              GObject        *acceleratable,
@@ -570,35 +550,14 @@ activate_key (GtkAccelGroup  *accel_group,
              GdkModifierType accel_mods,
              GrabbedKey     *grabbed_key)
 {
-  XEvent xevent;
   GdkEvent *gdk_event = gtk_get_current_event ();
   
   GtkSocket *socket = g_object_get_data (G_OBJECT (accel_group), "gtk-socket");
-  GdkScreen *screen = gdk_drawable_get_screen (socket->plug_window);
   gboolean retval = FALSE;
 
   if (gdk_event && gdk_event->type == GDK_KEY_PRESS && socket->plug_window)
     {
-      xevent.xkey.type = KeyPress;
-      xevent.xkey.window = GDK_WINDOW_XWINDOW (socket->plug_window);
-      xevent.xkey.root = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen));
-      xevent.xkey.subwindow = None;
-      xevent.xkey.time = gdk_event->key.time;
-      xevent.xkey.x = 0;
-      xevent.xkey.y = 0;
-      xevent.xkey.x_root = 0;
-      xevent.xkey.y_root = 0;
-      xevent.xkey.state = gdk_event->key.state;
-      xevent.xkey.keycode = gdk_event->key.hardware_keycode;
-      xevent.xkey.same_screen = True;
-
-      gdk_error_trap_push ();
-      XSendEvent (GDK_WINDOW_XDISPLAY (socket->plug_window),
-                 GDK_WINDOW_XWINDOW (socket->plug_window),
-                 False, KeyPressMask, &xevent);
-      gdk_display_sync (gdk_screen_get_display (screen));
-      gdk_error_trap_pop ();
-
+      _gtk_socket_windowing_send_key_event (socket, gdk_event, FALSE);
       retval = TRUE;
     }
 
@@ -619,10 +578,20 @@ find_accel_key (GtkAccelKey *key,
          key->accel_mods == grabbed_key->accel_mods);
 }
 
-static void
-add_grabbed_key (GtkSocket       *socket,
-                guint            keyval,
-                GdkModifierType  modifiers)
+/**
+ * _gtk_socket_add_grabbed_key:
+ *
+ * @socket: a #GtkSocket
+ * @keyval: a key
+ * @modifiers: modifiers for the key
+ *
+ * Called from the GtkSocket platform-specific backend when the
+ * corresponding plug has told the socket to grab a key.
+ */
+void
+_gtk_socket_add_grabbed_key (GtkSocket       *socket,
+                            guint            keyval,
+                            GdkModifierType  modifiers)
 {
   GClosure *closure;
   GrabbedKey *grabbed_key;
@@ -648,27 +617,24 @@ add_grabbed_key (GtkSocket       *socket,
                           closure);
 }
 
-static void
-remove_grabbed_key (GtkSocket      *socket,
-                   guint           keyval,
-                   GdkModifierType modifiers)
+/**
+ * _gtk_socket_remove_grabbed_key:
+ *
+ * @socket: a #GtkSocket
+ * @keyval: a key
+ * @modifiers: modifiers for the key
+ *
+ * Called from the GtkSocket backend when the corresponding plug has
+ * told the socket to remove a key grab.
+ */
+void
+_gtk_socket_remove_grabbed_key (GtkSocket      *socket,
+                               guint           keyval,
+                               GdkModifierType modifiers)
 {
-  gint i;
-
-  for (i = 0; i < socket->accel_group->n_accels; i++)
-    {
-      GtkAccelGroupEntry *accel_entry = &socket->accel_group->priv_accels[i];
-      if (accel_entry->key.accel_key == keyval &&
-         accel_entry->key.accel_mods == modifiers)
-       {
-         gtk_accel_group_disconnect (socket->accel_group,
-                                     accel_entry->closure);
-         return;
-       }
-    }
-
-  g_warning ("GtkSocket: request to remove non-present grabbed key %u,%#x\n",
-            keyval, modifiers);
+  if (!gtk_accel_group_disconnect_key (socket->accel_group, keyval, modifiers))
+    g_warning ("GtkSocket: request to remove non-present grabbed key %u,%#x\n",
+              keyval, modifiers);
 }
 
 static void
@@ -679,7 +645,8 @@ socket_update_focus_in (GtkSocket *socket)
   if (socket->plug_window)
     {
       GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
-      if (GTK_WIDGET_TOPLEVEL (toplevel) &&
+
+      if (gtk_widget_is_toplevel (toplevel) &&
          GTK_WINDOW (toplevel)->has_toplevel_focus &&
          gtk_widget_is_focus (GTK_WIDGET (socket)))
        focus_in = TRUE;
@@ -689,17 +656,7 @@ socket_update_focus_in (GtkSocket *socket)
     {
       socket->focus_in = focus_in;
 
-      if (focus_in)
-       {
-         send_xembed_message (socket, XEMBED_FOCUS_IN, XEMBED_FOCUS_CURRENT, 0, 0,
-                              gtk_get_current_event_time ());
-       }
-      else
-       {
-         send_xembed_message (socket, XEMBED_FOCUS_OUT, 0, 0, 0,
-                              gtk_get_current_event_time ());
-      
-       }
+      _gtk_socket_windowing_focus_change (socket, focus_in);
     }
 }
 
@@ -711,7 +668,8 @@ socket_update_active (GtkSocket *socket)
   if (socket->plug_window)
     {
       GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
-      if (GTK_WIDGET_TOPLEVEL (toplevel) &&
+
+      if (gtk_widget_is_toplevel (toplevel) &&
          GTK_WINDOW (toplevel)->is_active)
        active = TRUE;
     }
@@ -720,10 +678,7 @@ socket_update_active (GtkSocket *socket)
     {
       socket->active = active;
 
-      send_xembed_message (socket,
-                          active ? XEMBED_WINDOW_ACTIVATE : XEMBED_WINDOW_DEACTIVATE,
-                          0, 0, 0,
-                          gtk_get_current_event_time ());
+      _gtk_socket_windowing_update_active (socket, active);
     }
 }
 
@@ -773,9 +728,7 @@ gtk_socket_grab_notify (GtkWidget *widget,
   GtkSocket *socket = GTK_SOCKET (widget);
 
   if (!socket->same_app)
-    send_xembed_message (GTK_SOCKET (widget),
-                        was_grabbed ? XEMBED_MODALITY_OFF : XEMBED_MODALITY_ON,
-                        0, 0, 0, gtk_get_current_event_time ());
+    _gtk_socket_windowing_update_modality (socket, !was_grabbed);
 }
 
 static gboolean
@@ -784,31 +737,10 @@ gtk_socket_key_event (GtkWidget   *widget,
 {
   GtkSocket *socket = GTK_SOCKET (widget);
   
-  if (GTK_WIDGET_HAS_FOCUS (socket) && socket->plug_window && !socket->plug_widget)
+  if (gtk_widget_has_focus (widget) && socket->plug_window && !socket->plug_widget)
     {
-      GdkScreen *screen = gdk_drawable_get_screen (socket->plug_window);
-      XEvent xevent;
-      
-      xevent.xkey.type = (event->type == GDK_KEY_PRESS) ? KeyPress : KeyRelease;
-      xevent.xkey.window = GDK_WINDOW_XWINDOW (socket->plug_window);
-      xevent.xkey.root = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen));
-      xevent.xkey.time = event->time;
-      /* FIXME, the following might cause problems for non-GTK apps */
-      xevent.xkey.x = 0;
-      xevent.xkey.y = 0;
-      xevent.xkey.x_root = 0;
-      xevent.xkey.y_root = 0;
-      xevent.xkey.state = event->state;
-      xevent.xkey.keycode = event->hardware_keycode;
-      xevent.xkey.same_screen = TRUE; /* FIXME ? */
-      
-      gdk_error_trap_push ();
-      XSendEvent (GDK_WINDOW_XDISPLAY (socket->plug_window),
-                 GDK_WINDOW_XWINDOW (socket->plug_window),
-                 False, NoEventMask, &xevent);
-      gdk_display_sync (gtk_widget_get_display (widget));
-      gdk_error_trap_pop ();
-      
+      _gtk_socket_windowing_send_key_event (socket, (GdkEvent *) event, FALSE);
+
       return TRUE;
     }
   else
@@ -819,59 +751,48 @@ static void
 gtk_socket_notify (GObject    *object,
                   GParamSpec *pspec)
 {
-  if (!strcmp (pspec->name, "is_focus"))
+  if (!strcmp (pspec->name, "is-focus"))
     return;
-
   socket_update_focus_in (GTK_SOCKET (object));
 }
 
-static void
-gtk_socket_claim_focus (GtkSocket *socket,
-                       gboolean   send_event)
+/**
+ * _gtk_socket_claim_focus:
+ *
+ * @socket: a #GtkSocket
+ * @send_event: huh?
+ *
+ * Claims focus for the socket. XXX send_event?
+ */
+void
+_gtk_socket_claim_focus (GtkSocket *socket,
+                        gboolean   send_event)
 {
+  GtkWidget *widget = GTK_WIDGET (socket);
+
   if (!send_event)
     socket->focus_in = TRUE;   /* Otherwise, our notify handler will send FOCUS_IN  */
       
   /* Oh, the trickery... */
   
-  GTK_WIDGET_SET_FLAGS (socket, GTK_CAN_FOCUS);
-  gtk_widget_grab_focus (GTK_WIDGET (socket));
-  GTK_WIDGET_UNSET_FLAGS (socket, GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus (widget, TRUE);
+  gtk_widget_grab_focus (widget);
+  gtk_widget_set_can_focus (widget, FALSE);
 }
 
 static gboolean
-gtk_socket_focus (GtkWidget *widget, GtkDirectionType direction)
+gtk_socket_focus (GtkWidget       *widget,
+                 GtkDirectionType direction)
 {
-  GtkSocket *socket;
-  gint detail = -1;
-
-  g_return_val_if_fail (GTK_IS_SOCKET (widget), FALSE);
-  
-  socket = GTK_SOCKET (widget);
+  GtkSocket *socket = GTK_SOCKET (widget);
 
   if (socket->plug_widget)
     return gtk_widget_child_focus (socket->plug_widget, direction);
 
-  if (!GTK_WIDGET_HAS_FOCUS (widget))
+  if (!gtk_widget_is_focus (widget))
     {
-      switch (direction)
-       {
-       case GTK_DIR_UP:
-       case GTK_DIR_LEFT:
-       case GTK_DIR_TAB_BACKWARD:
-         detail = XEMBED_FOCUS_LAST;
-         break;
-       case GTK_DIR_DOWN:
-       case GTK_DIR_RIGHT:
-       case GTK_DIR_TAB_FORWARD:
-         detail = XEMBED_FOCUS_FIRST;
-         break;
-       }
-      
-      send_xembed_message (socket, XEMBED_FOCUS_IN, detail, 0, 0,
-                          gtk_get_current_event_time ());
-
-      gtk_socket_claim_focus (socket, FALSE);
+      _gtk_socket_windowing_focus (socket, direction);
+      _gtk_socket_claim_focus (socket, FALSE);
  
       return TRUE;
     }
@@ -902,48 +823,20 @@ gtk_socket_forall (GtkContainer *container,
     (* callback) (socket->plug_widget, callback_data);
 }
 
-static void
-gtk_socket_send_configure_event (GtkSocket *socket)
-{
-  XEvent event;
-  gint x, y;
-
-  g_return_if_fail (socket->plug_window != NULL);
-
-  event.xconfigure.type = ConfigureNotify;
-
-  event.xconfigure.event = GDK_WINDOW_XWINDOW (socket->plug_window);
-  event.xconfigure.window = GDK_WINDOW_XWINDOW (socket->plug_window);
-
-  /* The ICCCM says that synthetic events should have root relative
-   * coordinates. We still aren't really ICCCM compliant, since
-   * we don't send events when the real toplevel is moved.
-   */
-  gdk_error_trap_push ();
-  gdk_window_get_origin (socket->plug_window, &x, &y);
-  gdk_error_trap_pop ();
-                        
-  event.xconfigure.x = x;
-  event.xconfigure.y = y;
-  event.xconfigure.width = GTK_WIDGET(socket)->allocation.width;
-  event.xconfigure.height = GTK_WIDGET(socket)->allocation.height;
-
-  event.xconfigure.border_width = 0;
-  event.xconfigure.above = None;
-  event.xconfigure.override_redirect = False;
-
-  gdk_error_trap_push ();
-  XSendEvent (GDK_WINDOW_XDISPLAY (socket->plug_window),
-             GDK_WINDOW_XWINDOW (socket->plug_window),
-             False, NoEventMask, &event);
-  gdk_display_sync (gtk_widget_get_display (GTK_WIDGET (socket)));
-  gdk_error_trap_pop ();
-}
-
-static void
-gtk_socket_add_window (GtkSocket        *socket,
-                      GdkNativeWindow   xid,
-                      gboolean          need_reparent)
+/**
+ * _gtk_socket_add_window:
+ *
+ * @socket: a #GtkSocket
+ * @xid: the native identifier for a window
+ * @need_reparent: whether the socket's plug's window needs to be
+ *                reparented to the socket
+ *
+ * Adds a window to a GtkSocket.
+ */
+void
+_gtk_socket_add_window (GtkSocket       *socket,
+                       GdkNativeWindow  xid,
+                       gboolean         need_reparent)
 {
   GtkWidget *widget = GTK_WIDGET (socket);
   GdkDisplay *display = gtk_widget_get_display (widget);
@@ -963,7 +856,7 @@ gtk_socket_add_window (GtkSocket        *socket,
 
       if (!GTK_IS_PLUG (child_widget))
        {
-         g_warning (G_STRLOC "Can't add non-GtkPlug to GtkSocket");
+         g_warning (G_STRLOC "Can't add non-GtkPlug to GtkSocket");
          socket->plug_window = NULL;
          gdk_error_trap_pop ();
          
@@ -976,8 +869,6 @@ gtk_socket_add_window (GtkSocket        *socket,
     {
       GtkWidget *toplevel;
       GdkDragProtocol protocol;
-      unsigned long version;
-      unsigned long flags;
 
       gdk_error_trap_push ();
 
@@ -991,10 +882,8 @@ gtk_socket_add_window (GtkSocket        *socket,
            }
        }
        
-      XSelectInput (GDK_DISPLAY_XDISPLAY (display),
-                   GDK_WINDOW_XWINDOW (socket->plug_window),
-                   StructureNotifyMask | PropertyChangeMask);
-      
+      _gtk_socket_windowing_select_plug_window_input (socket);
+
       if (gdk_error_trap_pop ())
        {
          g_object_unref (socket->plug_window);
@@ -1014,19 +903,8 @@ gtk_socket_add_window (GtkSocket        *socket,
 
       socket->have_size = FALSE;
 
-      socket->xembed_version = -1;
-      if (xembed_get_info (socket->plug_window, &version, &flags))
-       {
-         socket->xembed_version = version;
-         socket->is_mapped = (flags & XEMBED_MAPPED) != 0;
-       }
-      else
-       {
-         /* FIXME, we should probably actually check the state before we started */
-         
-         socket->is_mapped = TRUE;
-       }
-      
+      _gtk_socket_windowing_embed_get_info (socket);
+
       socket->need_map = socket->is_mapped;
 
       if (gdk_drag_get_protocol_for_display (display, xid, &protocol))
@@ -1036,17 +914,18 @@ gtk_socket_add_window (GtkSocket        *socket,
       gdk_display_sync (display);
       gdk_error_trap_pop ();
 
-      gdk_window_add_filter (socket->plug_window, 
-                            gtk_socket_filter_func, socket);
+      gdk_window_add_filter (socket->plug_window,
+                            _gtk_socket_windowing_filter_func,
+                            socket);
 
       /* Add a pointer to the socket on our toplevel window */
 
       toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
-      if (toplevel && GTK_IS_WINDOW (toplevel))
+      if (GTK_IS_WINDOW (toplevel))
        gtk_window_add_embedded_xid (GTK_WINDOW (toplevel), xid);
 
-      send_xembed_message (socket, XEMBED_EMBEDDED_NOTIFY, 0, 0, 0,
-                          gtk_get_current_event_time ());
+      _gtk_socket_windowing_embed_notify (socket);
+
       socket_update_active (socket);
       socket_update_focus_in (socket);
 
@@ -1057,154 +936,15 @@ gtk_socket_add_window (GtkSocket        *socket,
     g_signal_emit (socket, socket_signals[PLUG_ADDED], 0);
 }
 
-
-static void
-send_xembed_message (GtkSocket *socket,
-                    glong      message,
-                    glong      detail,
-                    glong      data1,
-                    glong      data2,
-                    guint32    time)
-{
-  GTK_NOTE(PLUGSOCKET,
-        g_message ("GtkSocket: Sending XEMBED message of type %ld", message));
-  
-  if (socket->plug_window)
-    {
-      GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (socket));
-      XEvent xevent;
-
-      xevent.xclient.window = GDK_WINDOW_XWINDOW (socket->plug_window);
-      xevent.xclient.type = ClientMessage;
-      xevent.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED");
-      xevent.xclient.format = 32;
-      xevent.xclient.data.l[0] = time;
-      xevent.xclient.data.l[1] = message;
-      xevent.xclient.data.l[2] = detail;
-      xevent.xclient.data.l[3] = data1;
-      xevent.xclient.data.l[4] = data2;
-
-      gdk_error_trap_push ();
-      XSendEvent (GDK_DISPLAY_XDISPLAY (display),
-                 GDK_WINDOW_XWINDOW (socket->plug_window),
-                 False, NoEventMask, &xevent);
-      gdk_display_sync (display);
-      gdk_error_trap_pop ();
-    }
-}
-
-static gboolean
-xembed_get_info (GdkWindow     *window,
-                unsigned long *version,
-                unsigned long *flags)
-{
-  GdkDisplay *display = gdk_drawable_get_display (window);
-  Atom xembed_info_atom = gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED_INFO");
-  Atom type;
-  int format;
-  unsigned long nitems, bytes_after;
-  unsigned char *data;
-  unsigned long *data_long;
-  int status;
-  
-  gdk_error_trap_push();
-  status = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
-                              GDK_WINDOW_XWINDOW (window),
-                              xembed_info_atom,
-                              0, 2, False,
-                              xembed_info_atom, &type, &format,
-                              &nitems, &bytes_after, &data);
-  gdk_error_trap_pop();
-
-  if (status != Success)
-    return FALSE;              /* Window vanished? */
-
-  if (type == None)            /* No info property */
-    return FALSE;
-
-  if (type != xembed_info_atom)
-    {
-      g_warning ("_XEMBED_INFO property has wrong type\n");
-      return FALSE;
-    }
-  
-  if (nitems < 2)
-    {
-      g_warning ("_XEMBED_INFO too short\n");
-      XFree (data);
-      return FALSE;
-    }
-  
-  data_long = (unsigned long *)data;
-  if (version)
-    *version = data_long[0];
-  if (flags)
-    *flags = data_long[1] & XEMBED_MAPPED;
-  
-  XFree (data);
-  return TRUE;
-}
-
-static void
-handle_xembed_message (GtkSocket *socket,
-                      glong      message,
-                      glong      detail,
-                      glong      data1,
-                      glong      data2,
-                      guint32    time)
-{
-  GTK_NOTE (PLUGSOCKET,
-           g_message ("GtkSocket: Message of type %ld received", message));
-  
-  switch (message)
-    {
-    case XEMBED_EMBEDDED_NOTIFY:
-    case XEMBED_WINDOW_ACTIVATE:
-    case XEMBED_WINDOW_DEACTIVATE:
-    case XEMBED_MODALITY_ON:
-    case XEMBED_MODALITY_OFF:
-    case XEMBED_FOCUS_IN:
-    case XEMBED_FOCUS_OUT:
-      g_warning ("GtkSocket: Invalid _XEMBED message of type %ld received", message);
-      break;
-      
-    case XEMBED_REQUEST_FOCUS:
-      gtk_socket_claim_focus (socket, TRUE);
-      break;
-
-    case XEMBED_FOCUS_NEXT:
-    case XEMBED_FOCUS_PREV:
-      {
-       GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
-       if (toplevel)
-         {
-           gtk_widget_child_focus (toplevel,
-                                    (message == XEMBED_FOCUS_NEXT ?
-                                     GTK_DIR_TAB_FORWARD : GTK_DIR_TAB_BACKWARD));
-         }
-       break;
-      }
-      
-    case XEMBED_GTK_GRAB_KEY:
-      add_grabbed_key (socket, data1, data2);
-      break; 
-    case XEMBED_GTK_UNGRAB_KEY:
-      remove_grabbed_key (socket, data1, data2);
-      break;
-
-    case XEMBED_GRAB_KEY:
-    case XEMBED_UNGRAB_KEY:
-      break;
-      
-    default:
-      GTK_NOTE (PLUGSOCKET,
-               g_message ("GtkSocket: Ignoring unknown _XEMBED message of type %ld", message));
-      break;
-    }
-}
-
-static void
-map_request (GtkSocket *socket)
+/**
+ * _gtk_socket_handle_map_request:
+ *
+ * @socket: a #GtkSocket
+ *
+ * Called from the GtkSocket backend when the plug has been mapped.
+ */
+void
+_gtk_socket_handle_map_request (GtkSocket *socket)
 {
   if (!socket->is_mapped)
     {
@@ -1215,8 +955,15 @@ map_request (GtkSocket *socket)
     }
 }
 
-static void
-unmap_notify (GtkSocket *socket)
+/**
+ * _gtk_socket_unmap_notify:
+ *
+ * @socket: a #GtkSocket
+ *
+ * Called from the GtkSocket backend when the plug has been unmapped ???
+ */
+void
+_gtk_socket_unmap_notify (GtkSocket *socket)
 {
   if (socket->is_mapped)
     {
@@ -1225,232 +972,78 @@ unmap_notify (GtkSocket *socket)
     }
 }
 
-static GdkFilterReturn
-gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
+/**
+ * _gtk_socket_advance_toplevel_focus:
+ *
+ * @socket: a #GtkSocket
+ * @direction: a direction
+ *
+ * Called from the GtkSocket backend when the corresponding plug
+ * has told the socket to move the focus.
+ */
+void
+_gtk_socket_advance_toplevel_focus (GtkSocket        *socket,
+                                   GtkDirectionType  direction)
 {
-  GtkSocket *socket;
-  GtkWidget *widget;
-  GdkDisplay *display;
-  XEvent *xevent;
-
-  GdkFilterReturn return_val;
-  
-  socket = GTK_SOCKET (data);
-  widget = GTK_WIDGET (socket);
-  xevent = (XEvent *)gdk_xevent;
-  display = gtk_widget_get_display (widget);
-
-  return_val = GDK_FILTER_CONTINUE;
-
-  if (socket->plug_widget)
-    return return_val;
+  GtkBin *bin;
+  GtkWindow *window;
+  GtkContainer *container;
+  GtkWidget *child;
+  GtkWidget *toplevel;
+  GtkWidget *old_focus_child;
+  GtkWidget *parent;
+
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
+  if (!toplevel)
+    return;
 
-  switch (xevent->type)
+  if (!gtk_widget_is_toplevel (toplevel) || GTK_IS_PLUG (toplevel))
     {
-    case ClientMessage:
-      if (xevent->xclient.message_type == gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED"))
-       {
-         handle_xembed_message (socket,
-                                xevent->xclient.data.l[1],
-                                xevent->xclient.data.l[2],
-                                xevent->xclient.data.l[3],
-                                xevent->xclient.data.l[4],
-                                xevent->xclient.data.l[0]);
-         
-         
-         return_val = GDK_FILTER_REMOVE;
-       }
-      break;
-
-    case CreateNotify:
-      {
-       XCreateWindowEvent *xcwe = &xevent->xcreatewindow;
-
-       if (!socket->plug_window)
-         {
-           gtk_socket_add_window (socket, xcwe->window, FALSE);
-
-           if (socket->plug_window)
-             {
-               GTK_NOTE(PLUGSOCKET,
-                        g_message ("GtkSocket - window created"));
-             }
-         }
-       
-       return_val = GDK_FILTER_REMOVE;
-       
-       break;
-      }
+      gtk_widget_child_focus (toplevel,direction);
+      return;
+    }
 
-    case ConfigureRequest:
-      {
-       XConfigureRequestEvent *xcre = &xevent->xconfigurerequest;
-       
-       if (!socket->plug_window)
-         gtk_socket_add_window (socket, xcre->window, FALSE);
-       
-       if (socket->plug_window)
-         {
-           GtkSocketPrivate *private = gtk_socket_get_private (socket);
-           
-           if (xcre->value_mask & (CWWidth | CWHeight))
-             {
-               GTK_NOTE(PLUGSOCKET,
-                        g_message ("GtkSocket - configure request: %d %d",
-                                   socket->request_width,
-                                   socket->request_height));
-
-               private->resize_count++;
-               gtk_widget_queue_resize (widget);
-             }
-           else if (xcre->value_mask & (CWX | CWY))
-             {
-               gtk_socket_send_configure_event (socket);
-             }
-           /* Ignore stacking requests. */
-           
-           return_val = GDK_FILTER_REMOVE;
-         }
-       break;
-      }
-
-    case DestroyNotify:
-      {
-       XDestroyWindowEvent *xdwe = &xevent->xdestroywindow;
-
-       /* Note that we get destroy notifies both from SubstructureNotify on
-        * our window and StructureNotify on socket->plug_window
-        */
-       if (socket->plug_window && (xdwe->window == GDK_WINDOW_XWINDOW (socket->plug_window)))
-         {
-           gboolean result;
-           
-           GTK_NOTE(PLUGSOCKET,
-                    g_message ("GtkSocket - destroy notify"));
-           
-           gdk_window_destroy_notify (socket->plug_window);
-           gtk_socket_end_embedding (socket);
-
-           g_object_ref (widget);
-           g_signal_emit (widget, socket_signals[PLUG_REMOVED], 0, &result);
-           if (!result)
-             gtk_widget_destroy (widget);
-           g_object_unref (widget);
-           
-           return_val = GDK_FILTER_REMOVE;
-         }
-       break;
-      }
-
-    case FocusIn:
-      if (xevent->xfocus.mode == EMBEDDED_APP_WANTS_FOCUS)
-       {
-         gtk_socket_claim_focus (socket, TRUE);
-       }
-      return_val = GDK_FILTER_REMOVE;
-      break;
-    case FocusOut:
-      return_val = GDK_FILTER_REMOVE;
-      break;
-    case MapRequest:
-      if (!socket->plug_window)
-       gtk_socket_add_window (socket, xevent->xmaprequest.window, FALSE);
-       
-      if (socket->plug_window)
-       {
-         GTK_NOTE(PLUGSOCKET,
-                  g_message ("GtkSocket - Map Request"));
+  container = GTK_CONTAINER (toplevel);
+  window = GTK_WINDOW (toplevel);
+  bin = GTK_BIN (toplevel);
 
-         map_request (socket);
-         return_val = GDK_FILTER_REMOVE;
-       }
-      break;
-    case PropertyNotify:
-      if (socket->plug_window &&
-         xevent->xproperty.window == GDK_WINDOW_XWINDOW (socket->plug_window))
-       {
-         GdkDragProtocol protocol;
+  /* This is a copy of gtk_window_focus(), modified so that we
+   * can detect wrap-around.
+   */
+  old_focus_child = gtk_container_get_focus_child (container);
+  
+  if (old_focus_child)
+    {
+      if (gtk_widget_child_focus (old_focus_child, direction))
+       return;
+
+      /* We are allowed exactly one wrap-around per sequence of focus
+       * events
+       */
+      if (_gtk_socket_windowing_embed_get_focus_wrapped ())
+       return;
+      else
+       _gtk_socket_windowing_embed_set_focus_wrapped ();
+    }
 
-         if (xevent->xproperty.atom == gdk_x11_get_xatom_by_name_for_display (display, "WM_NORMAL_HINTS"))
-           {
-             socket->have_size = FALSE;
-             gtk_widget_queue_resize (widget);
-           }
-         else if ((xevent->xproperty.atom == gdk_x11_get_xatom_by_name_for_display (display, "XdndAware")) ||
-             (xevent->xproperty.atom == gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_DRAG_RECEIVER_INFO")))
-           {
-             gdk_error_trap_push ();
-             if (gdk_drag_get_protocol_for_display (display,
-                                                    xevent->xproperty.window,
-                                                    &protocol))
-               gtk_drag_dest_set_proxy (GTK_WIDGET (socket),
-                                        socket->plug_window,
-                                        protocol, TRUE);
-
-             gdk_display_sync (display);
-             gdk_error_trap_pop ();
-           }
-         else if (xevent->xproperty.atom == gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED_INFO"))
-           {
-             unsigned long flags;
-             
-             if (xembed_get_info (socket->plug_window, NULL, &flags))
-               {
-                 gboolean was_mapped = socket->is_mapped;
-                 gboolean is_mapped = (flags & XEMBED_MAPPED) != 0;
-
-                 if (was_mapped != is_mapped)
-                   {
-                     if (is_mapped)
-                       map_request (socket);
-                     else
-                       {
-                         gdk_error_trap_push ();
-                         gdk_window_show (socket->plug_window);
-                         gdk_flush ();
-                         gdk_error_trap_pop ();
-                         
-                         unmap_notify (socket);
-                       }
-                   }
-               }
-           }
-                  
-         return_val = GDK_FILTER_REMOVE;
-       }
-      break;
-    case ReparentNotify:
-      {
-       XReparentEvent *xre = &xevent->xreparent;
-
-       if (!socket->plug_window && xre->parent == GDK_WINDOW_XWINDOW (widget->window))
-         {
-           gtk_socket_add_window (socket, xre->window, FALSE);
-           
-           if (socket->plug_window)
-             {
-               GTK_NOTE(PLUGSOCKET,
-                        g_message ("GtkSocket - window reparented"));
-             }
-           
-           return_val = GDK_FILTER_REMOVE;
-         }
-       
-       break;
-      }
-    case UnmapNotify:
-      if (socket->plug_window &&
-         xevent->xunmap.window == GDK_WINDOW_XWINDOW (socket->plug_window))
+  if (window->focus_widget)
+    {
+      /* Wrapped off the end, clear the focus setting for the toplevel */
+      parent = window->focus_widget->parent;
+      while (parent)
        {
-         GTK_NOTE(PLUGSOCKET,
-                  g_message ("GtkSocket - Unmap notify"));
-
-         unmap_notify (socket);
-         return_val = GDK_FILTER_REMOVE;
+         gtk_container_set_focus_child (GTK_CONTAINER (parent), NULL);
+         parent = GTK_WIDGET (parent)->parent;
        }
-      break;
       
+      gtk_window_set_focus (GTK_WINDOW (container), NULL);
+    }
+
+  /* Now try to focus the first widget in the window */
+  child = gtk_bin_get_child (bin);
+  if (child)
+    {
+      if (gtk_widget_child_focus (child, direction))
+        return;
     }
-  
-  return return_val;
 }