* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
+#include <string.h>
+
#include "gdk/gdkkeysyms.h"
#include "gtkmain.h"
+#include "gtkmarshalers.h"
#include "gtkwindow.h"
-#include "gtksignal.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"
+#include "gtkalias.h"
/* Forward declararations */
-static void gtk_socket_class_init (GtkSocketClass *klass);
-static void gtk_socket_init (GtkSocket *socket);
-static void gtk_socket_realize (GtkWidget *widget);
-static void gtk_socket_unrealize (GtkWidget *widget);
-static void gtk_socket_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
-static void gtk_socket_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-static void gtk_socket_hierarchy_changed (GtkWidget *widget);
-static void gtk_socket_grab_notify (GtkWidget *widget,
- gboolean was_grabbed);
-static gboolean gtk_socket_key_press_event (GtkWidget *widget,
- GdkEventKey *event);
-static gboolean gtk_socket_focus_in_event (GtkWidget *widget,
- GdkEventFocus *event);
-static void gtk_socket_claim_focus (GtkSocket *socket);
-static gboolean gtk_socket_focus_out_event (GtkWidget *widget,
- GdkEventFocus *event);
-static void gtk_socket_send_configure_event (GtkSocket *socket);
-static gboolean gtk_socket_focus (GtkContainer *container,
- GtkDirectionType direction);
-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);
-
-/* From Tk */
-#define EMBEDDED_APP_WANTS_FOCUS NotifyNormal+20
+static void gtk_socket_finalize (GObject *object);
+static void gtk_socket_notify (GObject *object,
+ GParamSpec *pspec);
+static void gtk_socket_realize (GtkWidget *widget);
+static void gtk_socket_unrealize (GtkWidget *widget);
+static void gtk_socket_size_request (GtkWidget *widget,
+ GtkRequisition *requisition);
+static void gtk_socket_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
+static void gtk_socket_hierarchy_changed (GtkWidget *widget,
+ GtkWidget *old_toplevel);
+static void gtk_socket_grab_notify (GtkWidget *widget,
+ gboolean was_grabbed);
+static gboolean gtk_socket_key_event (GtkWidget *widget,
+ GdkEventKey *event);
+static gboolean gtk_socket_focus (GtkWidget *widget,
+ GtkDirectionType direction);
+static void gtk_socket_remove (GtkContainer *container,
+ GtkWidget *widget);
+static void gtk_socket_forall (GtkContainer *container,
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data);
+
/* Local data */
-static GtkWidgetClass *parent_class = NULL;
+typedef struct
+{
+ guint accel_key;
+ GdkModifierType accel_mods;
+} GrabbedKey;
-GtkType
-gtk_socket_get_type (void)
+enum {
+ PLUG_ADDED,
+ PLUG_REMOVED,
+ LAST_SIGNAL
+};
+
+static guint socket_signals[LAST_SIGNAL] = { 0 };
+
+/**
+ * _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)
{
- static GtkType socket_type = 0;
+ return G_TYPE_INSTANCE_GET_PRIVATE (socket, GTK_TYPE_SOCKET, GtkSocketPrivate);
+}
- 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);
- }
+G_DEFINE_TYPE (GtkSocket, gtk_socket, GTK_TYPE_CONTAINER)
- return socket_type;
+static void
+gtk_socket_finalize (GObject *object)
+{
+ GtkSocket *socket = GTK_SOCKET (object);
+
+ g_object_unref (socket->accel_group);
+ socket->accel_group = NULL;
+
+ G_OBJECT_CLASS (gtk_socket_parent_class)->finalize (object);
}
static void
{
GtkWidgetClass *widget_class;
GtkContainerClass *container_class;
+ GObjectClass *gobject_class;
+ gobject_class = (GObjectClass *) class;
widget_class = (GtkWidgetClass*) class;
container_class = (GtkContainerClass*) class;
- parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
+ gobject_class->finalize = gtk_socket_finalize;
+ gobject_class->notify = gtk_socket_notify;
widget_class->realize = gtk_socket_realize;
widget_class->unrealize = gtk_socket_unrealize;
widget_class->size_request = gtk_socket_size_request;
widget_class->size_allocate = gtk_socket_size_allocate;
widget_class->hierarchy_changed = gtk_socket_hierarchy_changed;
-#if 0
widget_class->grab_notify = gtk_socket_grab_notify;
-#endif
- widget_class->key_press_event = gtk_socket_key_press_event;
- widget_class->focus_in_event = gtk_socket_focus_in_event;
- widget_class->focus_out_event = gtk_socket_focus_out_event;
+ widget_class->key_press_event = gtk_socket_key_event;
+ widget_class->key_release_event = gtk_socket_key_event;
+ widget_class->focus = gtk_socket_focus;
- container_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;
+
+ socket_signals[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);
+ socket_signals[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
socket->current_height = 0;
socket->plug_window = NULL;
- socket->same_app = FALSE;
+ socket->plug_widget = NULL;
socket->focus_in = FALSE;
socket->have_size = FALSE;
socket->need_map = FALSE;
+ socket->active = FALSE;
+
+ socket->accel_group = gtk_accel_group_new ();
+ g_object_set_data (G_OBJECT (socket->accel_group), I_("gtk-socket"), socket);
}
+/**
+ * gtk_socket_new:
+ *
+ * Create a new empty #GtkSocket.
+ *
+ * Return value: the new #GtkSocket.
+ **/
GtkWidget*
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 id)
+gtk_socket_steal (GtkSocket *socket,
+ GdkNativeWindow wid)
{
- GtkWidget *widget;
- gpointer user_data = NULL;
-
- widget = GTK_WIDGET (socket);
-
- socket->plug_window = gdk_window_lookup (id);
+ g_return_if_fail (GTK_IS_SOCKET (socket));
+ g_return_if_fail (GTK_WIDGET_ANCHORED (socket));
- gdk_error_trap_push ();
+ if (!GTK_WIDGET_REALIZED (socket))
+ gtk_widget_realize (GTK_WIDGET (socket));
- if (socket->plug_window)
- gdk_window_get_user_data (socket->plug_window,
- &user_data);
-
- if (user_data)
- {
- /*
- GtkWidget *child_widget;
+ _gtk_socket_add_window (socket, wid, TRUE);
+}
- child_widget = GTK_WIDGET (socket->plug_window->user_data);
- */
+/**
+ * gtk_socket_add_id:
+ * @socket_: a #GtkSocket
+ * @window_id: the window ID of a client participating in the XEMBED protocol.
+ *
+ * Adds an XEMBED client, such as a #GtkPlug, to the #GtkSocket. The
+ * client may be in the same process or in a different process.
+ *
+ * To embed a #GtkPlug in a #GtkSocket, you can either create the
+ * #GtkPlug with <literal>gtk_plug_new (0)</literal>, call
+ * gtk_plug_get_id() to get the window ID of the plug, and then pass that to the
+ * gtk_socket_add_id(), or you can call gtk_socket_get_id() to get the
+ * window ID for the socket, and call gtk_plug_new() passing in that
+ * ID.
+ *
+ * The #GtkSocket must have already be added into a toplevel window
+ * before you can make this call.
+ **/
+void
+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));
- g_warning("Stealing from same app not yet implemented");
-
- socket->same_app = TRUE;
- }
- else
- {
- socket->plug_window = gdk_window_foreign_new (id);
- if (!socket->plug_window) /* was deleted before we could get it */
- {
- gdk_error_trap_pop ();
- return;
- }
-
- socket->same_app = FALSE;
- socket->have_size = FALSE;
+ if (!GTK_WIDGET_REALIZED (socket))
+ gtk_widget_realize (GTK_WIDGET (socket));
- XSelectInput (GDK_DISPLAY (),
- GDK_WINDOW_XWINDOW(socket->plug_window),
- StructureNotifyMask | PropertyChangeMask);
+ _gtk_socket_add_window (socket, window_id, TRUE);
+}
- gtk_widget_queue_resize (widget);
- }
+/**
+ * gtk_socket_get_id:
+ * @socket_: a #GtkSocket.
+ *
+ * Gets the window ID of a #GtkSocket widget, which can then
+ * be used to create a client embedded inside the socket, for
+ * instance with gtk_plug_new().
+ *
+ * The #GtkSocket must have already be added into a toplevel window
+ * before you can make this call.
+ *
+ * Return value: the window ID for the socket
+ **/
+GdkNativeWindow
+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);
- gdk_window_hide (socket->plug_window);
- gdk_window_reparent (socket->plug_window, widget->window, 0, 0);
+ if (!GTK_WIDGET_REALIZED (socket))
+ gtk_widget_realize (GTK_WIDGET (socket));
- gdk_flush ();
- gdk_error_trap_pop ();
-
- socket->need_map = TRUE;
+ return _gtk_socket_windowing_get_id (socket);
}
static void
GtkSocket *socket;
GdkWindowAttr attributes;
gint attributes_mask;
- XWindowAttributes xattrs;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SOCKET (widget));
socket = GTK_SOCKET (widget);
widget->style = gtk_style_attach (widget->style, widget->window);
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
- XGetWindowAttributes (GDK_DISPLAY (),
- GDK_WINDOW_XWINDOW (widget->window),
- &xattrs);
-
- XSelectInput (GDK_DISPLAY (),
- 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);
+ gdk_window_add_filter (widget->window,
+ _gtk_socket_windowing_filter_func,
+ widget);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
* our window is passed to another application, SubstructureRedirectMask
* will be set by the time the other app creates its window.
*/
- gdk_flush();
+ gdk_display_sync (gtk_widget_get_display (widget));
+}
+
+/**
+ * _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);
+ GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
+ gint i;
+
+ if (toplevel && 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);
+ }
}
static void
gtk_socket_unrealize (GtkWidget *widget)
{
- GtkSocket *socket;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_SOCKET (widget));
+ GtkSocket *socket = GTK_SOCKET (widget);
- socket = GTK_SOCKET (widget);
+ GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED);
- if (socket->plug_window)
+ if (socket->plug_widget)
{
- GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
- if (toplevel && GTK_IS_WINDOW (toplevel))
- gtk_window_remove_embedded_xid (GTK_WINDOW (toplevel),
- GDK_WINDOW_XWINDOW (socket->plug_window));
-
- socket->plug_window = NULL;
+ _gtk_plug_remove_from_socket (GTK_PLUG (socket->plug_widget), socket);
}
-
-#if 0
- if (socket->grabbed_keys)
+ else if (socket->plug_window)
{
- g_hash_table_foreach (socket->grabbed_keys, (GHFunc)g_free, NULL);
- g_hash_table_destroy (socket->grabbed_keys);
- socket->grabbed_keys = NULL;
+ _gtk_socket_end_embedding (socket);
}
-#endif
-
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+
+ if (GTK_WIDGET_CLASS (gtk_socket_parent_class)->unrealize)
+ (* GTK_WIDGET_CLASS (gtk_socket_parent_class)->unrealize) (widget);
}
static void
gtk_socket_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
- GtkSocket *socket;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_SOCKET (widget));
- g_return_if_fail (requisition != NULL);
-
- socket = GTK_SOCKET (widget);
+ GtkSocket *socket = GTK_SOCKET (widget);
- if (!socket->have_size && socket->plug_window)
+ if (socket->plug_widget)
+ {
+ gtk_widget_size_request (socket->plug_widget, requisition);
+ }
+ else
{
- XSizeHints hints;
- long supplied;
+ if (socket->is_mapped && !socket->have_size && socket->plug_window)
+ _gtk_socket_windowing_size_request (socket);
- gdk_error_trap_push ();
-
- if (XGetWMNormalHints (GDK_DISPLAY(),
- GDK_WINDOW_XWINDOW (socket->plug_window),
- &hints, &supplied))
+ if (socket->is_mapped && socket->have_size)
{
- /* This is obsolete, according the X docs, but many programs
- * still use it */
- if (hints.flags & (PSize | USSize))
- {
- socket->request_width = hints.width;
- socket->request_height = hints.height;
- }
- else 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;
- }
+ requisition->width = MAX (socket->request_width, 1);
+ requisition->height = MAX (socket->request_height, 1);
+ }
+ else
+ {
+ requisition->width = 1;
+ requisition->height = 1;
}
- socket->have_size = TRUE; /* don't check again? */
-
- gdk_error_trap_pop ();
}
-
- requisition->width = MAX (socket->request_width, 1);
- requisition->height = MAX (socket->request_height, 1);
}
static void
{
GtkSocket *socket;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_SOCKET (widget));
g_return_if_fail (allocation != NULL);
allocation->x, allocation->y,
allocation->width, allocation->height);
- if (socket->plug_window)
+ if (socket->plug_widget)
+ {
+ GtkAllocation child_allocation;
+
+ child_allocation.x = 0;
+ child_allocation.y = 0;
+ child_allocation.width = allocation->width;
+ child_allocation.height = allocation->height;
+
+ gtk_widget_size_allocate (socket->plug_widget, &child_allocation);
+ }
+ else if (socket->plug_window)
{
+ GtkSocketPrivate *private = _gtk_socket_get_private (socket);
+
gdk_error_trap_push ();
- if (!socket->need_map &&
- (allocation->width == socket->current_width) &&
- (allocation->height == socket->current_height))
- {
- gtk_socket_send_configure_event (socket);
- GTK_NOTE(PLUGSOCKET,
- g_message ("GtkSocket - allocated no change: %d %d",
- allocation->width, allocation->height));
- }
- else
+ if (allocation->width != socket->current_width ||
+ allocation->height != socket->current_height)
{
gdk_window_move_resize (socket->plug_window,
0, 0,
allocation->width, allocation->height);
- GTK_NOTE(PLUGSOCKET,
- g_message ("GtkSocket - allocated: %d %d",
- allocation->width, allocation->height));
+ if (private->resize_count)
+ private->resize_count--;
+
+ GTK_NOTE (PLUGSOCKET,
+ g_message ("GtkSocket - allocated: %d %d",
+ allocation->width, allocation->height));
socket->current_width = allocation->width;
socket->current_height = allocation->height;
}
socket->need_map = FALSE;
}
- gdk_flush ();
+ while (private->resize_count)
+ {
+ _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));
+ }
+
+ gdk_display_sync (gtk_widget_get_display (widget));
gdk_error_trap_pop ();
}
}
}
-#if 0
-
-typedef struct
-{
- guint accelerator_key;
- GdkModifierType accelerator_mods;
-} GrabbedKey;
-
-static guint
-grabbed_key_hash (gconstpointer a)
+static gboolean
+activate_key (GtkAccelGroup *accel_group,
+ GObject *acceleratable,
+ guint accel_key,
+ GdkModifierType accel_mods,
+ GrabbedKey *grabbed_key)
{
- const GrabbedKey *key = a;
- guint h;
+ GdkEvent *gdk_event = gtk_get_current_event ();
- h = key->accelerator_key << 16;
- h ^= key->accelerator_key >> 16;
- h ^= key->accelerator_mods;
+ GtkSocket *socket = g_object_get_data (G_OBJECT (accel_group), "gtk-socket");
+ gboolean retval = FALSE;
+
+ if (gdk_event && gdk_event->type == GDK_KEY_PRESS && socket->plug_window)
+ {
+ _gtk_socket_windowing_send_key_event (socket, gdk_event, TRUE);
+ retval = TRUE;
+ }
+
+ if (gdk_event)
+ gdk_event_free (gdk_event);
- return h;
+ return retval;
}
static gboolean
-grabbed_key_equal (gconstpointer a, gconstpointer b)
+find_accel_key (GtkAccelKey *key,
+ GClosure *closure,
+ gpointer data)
{
- const GrabbedKey *keya = a;
- const GrabbedKey *keyb = b;
-
- return (keya->accelerator_key == keyb->accelerator_key &&
- keya->accelerator_mods == keyb->accelerator_mods);
+ GrabbedKey *grabbed_key = data;
+
+ return (key->accel_key == grabbed_key->accel_key &&
+ key->accel_mods == grabbed_key->accel_mods);
}
-static void
-add_grabbed_key (GtkSocket *socket,
- guint hardware_keycode,
- GdkModifierType mods)
+/**
+ * _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)
{
- GrabbedKey key;
- GrabbedKey *new_key;
- GrabbedKey *found_key;
+ GClosure *closure;
+ GrabbedKey *grabbed_key;
+
+ grabbed_key = g_new (GrabbedKey, 1);
+
+ grabbed_key->accel_key = keyval;
+ grabbed_key->accel_mods = modifiers;
- if (socket->grabbed_keys)
+ if (gtk_accel_group_find (socket->accel_group,
+ find_accel_key,
+ &grabbed_key))
{
- key.accelerator_key = hardware_keycode;
- key.accelerator_mods = mods;
+ g_warning ("GtkSocket: request to add already present grabbed key %u,%#x\n",
+ keyval, modifiers);
+ g_free (grabbed_key);
+ return;
+ }
+
+ closure = g_cclosure_new (G_CALLBACK (activate_key), grabbed_key, (GClosureNotify)g_free);
- found_key = g_hash_table_lookup (socket->grabbed_keys, &key);
+ gtk_accel_group_connect (socket->accel_group, keyval, modifiers, GTK_ACCEL_LOCKED,
+ closure);
+}
+
+/**
+ * _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;
- if (found_key)
+ 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)
{
- g_warning ("GtkSocket: request to add already present grabbed key %u,%#x\n",
- hardware_keycode, mods);
+ gtk_accel_group_disconnect (socket->accel_group,
+ accel_entry->closure);
return;
}
}
-
- if (!socket->grabbed_keys)
- socket->grabbed_keys = g_hash_table_new (grabbed_key_hash, grabbed_key_equal);
-
- new_key = g_new (GrabbedKey, 1);
-
- new_key->accelerator_key = hardware_keycode;
- new_key->accelerator_mods = mods;
- g_hash_table_insert (socket->grabbed_keys, new_key, new_key);
+ g_warning ("GtkSocket: request to remove non-present grabbed key %u,%#x\n",
+ keyval, modifiers);
}
static void
-remove_grabbed_key (GtkSocket *socket,
- guint hardware_keycode,
- GdkModifierType mods)
+socket_update_focus_in (GtkSocket *socket)
{
- GrabbedKey key;
- GrabbedKey *found_key = NULL;
+ gboolean focus_in = FALSE;
- if (socket->grabbed_keys)
+ if (socket->plug_window)
{
- key.accelerator_key = hardware_keycode;
- key.accelerator_mods = mods;
+ GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
- found_key = g_hash_table_lookup (socket->grabbed_keys, &key);
+ if (GTK_WIDGET_TOPLEVEL (toplevel) &&
+ GTK_WINDOW (toplevel)->has_toplevel_focus &&
+ gtk_widget_is_focus (GTK_WIDGET (socket)))
+ focus_in = TRUE;
}
- if (found_key)
+ if (focus_in != socket->focus_in)
{
- g_hash_table_remove (socket->grabbed_keys, &key);
- g_free (found_key);
+ socket->focus_in = focus_in;
+
+ _gtk_socket_windowing_focus_change (socket, focus_in);
}
- else
- g_warning ("GtkSocket: request to remove non-present grabbed key %u,%#x\n",
- hardware_keycode, mods);
}
-static gboolean
-toplevel_key_press_handler (GtkWidget *toplevel,
- GdkEventKey *event,
- GtkSocket *socket)
+static void
+socket_update_active (GtkSocket *socket)
{
- GrabbedKey search_key;
-
- search_key.accelerator_key = event->hardware_keycode;
- search_key.accelerator_mods = event->state;
+ gboolean active = FALSE;
- if (socket->grabbed_keys &&
- g_hash_table_lookup (socket->grabbed_keys, &search_key))
+ if (socket->plug_window)
{
- gtk_socket_key_press_event (GTK_WIDGET (socket), event);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (toplevel), "key_press_event");
+ GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
- return TRUE;
+ if (GTK_WIDGET_TOPLEVEL (toplevel) &&
+ GTK_WINDOW (toplevel)->is_active)
+ active = TRUE;
}
- else
- return FALSE;
-}
-#endif
-
-static void
-toplevel_focus_in_handler (GtkWidget *toplevel,
- GdkEventFocus *event,
- GtkSocket *socket)
-{
- /* It appears spurious focus in events can occur when
- * the window is hidden. So we'll just check to see if
- * the window is visible before actually handling the
- * event. (Comment from gtkwindow.c)
- */
- if (GTK_WIDGET_VISIBLE (toplevel))
- send_xembed_message (socket, XEMBED_WINDOW_ACTIVATE, 0, 0, 0,
- gtk_get_current_event_time ()); /* Will be GDK_CURRENT_TIME */
-}
+ if (active != socket->active)
+ {
+ socket->active = active;
-static void
-toplevel_focus_out_handler (GtkWidget *toplevel,
- GdkEventFocus *event,
- GtkSocket *socket)
-{
- send_xembed_message (socket, XEMBED_WINDOW_DEACTIVATE, 0, 0, 0,
- gtk_get_current_event_time ()); /* Will be GDK_CURRENT_TIME */
+ _gtk_socket_windowing_update_active (socket, active);
+ }
}
static void
-gtk_socket_hierarchy_changed (GtkWidget *widget)
+gtk_socket_hierarchy_changed (GtkWidget *widget,
+ GtkWidget *old_toplevel)
{
GtkSocket *socket = GTK_SOCKET (widget);
GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
{
if (socket->toplevel)
{
-#if 0
- gtk_signal_disconnect_by_func (GTK_OBJECT (socket->toplevel), GTK_SIGNAL_FUNC (toplevel_key_press_handler), socket);
-#endif
- gtk_signal_disconnect_by_func (GTK_OBJECT (socket->toplevel), GTK_SIGNAL_FUNC (toplevel_focus_in_handler), socket);
- gtk_signal_disconnect_by_func (GTK_OBJECT (socket->toplevel), GTK_SIGNAL_FUNC (toplevel_focus_out_handler), socket);
+ gtk_window_remove_accel_group (GTK_WINDOW (socket->toplevel), socket->accel_group);
+ g_signal_handlers_disconnect_by_func (socket->toplevel,
+ socket_update_focus_in,
+ socket);
+ g_signal_handlers_disconnect_by_func (socket->toplevel,
+ socket_update_active,
+ socket);
}
socket->toplevel = toplevel;
if (toplevel)
{
-#if 0
- gtk_signal_connect (GTK_OBJECT (socket->toplevel), "key_press_event",
- GTK_SIGNAL_FUNC (toplevel_key_press_handler), socket);
-#endif
- gtk_signal_connect (GTK_OBJECT (socket->toplevel), "focus_in_event",
- GTK_SIGNAL_FUNC (toplevel_focus_in_handler), socket);
- gtk_signal_connect (GTK_OBJECT (socket->toplevel), "focus_out_event",
- GTK_SIGNAL_FUNC (toplevel_focus_out_handler), socket);
+ gtk_window_add_accel_group (GTK_WINDOW (socket->toplevel), socket->accel_group);
+ g_signal_connect_swapped (socket->toplevel, "notify::has-toplevel-focus",
+ G_CALLBACK (socket_update_focus_in), socket);
+ g_signal_connect_swapped (socket->toplevel, "notify::is-active",
+ G_CALLBACK (socket_update_active), socket);
}
+
+ socket_update_focus_in (socket);
+ socket_update_active (socket);
}
}
gtk_socket_grab_notify (GtkWidget *widget,
gboolean was_grabbed)
{
- send_xembed_message (GTK_SOCKET (widget),
- was_grabbed ? XEMBED_MODALITY_OFF : XEMBED_MODALITY_ON,
- 0, 0, 0, gtk_get_current_event_time ());
+ GtkSocket *socket = GTK_SOCKET (widget);
+
+ if (!socket->same_app)
+ _gtk_socket_windowing_update_modality (socket, !was_grabbed);
}
static gboolean
-gtk_socket_key_press_event (GtkWidget *widget,
- GdkEventKey *event)
+gtk_socket_key_event (GtkWidget *widget,
+ GdkEventKey *event)
{
GtkSocket *socket = GTK_SOCKET (widget);
- if (socket->plug_window)
+ if (GTK_WIDGET_HAS_FOCUS (socket) && socket->plug_window && !socket->plug_widget)
{
- XEvent xevent;
-
- xevent.xkey.type = KeyPress;
- xevent.xkey.display = GDK_WINDOW_XDISPLAY (event->window);
- xevent.xkey.window = GDK_WINDOW_XWINDOW (socket->plug_window);
- xevent.xkey.root = GDK_ROOT_WINDOW ();
- 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_display,
- GDK_WINDOW_XWINDOW (socket->plug_window),
- False, NoEventMask, &xevent);
- gdk_flush ();
- gdk_error_trap_pop ();
-
+ _gtk_socket_windowing_send_key_event (socket, (GdkEvent *) event, FALSE);
+
return TRUE;
}
else
return FALSE;
}
-static gboolean
-gtk_socket_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
-{
- GtkSocket *socket = GTK_SOCKET (widget);
-
- if (!GTK_WIDGET_HAS_FOCUS (widget))
- {
- GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
-
- if (socket->plug_window)
- {
- send_xembed_message (socket, XEMBED_FOCUS_IN, XEMBED_FOCUS_CURRENT, 0, 0,
- gtk_get_current_event_time ());
- }
- }
-
- return TRUE;
-}
-
-static gboolean
-gtk_socket_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
+static void
+gtk_socket_notify (GObject *object,
+ GParamSpec *pspec)
{
- GtkSocket *socket = GTK_SOCKET (widget);
-
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
-
-#if 0
- GtkWidget *toplevel;
- toplevel = gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW);
-
- if (toplevel)
- {
- XSetInputFocus (GDK_DISPLAY (),
- GDK_WINDOW_XWINDOW (toplevel->window),
- RevertToParent, CurrentTime); /* FIXME? */
- }
-
-#endif
-
- if (socket->plug_window)
- {
- send_xembed_message (socket, XEMBED_FOCUS_OUT, 0, 0, 0,
- gtk_get_current_event_time ());
- }
-
- socket->focus_in = FALSE;
-
- return TRUE;
+ if (!strcmp (pspec->name, "is-focus"))
+ return;
+ socket_update_focus_in (GTK_SOCKET (object));
}
-static void
-gtk_socket_claim_focus (GtkSocket *socket)
+/**
+ * _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)
{
+ if (!send_event)
+ socket->focus_in = TRUE; /* Otherwise, our notify handler will send FOCUS_IN */
- socket->focus_in = TRUE;
-
/* 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);
-
- /* FIXME: we might grab the focus even if we don't have
- * it as an app... (and see _focus_in ()) */
- if (socket->plug_window)
- {
-#if 0
- gdk_error_trap_push ();
- XSetInputFocus (GDK_DISPLAY (),
- GDK_WINDOW_XWINDOW (socket->plug_window),
- RevertToParent, GDK_CURRENT_TIME);
- gdk_flush ();
- gdk_error_trap_pop ();
-#endif
- }
}
static gboolean
-gtk_socket_focus (GtkContainer *container, GtkDirectionType direction)
+gtk_socket_focus (GtkWidget *widget,
+ GtkDirectionType direction)
{
GtkSocket *socket;
- gint detail = -1;
- g_return_val_if_fail (GTK_IS_SOCKET (container), FALSE);
+ g_return_val_if_fail (GTK_IS_SOCKET (widget), FALSE);
- socket = GTK_SOCKET (container);
+ socket = GTK_SOCKET (widget);
- if (!GTK_WIDGET_HAS_FOCUS (container))
- {
- 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 ());
+ if (socket->plug_widget)
+ return gtk_widget_child_focus (socket->plug_widget, direction);
- GTK_WIDGET_SET_FLAGS (container, GTK_HAS_FOCUS);
- gtk_widget_grab_focus (GTK_WIDGET (container));
+ if (!gtk_widget_is_focus (widget))
+ {
+ _gtk_socket_windowing_focus (socket, direction);
+ _gtk_socket_claim_focus (socket, FALSE);
return TRUE;
}
else
return FALSE;
+}
-#if 0
- if (!socket->focus_in && socket->plug_window)
- {
- XEvent xevent;
-
- gtk_socket_claim_focus (socket);
-
- xevent.xkey.type = KeyPress;
- xevent.xkey.display = GDK_DISPLAY ();
- xevent.xkey.window = GDK_WINDOW_XWINDOW (socket->plug_window);
- xevent.xkey.root = GDK_ROOT_WINDOW (); /* FIXME */
- xevent.xkey.time = GDK_CURRENT_TIME; /* FIXME */
- /* FIXME, the following might cause big 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 = 0;
- xevent.xkey.same_screen = TRUE; /* FIXME ? */
-
- switch (direction)
- {
- case GTK_DIR_UP:
- xevent.xkey.keycode = XKeysymToKeycode(GDK_DISPLAY(), GDK_Up);
- break;
- case GTK_DIR_DOWN:
- xevent.xkey.keycode = XKeysymToKeycode(GDK_DISPLAY(), GDK_Down);
- break;
- case GTK_DIR_LEFT:
- xevent.xkey.keycode = XKeysymToKeycode(GDK_DISPLAY(), GDK_Left);
- break;
- case GTK_DIR_RIGHT:
- xevent.xkey.keycode = XKeysymToKeycode(GDK_DISPLAY(), GDK_Right);
- break;
- case GTK_DIR_TAB_FORWARD:
- xevent.xkey.keycode = XKeysymToKeycode(GDK_DISPLAY(), GDK_Tab);
- break;
- case GTK_DIR_TAB_BACKWARD:
- xevent.xkey.keycode = XKeysymToKeycode(GDK_DISPLAY(), GDK_Tab);
- xevent.xkey.state = ShiftMask;
- break;
- }
+static void
+gtk_socket_remove (GtkContainer *container,
+ GtkWidget *child)
+{
+ GtkSocket *socket = GTK_SOCKET (container);
+ g_return_if_fail (child == socket->plug_widget);
- gdk_error_trap_push ();
- XSendEvent (gdk_display,
- GDK_WINDOW_XWINDOW (socket->plug_window),
- False, NoEventMask, &xevent);
- gdk_flush();
- gdk_error_trap_pop ();
-
- return TRUE;
- }
- else
- {
- return FALSE;
- }
-#endif
+ _gtk_plug_remove_from_socket (GTK_PLUG (socket->plug_widget), socket);
}
static void
-gtk_socket_send_configure_event (GtkSocket *socket)
+gtk_socket_forall (GtkContainer *container,
+ gboolean include_internals,
+ GtkCallback callback,
+ gpointer callback_data)
{
- XEvent event;
+ GtkSocket *socket = GTK_SOCKET (container);
- g_return_if_fail (socket->plug_window != NULL);
-
- event.xconfigure.type = ConfigureNotify;
- event.xconfigure.display = gdk_display;
-
- event.xconfigure.event = GDK_WINDOW_XWINDOW (socket->plug_window);
- event.xconfigure.window = GDK_WINDOW_XWINDOW (socket->plug_window);
+ if (socket->plug_widget)
+ (* callback) (socket->plug_widget, callback_data);
+}
- event.xconfigure.x = 0;
- event.xconfigure.y = 0;
- event.xconfigure.width = GTK_WIDGET(socket)->allocation.width;
- event.xconfigure.height = GTK_WIDGET(socket)->allocation.height;
+/**
+ * _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);
+ gpointer user_data = NULL;
+
+ socket->plug_window = gdk_window_lookup_for_display (display, xid);
- event.xconfigure.border_width = 0;
- event.xconfigure.above = None;
- event.xconfigure.override_redirect = False;
+ if (socket->plug_window)
+ {
+ g_object_ref (socket->plug_window);
+ gdk_window_get_user_data (socket->plug_window, &user_data);
+ }
- gdk_error_trap_push ();
- XSendEvent (gdk_display,
- GDK_WINDOW_XWINDOW (socket->plug_window),
- False, NoEventMask, &event);
- gdk_flush ();
- gdk_error_trap_pop ();
-}
+ if (user_data) /* A widget's window in this process */
+ {
+ GtkWidget *child_widget = user_data;
-static void
-gtk_socket_add_window (GtkSocket *socket, GdkNativeWindow xid)
-{
- socket->plug_window = gdk_window_lookup (xid);
- socket->same_app = TRUE;
+ if (!GTK_IS_PLUG (child_widget))
+ {
+ g_warning (G_STRLOC ": Can't add non-GtkPlug to GtkSocket");
+ socket->plug_window = NULL;
+ gdk_error_trap_pop ();
+
+ return;
+ }
- if (!socket->plug_window)
+ _gtk_plug_add_to_socket (GTK_PLUG (child_widget), socket);
+ }
+ else /* A foreign window */
{
GtkWidget *toplevel;
GdkDragProtocol protocol;
-
- socket->plug_window = gdk_window_foreign_new (xid);
- if (!socket->plug_window) /* Already gone */
- return;
-
- socket->same_app = FALSE;
gdk_error_trap_push ();
- XSelectInput (GDK_DISPLAY (),
- GDK_WINDOW_XWINDOW(socket->plug_window),
- StructureNotifyMask | PropertyChangeMask);
+
+ if (!socket->plug_window)
+ {
+ socket->plug_window = gdk_window_foreign_new_for_display (display, xid);
+ if (!socket->plug_window) /* was deleted before we could get it */
+ {
+ gdk_error_trap_pop ();
+ return;
+ }
+ }
+
+ _gtk_socket_windowing_select_plug_window_input (socket);
+
+ if (gdk_error_trap_pop ())
+ {
+ g_object_unref (socket->plug_window);
+ socket->plug_window = NULL;
+ return;
+ }
- if (gdk_drag_get_protocol (xid, &protocol))
+ /* OK, we now will reliably get destroy notification on socket->plug_window */
+
+ gdk_error_trap_push ();
+
+ if (need_reparent)
+ {
+ gdk_window_hide (socket->plug_window); /* Shouldn't actually be necessary for XEMBED, but just in case */
+ gdk_window_reparent (socket->plug_window, widget->window, 0, 0);
+ }
+
+ socket->have_size = FALSE;
+
+ _gtk_socket_windowing_embed_get_info (socket);
+
+ socket->need_map = socket->is_mapped;
+
+ if (gdk_drag_get_protocol_for_display (display, xid, &protocol))
gtk_drag_dest_set_proxy (GTK_WIDGET (socket), socket->plug_window,
protocol, TRUE);
- gdk_flush ();
+
+ 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))
- {
- gtk_window_add_embedded_xid (GTK_WINDOW (toplevel), xid);
- }
+ gtk_window_add_embedded_xid (GTK_WINDOW (toplevel), xid);
+
+ _gtk_socket_windowing_embed_notify (socket);
+
+ socket_update_active (socket);
+ socket_update_focus_in (socket);
gtk_widget_queue_resize (GTK_WIDGET (socket));
}
-}
+ if (socket->plug_window)
+ 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_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)
{
- GTK_NOTE(PLUGSOCKET,
- g_message ("GtkSocket: Sending XEMBED message of type %d", message));
-
- if (socket->plug_window)
+ if (!socket->is_mapped)
{
- XEvent xevent;
-
- xevent.xclient.window = GDK_WINDOW_XWINDOW (socket->plug_window);
- xevent.xclient.type = ClientMessage;
- xevent.xclient.message_type = gdk_atom_intern ("_XEMBED", FALSE);
- 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;
+ socket->is_mapped = TRUE;
+ socket->need_map = TRUE;
- gdk_error_trap_push ();
- XSendEvent (gdk_display,
- GDK_WINDOW_XWINDOW (socket->plug_window),
- False, NoEventMask, &xevent);
- gdk_flush ();
- gdk_error_trap_pop ();
+ gtk_widget_queue_resize (GTK_WIDGET (socket));
}
}
-static void
-handle_xembed_message (GtkSocket *socket,
- glong message,
- glong detail,
- glong data1,
- glong data2,
- guint32 time)
+/**
+ * _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)
{
- switch (message)
+ if (socket->is_mapped)
{
- 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);
- break;
-
- case XEMBED_FOCUS_NEXT:
- case XEMBED_FOCUS_PREV:
- {
- GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
- if (toplevel && GTK_IS_CONTAINER (toplevel))
- {
- gtk_container_focus (GTK_CONTAINER (toplevel),
- (message == XEMBED_FOCUS_NEXT ?
- GTK_DIR_TAB_FORWARD : GTK_DIR_TAB_BACKWARD));
- }
- break;
- }
-
- case XEMBED_GRAB_KEY:
-#if 0
- add_grabbed_key (socket, data1, data2);
-#endif
- break;
- case XEMBED_UNGRAB_KEY:
-#if 0
- remove_grabbed_key (socket, data1, data2);
-#endif
- break;
-
- default:
- GTK_NOTE(PLUGSOCKET,
- g_message ("GtkSocket: Ignoring unknown _XEMBED message of type %ld", message));
- break;
+ socket->is_mapped = FALSE;
+ gtk_widget_queue_resize (GTK_WIDGET (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;
- XEvent *xevent;
-
- GdkFilterReturn return_val;
-
- socket = GTK_SOCKET (data);
- widget = GTK_WIDGET (socket);
- xevent = (XEvent *)gdk_xevent;
+ GtkBin *bin;
+ GtkWindow *window;
+ GtkContainer *container;
+ GtkWidget *toplevel;
+ GtkWidget *old_focus_child;
+ GtkWidget *parent;
- return_val = GDK_FILTER_CONTINUE;
+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
+ if (!toplevel)
+ return;
- switch (xevent->type)
+ if (!GTK_WIDGET_TOPLEVEL (toplevel) || GTK_IS_PLUG (toplevel))
{
- case CreateNotify:
- {
- XCreateWindowEvent *xcwe = &xevent->xcreatewindow;
-
- if (!socket->plug_window)
- {
- gtk_socket_add_window (socket, xcwe->window);
-
- gdk_error_trap_push ();
- gdk_window_move_resize(socket->plug_window,
- 0, 0,
- widget->allocation.width,
- widget->allocation.height);
- gdk_flush ();
- gdk_error_trap_pop ();
-
- socket->request_width = xcwe->width;
- socket->request_height = xcwe->height;
- socket->have_size = TRUE;
-
- GTK_NOTE(PLUGSOCKET,
- g_message ("GtkSocket - window created with size: %d %d",
- socket->request_width,
- socket->request_height));
- }
-
- 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);
-
- if (xcre->window == GDK_WINDOW_XWINDOW (socket->plug_window))
- {
- if (xcre->value_mask & (CWWidth | CWHeight))
- {
- socket->request_width = xcre->width;
- socket->request_height = xcre->height;
- socket->have_size = TRUE;
-
- GTK_NOTE(PLUGSOCKET,
- g_message ("GtkSocket - configure request: %d %d",
- socket->request_width,
- socket->request_height));
-
- 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;
-
- if (socket->plug_window &&
- (xdwe->window == GDK_WINDOW_XWINDOW (socket->plug_window)))
- {
- GtkWidget *toplevel;
-
- GTK_NOTE(PLUGSOCKET,
- g_message ("GtkSocket - destroy notify"));
-
- toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
- if (toplevel && GTK_IS_WINDOW (toplevel))
- gtk_window_remove_embedded_xid (GTK_WINDOW (toplevel), xdwe->window);
-
- gdk_window_destroy_notify (socket->plug_window);
- gtk_widget_destroy (widget);
-
- socket->plug_window = NULL;
-
- return_val = GDK_FILTER_REMOVE;
- }
- break;
- }
-
- case FocusIn:
- if (xevent->xfocus.mode == EMBEDDED_APP_WANTS_FOCUS)
- {
- gtk_socket_claim_focus (socket);
- }
- else if (xevent->xfocus.detail == NotifyInferior)
- {
-#if 0
- GtkWidget *toplevel;
- toplevel = gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW);
-
- if (toplevel)
- {
- XSetInputFocus (GDK_DISPLAY (),
- GDK_WINDOW_XWINDOW (toplevel->window),
- RevertToParent, CurrentTime); /* FIXME? */
- }
-#endif
- }
- 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);
-
- if (xevent->xmaprequest.window ==
- GDK_WINDOW_XWINDOW (socket->plug_window))
- {
- GTK_NOTE(PLUGSOCKET,
- g_message ("GtkSocket - Map Request"));
-
- gdk_error_trap_push ();
- gdk_window_show (socket->plug_window);
- gdk_flush ();
- gdk_error_trap_pop ();
+ container = GTK_CONTAINER (toplevel);
+ window = GTK_WINDOW (toplevel);
+ bin = GTK_BIN (toplevel);
- return_val = GDK_FILTER_REMOVE;
- }
- break;
- case PropertyNotify:
- if (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 = container->focus_child;
+
+ if (old_focus_child)
+ {
+ if (gtk_widget_child_focus (old_focus_child, direction))
+ return;
- if ((xevent->xproperty.atom == gdk_atom_intern ("XdndAware", FALSE)) ||
- (xevent->xproperty.atom == gdk_atom_intern ("_MOTIF_DRAG_RECEIVER_INFO", FALSE)))
- {
- gdk_error_trap_push ();
- if (gdk_drag_get_protocol (xevent->xproperty.window, &protocol))
- gtk_drag_dest_set_proxy (GTK_WIDGET (socket),
- socket->plug_window,
- protocol, TRUE);
- gdk_flush ();
- gdk_error_trap_pop ();
- }
- return_val = GDK_FILTER_REMOVE;
- }
- break;
- case ClientMessage:
- if (xevent->xclient.message_type == gdk_atom_intern ("_XEMBED", FALSE))
+ /* 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 (window->focus_widget)
+ {
+ /* Wrapped off the end, clear the focus setting for the toplevel */
+ parent = window->focus_widget->parent;
+ while (parent)
{
- 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;
+ 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 */
+ if (bin->child)
+ {
+ if (gtk_widget_child_focus (bin->child, direction))
+ return;
}
-
- return return_val;
}
+
+#define __GTK_SOCKET_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff