* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.Free
*/
/* By Owen Taylor <otaylor@gtk.org> 98/4/4 */
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include "config.h"
+
+#include "gtksocketprivate.h"
+
#include <string.h>
-#include "gdk/gdkkeysyms.h"
-#include "gtkmain.h"
#include "gtkmarshalers.h"
-#include "gtkwindow.h"
+#include "gtksizerequest.h"
#include "gtkplug.h"
#include "gtkprivate.h"
-#include "gtksocket.h"
#include "gtkdnd.h"
+#include "gtkdebug.h"
+#include "gtkintl.h"
+#include "gtkmain.h"
+#include "gtkwidgetprivate.h"
-#include "x11/gdkx.h"
+#include <gdk/gdkx.h>
+#include <gdk/gdkprivate.h>
+
+#ifdef HAVE_XFIXES
+#include <X11/extensions/Xfixes.h>
+#endif
#include "gtkxembed.h"
-typedef struct _GtkSocketPrivate GtkSocketPrivate;
-struct _GtkSocketPrivate
-{
- gint resize_count;
-};
+/**
+ * SECTION:gtksocket
+ * @Short_description: Container for widgets from other processes
+ * @Title: GtkSocket
+ * @include: gtk/gtkx.h
+ * @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.
+ *
+ * <note>
+ * The #GtkPlug and #GtkSocket widgets are only available when GTK+
+ * is compiled for the X11 platform and %GDK_WINDOWING_X11 is defined.
+ * They can only be used on a #GdkX11Display. To use #GtkPlug and
+ * #GtkSocket, you need to include the <filename>gtk/gtkx.h</filename>
+ * header.
+ * </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);
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_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
+static void gtk_socket_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural);
static void gtk_socket_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_socket_hierarchy_changed (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,
gboolean include_internals,
GtkCallback callback,
gpointer callback_data);
+static void gtk_socket_add_window (GtkSocket *socket,
+ Window xid,
+ gboolean need_reparent);
+static GdkFilterReturn gtk_socket_filter_func (GdkXEvent *gdk_xevent,
+ GdkEvent *event,
+ gpointer 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 gboolean xembed_get_info (GdkWindow *gdk_window,
- unsigned long *version,
- unsigned long *flags);
+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;
-
-GtkSocketPrivate *
-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;
-}
-
-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)
{
GtkSocket *socket = GTK_SOCKET (object);
-
- g_object_unref (socket->accel_group);
- socket->accel_group = NULL;
+ GtkSocketPrivate *priv = socket->priv;
+
+ g_object_unref (priv->accel_group);
- 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 = g_type_class_peek_parent (class);
-
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->get_preferred_width = gtk_socket_get_preferred_width;
+ widget_class->get_preferred_height = gtk_socket_get_preferred_height;
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_event;
widget_class->key_release_event = gtk_socket_key_event;
widget_class->focus = gtk_socket_focus;
-
+
+ /* We don't want to show_all the in-process plug, if any.
+ */
+ widget_class->show_all = gtk_widget_show;
+
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
gtk_socket_init (GtkSocket *socket)
{
- socket->request_width = 0;
- socket->request_height = 0;
- socket->current_width = 0;
- socket->current_height = 0;
-
- socket->plug_window = NULL;
- 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), "gtk-socket", socket);
+ GtkSocketPrivate *priv;
+
+ priv = G_TYPE_INSTANCE_GET_PRIVATE (socket,
+ GTK_TYPE_SOCKET,
+ GtkSocketPrivate);
+ socket->priv = priv;
+ priv->request_width = 0;
+ priv->request_height = 0;
+ priv->current_width = 0;
+ priv->current_height = 0;
+
+ priv->plug_window = NULL;
+ priv->plug_widget = NULL;
+ priv->focus_in = FALSE;
+ priv->have_size = FALSE;
+ priv->need_map = FALSE;
+ priv->active = FALSE;
+
+ priv->accel_group = gtk_accel_group_new ();
+ g_object_set_data (G_OBJECT (priv->accel_group), I_("gtk-socket"), socket);
}
/**
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
- * @window_id: the window ID of a client participating in the XEMBED protocol.
+ * @window: the Window 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.
* before you can make this call.
**/
void
-gtk_socket_add_id (GtkSocket *socket, GdkNativeWindow window_id)
+gtk_socket_add_id (GtkSocket *socket,
+ Window window)
{
g_return_if_fail (GTK_IS_SOCKET (socket));
- g_return_if_fail (GTK_WIDGET_ANCHORED (socket));
+ g_return_if_fail (_gtk_widget_get_anchored (GTK_WIDGET (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, TRUE);
}
/**
*
* Return value: the window ID for the socket
**/
-GdkNativeWindow
+Window
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);
+ g_return_val_if_fail (_gtk_widget_get_anchored (GTK_WIDGET (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 GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (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: (transfer none): 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->priv->plug_window;
}
static void
gtk_socket_realize (GtkWidget *widget)
{
- GtkSocket *socket;
+ GtkAllocation allocation;
+ GdkWindow *window;
GdkWindowAttr attributes;
- gint attributes_mask;
XWindowAttributes xattrs;
+ gint attributes_mask;
- g_return_if_fail (GTK_IS_SOCKET (widget));
+ gtk_widget_set_realized (widget, TRUE);
- socket = GTK_SOCKET (widget);
- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+ gtk_widget_get_allocation (widget, &allocation);
attributes.window_type = GDK_WINDOW_CHILD;
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
+ attributes.x = allocation.x;
+ attributes.y = allocation.y;
+ attributes.width = allocation.width;
+ attributes.height = allocation.height;
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (widget);
attributes.event_mask = GDK_FOCUS_CHANGE_MASK;
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
- widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
- &attributes, attributes_mask);
- gdk_window_set_user_data (widget->window, socket);
+ window = gdk_window_new (gtk_widget_get_parent_window (widget),
+ &attributes, attributes_mask);
+ gtk_widget_set_window (widget, window);
+ gtk_widget_register_window (widget, window);
- widget->style = gtk_style_attach (widget->style, widget->window);
- gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+ gtk_style_context_set_background (gtk_widget_get_style_context (widget),
+ window);
- XGetWindowAttributes (GDK_WINDOW_XDISPLAY (widget->window),
- GDK_WINDOW_XWINDOW (widget->window),
+ XGetWindowAttributes (GDK_WINDOW_XDISPLAY (window),
+ GDK_WINDOW_XID (window),
&xattrs);
- XSelectInput (GDK_WINDOW_XDISPLAY (widget->window),
- GDK_WINDOW_XWINDOW (widget->window),
- xattrs.your_event_mask |
+ /* Sooooo, it turns out that mozilla, as per the gtk2xt code selects
+ for input on the socket with a mask of 0x0fffff (for god knows why)
+ which includes ButtonPressMask causing a BadAccess if someone else
+ also selects for this. As per the client-side windows merge we always
+ normally selects for button press so we can emulate it on client
+ side children that selects for button press. However, we don't need
+ this for GtkSocket, so we unselect it here, fixing the crashes in
+ firefox. */
+ XSelectInput (GDK_WINDOW_XDISPLAY (window),
+ GDK_WINDOW_XID (window),
+ (xattrs.your_event_mask & ~ButtonPressMask) |
SubstructureNotifyMask | SubstructureRedirectMask);
- gdk_window_add_filter (widget->window, gtk_socket_filter_func, widget);
-
- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+ gdk_window_add_filter (window,
+ gtk_socket_filter_func,
+ widget);
/* We sync here so that we make sure that if the XID for
* our window is passed to another application, SubstructureRedirectMask
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.
+ */
static 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_window_remove_embedded_xid (GTK_WINDOW (toplevel),
- GDK_WINDOW_XWINDOW (socket->plug_window));
+ GtkSocketPrivate *private = socket->priv;
- g_object_unref (socket->plug_window);
- socket->plug_window = NULL;
+ g_object_unref (private->plug_window);
+ private->plug_window = NULL;
+ private->current_width = 0;
+ private->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 (private->accel_group, NULL);
}
static void
gtk_socket_unrealize (GtkWidget *widget)
{
GtkSocket *socket = GTK_SOCKET (widget);
+ GtkSocketPrivate *private = socket->priv;
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_REALIZED);
+ gtk_widget_set_realized (widget, FALSE);
- if (socket->plug_widget)
+ if (private->plug_widget)
{
- _gtk_plug_remove_from_socket (GTK_PLUG (socket->plug_widget), socket);
+ _gtk_plug_remove_from_socket (GTK_PLUG (private->plug_widget), socket);
}
- else if (socket->plug_window)
+ else if (private->plug_window)
{
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
+gtk_socket_size_request (GtkSocket *socket)
+{
+ GtkSocketPrivate *private = socket->priv;
+ XSizeHints hints;
+ long supplied;
+
+ gdk_error_trap_push ();
+
+ private->request_width = 1;
+ private->request_height = 1;
+
+ if (XGetWMNormalHints (GDK_WINDOW_XDISPLAY (private->plug_window),
+ GDK_WINDOW_XID (private->plug_window),
+ &hints, &supplied))
+ {
+ if (hints.flags & PMinSize)
+ {
+ private->request_width = MAX (hints.min_width, 1);
+ private->request_height = MAX (hints.min_height, 1);
+ }
+ else if (hints.flags & PBaseSize)
+ {
+ private->request_width = MAX (hints.base_width, 1);
+ private->request_height = MAX (hints.base_height, 1);
+ }
+ }
+ private->have_size = TRUE;
-static void
-gtk_socket_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
+ gdk_error_trap_pop_ignored ();
+}
+
+static void
+gtk_socket_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
{
GtkSocket *socket = GTK_SOCKET (widget);
+ GtkSocketPrivate *private = socket->priv;
- if (socket->plug_widget)
+ if (private->plug_widget)
{
- gtk_widget_size_request (socket->plug_widget, requisition);
+ gtk_widget_get_preferred_width (private->plug_widget, minimum, natural);
}
else
{
- if (socket->is_mapped && !socket->have_size && socket->plug_window)
- {
- XSizeHints hints;
- long supplied;
-
- gdk_error_trap_push ();
+ if (private->is_mapped && !private->have_size && private->plug_window)
+ gtk_socket_size_request (socket);
- 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 ();
- }
+ if (private->is_mapped && private->have_size)
+ *minimum = *natural = MAX (private->request_width, 1);
+ else
+ *minimum = *natural = 1;
+ }
+}
- if (socket->is_mapped && socket->have_size)
- {
- requisition->width = MAX (socket->request_width, 1);
- requisition->height = MAX (socket->request_height, 1);
- }
+static void
+gtk_socket_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+{
+ GtkSocket *socket = GTK_SOCKET (widget);
+ GtkSocketPrivate *private = socket->priv;
+
+ if (private->plug_widget)
+ {
+ gtk_widget_get_preferred_height (private->plug_widget, minimum, natural);
+ }
+ else
+ {
+ if (private->is_mapped && !private->have_size && private->plug_window)
+ gtk_socket_size_request (socket);
+
+ if (private->is_mapped && private->have_size)
+ *minimum = *natural = MAX (private->request_height, 1);
else
- {
- requisition->width = 1;
- requisition->height = 1;
- }
+ *minimum = *natural = 1;
}
}
static void
-gtk_socket_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
+gtk_socket_send_configure_event (GtkSocket *socket)
{
- GtkSocket *socket;
+ GtkAllocation allocation;
+ XConfigureEvent xconfigure;
+ gint x, y;
+
+ g_return_if_fail (socket->priv->plug_window != NULL);
- g_return_if_fail (GTK_IS_SOCKET (widget));
- g_return_if_fail (allocation != NULL);
+ memset (&xconfigure, 0, sizeof (xconfigure));
+ xconfigure.type = ConfigureNotify;
- socket = GTK_SOCKET (widget);
+ xconfigure.event = GDK_WINDOW_XID (socket->priv->plug_window);
+ xconfigure.window = GDK_WINDOW_XID (socket->priv->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->priv->plug_window, &x, &y);
+ gdk_error_trap_pop_ignored ();
- widget->allocation = *allocation;
- if (GTK_WIDGET_REALIZED (widget))
+ gtk_widget_get_allocation (GTK_WIDGET(socket), &allocation);
+ xconfigure.x = x;
+ xconfigure.y = y;
+ xconfigure.width = allocation.width;
+ xconfigure.height = allocation.height;
+
+ xconfigure.border_width = 0;
+ xconfigure.above = None;
+ xconfigure.override_redirect = False;
+
+ gdk_error_trap_push ();
+ XSendEvent (GDK_WINDOW_XDISPLAY (socket->priv->plug_window),
+ GDK_WINDOW_XID (socket->priv->plug_window),
+ False, NoEventMask, (XEvent *)&xconfigure);
+ gdk_error_trap_pop_ignored ();
+}
+
+static void
+gtk_socket_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
+{
+ GtkSocket *socket = GTK_SOCKET (widget);
+ GtkSocketPrivate *private = socket->priv;
+
+ gtk_widget_set_allocation (widget, allocation);
+ if (gtk_widget_get_realized (widget))
{
- gdk_window_move_resize (widget->window,
+ gdk_window_move_resize (gtk_widget_get_window (widget),
allocation->x, allocation->y,
allocation->width, allocation->height);
- if (socket->plug_widget)
+ if (private->plug_widget)
{
GtkAllocation child_allocation;
child_allocation.width = allocation->width;
child_allocation.height = allocation->height;
- gtk_widget_size_allocate (socket->plug_widget, &child_allocation);
+ gtk_widget_size_allocate (private->plug_widget, &child_allocation);
}
- else if (socket->plug_window)
+ else if (private->plug_window)
{
- GtkSocketPrivate *private = gtk_socket_get_private (socket);
-
gdk_error_trap_push ();
-
- if (allocation->width != socket->current_width ||
- allocation->height != socket->current_height)
+
+ if (allocation->width != private->current_width ||
+ allocation->height != private->current_height)
{
- gdk_window_move_resize (socket->plug_window,
+ gdk_window_move_resize (private->plug_window,
0, 0,
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;
+ GTK_NOTE (PLUGSOCKET,
+ g_message ("GtkSocket - allocated: %d %d",
+ allocation->width, allocation->height));
+ private->current_width = allocation->width;
+ private->current_height = allocation->height;
}
- if (socket->need_map)
+ if (private->need_map)
{
- gdk_window_show (socket->plug_window);
- socket->need_map = FALSE;
+ gdk_window_show (private->plug_window);
+ private->need_map = FALSE;
}
while (private->resize_count)
{
gtk_socket_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));
- gdk_error_trap_pop ();
+
+ gdk_error_trap_pop_ignored ();
}
}
}
-typedef struct
+static void
+gtk_socket_send_key_event (GtkSocket *socket,
+ GdkEvent *gdk_event,
+ gboolean mask_key_presses)
{
- guint accel_key;
- GdkModifierType accel_mods;
-} GrabbedKey;
+ XKeyEvent xkey;
+ GdkScreen *screen = gdk_window_get_screen (socket->priv->plug_window);
+
+ memset (&xkey, 0, sizeof (xkey));
+ xkey.type = (gdk_event->type == GDK_KEY_PRESS) ? KeyPress : KeyRelease;
+ xkey.window = GDK_WINDOW_XID (socket->priv->plug_window);
+ xkey.root = GDK_WINDOW_XID (gdk_screen_get_root_window (screen));
+ xkey.subwindow = None;
+ xkey.time = gdk_event->key.time;
+ xkey.x = 0;
+ xkey.y = 0;
+ xkey.x_root = 0;
+ xkey.y_root = 0;
+ xkey.state = gdk_event->key.state;
+ xkey.keycode = gdk_event->key.hardware_keycode;
+ xkey.same_screen = True;/* FIXME ? */
+
+ gdk_error_trap_push ();
+ XSendEvent (GDK_WINDOW_XDISPLAY (socket->priv->plug_window),
+ GDK_WINDOW_XID (socket->priv->plug_window),
+ False,
+ (mask_key_presses ? KeyPressMask : NoEventMask),
+ (XEvent *)&xkey);
+ gdk_error_trap_pop_ignored ();
+}
static gboolean
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)
+ if (gdk_event && gdk_event->type == GDK_KEY_PRESS && socket->priv->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_send_key_event (socket, gdk_event, FALSE);
retval = TRUE;
}
key->accel_mods == grabbed_key->accel_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.
+ */
static void
-add_grabbed_key (GtkSocket *socket,
- guint keyval,
- GdkModifierType modifiers)
+gtk_socket_add_grabbed_key (GtkSocket *socket,
+ guint keyval,
+ GdkModifierType modifiers)
{
GClosure *closure;
GrabbedKey *grabbed_key;
grabbed_key->accel_key = keyval;
grabbed_key->accel_mods = modifiers;
- if (gtk_accel_group_find (socket->accel_group,
+ if (gtk_accel_group_find (socket->priv->accel_group,
find_accel_key,
&grabbed_key))
{
closure = g_cclosure_new (G_CALLBACK (activate_key), grabbed_key, (GClosureNotify)g_free);
- gtk_accel_group_connect (socket->accel_group, keyval, modifiers, GTK_ACCEL_LOCKED,
+ gtk_accel_group_connect (socket->priv->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.
+ */
static void
-remove_grabbed_key (GtkSocket *socket,
- guint keyval,
- GdkModifierType modifiers)
+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->priv->accel_group, keyval, modifiers))
+ g_warning ("GtkSocket: request to remove non-present grabbed key %u,%#x\n",
+ keyval, modifiers);
}
static void
socket_update_focus_in (GtkSocket *socket)
{
+ GtkSocketPrivate *private = socket->priv;
gboolean focus_in = FALSE;
- if (socket->plug_window)
+ if (private->plug_window)
{
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
- if (GTK_WIDGET_TOPLEVEL (toplevel) &&
- GTK_WINDOW (toplevel)->has_toplevel_focus &&
+
+ if (gtk_widget_is_toplevel (toplevel) &&
+ gtk_window_has_toplevel_focus (GTK_WINDOW (toplevel)) &&
gtk_widget_is_focus (GTK_WIDGET (socket)))
focus_in = TRUE;
}
- if (focus_in != socket->focus_in)
+ if (focus_in != private->focus_in)
{
- socket->focus_in = focus_in;
+ private->focus_in = focus_in;
if (focus_in)
- _gtk_xembed_send_focus_message (socket->plug_window,
- XEMBED_FOCUS_IN, XEMBED_FOCUS_CURRENT);
+ _gtk_xembed_send_focus_message (private->plug_window,
+ XEMBED_FOCUS_IN, XEMBED_FOCUS_CURRENT);
else
- _gtk_xembed_send_message (socket->plug_window,
- XEMBED_FOCUS_OUT, 0, 0, 0);
+ _gtk_xembed_send_message (private->plug_window,
+ XEMBED_FOCUS_OUT, 0, 0, 0);
}
}
static void
socket_update_active (GtkSocket *socket)
{
+ GtkSocketPrivate *private = socket->priv;
gboolean active = FALSE;
- if (socket->plug_window)
+ if (private->plug_window)
{
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
- if (GTK_WIDGET_TOPLEVEL (toplevel) &&
- GTK_WINDOW (toplevel)->is_active)
+
+ if (gtk_widget_is_toplevel (toplevel) &&
+ gtk_window_is_active (GTK_WINDOW (toplevel)))
active = TRUE;
}
- if (active != socket->active)
+ if (active != private->active)
{
- socket->active = active;
+ private->active = active;
- _gtk_xembed_send_message (socket->plug_window,
- active ? XEMBED_WINDOW_ACTIVATE : XEMBED_WINDOW_DEACTIVATE,
- 0, 0, 0);
+ _gtk_xembed_send_message (private->plug_window,
+ active ? XEMBED_WINDOW_ACTIVATE : XEMBED_WINDOW_DEACTIVATE,
+ 0, 0, 0);
}
}
GtkWidget *old_toplevel)
{
GtkSocket *socket = GTK_SOCKET (widget);
+ GtkSocketPrivate *private = socket->priv;
GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
if (toplevel && !GTK_IS_WINDOW (toplevel))
toplevel = NULL;
- if (toplevel != socket->toplevel)
+ if (toplevel != private->toplevel)
{
- if (socket->toplevel)
+ if (private->toplevel)
{
- gtk_window_remove_accel_group (GTK_WINDOW (socket->toplevel), socket->accel_group);
- g_signal_handlers_disconnect_by_func (socket->toplevel,
+ gtk_window_remove_accel_group (GTK_WINDOW (private->toplevel), private->accel_group);
+ g_signal_handlers_disconnect_by_func (private->toplevel,
socket_update_focus_in,
socket);
- g_signal_handlers_disconnect_by_func (socket->toplevel,
+ g_signal_handlers_disconnect_by_func (private->toplevel,
socket_update_active,
socket);
}
- socket->toplevel = toplevel;
+ private->toplevel = toplevel;
if (toplevel)
{
- gtk_window_add_accel_group (GTK_WINDOW (socket->toplevel), socket->accel_group);
- g_signal_connect_swapped (socket->toplevel, "notify::has-toplevel-focus",
+ gtk_window_add_accel_group (GTK_WINDOW (private->toplevel), private->accel_group);
+ g_signal_connect_swapped (private->toplevel, "notify::has-toplevel-focus",
G_CALLBACK (socket_update_focus_in), socket);
- g_signal_connect_swapped (socket->toplevel, "notify::is-active",
+ g_signal_connect_swapped (private->toplevel, "notify::is-active",
G_CALLBACK (socket_update_active), socket);
}
{
GtkSocket *socket = GTK_SOCKET (widget);
- if (!socket->same_app)
- _gtk_xembed_send_message (GTK_SOCKET (widget)->plug_window,
- was_grabbed ? XEMBED_MODALITY_OFF : XEMBED_MODALITY_ON,
- 0, 0, 0);
+ if (!socket->priv->same_app)
+ _gtk_xembed_send_message (socket->priv->plug_window,
+ was_grabbed ? XEMBED_MODALITY_OFF : XEMBED_MODALITY_ON,
+ 0, 0, 0);
}
static gboolean
GdkEventKey *event)
{
GtkSocket *socket = GTK_SOCKET (widget);
+ GtkSocketPrivate *private = socket->priv;
- if (GTK_WIDGET_HAS_FOCUS (socket) && socket->plug_window && !socket->plug_widget)
+ if (gtk_widget_has_focus (widget) && private->plug_window && !private->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_send_key_event (socket, (GdkEvent *) event, FALSE);
+
return TRUE;
}
else
gtk_socket_notify (GObject *object,
GParamSpec *pspec)
{
- if (!strcmp (pspec->name, "is_focus"))
- return;
+ if (strcmp (pspec->name, "is-focus") == 0)
+ socket_update_focus_in (GTK_SOCKET (object));
- socket_update_focus_in (GTK_SOCKET (object));
+ if (G_OBJECT_CLASS (gtk_socket_parent_class)->notify)
+ G_OBJECT_CLASS (gtk_socket_parent_class)->notify (object, pspec);
}
+/**
+ * gtk_socket_claim_focus:
+ * @socket: a #GtkSocket
+ * @send_event: huh?
+ *
+ * Claims focus for the socket. XXX send_event?
+ */
static void
gtk_socket_claim_focus (GtkSocket *socket,
gboolean send_event)
{
+ GtkWidget *widget = GTK_WIDGET (socket);
+ GtkSocketPrivate *private = socket->priv;
+
if (!send_event)
- socket->focus_in = TRUE; /* Otherwise, our notify handler will send FOCUS_IN */
+ private->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);
+ GtkSocketPrivate *private = socket->priv;
- if (socket->plug_widget)
- return gtk_widget_child_focus (socket->plug_widget, direction);
+ if (private->plug_widget)
+ return gtk_widget_child_focus (private->plug_widget, direction);
- if (!GTK_WIDGET_HAS_FOCUS (widget))
+ if (!gtk_widget_is_focus (widget))
{
+ gint detail = -1;
+
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;
- }
+ {
+ 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;
+ }
- _gtk_xembed_send_focus_message (socket->plug_window,
- XEMBED_FOCUS_IN, detail);
-
+ _gtk_xembed_send_focus_message (private->plug_window, XEMBED_FOCUS_IN, detail);
gtk_socket_claim_focus (socket, FALSE);
return TRUE;
GtkWidget *child)
{
GtkSocket *socket = GTK_SOCKET (container);
+ GtkSocketPrivate *private = socket->priv;
- g_return_if_fail (child == socket->plug_widget);
+ g_return_if_fail (child == private->plug_widget);
- _gtk_plug_remove_from_socket (GTK_PLUG (socket->plug_widget), socket);
+ _gtk_plug_remove_from_socket (GTK_PLUG (private->plug_widget), socket);
}
static void
gpointer callback_data)
{
GtkSocket *socket = GTK_SOCKET (container);
+ GtkSocketPrivate *private = socket->priv;
- if (socket->plug_widget)
- (* 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 ();
+ if (private->plug_widget)
+ (* callback) (private->plug_widget, callback_data);
}
+/**
+ * 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.
+ */
static void
-gtk_socket_add_window (GtkSocket *socket,
- GdkNativeWindow xid,
- gboolean need_reparent)
+gtk_socket_add_window (GtkSocket *socket,
+ Window 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);
+ GtkSocketPrivate *private = socket->priv;
+ unsigned long version;
+ unsigned long flags;
- if (socket->plug_window)
+ if (GDK_IS_X11_DISPLAY (display))
+ private->plug_window = gdk_x11_window_lookup_for_display (display, xid);
+ else
+ private->plug_window = NULL;
+
+ if (private->plug_window)
{
- g_object_ref (socket->plug_window);
- gdk_window_get_user_data (socket->plug_window, &user_data);
+ g_object_ref (private->plug_window);
+ gdk_window_get_user_data (private->plug_window, &user_data);
}
- if (user_data) /* A widget's window in this process */
+ if (user_data) /* A widget's window in this process */
{
GtkWidget *child_widget = user_data;
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;
- }
+ {
+ g_warning (G_STRLOC ": Can't add non-GtkPlug to GtkSocket");
+ private->plug_window = NULL;
+ gdk_error_trap_pop_ignored ();
+
+ return;
+ }
_gtk_plug_add_to_socket (GTK_PLUG (child_widget), socket);
}
- else /* A foreign window */
+ else /* A foreign window */
{
- GtkWidget *toplevel;
GdkDragProtocol protocol;
- unsigned long version;
- unsigned long flags;
gdk_error_trap_push ();
- 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;
- }
- }
-
- XSelectInput (GDK_DISPLAY_XDISPLAY (display),
- GDK_WINDOW_XWINDOW (socket->plug_window),
- StructureNotifyMask | PropertyChangeMask);
-
+ if (!private->plug_window)
+ {
+ if (GDK_IS_X11_DISPLAY (display))
+ private->plug_window = gdk_x11_window_foreign_new_for_display (display, xid);
+ if (!private->plug_window) /* was deleted before we could get it */
+ {
+ gdk_error_trap_pop_ignored ();
+ return;
+ }
+ }
+
+ XSelectInput (GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (socket))),
+ GDK_WINDOW_XID (private->plug_window),
+ StructureNotifyMask | PropertyChangeMask);
+
if (gdk_error_trap_pop ())
{
- g_object_unref (socket->plug_window);
- socket->plug_window = NULL;
+ g_object_unref (private->plug_window);
+ private->plug_window = NULL;
return;
}
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);
+ gdk_window_hide (private->plug_window); /* Shouldn't actually be necessary for XEMBED, but just in case */
+ gdk_window_reparent (private->plug_window,
+ gtk_widget_get_window (widget),
+ 0, 0);
}
- socket->have_size = FALSE;
+ private->have_size = FALSE;
- socket->xembed_version = -1;
- if (xembed_get_info (socket->plug_window, &version, &flags))
- {
- socket->xembed_version = MIN (GTK_XEMBED_PROTOCOL_VERSION, version);
- socket->is_mapped = (flags & XEMBED_MAPPED) != 0;
- }
+ private->xembed_version = -1;
+ if (xembed_get_info (private->plug_window, &version, &flags))
+ {
+ private->xembed_version = MIN (GTK_XEMBED_PROTOCOL_VERSION, version);
+ private->is_mapped = (flags & XEMBED_MAPPED) != 0;
+ }
else
- {
- /* FIXME, we should probably actually check the state before we started */
-
- socket->is_mapped = TRUE;
- }
-
- socket->need_map = socket->is_mapped;
+ {
+ /* FIXME, we should probably actually check the state before we started */
+ private->is_mapped = TRUE;
+ }
- if (gdk_drag_get_protocol_for_display (display, xid, &protocol))
- gtk_drag_dest_set_proxy (GTK_WIDGET (socket), socket->plug_window,
- protocol, TRUE);
+ private->need_map = private->is_mapped;
- gdk_display_sync (display);
- gdk_error_trap_pop ();
+ protocol = gdk_window_get_drag_protocol (private->plug_window, NULL);
+ if (protocol)
+ gtk_drag_dest_set_proxy (GTK_WIDGET (socket), private->plug_window,
+ protocol, TRUE);
- gdk_window_add_filter (socket->plug_window,
- gtk_socket_filter_func, socket);
+ gdk_error_trap_pop_ignored ();
- /* Add a pointer to the socket on our toplevel window */
+ gdk_window_add_filter (private->plug_window,
+ gtk_socket_filter_func,
+ socket);
- toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
- if (toplevel && GTK_IS_WINDOW (toplevel))
- gtk_window_add_embedded_xid (GTK_WINDOW (toplevel), xid);
+#ifdef HAVE_XFIXES
+ gdk_error_trap_push ();
+ XFixesChangeSaveSet (GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (socket))),
+ GDK_WINDOW_XID (private->plug_window),
+ SetModeInsert, SaveSetRoot, SaveSetUnmap);
+ gdk_error_trap_pop_ignored ();
+#endif
+ _gtk_xembed_send_message (private->plug_window,
+ XEMBED_EMBEDDED_NOTIFY, 0,
+ GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (socket))),
+ private->xembed_version);
- _gtk_xembed_send_message (socket->plug_window,
- XEMBED_EMBEDDED_NOTIFY, 0,
- GDK_WINDOW_XWINDOW (widget->window),
- socket->xembed_version);
socket_update_active (socket);
socket_update_focus_in (socket);
gtk_widget_queue_resize (GTK_WIDGET (socket));
}
- if (socket->plug_window)
+ if (private->plug_window)
g_signal_emit (socket, socket_signals[PLUG_ADDED], 0);
}
-static gboolean
-xembed_get_info (GdkWindow *window,
- unsigned long *version,
- unsigned long *flags)
+/**
+ * gtk_socket_handle_map_request:
+ * @socket: a #GtkSocket
+ *
+ * Called from the GtkSocket backend when the plug has been mapped.
+ */
+static void
+gtk_socket_handle_map_request (GtkSocket *socket)
{
- 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)
+ GtkSocketPrivate *private = socket->priv;
+ if (!private->is_mapped)
{
- g_warning ("_XEMBED_INFO property has wrong type\n");
- return FALSE;
+ private->is_mapped = TRUE;
+ private->need_map = TRUE;
+
+ gtk_widget_queue_resize (GTK_WIDGET (socket));
}
-
- if (nitems < 2)
+}
+
+/**
+ * gtk_socket_unmap_notify:
+ * @socket: a #GtkSocket
+ *
+ * Called from the GtkSocket backend when the plug has been unmapped ???
+ */
+static void
+gtk_socket_unmap_notify (GtkSocket *socket)
+{
+ GtkSocketPrivate *private = socket->priv;
+ if (private->is_mapped)
{
- g_warning ("_XEMBED_INFO too short\n");
- XFree (data);
- return FALSE;
+ private->is_mapped = 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;
}
+/**
+ * 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.
+ */
static void
-advance_toplevel_focus (GtkSocket *socket,
- GtkDirectionType direction)
+gtk_socket_advance_toplevel_focus (GtkSocket *socket,
+ GtkDirectionType direction)
{
GtkBin *bin;
GtkWindow *window;
GtkContainer *container;
+ GtkWidget *child;
+ GtkWidget *focus_widget;
GtkWidget *toplevel;
GtkWidget *old_focus_child;
GtkWidget *parent;
if (!toplevel)
return;
- if (!GTK_WIDGET_TOPLEVEL (toplevel) || GTK_IS_PLUG (toplevel))
+ if (!gtk_widget_is_toplevel (toplevel) || GTK_IS_PLUG (toplevel))
{
gtk_widget_child_focus (toplevel,direction);
return;
/* This is a copy of gtk_window_focus(), modified so that we
* can detect wrap-around.
*/
- old_focus_child = container->focus_child;
+ old_focus_child = gtk_container_get_focus_child (container);
if (old_focus_child)
{
_gtk_xembed_set_focus_wrapped ();
}
- if (window->focus_widget)
+ focus_widget = gtk_window_get_focus (window);
+ if (window)
{
/* Wrapped off the end, clear the focus setting for the toplevel */
- parent = window->focus_widget->parent;
+ parent = gtk_widget_get_parent (focus_widget);
while (parent)
{
gtk_container_set_focus_child (GTK_CONTAINER (parent), NULL);
- parent = GTK_WIDGET (parent)->parent;
+ parent = gtk_widget_get_parent (parent);
}
gtk_window_set_focus (GTK_WINDOW (container), NULL);
}
/* Now try to focus the first widget in the window */
- if (bin->child)
+ child = gtk_bin_get_child (bin);
+ if (child)
{
- if (gtk_widget_child_focus (bin->child, direction))
+ if (gtk_widget_child_focus (child, direction))
return;
}
}
+static gboolean
+xembed_get_info (GdkWindow *window,
+ unsigned long *version,
+ unsigned long *flags)
+{
+ GdkDisplay *display = gdk_window_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_XID (window),
+ xembed_info_atom,
+ 0, 2, False,
+ xembed_info_atom, &type, &format,
+ &nitems, &bytes_after, &data);
+ gdk_error_trap_pop_ignored ();
+
+ 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,
XEmbedMessageType message,
guint32 time)
{
GTK_NOTE (PLUGSOCKET,
- g_message ("GtkSocket: Message of type %d received", message));
+ g_message ("GtkSocket: %s received", _gtk_xembed_message_name (message)));
switch (message)
{
case XEMBED_MODALITY_OFF:
case XEMBED_FOCUS_IN:
case XEMBED_FOCUS_OUT:
- g_warning ("GtkSocket: Invalid _XEMBED message of type %d received", message);
+ g_warning ("GtkSocket: Invalid _XEMBED message %s received", _gtk_xembed_message_name (message));
break;
case XEMBED_REQUEST_FOCUS:
case XEMBED_FOCUS_NEXT:
case XEMBED_FOCUS_PREV:
- advance_toplevel_focus (socket,
- (message == XEMBED_FOCUS_NEXT ?
- GTK_DIR_TAB_FORWARD : GTK_DIR_TAB_BACKWARD));
+ gtk_socket_advance_toplevel_focus (socket,
+ (message == XEMBED_FOCUS_NEXT ?
+ GTK_DIR_TAB_FORWARD : GTK_DIR_TAB_BACKWARD));
break;
case XEMBED_GTK_GRAB_KEY:
- add_grabbed_key (socket, data1, data2);
+ gtk_socket_add_grabbed_key (socket, data1, data2);
break;
case XEMBED_GTK_UNGRAB_KEY:
- remove_grabbed_key (socket, data1, data2);
+ gtk_socket_remove_grabbed_key (socket, data1, data2);
break;
case XEMBED_GRAB_KEY:
}
}
-static void
-map_request (GtkSocket *socket)
-{
- if (!socket->is_mapped)
- {
- socket->is_mapped = TRUE;
- socket->need_map = TRUE;
-
- gtk_widget_queue_resize (GTK_WIDGET (socket));
- }
-}
-
-static void
-unmap_notify (GtkSocket *socket)
-{
- if (socket->is_mapped)
- {
- 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_filter_func (GdkXEvent *gdk_xevent,
+ GdkEvent *event,
+ gpointer data)
{
GtkSocket *socket;
GtkWidget *widget;
GdkDisplay *display;
XEvent *xevent;
+ GtkSocketPrivate *private;
GdkFilterReturn return_val;
-
+
socket = GTK_SOCKET (data);
- widget = GTK_WIDGET (socket);
- xevent = (XEvent *)gdk_xevent;
- display = gtk_widget_get_display (widget);
+ private = socket->priv;
return_val = GDK_FILTER_CONTINUE;
- if (socket->plug_widget)
+ if (private->plug_widget)
return return_val;
+ widget = GTK_WIDGET (socket);
+ xevent = (XEvent *)gdk_xevent;
+ display = gtk_widget_get_display (widget);
+
switch (xevent->type)
{
case ClientMessage:
{
XCreateWindowEvent *xcwe = &xevent->xcreatewindow;
- if (!socket->plug_window)
+ if (!private->plug_window)
{
gtk_socket_add_window (socket, xcwe->window, FALSE);
- if (socket->plug_window)
+ if (private->plug_window)
{
- GTK_NOTE(PLUGSOCKET,
- g_message ("GtkSocket - window created"));
+ GTK_NOTE (PLUGSOCKET, g_message ("GtkSocket - window created"));
}
}
{
XConfigureRequestEvent *xcre = &xevent->xconfigurerequest;
- if (!socket->plug_window)
+ if (!private->plug_window)
gtk_socket_add_window (socket, xcre->window, FALSE);
- if (socket->plug_window)
+ if (private->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));
+ GTK_NOTE (PLUGSOCKET,
+ g_message ("GtkSocket - configure request: %d %d",
+ private->request_width,
+ private->request_height));
private->resize_count++;
gtk_widget_queue_resize (widget);
/* 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)))
+ if (private->plug_window && (xdwe->window == GDK_WINDOW_XID (private->plug_window)))
{
gboolean result;
- GTK_NOTE(PLUGSOCKET,
- g_message ("GtkSocket - destroy notify"));
+ GTK_NOTE (PLUGSOCKET, g_message ("GtkSocket - destroy notify"));
- gdk_window_destroy_notify (socket->plug_window);
+ gdk_window_destroy_notify (private->plug_window);
gtk_socket_end_embedding (socket);
g_object_ref (widget);
- g_signal_emit (widget, socket_signals[PLUG_REMOVED], 0, &result);
+ g_signal_emit_by_name (widget, "plug-removed", &result);
if (!result)
gtk_widget_destroy (widget);
g_object_unref (widget);
return_val = GDK_FILTER_REMOVE;
break;
case MapRequest:
- if (!socket->plug_window)
- gtk_socket_add_window (socket, xevent->xmaprequest.window, FALSE);
+ if (!private->plug_window)
+ {
+ gtk_socket_add_window (socket, xevent->xmaprequest.window, FALSE);
+ }
- if (socket->plug_window)
+ if (private->plug_window)
{
- GTK_NOTE(PLUGSOCKET,
- g_message ("GtkSocket - Map Request"));
+ GTK_NOTE (PLUGSOCKET, g_message ("GtkSocket - Map Request"));
- map_request (socket);
+ gtk_socket_handle_map_request (socket);
return_val = GDK_FILTER_REMOVE;
}
break;
case PropertyNotify:
- if (socket->plug_window &&
- xevent->xproperty.window == GDK_WINDOW_XWINDOW (socket->plug_window))
+ if (private->plug_window &&
+ xevent->xproperty.window == GDK_WINDOW_XID (private->plug_window))
{
GdkDragProtocol protocol;
if (xevent->xproperty.atom == gdk_x11_get_xatom_by_name_for_display (display, "WM_NORMAL_HINTS"))
{
- socket->have_size = FALSE;
+ GTK_NOTE (PLUGSOCKET, g_message ("GtkSocket - received PropertyNotify for plug's WM_NORMAL_HINTS"));
+ private->have_size = FALSE;
gtk_widget_queue_resize (widget);
return_val = GDK_FILTER_REMOVE;
}
(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))
+ protocol = gdk_window_get_drag_protocol (private->plug_window, NULL);
+ if (protocol)
gtk_drag_dest_set_proxy (GTK_WIDGET (socket),
- socket->plug_window,
+ private->plug_window,
protocol, TRUE);
- gdk_display_sync (display);
- gdk_error_trap_pop ();
+ gdk_error_trap_pop_ignored ();
return_val = GDK_FILTER_REMOVE;
}
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))
+ if (xembed_get_info (private->plug_window, NULL, &flags))
{
- gboolean was_mapped = socket->is_mapped;
+ gboolean was_mapped = private->is_mapped;
gboolean is_mapped = (flags & XEMBED_MAPPED) != 0;
if (was_mapped != is_mapped)
{
if (is_mapped)
- map_request (socket);
+ gtk_socket_handle_map_request (socket);
else
{
gdk_error_trap_push ();
- gdk_window_show (socket->plug_window);
- gdk_flush ();
- gdk_error_trap_pop ();
+ gdk_window_show (private->plug_window);
+ gdk_error_trap_pop_ignored ();
- unmap_notify (socket);
+ gtk_socket_unmap_notify (socket);
}
}
}
break;
case ReparentNotify:
{
+ GdkWindow *window;
XReparentEvent *xre = &xevent->xreparent;
- if (!socket->plug_window && xre->parent == GDK_WINDOW_XWINDOW (widget->window))
+ window = gtk_widget_get_window (widget);
+
+ GTK_NOTE (PLUGSOCKET, g_message ("GtkSocket - ReparentNotify received"));
+ if (!private->plug_window &&
+ xre->parent == GDK_WINDOW_XID (window))
{
gtk_socket_add_window (socket, xre->window, FALSE);
- if (socket->plug_window)
+ if (private->plug_window)
{
- GTK_NOTE(PLUGSOCKET,
- g_message ("GtkSocket - window reparented"));
+ GTK_NOTE (PLUGSOCKET, g_message ("GtkSocket - window reparented"));
}
return_val = GDK_FILTER_REMOVE;
}
-
+ else
+ {
+ if (private->plug_window &&
+ xre->window == GDK_WINDOW_XID (private->plug_window) &&
+ xre->parent != GDK_WINDOW_XID (window))
+ {
+ gboolean result;
+
+ gtk_socket_end_embedding (socket);
+
+ g_object_ref (widget);
+ g_signal_emit_by_name (widget, "plug-removed", &result);
+ if (!result)
+ gtk_widget_destroy (widget);
+ g_object_unref (widget);
+
+ return_val = GDK_FILTER_REMOVE;
+ }
+ }
+
break;
}
case UnmapNotify:
- if (socket->plug_window &&
- xevent->xunmap.window == GDK_WINDOW_XWINDOW (socket->plug_window))
+ if (private->plug_window &&
+ xevent->xunmap.window == GDK_WINDOW_XID (private->plug_window))
{
- GTK_NOTE(PLUGSOCKET,
- g_message ("GtkSocket - Unmap notify"));
+ GTK_NOTE (PLUGSOCKET, g_message ("GtkSocket - Unmap notify"));
- unmap_notify (socket);
+ gtk_socket_unmap_notify (socket);
return_val = GDK_FILTER_REMOVE;
}
break;
projects / ~andy / gtk / blobdiff