-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
#include "gtkintl.h"
#include "gtkprivate.h"
#include "gtkplugprivate.h"
+#include "gtkwidgetprivate.h"
+#include "gtkwindow.h"
-#include "gtkalias.h"
+/**
+ * SECTION:gtkplug
+ * @Short_description: Toplevel for embedding into other processes
+ * @Title: GtkPlug
+ * @See_also: #GtkSocket
+ *
+ * Together with #GtkSocket, #GtkPlug 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 the
+ * ID of that widget's window 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.
+ *
+ * <note>
+ * The #GtkPlug and #GtkSocket widgets are currently not available
+ * on all platforms supported by GTK+.
+ * </note>
+ */
static void gtk_plug_get_property (GObject *object,
guint prop_id,
GParamSpec *pspec)
{
GtkPlug *plug = GTK_PLUG (object);
+ GtkPlugPrivate *priv = plug->priv;
switch (prop_id)
{
case PROP_EMBEDDED:
- g_value_set_boolean (value, plug->socket_window != NULL);
+ g_value_set_boolean (value, priv->socket_window != NULL);
break;
case PROP_SOCKET_WINDOW:
- g_value_set_object (value, plug->socket_window);
+ g_value_set_object (value, priv->socket_window);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
PROP_EMBEDDED,
g_param_spec_boolean ("embedded",
P_("Embedded"),
- P_("Whether or not the plug is embedded"),
+ P_("Whether the plug is embedded"),
FALSE,
GTK_PARAM_READABLE));
* GtkPlug::embedded:
* @plug: the object on which the signal was emitted
*
- * Gets emitted when the plug becomes embedded in a socket
- * and when the embedding ends.
+ * Gets emitted when the plug becomes embedded in a socket.
*/
plug_signals[EMBEDDED] =
g_signal_new (I_("embedded"),
NULL, NULL,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+
+ g_type_class_add_private (class, sizeof (GtkPlugPrivate));
}
static void
gtk_plug_init (GtkPlug *plug)
{
- GtkWindow *window;
-
- window = GTK_WINDOW (plug);
-
- window->type = GTK_WINDOW_TOPLEVEL;
+ plug->priv = G_TYPE_INSTANCE_GET_PRIVATE (plug,
+ GTK_TYPE_PLUG,
+ GtkPlugPrivate);
}
static void
gtk_plug_set_is_child (GtkPlug *plug,
gboolean is_child)
{
- g_assert (!GTK_WIDGET (plug)->parent);
-
+ GtkPlugPrivate *priv = plug->priv;
+ GtkWidget *widget = GTK_WIDGET (plug);
+
+ g_assert (!gtk_widget_get_parent (widget));
+
if (is_child)
{
- if (plug->modality_window)
+ if (priv->modality_window)
_gtk_plug_handle_modality_off (plug);
- if (plug->modality_group)
+ if (priv->modality_group)
{
- gtk_window_group_remove_window (plug->modality_group, GTK_WINDOW (plug));
- g_object_unref (plug->modality_group);
- plug->modality_group = NULL;
+ gtk_window_group_remove_window (priv->modality_group, GTK_WINDOW (plug));
+ g_object_unref (priv->modality_group);
+ priv->modality_group = NULL;
}
/* As a toplevel, the MAPPED flag doesn't correspond
* here, but don't bother remapping -- we will get mapped
* by gtk_widget_set_parent ().
*/
- if (GTK_WIDGET_MAPPED (plug))
- gtk_widget_unmap (GTK_WIDGET (plug));
-
- GTK_WIDGET_UNSET_FLAGS (plug, GTK_TOPLEVEL);
+ if (gtk_widget_get_mapped (widget))
+ gtk_widget_unmap (widget);
+
+ _gtk_window_set_is_toplevel (GTK_WINDOW (plug), FALSE);
gtk_container_set_resize_mode (GTK_CONTAINER (plug), GTK_RESIZE_PARENT);
- _gtk_widget_propagate_hierarchy_changed (GTK_WIDGET (plug), GTK_WIDGET (plug));
+ _gtk_widget_propagate_hierarchy_changed (widget, widget);
}
else
{
- if (GTK_WINDOW (plug)->focus_widget)
+ if (gtk_window_get_focus (GTK_WINDOW (plug)))
gtk_window_set_focus (GTK_WINDOW (plug), NULL);
- if (GTK_WINDOW (plug)->default_widget)
+ if (gtk_window_get_default_widget (GTK_WINDOW (plug)))
gtk_window_set_default (GTK_WINDOW (plug), NULL);
-
- plug->modality_group = gtk_window_group_new ();
- gtk_window_group_add_window (plug->modality_group, GTK_WINDOW (plug));
-
- GTK_WIDGET_SET_FLAGS (plug, GTK_TOPLEVEL);
+
+ priv->modality_group = gtk_window_group_new ();
+ gtk_window_group_add_window (priv->modality_group, GTK_WINDOW (plug));
+
+ _gtk_window_set_is_toplevel (GTK_WINDOW (plug), TRUE);
gtk_container_set_resize_mode (GTK_CONTAINER (plug), GTK_RESIZE_QUEUE);
_gtk_widget_propagate_hierarchy_changed (GTK_WIDGET (plug), NULL);
{
g_return_val_if_fail (GTK_IS_PLUG (plug), 0);
- if (!GTK_WIDGET_REALIZED (plug))
+ if (!gtk_widget_get_realized (GTK_WIDGET (plug)))
gtk_widget_realize (GTK_WIDGET (plug));
return _gtk_plug_windowing_get_id (plug);
{
g_return_val_if_fail (GTK_IS_PLUG (plug), FALSE);
- return plug->socket_window != NULL;
+ return plug->priv->socket_window != NULL;
}
/**
*
* Retrieves the socket the plug is embedded in.
*
- * Return value: the window of the socket, or %NULL
+ * Return value: (transfer none): the window of the socket, or %NULL
*
* Since: 2.14
**/
{
g_return_val_if_fail (GTK_IS_PLUG (plug), NULL);
- return plug->socket_window;
+ return plug->priv->socket_window;
}
/**
_gtk_plug_add_to_socket (GtkPlug *plug,
GtkSocket *socket_)
{
+ GtkPlugPrivate *priv;
GtkWidget *widget;
- gint w, h;
g_return_if_fail (GTK_IS_PLUG (plug));
g_return_if_fail (GTK_IS_SOCKET (socket_));
- g_return_if_fail (GTK_WIDGET_REALIZED (socket_));
+ g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (socket_)));
+ priv = plug->priv;
widget = GTK_WIDGET (plug);
gtk_plug_set_is_child (plug, TRUE);
- plug->same_app = TRUE;
+ priv->same_app = TRUE;
socket_->same_app = TRUE;
socket_->plug_widget = widget;
- plug->socket_window = GTK_WIDGET (socket_)->window;
+ priv->socket_window = gtk_widget_get_window (GTK_WIDGET (socket_));
+ g_object_ref (priv->socket_window);
+ g_signal_emit (plug, plug_signals[EMBEDDED], 0);
+ g_object_notify (G_OBJECT (plug), "embedded");
- if (GTK_WIDGET_REALIZED (widget))
+ if (gtk_widget_get_realized (widget))
{
- gdk_drawable_get_size (GDK_DRAWABLE (widget->window), &w, &h);
- gdk_window_reparent (widget->window, plug->socket_window, -w, -h);
+ GdkWindow *window;
+
+ window = gtk_widget_get_window (widget);
+ gdk_window_reparent (window, priv->socket_window,
+ -gdk_window_get_width (window),
+ -gdk_window_get_height (window));
}
gtk_widget_set_parent (widget, GTK_WIDGET (socket_));
- g_signal_emit_by_name (socket_, "plug_added");
+ g_signal_emit_by_name (socket_, "plug-added");
}
/**
{
GdkEvent *event = gdk_event_new (GDK_DELETE);
- event->any.window = g_object_ref (widget->window);
+ event->any.window = g_object_ref (gtk_widget_get_window (widget));
event->any.send_event = FALSE;
g_object_ref (widget);
_gtk_plug_remove_from_socket (GtkPlug *plug,
GtkSocket *socket_)
{
+ GtkPlugPrivate *priv;
GtkWidget *widget;
+ GdkWindow *window;
gboolean result;
gboolean widget_was_visible;
g_return_if_fail (GTK_IS_PLUG (plug));
g_return_if_fail (GTK_IS_SOCKET (socket_));
- g_return_if_fail (GTK_WIDGET_REALIZED (plug));
+ g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (plug)));
+ priv = plug->priv;
widget = GTK_WIDGET (plug);
- if (GTK_WIDGET_IN_REPARENT (widget))
+ if (_gtk_widget_get_in_reparent (widget))
return;
g_object_ref (plug);
g_object_ref (socket_);
- widget_was_visible = GTK_WIDGET_VISIBLE (plug);
-
- gdk_window_hide (widget->window);
- GTK_PRIVATE_SET_FLAG (plug, GTK_IN_REPARENT);
- gdk_window_reparent (widget->window,
+ widget_was_visible = gtk_widget_get_visible (widget);
+ window = gtk_widget_get_window (widget);
+
+ gdk_window_hide (window);
+ _gtk_widget_set_in_reparent (widget, TRUE);
+ gdk_window_reparent (window,
gtk_widget_get_root_window (widget),
0, 0);
gtk_widget_unparent (GTK_WIDGET (plug));
- GTK_PRIVATE_UNSET_FLAG (plug, GTK_IN_REPARENT);
+ _gtk_widget_set_in_reparent (widget, FALSE);
socket_->plug_widget = NULL;
if (socket_->plug_window != NULL)
socket_->same_app = FALSE;
- plug->same_app = FALSE;
- plug->socket_window = NULL;
-
+ priv->same_app = FALSE;
+ if (priv->socket_window != NULL)
+ {
+ g_object_unref (priv->socket_window);
+ priv->socket_window = NULL;
+ }
gtk_plug_set_is_child (plug, FALSE);
-
- g_signal_emit_by_name (socket_, "plug_removed", &result);
+
+ g_signal_emit_by_name (socket_, "plug-removed", &result);
if (!result)
gtk_widget_destroy (GTK_WIDGET (socket_));
- if (widget->window)
+ if (window)
_gtk_plug_send_delete_event (widget);
g_object_unref (plug);
- if (widget_was_visible && GTK_WIDGET_VISIBLE (socket_))
+ if (widget_was_visible && gtk_widget_get_visible (GTK_WIDGET (socket_)))
gtk_widget_queue_resize (GTK_WIDGET (socket_));
g_object_unref (socket_);
GdkDisplay *display,
GdkNativeWindow socket_id)
{
+ GtkPlugPrivate *priv;
+
+ g_return_if_fail (GTK_IS_PLUG (plug));
+ g_return_if_fail (GDK_IS_DISPLAY (display));
+
+ priv = plug->priv;
+
if (socket_id)
{
gpointer user_data = NULL;
- plug->socket_window = gdk_window_lookup_for_display (display, socket_id);
-
- if (plug->socket_window)
- gdk_window_get_user_data (plug->socket_window, &user_data);
- else
- plug->socket_window = gdk_window_foreign_new_for_display (display, socket_id);
-
- if (user_data)
+ priv->socket_window = gdk_window_lookup_for_display (display, socket_id);
+ if (priv->socket_window)
{
- if (GTK_IS_SOCKET (user_data))
- _gtk_plug_add_to_socket (plug, user_data);
- else
+ gdk_window_get_user_data (priv->socket_window, &user_data);
+
+ if (user_data)
{
- g_warning (G_STRLOC "Can't create GtkPlug as child of non-GtkSocket");
- plug->socket_window = NULL;
+ if (GTK_IS_SOCKET (user_data))
+ _gtk_plug_add_to_socket (plug, user_data);
+ else
+ {
+ g_warning (G_STRLOC "Can't create GtkPlug as child of non-GtkSocket");
+ priv->socket_window = NULL;
+ }
}
+ else
+ g_object_ref (priv->socket_window);
}
+ else
+ priv->socket_window = gdk_window_foreign_new_for_display (display, socket_id);
- if (plug->socket_window) {
+ if (priv->socket_window) {
g_signal_emit (plug, plug_signals[EMBEDDED], 0);
g_object_notify (G_OBJECT (plug), "embedded");
/**
* gtk_plug_new_for_display:
- * @display : the #GdkDisplay on which @socket_id is displayed
+ * @display: the #GdkDisplay on which @socket_id is displayed
* @socket_id: the XID of the socket's window.
*
* Create a new plug widget inside the #GtkSocket identified by socket_id.
{
GtkPlug *plug;
+ g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+
plug = g_object_new (GTK_TYPE_PLUG, NULL);
gtk_plug_construct_for_display (plug, display, socket_id);
return GTK_WIDGET (plug);
gtk_plug_finalize (GObject *object)
{
GtkPlug *plug = GTK_PLUG (object);
+ GtkPlugPrivate *priv = plug->priv;
- if (plug->grabbed_keys)
+ if (priv->grabbed_keys)
{
- g_hash_table_destroy (plug->grabbed_keys);
- plug->grabbed_keys = NULL;
+ g_hash_table_destroy (priv->grabbed_keys);
+ priv->grabbed_keys = NULL;
}
G_OBJECT_CLASS (gtk_plug_parent_class)->finalize (object);
gtk_plug_unrealize (GtkWidget *widget)
{
GtkPlug *plug = GTK_PLUG (widget);
+ GtkPlugPrivate *priv = plug->priv;
- if (plug->socket_window != NULL)
+ if (priv->socket_window != NULL)
{
- gdk_window_set_user_data (plug->socket_window, NULL);
- g_object_unref (plug->socket_window);
- plug->socket_window = NULL;
+ gdk_window_set_user_data (priv->socket_window, NULL);
+ g_object_unref (priv->socket_window);
+ priv->socket_window = NULL;
g_object_notify (G_OBJECT (widget), "embedded");
}
- if (!plug->same_app)
+ if (!priv->same_app)
{
- if (plug->modality_window)
+ if (priv->modality_window)
_gtk_plug_handle_modality_off (plug);
- gtk_window_group_remove_window (plug->modality_group, GTK_WINDOW (plug));
- g_object_unref (plug->modality_group);
+ gtk_window_group_remove_window (priv->modality_group, GTK_WINDOW (plug));
+ g_object_unref (priv->modality_group);
}
-
- if (GTK_WIDGET_CLASS (gtk_plug_parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (gtk_plug_parent_class)->unrealize) (widget);
+
+ GTK_WIDGET_CLASS (gtk_plug_parent_class)->unrealize (widget);
}
static void
gtk_plug_realize (GtkWidget *widget)
{
- GtkWindow *window = GTK_WINDOW (widget);
+ GtkAllocation allocation;
GtkPlug *plug = GTK_PLUG (widget);
+ GtkPlugPrivate *priv = plug->priv;
+ GtkWindow *window = GTK_WINDOW (widget);
+ GdkWindow *gdk_window;
GdkWindowAttr attributes;
+ const gchar *title;
+ gchar *wmclass_name, *wmclass_class;
gint attributes_mask;
- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+ gtk_widget_set_realized (widget, TRUE);
+
+ title = gtk_window_get_title (window);
+ _gtk_window_get_wmclass (window, &wmclass_name, &wmclass_class);
+ gtk_widget_get_allocation (widget, &allocation);
attributes.window_type = GDK_WINDOW_CHILD; /* XXX GDK_WINDOW_PLUG ? */
- attributes.title = window->title;
- attributes.wmclass_name = window->wmclass_name;
- attributes.wmclass_class = window->wmclass_class;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
+ attributes.title = (gchar *) title;
+ attributes.wmclass_name = wmclass_name;
+ attributes.wmclass_class = wmclass_class;
+ attributes.width = allocation.width;
+ attributes.height = allocation.height;
attributes.wclass = GDK_INPUT_OUTPUT;
/* this isn't right - we should match our parent's visual/colormap.
* though that will require handling "foreign" colormaps */
attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (widget);
attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |= (GDK_EXPOSURE_MASK |
GDK_KEY_PRESS_MASK |
GDK_LEAVE_NOTIFY_MASK |
GDK_STRUCTURE_MASK);
- attributes_mask = GDK_WA_VISUAL | GDK_WA_COLORMAP;
- attributes_mask |= (window->title ? GDK_WA_TITLE : 0);
- attributes_mask |= (window->wmclass_name ? GDK_WA_WMCLASS : 0);
+ attributes_mask = GDK_WA_VISUAL;
+ attributes_mask |= (title ? GDK_WA_TITLE : 0);
+ attributes_mask |= (wmclass_name ? GDK_WA_WMCLASS : 0);
- if (GTK_WIDGET_TOPLEVEL (widget))
+ if (gtk_widget_is_toplevel (widget))
{
attributes.window_type = GDK_WINDOW_TOPLEVEL;
gdk_error_trap_push ();
- if (plug->socket_window)
- widget->window = gdk_window_new (plug->socket_window,
- &attributes, attributes_mask);
+ if (priv->socket_window)
+ gdk_window = gdk_window_new (priv->socket_window,
+ &attributes, attributes_mask);
else /* If it's a passive plug, we use the root window */
- widget->window = gdk_window_new (gtk_widget_get_root_window (widget),
- &attributes, attributes_mask);
+ gdk_window = gdk_window_new (gtk_widget_get_root_window (widget),
+ &attributes, attributes_mask);
+ gtk_widget_set_window (widget, gdk_window);
gdk_display_sync (gtk_widget_get_display (widget));
if (gdk_error_trap_pop ()) /* Uh-oh */
{
gdk_error_trap_push ();
- gdk_window_destroy (widget->window);
- gdk_flush ();
- gdk_error_trap_pop ();
- widget->window = gdk_window_new (gtk_widget_get_root_window (widget),
- &attributes, attributes_mask);
+ gdk_window_destroy (gdk_window);
+ gdk_error_trap_pop_ignored ();
+ gdk_window = gdk_window_new (gtk_widget_get_root_window (widget),
+ &attributes, attributes_mask);
+ gtk_widget_set_window (widget, gdk_window);
}
-
- gdk_window_add_filter (widget->window,
+
+ gdk_window_add_filter (gdk_window,
_gtk_plug_windowing_filter_func,
widget);
- plug->modality_group = gtk_window_group_new ();
- gtk_window_group_add_window (plug->modality_group, window);
-
+ priv->modality_group = gtk_window_group_new ();
+ gtk_window_group_add_window (priv->modality_group, window);
+
_gtk_plug_windowing_realize_toplevel (plug);
}
else
- widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
- &attributes, attributes_mask);
-
- gdk_window_set_user_data (widget->window, window);
+ {
+ gdk_window = gdk_window_new (gtk_widget_get_parent_window (widget),
+ &attributes, attributes_mask);
+ gtk_widget_set_window (widget, gdk_window);
+ }
- widget->style = gtk_style_attach (widget->style, widget->window);
- gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+ gdk_window_set_user_data (gdk_window, window);
- gdk_window_enable_synchronized_configure (widget->window);
+ gtk_widget_style_attach (widget);
+ gtk_style_set_background (gtk_widget_get_style (widget),
+ gdk_window, GTK_STATE_NORMAL);
+
+ gdk_window_enable_synchronized_configure (gdk_window);
}
static void
gtk_plug_show (GtkWidget *widget)
{
- if (GTK_WIDGET_TOPLEVEL (widget))
+ if (gtk_widget_is_toplevel (widget))
GTK_WIDGET_CLASS (gtk_plug_parent_class)->show (widget);
else
GTK_WIDGET_CLASS (bin_class)->show (widget);
static void
gtk_plug_hide (GtkWidget *widget)
{
- if (GTK_WIDGET_TOPLEVEL (widget))
+ if (gtk_widget_is_toplevel (widget))
GTK_WIDGET_CLASS (gtk_plug_parent_class)->hide (widget);
else
GTK_WIDGET_CLASS (bin_class)->hide (widget);
static void
gtk_plug_map (GtkWidget *widget)
{
- if (GTK_WIDGET_TOPLEVEL (widget))
+ if (gtk_widget_is_toplevel (widget))
{
GtkBin *bin = GTK_BIN (widget);
GtkPlug *plug = GTK_PLUG (widget);
+ GtkWidget *child;
- GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+ gtk_widget_set_mapped (widget, TRUE);
- if (bin->child &&
- GTK_WIDGET_VISIBLE (bin->child) &&
- !GTK_WIDGET_MAPPED (bin->child))
- gtk_widget_map (bin->child);
+ child = gtk_bin_get_child (bin);
+ if (child != NULL &&
+ gtk_widget_get_visible (child) &&
+ !gtk_widget_get_mapped (child))
+ gtk_widget_map (child);
_gtk_plug_windowing_map_toplevel (plug);
-
- gdk_synthesize_window_state (widget->window,
+
+ gdk_synthesize_window_state (gtk_widget_get_window (widget),
GDK_WINDOW_STATE_WITHDRAWN,
0);
}
static void
gtk_plug_unmap (GtkWidget *widget)
{
- if (GTK_WIDGET_TOPLEVEL (widget))
+ if (gtk_widget_is_toplevel (widget))
{
GtkPlug *plug = GTK_PLUG (widget);
+ GdkWindow *window;
+
+ window = gtk_widget_get_window (widget);
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
+ gtk_widget_set_mapped (widget, FALSE);
- gdk_window_hide (widget->window);
+ gdk_window_hide (window);
_gtk_plug_windowing_unmap_toplevel (plug);
-
- gdk_synthesize_window_state (widget->window,
+
+ gdk_synthesize_window_state (window,
0,
GDK_WINDOW_STATE_WITHDRAWN);
}
gtk_plug_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
- if (GTK_WIDGET_TOPLEVEL (widget))
+ GtkWidget *child;
+
+ if (gtk_widget_is_toplevel (widget))
GTK_WIDGET_CLASS (gtk_plug_parent_class)->size_allocate (widget, allocation);
else
{
GtkBin *bin = GTK_BIN (widget);
- widget->allocation = *allocation;
+ gtk_widget_set_allocation (widget, allocation);
- if (GTK_WIDGET_REALIZED (widget))
- gdk_window_move_resize (widget->window,
+ if (gtk_widget_get_realized (widget))
+ gdk_window_move_resize (gtk_widget_get_window (widget),
allocation->x, allocation->y,
allocation->width, allocation->height);
- if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
+ child = gtk_bin_get_child (bin);
+
+ if (child != NULL && gtk_widget_get_visible (child))
{
GtkAllocation child_allocation;
- child_allocation.x = child_allocation.y = GTK_CONTAINER (widget)->border_width;
+ child_allocation.x = child_allocation.y = gtk_container_get_border_width (GTK_CONTAINER (widget));
child_allocation.width =
MAX (1, (gint)allocation->width - child_allocation.x * 2);
child_allocation.height =
MAX (1, (gint)allocation->height - child_allocation.y * 2);
- gtk_widget_size_allocate (bin->child, &child_allocation);
+ gtk_widget_size_allocate (child, &child_allocation);
}
}
gtk_plug_key_press_event (GtkWidget *widget,
GdkEventKey *event)
{
- if (GTK_WIDGET_TOPLEVEL (widget))
+ if (gtk_widget_is_toplevel (widget))
return GTK_WIDGET_CLASS (gtk_plug_parent_class)->key_press_event (widget, event);
else
return FALSE;
/* Ask for focus from embedder
*/
- if (focus && !window->has_toplevel_focus)
+ if (focus && !gtk_window_has_toplevel_focus (window))
_gtk_plug_windowing_set_focus (plug);
}
{
GrabbedKey *grabbed_key = key;
GtkPlug *plug = data;
+ GtkPlugPrivate *priv = plug->priv;
- if (!plug->grabbed_keys ||
- !g_hash_table_lookup (plug->grabbed_keys, grabbed_key))
+ if (!priv->grabbed_keys ||
+ !g_hash_table_lookup (priv->grabbed_keys, grabbed_key))
{
_gtk_plug_windowing_add_grabbed_key (plug,
grabbed_key->accelerator_key,
void
_gtk_plug_add_all_grabbed_keys (GtkPlug *plug)
{
- if (plug->grabbed_keys)
- g_hash_table_foreach (plug->grabbed_keys, add_grabbed_key_always, plug);
+ GtkPlugPrivate *priv = plug->priv;
+
+ if (priv->grabbed_keys)
+ g_hash_table_foreach (priv->grabbed_keys, add_grabbed_key_always, plug);
}
static void
{
GrabbedKey *grabbed_key = key;
GtkPlug *plug = data;
+ GtkPlugPrivate *priv = plug->priv;
- if (!plug->grabbed_keys ||
- !g_hash_table_lookup (plug->grabbed_keys, grabbed_key))
+ if (!priv->grabbed_keys ||
+ !g_hash_table_lookup (priv->grabbed_keys, grabbed_key))
{
_gtk_plug_windowing_remove_grabbed_key (plug,
grabbed_key->accelerator_key,
{
GHashTable *new_grabbed_keys, *old_grabbed_keys;
GtkPlug *plug = GTK_PLUG (window);
+ GtkPlugPrivate *priv = plug->priv;
new_grabbed_keys = g_hash_table_new_full (grabbed_key_hash, grabbed_key_equal, (GDestroyNotify)grabbed_key_free, NULL);
_gtk_window_keys_foreach (window, keys_foreach, new_grabbed_keys);
- if (plug->socket_window)
+ if (priv->socket_window)
g_hash_table_foreach (new_grabbed_keys, add_grabbed_key, plug);
- old_grabbed_keys = plug->grabbed_keys;
- plug->grabbed_keys = new_grabbed_keys;
+ old_grabbed_keys = priv->grabbed_keys;
+ priv->grabbed_keys = new_grabbed_keys;
if (old_grabbed_keys)
{
- if (plug->socket_window)
+ if (priv->socket_window)
g_hash_table_foreach (old_grabbed_keys, remove_grabbed_key, plug);
g_hash_table_destroy (old_grabbed_keys);
}
GtkPlug *plug = GTK_PLUG (widget);
GtkWindow *window = GTK_WINDOW (widget);
GtkContainer *container = GTK_CONTAINER (widget);
- GtkWidget *old_focus_child = container->focus_child;
+ GtkWidget *child;
+ GtkWidget *old_focus_child;
GtkWidget *parent;
-
+
+ old_focus_child = gtk_container_get_focus_child (container);
/* We override GtkWindow's behavior, since we don't want wrapping here.
*/
if (old_focus_child)
{
+ GtkWidget *focus_widget;
+
if (gtk_widget_child_focus (old_focus_child, direction))
return TRUE;
- if (window->focus_widget)
+ focus_widget = gtk_window_get_focus (window);
+ if (focus_widget)
{
/* 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);
else
{
/* Try to focus the first widget in the window */
- if (bin->child && gtk_widget_child_focus (bin->child, direction))
+ child = gtk_bin_get_child (bin);
+ if (child && gtk_widget_child_focus (child, direction))
return TRUE;
}
- if (!GTK_CONTAINER (window)->focus_child)
+ if (!gtk_container_get_focus_child (GTK_CONTAINER (window)))
_gtk_plug_windowing_focus_to_parent (plug, direction);
return FALSE;
static void
gtk_plug_check_resize (GtkContainer *container)
{
- if (GTK_WIDGET_TOPLEVEL (container))
+ if (gtk_widget_is_toplevel (GTK_WIDGET (container)))
GTK_CONTAINER_CLASS (gtk_plug_parent_class)->check_resize (container);
else
GTK_CONTAINER_CLASS (bin_class)->check_resize (container);
void
_gtk_plug_handle_modality_on (GtkPlug *plug)
{
- if (!plug->modality_window)
+ GtkPlugPrivate *priv = plug->priv;
+
+ if (!priv->modality_window)
{
- plug->modality_window = gtk_window_new (GTK_WINDOW_POPUP);
- gtk_window_set_screen (GTK_WINDOW (plug->modality_window),
+ priv->modality_window = gtk_window_new (GTK_WINDOW_POPUP);
+ gtk_window_set_screen (GTK_WINDOW (priv->modality_window),
gtk_widget_get_screen (GTK_WIDGET (plug)));
- gtk_widget_realize (plug->modality_window);
- gtk_window_group_add_window (plug->modality_group, GTK_WINDOW (plug->modality_window));
- gtk_grab_add (plug->modality_window);
+ gtk_widget_realize (priv->modality_window);
+ gtk_window_group_add_window (priv->modality_group, GTK_WINDOW (priv->modality_window));
+ gtk_grab_add (priv->modality_window);
}
}
void
_gtk_plug_handle_modality_off (GtkPlug *plug)
{
- if (plug->modality_window)
+ GtkPlugPrivate *priv = plug->priv;
+
+ if (priv->modality_window)
{
- gtk_widget_destroy (plug->modality_window);
- plug->modality_window = NULL;
+ gtk_widget_destroy (priv->modality_window);
+ priv->modality_window = NULL;
}
}
GtkDirectionType direction)
{
GtkWindow *window = GTK_WINDOW (plug);
+ GtkWidget *focus_widget;
GtkWidget *parent;
- if (window->focus_widget)
+ focus_widget = gtk_window_get_focus (window);
+ if (focus_widget)
{
- 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 (plug), NULL);
gtk_widget_child_focus (GTK_WIDGET (plug), direction);
}
-
-#define __GTK_PLUG_C__
-#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff