forked from AuroraMiddleware/gtk
f409cd9b7f
Mon Jul 2 16:53:25 2001 Owen Taylor <otaylor@redhat.com>
* gtk/xembed.h gtk/gtkplug.c gtk/gtksocket.c: For
XEMBED embedding add a _XEMBED_INFO property to the
client with version number and a "mapped" flags.
Use the mapped flag instead of the racy MapRequestEvent
* gtk/gtksocket.c: Clean up the gtk_socket_steal()
code to reliably set things (when the child is a passive
embedder participating in the XEMBED protocol) intead
of just being a hack for embedding non-participating
programs. Fix various bugs and race conditions.
* gtk/gtksocket.[ch] gtk/gtkplug.[ch]: Make local embedding
work by simply making the GtkSocket the gtk parent
of the GtkPlug. Set a flag in this case and make
the GtkPlug work like a normal container by overriding
methods such as check_resize and "chaining past" GtkWindow
to GtkBin.
* gtk/gtkentry.c (gtk_entry_real_activate)
gtk/gtkmain.c (gtk_propagate_event):
Eliminate use of gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW).
* gtk/gtkwidget.c (gtk_widget_get_toplevel,
gtk_widget_get_ancestor):
Explain why gtk_widget_get_ancestor (widget, GTK_TYPE_WINDOW)
might not give the expected result and recommend
an alternative.
* tests/testsocket.c tests/testsocket_child.c
tests/testsocket_common.c tests/Makefile.am: Extended
to test different type of adding plugs to sockets
(local,active,passive), and to test mapping/unmapping
the plug.
* gdk/gdkwindow.c (_gdk_window_destroy_hierarchy): Don't
mark the window as destroyed until after we
called _gdk_windowing_window_destroy().
(_gdk_windowing_window_destroy() may use GDK functions
on the window.)
* gdk/x11/gdkinput.c: Remove the check for finalization -
devices can be finalized under some circumnstances.
* gdk/x11/gdkinput-x11.c (gdk_input_device_new): Fix
small problem with GDK_TYPE_DEVICE.
47 lines
723 B
C
47 lines
723 B
C
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
extern guint32 create_child_plug (guint32 xid,
|
|
gboolean local);
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
guint32 xid;
|
|
guint32 plug_xid;
|
|
|
|
gtk_init (&argc, &argv);
|
|
|
|
if (argc != 1 && argc != 2)
|
|
{
|
|
fprintf (stderr, "Usage: testsocket_child [WINDOW_ID]\n");
|
|
exit (1);
|
|
}
|
|
|
|
if (argc == 2)
|
|
{
|
|
xid = strtol (argv[1], NULL, 0);
|
|
if (xid == 0)
|
|
{
|
|
fprintf (stderr, "Invalid window id '%s'\n", argv[1]);
|
|
exit (1);
|
|
}
|
|
|
|
create_child_plug (xid, FALSE);
|
|
}
|
|
else
|
|
{
|
|
plug_xid = create_child_plug (0, FALSE);
|
|
printf ("%d\n", plug_xid);
|
|
fflush (stdout);
|
|
}
|
|
|
|
gtk_main ();
|
|
|
|
return 0;
|
|
}
|
|
|
|
|