* 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 "gtkplug.h"
#include "gtkprivate.h"
-#include "gtksignal.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;
-};
+#include "gtkalias.h"
/* 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);
static void gtk_socket_realize (GtkWidget *widget);
static void gtk_socket_unrealize (GtkWidget *widget);
static void gtk_socket_size_request (GtkWidget *widget,
GtkWidget *old_toplevel);
static void gtk_socket_grab_notify (GtkWidget *widget,
gboolean was_grabbed);
-static gboolean gtk_socket_key_press_event (GtkWidget *widget,
+static gboolean gtk_socket_key_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 (GtkWidget *widget,
GtkDirectionType direction);
static void gtk_socket_remove (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,
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);
- 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);
}
-GtkType
-gtk_socket_get_type (void)
-{
- static GtkType 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)
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
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_allocate = gtk_socket_size_allocate;
widget_class->hierarchy_changed = gtk_socket_hierarchy_changed;
widget_class->grab_notify = gtk_socket_grab_notify;
- 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;
+
+ /* 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,
- GTK_TYPE_NONE, 0);
+ 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
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), "gtk-socket", socket);
+ g_object_set_data (G_OBJECT (socket->accel_group), I_("gtk-socket"), socket);
}
/**
/**
* gtk_socket_steal:
- * @socket: a #GtkSocket
+ * @socket_: a #GtkSocket
* @wid: the window ID of an existing toplevel window.
*
* Reparents a pre-existing toplevel window into a #GtkSocket. This is
* before you can make this call.
**/
void
-gtk_socket_steal (GtkSocket *socket, GdkNativeWindow wid)
+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_window (socket, wid, TRUE);
}
/**
* gtk_socket_add_id:
- * @socket: a #GtkSocket
+ * @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
* 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))
gtk_widget_realize (GTK_WIDGET (socket));
- gtk_socket_add_window (socket, window_id, TRUE);
+ _gtk_socket_add_window (socket, window_id, TRUE);
}
/**
* gtk_socket_get_id:
- * @socket: a #GtkSocket.
+ * @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
if (!GTK_WIDGET_REALIZED (socket))
gtk_widget_realize (GTK_WIDGET (socket));
- return GDK_WINDOW_XWINDOW (GTK_WIDGET (socket)->window);
+ return _gtk_socket_windowing_get_id (socket);
}
static void
GtkSocket *socket;
GdkWindowAttr attributes;
gint attributes_mask;
- XWindowAttributes xattrs;
g_return_if_fail (GTK_IS_SOCKET (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);
+ gdk_window_add_filter (widget->window,
+ _gtk_socket_windowing_filter_func,
+ widget);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
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));
+ _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 */
}
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);
+ if (GTK_WIDGET_CLASS (gtk_socket_parent_class)->unrealize)
+ (* GTK_WIDGET_CLASS (gtk_socket_parent_class)->unrealize) (widget);
}
static void
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)
{
}
else if (socket->plug_window)
{
- GtkSocketPrivate *private = gtk_socket_get_private (socket);
+ GtkSocketPrivate *private = _gtk_socket_get_private (socket);
gdk_error_trap_push ();
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;
}
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));
}
}
-typedef struct
-{
- guint accel_key;
- GdkModifierType accel_mods;
-} GrabbedKey;
-
-static void
-activate_key (GtkAccelGroup *accel_group,
- GrabbedKey *grabbed_key)
+static gboolean
+activate_key (GtkAccelGroup *accel_group,
+ GObject *acceleratable,
+ guint accel_key,
+ 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, TRUE);
+ retval = TRUE;
}
if (gdk_event)
gdk_event_free (gdk_event);
+
+ return retval;
}
static gboolean
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;
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;
accel_entry->closure);
return;
}
-
}
g_warning ("GtkSocket: request to remove non-present grabbed key %u,%#x\n",
keyval, modifiers);
}
-static gboolean
-toplevel_focus_in_handler (GtkWidget *toplevel,
- GdkEventFocus *event,
- GtkSocket *socket)
+static void
+socket_update_focus_in (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 */
+ gboolean focus_in = FALSE;
- return FALSE;
+ if (socket->plug_window)
+ {
+ GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
+
+ if (GTK_WIDGET_TOPLEVEL (toplevel) &&
+ GTK_WINDOW (toplevel)->has_toplevel_focus &&
+ gtk_widget_is_focus (GTK_WIDGET (socket)))
+ focus_in = TRUE;
+ }
+
+ if (focus_in != socket->focus_in)
+ {
+ socket->focus_in = focus_in;
+
+ _gtk_socket_windowing_focus_change (socket, focus_in);
+ }
}
-static gboolean
-toplevel_focus_out_handler (GtkWidget *toplevel,
- GdkEventFocus *event,
- GtkSocket *socket)
+static void
+socket_update_active (GtkSocket *socket)
{
- send_xembed_message (socket, XEMBED_WINDOW_DEACTIVATE, 0, 0, 0,
- gtk_get_current_event_time ()); /* Will be GDK_CURRENT_TIME */
+ gboolean active = FALSE;
- return FALSE;
+ if (socket->plug_window)
+ {
+ GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
+
+ if (GTK_WIDGET_TOPLEVEL (toplevel) &&
+ GTK_WINDOW (toplevel)->is_active)
+ active = TRUE;
+ }
+
+ if (active != socket->active)
+ {
+ socket->active = active;
+
+ _gtk_socket_windowing_update_active (socket, active);
+ }
}
static void
if (socket->toplevel)
{
gtk_window_remove_accel_group (GTK_WINDOW (socket->toplevel), socket->accel_group);
- 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);
+ 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)
{
gtk_window_add_accel_group (GTK_WINDOW (socket->toplevel), socket->accel_group);
- 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);
+ 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);
}
}
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
-gtk_socket_key_press_event (GtkWidget *widget,
- GdkEventKey *event)
+gtk_socket_key_event (GtkWidget *widget,
+ GdkEventKey *event)
{
GtkSocket *socket = GTK_SOCKET (widget);
if (GTK_WIDGET_HAS_FOCUS (socket) && socket->plug_window && !socket->plug_widget)
{
- GdkScreen *screen = gdk_drawable_get_screen (socket->plug_window);
- XEvent xevent;
-
- 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.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
return FALSE;
}
-static gboolean
-gtk_socket_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
-{
- GtkSocket *socket = GTK_SOCKET (widget);
-
- 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);
- 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);
}
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);
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_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
- gtk_widget_grab_focus (widget);
+ _gtk_socket_windowing_focus (socket, direction);
+ _gtk_socket_claim_focus (socket, FALSE);
return TRUE;
}
(* 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);
gpointer user_data = NULL;
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 ();
{
GtkWidget *toplevel;
GdkDragProtocol protocol;
- unsigned long version;
- unsigned long flags;
gdk_error_trap_push ();
}
}
- 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 ())
{
- gdk_window_unref (socket->plug_window);
+ g_object_unref (socket->plug_window);
socket->plug_window = NULL;
return;
}
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 = need_reparent ? TRUE : FALSE;
- }
-
+ _gtk_socket_windowing_embed_get_info (socket);
+
socket->need_map = socket->is_mapped;
if (gdk_drag_get_protocol_for_display (display, xid, &protocol))
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 */
if (toplevel && GTK_IS_WINDOW (toplevel))
gtk_window_add_embedded_xid (GTK_WINDOW (toplevel), xid);
- gtk_widget_queue_resize (GTK_WIDGET (socket));
- }
+ _gtk_socket_windowing_embed_notify (socket);
- if (socket->plug_window)
- g_signal_emit (G_OBJECT (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;
+ socket_update_active (socket);
+ socket_update_focus_in (socket);
- 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;
+ gtk_widget_queue_resize (GTK_WIDGET (socket));
}
-
- 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)
-{
- 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);
- 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;
- }
+ if (socket->plug_window)
+ g_signal_emit (socket, socket_signals[PLUG_ADDED], 0);
}
-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)
{
}
}
-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)
{
}
}
-static GdkFilterReturn
-gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
-{
- GtkSocket *socket;
- GtkWidget *widget;
- GdkDisplay *display;
- XEvent *xevent;
-
- GdkFilterReturn return_val;
-
- socket = GTK_SOCKET (data);
- widget = GTK_WIDGET (socket);
- xevent = (XEvent *)gdk_xevent;
- display = gdk_drawable_get_display (event->any.window);
-
- return_val = GDK_FILTER_CONTINUE;
-
- if (socket->plug_widget)
- return return_val;
-
- switch (xevent->type)
+/**
+ * _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)
+{
+ GtkBin *bin;
+ GtkWindow *window;
+ GtkContainer *container;
+ GtkWidget *toplevel;
+ GtkWidget *old_focus_child;
+ GtkWidget *parent;
+
+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
+ if (!toplevel)
+ return;
+
+ if (!GTK_WIDGET_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 (G_OBJECT (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);
- }
- 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 = container->focus_child;
+
+ 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 */
+ 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