* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include "gtkalias.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkplug.h"
#include "gdk/gdkkeysyms.h"
#include "x11/gdkx.h"
-#include "xembed.h"
+#include "gtkxembed.h"
static void gtk_plug_class_init (GtkPlugClass *klass);
static void gtk_plug_init (GtkPlug *plug);
GtkAllocation *allocation);
static gboolean gtk_plug_key_press_event (GtkWidget *widget,
GdkEventKey *event);
+static gboolean gtk_plug_focus_event (GtkWidget *widget,
+ GdkEventFocus *event);
static void gtk_plug_set_focus (GtkWindow *window,
GtkWidget *focus);
static gboolean gtk_plug_focus (GtkWidget *widget,
gpointer data);
static void handle_modality_off (GtkPlug *plug);
-static void send_xembed_message (GtkPlug *plug,
- glong message,
- glong detail,
- glong data1,
- glong data2,
- guint32 time);
static void xembed_set_info (GdkWindow *window,
unsigned long flags);
static guint plug_signals[LAST_SIGNAL] = { 0 };
-GtkType
-gtk_plug_get_type ()
+GType
+gtk_plug_get_type (void)
{
- static GtkType plug_type = 0;
+ static GType plug_type = 0;
if (!plug_type)
{
(GInstanceInitFunc) gtk_plug_init,
};
- plug_type = g_type_register_static (GTK_TYPE_WINDOW, "GtkPlug", &plug_info, 0);
+ plug_type = g_type_register_static (GTK_TYPE_WINDOW, "GtkPlug",
+ &plug_info, 0);
}
return plug_type;
GtkWindowClass *window_class = (GtkWindowClass *)class;
GtkContainerClass *container_class = (GtkContainerClass *)class;
- parent_class = gtk_type_class (GTK_TYPE_WINDOW);
- bin_class = gtk_type_class (GTK_TYPE_BIN);
+ parent_class = g_type_class_peek_parent (class);
+ bin_class = g_type_class_peek (GTK_TYPE_BIN);
gobject_class->finalize = gtk_plug_finalize;
widget_class->realize = gtk_plug_realize;
widget_class->unrealize = gtk_plug_unrealize;
widget_class->key_press_event = gtk_plug_key_press_event;
+ widget_class->focus_in_event = gtk_plug_focus_event;
+ widget_class->focus_out_event = gtk_plug_focus_event;
widget_class->show = gtk_plug_show;
widget_class->hide = gtk_plug_hide;
G_STRUCT_OFFSET (GtkPlugClass, embedded),
NULL, NULL,
_gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE, 0);
+ G_TYPE_NONE, 0);
}
static void
/**
* _gtk_plug_add_to_socket:
* @plug: a #GtkPlug
- * @socket: a #GtkSocket
+ * @socket_: a #GtkSocket
*
* Adds a plug to a socket within the same application.
**/
gtk_widget_set_parent (widget, GTK_WIDGET (socket));
- g_signal_emit_by_name (G_OBJECT (socket), "plug_added", 0);
+ g_signal_emit_by_name (socket, "plug_added", 0);
+}
+
+static void
+send_delete_event (GtkWidget *widget)
+{
+ GdkEvent *event = gdk_event_new (GDK_DELETE);
+
+ event->any.window = g_object_ref (widget->window);
+ event->any.send_event = FALSE;
+
+ gtk_widget_ref (widget);
+
+ if (!gtk_widget_event (widget, event))
+ gtk_widget_destroy (widget);
+
+ gtk_widget_unref (widget);
+
+ gdk_event_free (event);
}
/**
* _gtk_plug_remove_from_socket:
* @plug: a #GtkPlug
- * @socket: a #GtkSocket
+ * @socket_: a #GtkSocket
*
* Removes a plug from a socket within the same application.
**/
GtkSocket *socket)
{
GtkWidget *widget;
- GdkEvent event;
gboolean result;
gboolean widget_was_visible;
GTK_PRIVATE_UNSET_FLAG (plug, GTK_IN_REPARENT);
socket->plug_widget = NULL;
- socket->plug_window = NULL;
+ if (socket->plug_window != NULL)
+ {
+ g_object_unref (socket->plug_window);
+ socket->plug_window = NULL;
+ }
+
socket->same_app = FALSE;
plug->same_app = FALSE;
gtk_plug_set_is_child (plug, FALSE);
- g_signal_emit_by_name (G_OBJECT (socket), "plug_removed", &result);
+ g_signal_emit_by_name (socket, "plug_removed", &result);
if (!result)
gtk_widget_destroy (GTK_WIDGET (socket));
- event.any.type = GDK_DELETE;
- event.any.window = g_object_ref (widget->window);
- event.any.send_event = FALSE;
-
- if (!gtk_widget_event (widget, &event))
- gtk_widget_destroy (widget);
-
- g_object_unref (event.any.window);
+ send_delete_event (widget);
+
g_object_unref (plug);
if (widget_was_visible && GTK_WIDGET_VISIBLE (socket))
/**
* gtk_plug_construct:
- * @display: the #GdkDisplay associated with @socket_id's #GtkSocket.
* @plug: a #GtkPlug.
* @socket_id: the XID of the socket's window.
*
- * Finish the Initialization of @plug for a given #GtkSocket identified by
+ * Finish the initialization of @plug for a given #GtkSocket identified by
* @socket_id. This function will generally only be used by classes deriving from #GtkPlug.
**/
void
gtk_plug_construct (GtkPlug *plug,
GdkNativeWindow socket_id)
{
- gtk_plug_construct_for_display (gdk_get_default_display (), plug, socket_id);
+ gtk_plug_construct_for_display (plug, gdk_display_get_default (), socket_id);
}
/**
* gtk_plug_construct_for_display:
+ * @plug: a #GtkPlug.
* @display: the #GdkDisplay associated with @socket_id's
* #GtkSocket.
- * @plug: a #GtkPlug.
* @socket_id: the XID of the socket's window.
*
- * Finish the Initialization of @plug for a given #GtkSocket identified by
+ * Finish the initialization of @plug for a given #GtkSocket identified by
* @socket_id which is currently displayed on @display.
* This function will generally only be used by classes deriving from #GtkPlug.
+ *
+ * Since: 2.2
**/
void
-gtk_plug_construct_for_display (GdkDisplay *display,
- GtkPlug *plug,
+gtk_plug_construct_for_display (GtkPlug *plug,
+ GdkDisplay *display,
GdkNativeWindow socket_id)
{
if (socket_id)
}
if (plug->socket_window)
- g_signal_emit (G_OBJECT (plug), plug_signals[EMBEDDED], 0);
+ g_signal_emit (plug, plug_signals[EMBEDDED], 0);
}
}
GtkWidget*
gtk_plug_new (GdkNativeWindow socket_id)
{
- return gtk_plug_new_for_display (gdk_get_default_display (), socket_id);
+ return gtk_plug_new_for_display (gdk_display_get_default (), socket_id);
}
/**
* @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.
+ * Create a new plug widget inside the #GtkSocket identified by socket_id.
*
* Return value: the new #GtkPlug widget.
+ *
+ * Since: 2.2
*/
GtkWidget*
gtk_plug_new_for_display (GdkDisplay *display,
{
GtkPlug *plug;
- plug = GTK_PLUG (gtk_type_new (GTK_TYPE_PLUG));
- gtk_plug_construct_for_display (display, plug, socket_id);
+ plug = g_object_new (GTK_TYPE_PLUG, NULL);
+ gtk_plug_construct_for_display (plug, display, socket_id);
return GTK_WIDGET (plug);
}
if (plug->socket_window != NULL)
{
gdk_window_set_user_data (plug->socket_window, NULL);
- gdk_window_unref (plug->socket_window);
+ g_object_unref (plug->socket_window);
plug->socket_window = NULL;
}
GDK_KEY_RELEASE_MASK |
GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK |
- GDK_FOCUS_CHANGE_MASK |
GDK_STRUCTURE_MASK);
attributes_mask = GDK_WA_VISUAL | GDK_WA_COLORMAP;
widget->style = gtk_style_attach (widget->style, widget->window);
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+
+ gdk_window_enable_synchronized_configure (widget->window);
}
static void
return FALSE;
}
+static gboolean
+gtk_plug_focus_event (GtkWidget *widget,
+ GdkEventFocus *event)
+{
+ /* We eat focus-in events and focus-out events, since they
+ * can be generated by something like a keyboard grab on
+ * a child of the plug.
+ */
+ return FALSE;
+}
+
static void
gtk_plug_set_focus (GtkWindow *window,
GtkWidget *focus)
/* Ask for focus from embedder
*/
- if (focus && !window->has_focus)
+ if (focus && !window->has_toplevel_focus)
{
-#if 0
- XEvent xevent;
-
- xevent.xfocus.type = FocusIn;
- xevent.xfocus.display = GDK_WINDOW_XDISPLAY (plug->socket_window);
- xevent.xfocus.window = GDK_WINDOW_XWINDOW (plug->socket_window);
- xevent.xfocus.mode = EMBEDDED_APP_WANTS_FOCUS;
- xevent.xfocus.detail = FALSE; /* Don't force */
-
- gdk_error_trap_push ();
- XSendEvent (GDK_DISPLAY (),
- GDK_WINDOW_XWINDOW (plug->socket_window),
- False, NoEventMask, &xevent);
- gdk_display_sync (gdk_drawable_get_display (plug->socket_window));
- gdk_error_trap_pop ();
-#endif
-
- send_xembed_message (plug, XEMBED_REQUEST_FOCUS, 0, 0, 0,
- gtk_get_current_event_time ());
+ _gtk_xembed_send_message (plug->socket_window,
+ XEMBED_REQUEST_FOCUS, 0, 0, 0);
}
}
if (!plug->grabbed_keys ||
!g_hash_table_lookup (plug->grabbed_keys, grabbed_key))
{
- send_xembed_message (plug, XEMBED_GTK_GRAB_KEY, 0,
- grabbed_key->accelerator_key, grabbed_key->accelerator_mods,
- gtk_get_current_event_time ());
+ _gtk_xembed_send_message (plug->socket_window, XEMBED_GTK_GRAB_KEY, 0,
+ grabbed_key->accelerator_key, grabbed_key->accelerator_mods);
}
}
GrabbedKey *grabbed_key = key;
GtkPlug *plug = data;
- send_xembed_message (plug, XEMBED_GTK_GRAB_KEY, 0,
- grabbed_key->accelerator_key, grabbed_key->accelerator_mods,
- gtk_get_current_event_time ());
+ _gtk_xembed_send_message (plug->socket_window, XEMBED_GTK_GRAB_KEY, 0,
+ grabbed_key->accelerator_key, grabbed_key->accelerator_mods);
}
static void
if (!plug->grabbed_keys ||
!g_hash_table_lookup (plug->grabbed_keys, grabbed_key))
{
- send_xembed_message (plug, XEMBED_GTK_UNGRAB_KEY, 0,
- grabbed_key->accelerator_key, grabbed_key->accelerator_mods,
- gtk_get_current_event_time ());
+ _gtk_xembed_send_message (plug->socket_window, XEMBED_GTK_UNGRAB_KEY, 0,
+ grabbed_key->accelerator_key, grabbed_key->accelerator_mods);
}
}
}
}
+static void
+focus_to_parent (GtkPlug *plug,
+ GtkDirectionType direction)
+{
+ XEmbedMessageType message = XEMBED_FOCUS_PREV; /* Quiet GCC */
+
+ switch (direction)
+ {
+ case GTK_DIR_UP:
+ case GTK_DIR_LEFT:
+ case GTK_DIR_TAB_BACKWARD:
+ message = XEMBED_FOCUS_PREV;
+ break;
+ case GTK_DIR_DOWN:
+ case GTK_DIR_RIGHT:
+ case GTK_DIR_TAB_FORWARD:
+ message = XEMBED_FOCUS_NEXT;
+ break;
+ }
+
+ _gtk_xembed_send_focus_message (plug->socket_window, message, 0);
+}
+
static gboolean
gtk_plug_focus (GtkWidget *widget,
GtkDirectionType direction)
}
gtk_window_set_focus (GTK_WINDOW (container), NULL);
-
- if (!GTK_CONTAINER (window)->focus_child)
- {
- gint message = -1;
-
- switch (direction)
- {
- case GTK_DIR_UP:
- case GTK_DIR_LEFT:
- case GTK_DIR_TAB_BACKWARD:
- message = XEMBED_FOCUS_PREV;
- break;
- case GTK_DIR_DOWN:
- case GTK_DIR_RIGHT:
- case GTK_DIR_TAB_FORWARD:
- message = XEMBED_FOCUS_NEXT;
- break;
- }
-
- send_xembed_message (plug, message, 0, 0, 0,
- gtk_get_current_event_time ());
-
-#if 0
- gtk_window_set_focus (GTK_WINDOW (widget), NULL);
-
- gdk_error_trap_push ();
- XSetInputFocus (GDK_WINDOW_XDISPLAY (plug->socket_window),
- GDK_WINDOW_XWINDOW (plug->socket_window),
- RevertToParent, event->time);
- gdk_display_sync (gdk_drawable_get_display (plug->socket_window));
- gdk_error_trap_pop ();
-
- gtk_plug_forward_key_press (plug, event);
-#endif
- }
}
-
- return FALSE;
}
else
{
/* Try to focus the first widget in the window */
-
if (bin->child && gtk_widget_child_focus (bin->child, direction))
return TRUE;
}
+ if (!GTK_CONTAINER (window)->focus_child)
+ focus_to_parent (plug, direction);
+
return FALSE;
}
GTK_CONTAINER_CLASS (bin_class)->check_resize (container);
}
-static void
-send_xembed_message (GtkPlug *plug,
- glong message,
- glong detail,
- glong data1,
- glong data2,
- guint32 time)
-{
- if (plug->socket_window)
- {
- GdkDisplay *display = gdk_drawable_get_display (plug->socket_window);
- XEvent xevent;
-
- xevent.xclient.window = GDK_WINDOW_XWINDOW (plug->socket_window);
- xevent.xclient.type = ClientMessage;
- xevent.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED");
- xevent.xclient.format = 32;
- xevent.xclient.data.l[0] = time;
- xevent.xclient.data.l[1] = message;
- xevent.xclient.data.l[2] = detail;
- xevent.xclient.data.l[3] = data1;
- xevent.xclient.data.l[4] = data2;
-
- gdk_error_trap_push ();
- XSendEvent (GDK_WINDOW_XDISPLAY(plug->socket_window),
- GDK_WINDOW_XWINDOW (plug->socket_window),
- False, NoEventMask, &xevent);
- gdk_display_sync (display);
- gdk_error_trap_pop ();
- }
-}
-
static void
focus_first_last (GtkPlug *plug,
GtkDirectionType direction)
{
GtkWindow *window = GTK_WINDOW (plug);
GtkWidget *parent;
-
+
if (window->focus_widget)
{
parent = window->focus_widget->parent;
Atom xembed_info_atom = gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED_INFO");
- buffer[1] = 0; /* Protocol version */
+ buffer[0] = GTK_XEMBED_PROTOCOL_VERSION;
buffer[1] = flags;
XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
}
static void
-handle_xembed_message (GtkPlug *plug,
- glong message,
- glong detail,
- glong data1,
- glong data2,
- guint32 time)
+handle_xembed_message (GtkPlug *plug,
+ XEmbedMessageType message,
+ glong detail,
+ glong data1,
+ glong data2,
+ guint32 time)
{
+ GtkWindow *window = GTK_WINDOW (plug);
+
GTK_NOTE (PLUGSOCKET,
- g_message ("Message of type %ld received", message));
+ g_message ("GtkPlug: Message of type %d received", message));
switch (message)
{
case XEMBED_EMBEDDED_NOTIFY:
break;
case XEMBED_WINDOW_ACTIVATE:
- GTK_NOTE(PLUGSOCKET,
- g_message ("GtkPlug: ACTIVATE received"));
+ _gtk_window_set_is_active (window, TRUE);
break;
case XEMBED_WINDOW_DEACTIVATE:
- GTK_NOTE(PLUGSOCKET,
- g_message ("GtkPlug: DEACTIVATE received"));
+ _gtk_window_set_is_active (window, FALSE);
break;
case XEMBED_MODALITY_ON:
break;
case XEMBED_FOCUS_IN:
+ _gtk_window_set_has_toplevel_focus (window, TRUE);
switch (detail)
{
case XEMBED_FOCUS_FIRST:
focus_first_last (plug, GTK_DIR_TAB_BACKWARD);
break;
case XEMBED_FOCUS_CURRENT:
- /* fall through */;
+ break;
}
-
- case XEMBED_FOCUS_OUT:
- {
- GdkEvent event;
-
- event.focus_change.type = GDK_FOCUS_CHANGE;
- event.focus_change.window = GTK_WIDGET (plug)->window;
- event.focus_change.send_event = TRUE;
- event.focus_change.in = (message == XEMBED_FOCUS_IN);
-
- gtk_widget_event (GTK_WIDGET (plug), &event);
+ break;
- break;
- }
+ case XEMBED_FOCUS_OUT:
+ _gtk_window_set_has_toplevel_focus (window, FALSE);
+ break;
case XEMBED_GRAB_KEY:
case XEMBED_UNGRAB_KEY:
case XEMBED_REQUEST_FOCUS:
case XEMBED_FOCUS_NEXT:
case XEMBED_FOCUS_PREV:
- g_warning ("GtkPlug: Invalid _XEMBED message of type %ld received", message);
+ g_warning ("GtkPlug: Invalid _XEMBED message of type %d received", message);
break;
default:
GTK_NOTE(PLUGSOCKET,
- g_message ("GtkPlug: Ignoring unknown _XEMBED message of type %ld", message));
+ g_message ("GtkPlug: Ignoring unknown _XEMBED message of type %d", message));
break;
}
}
case ClientMessage:
if (xevent->xclient.message_type == gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED"))
{
+ _gtk_xembed_push_message (xevent);
handle_xembed_message (plug,
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]);
+ _gtk_xembed_pop_message ();
-
return GDK_FILTER_REMOVE;
}
else if (xevent->xclient.message_type == gdk_x11_get_xatom_by_name_for_display (display, "WM_DELETE_WINDOW"))
GtkWidget *widget = GTK_WIDGET (plug);
gdk_window_set_user_data (plug->socket_window, NULL);
- gdk_window_unref (plug->socket_window);
+ g_object_unref (plug->socket_window);
plug->socket_window = NULL;
/* Emit a delete window, as if the user attempted
*/
if (xre->parent == GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen)))
- {
- GdkEvent event;
-
- event.any.type = GDK_DELETE;
- event.any.window = g_object_ref (widget->window);
- event.any.send_event = FALSE;
-
- if (!gtk_widget_event (widget, &event))
- gtk_widget_destroy (widget);
-
- g_object_unref (event.any.window);
- }
+ send_delete_event (widget);
}
else
- break;
+ goto done;
}
if (xre->parent != GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen)))
g_hash_table_foreach (plug->grabbed_keys, add_grabbed_key_always, plug);
if (!was_embedded)
- g_signal_emit (G_OBJECT (plug), plug_signals[EMBEDDED], 0);
+ g_signal_emit (plug, plug_signals[EMBEDDED], 0);
}
-
+
+ done:
g_object_unref (plug);
break;
projects / ~andy / gtk / blobdiff