1998-11-24 04:45:29 +00:00
|
|
|
/* 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
|
2000-07-26 11:33:08 +00:00
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
1998-11-24 04:45:29 +00:00
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2000-07-26 11:33:08 +00:00
|
|
|
* Lesser General Public License for more details.
|
1998-11-24 04:45:29 +00:00
|
|
|
*
|
2000-07-26 11:33:08 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
1998-11-24 04:45:29 +00:00
|
|
|
* License along with this library; if not, write to the Free
|
|
|
|
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* By Owen Taylor <otaylor@gtk.org> 98/4/4 */
|
|
|
|
|
1999-02-24 07:37:18 +00:00
|
|
|
/*
|
2000-07-26 11:33:08 +00:00
|
|
|
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
1999-02-24 07:37:18 +00:00
|
|
|
* file for a list of people on the GTK+ Team. See the ChangeLog
|
|
|
|
* files for a list of changes. These files are distributed with
|
|
|
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
|
|
|
*/
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
#include "gdk/gdkkeysyms.h"
|
2001-04-19 20:36:46 +00:00
|
|
|
#include "gtkmain.h"
|
2001-07-05 02:58:34 +00:00
|
|
|
#include "gtkmarshal.h"
|
1998-11-24 04:45:29 +00:00
|
|
|
#include "gtkwindow.h"
|
2001-07-03 14:14:30 +00:00
|
|
|
#include "gtkplug.h"
|
2001-07-05 02:58:34 +00:00
|
|
|
#include "gtkprivate.h"
|
1998-11-24 04:45:29 +00:00
|
|
|
#include "gtksignal.h"
|
|
|
|
#include "gtksocket.h"
|
|
|
|
#include "gtkdnd.h"
|
|
|
|
|
2001-04-23 19:51:06 +00:00
|
|
|
#include "x11/gdkx.h"
|
2001-04-19 20:36:46 +00:00
|
|
|
|
2001-04-23 19:51:06 +00:00
|
|
|
#include "xembed.h"
|
This might seem like a large patch, but it isn't that bad, and nothing
should break on Unix/X11.
Win32 merge and general portability stuff:
* acconfig.h,configure.in: Check for <sys/time.h>.
* gdk/win32: New directory (actually, been there for a while).
* gtk/fnmatch.c: Include <glib.h> for G_DIR_SEPARATOR, WIN32 and
NATIVE_WIN32, and use these. Always case fold on Win32. No
backslashed escapes on native Win32.
* gtk/{gtk.def,makefile.msc}: New files.
* gtk/Makefile.am: Add above new files.
* gtk/{gtkaccelgroup,gtkbindings}.c: Include <string.h>
instead of <strings.h>.
* gtk/{gtkcalendar,gtkitemfactory,gtkpreview,gtkrc}.c: Include
config.h. Protect inclusion of <sys/param.h>, <sys/time.h>, and
<unistd.h> appropriately.
* gtk/gtkdnd.c: Merge in Win32 version (which doesn't do much).
Use ABS() (from <glib.h>) instead of abs().
* gtk/gtkfilesel.c: Moved Win32-specific includes after inclusion
of gtk (and thus glib) headers, so that WIN32 will be
defined. With MS C, include <direct.h> for mkdir prototype.
* gtk/gtkitemfactory.c (gtk_item_factory_callback_marshal): Add
some casts, needed by MS C.
* gtk/{gtklayout,gtkplug}.c: Merge in Win32 version (which isn't
implemented).
* gtk/gtkmain.c: Include gdk/gdkx.h for GDK_WINDOWING. Include
<X11/Xlocale.h> only on X11 platform, otherwise <locale.h>. Use
G_SEARCHPATH_SEPARATOR_S and g_module_build_path.
* gtk/gtkmain.h: Mark variables for export/import on Win32.
* gtk/gtkrange.c (gtk_range_motion_notify): Set mods also in case
the event is not a hint, or its window is not the slider. Needed
on Win32, at least.
* gtk/gtkrc.c: Include config.h and gdk/gdkx.h. Use <locale.h>
unless on X11. Skip \r chars, too. Use G_DIR_SEPARATOR and
G_SEARCHPATH_SEPARATOR(_S). Use g_path_is_absolute. On Win32, use
a subdirectory of the Windows directory as gtk system
configuration directory.
* gtk/gtkselection.c: No chunks on Win32.
* gtk/gtksocket.c: Not implemented on Win32.
* gtk/gtkthemes.c (gtk_theme_engine_get): Use g_module_build_path.
* gtk/makeenums.h: Include gdkprivate.h after gdk.h.
* gtk/testrgb.c: Use dynamically allocated buffer. Use GTimers.
1999-03-15 00:03:37 +00:00
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
/* Forward declararations */
|
|
|
|
|
2001-07-03 14:14:30 +00:00
|
|
|
static void gtk_socket_class_init (GtkSocketClass *klass);
|
|
|
|
static void gtk_socket_init (GtkSocket *socket);
|
|
|
|
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_size_allocate (GtkWidget *widget,
|
|
|
|
GtkAllocation *allocation);
|
|
|
|
static void gtk_socket_hierarchy_changed (GtkWidget *widget,
|
|
|
|
GtkWidget *old_toplevel);
|
|
|
|
static void gtk_socket_grab_notify (GtkWidget *widget,
|
|
|
|
gboolean was_grabbed);
|
|
|
|
static gboolean gtk_socket_key_press_event (GtkWidget *widget,
|
|
|
|
GdkEventKey *event);
|
|
|
|
static gboolean gtk_socket_focus_in_event (GtkWidget *widget,
|
|
|
|
GdkEventFocus *event);
|
|
|
|
static void gtk_socket_claim_focus (GtkSocket *socket);
|
|
|
|
static gboolean gtk_socket_focus_out_event (GtkWidget *widget,
|
|
|
|
GdkEventFocus *event);
|
|
|
|
static void gtk_socket_send_configure_event (GtkSocket *socket);
|
|
|
|
static gboolean gtk_socket_focus (GtkWidget *widget,
|
|
|
|
GtkDirectionType direction);
|
|
|
|
static void gtk_socket_remove (GtkContainer *container,
|
|
|
|
GtkWidget *widget);
|
|
|
|
static void gtk_socket_forall (GtkContainer *container,
|
|
|
|
gboolean include_internals,
|
|
|
|
GtkCallback callback,
|
|
|
|
gpointer callback_data);
|
|
|
|
|
|
|
|
|
|
|
|
static void gtk_socket_add_window (GtkSocket *socket,
|
|
|
|
GdkNativeWindow xid,
|
|
|
|
gboolean need_reparent);
|
|
|
|
static GdkFilterReturn gtk_socket_filter_func (GdkXEvent *gdk_xevent,
|
|
|
|
GdkEvent *event,
|
|
|
|
gpointer data);
|
|
|
|
|
|
|
|
static void send_xembed_message (GtkSocket *socket,
|
|
|
|
glong message,
|
|
|
|
glong detail,
|
|
|
|
glong data1,
|
|
|
|
glong data2,
|
|
|
|
guint32 time);
|
|
|
|
static gboolean xembed_get_info (GdkWindow *gdk_window,
|
|
|
|
unsigned long *version,
|
|
|
|
unsigned long *flags);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
/* From Tk */
|
|
|
|
#define EMBEDDED_APP_WANTS_FOCUS NotifyNormal+20
|
|
|
|
|
|
|
|
/* Local data */
|
|
|
|
|
2001-07-05 02:58:34 +00:00
|
|
|
enum {
|
|
|
|
PLUG_ADDED,
|
|
|
|
PLUG_REMOVED,
|
|
|
|
LAST_SIGNAL
|
|
|
|
};
|
|
|
|
|
|
|
|
static guint socket_signals[LAST_SIGNAL] = { 0 };
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
static GtkWidgetClass *parent_class = NULL;
|
|
|
|
|
1999-09-17 18:17:20 +00:00
|
|
|
GtkType
|
2000-02-13 08:16:48 +00:00
|
|
|
gtk_socket_get_type (void)
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
1999-09-17 18:17:20 +00:00
|
|
|
static GtkType socket_type = 0;
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
if (!socket_type)
|
|
|
|
{
|
documented necessary changes for 1.4 transition.
Fri May 12 17:13:32 2000 Tim Janik <timj@gtk.org>
* docs/Changes-1.4.txt: documented necessary changes for 1.4 transition.
* gtk/gtktext.c: made the adjustments no-construct args, simply
provide default adjustments.
(gtk_text_destroy): release adjustments.
* gtk/gtkprogressbar.c (gtk_progress_bar_class_init): made the
adjustment argument non-construct.
* gtk/gtkprogress.c (gtk_progress_destroy): release adjustment here,
instead of in finalize.
(gtk_progress_get_text_from_value):
(gtk_progress_get_current_text):
(gtk_progress_set_value):
(gtk_progress_get_percentage_from_value):
(gtk_progress_get_current_percentage):
(gtk_progress_set_percentage):
(gtk_progress_configure): ensure an adjustment is present.
Thu May 11 01:24:08 2000 Tim Janik <timj@gtk.org>
* gtk/gtkcolorsel.[hc]:
* gtk/gtkcolorseldialog.[hc]:
* gtk/gtkhsv.[hc]: major code cleanups, destroy handlers need to chain
their parent implementation, use bit fields for boolean values, don't
create unused widgets, usage of glib types, braces go on their own
lines, function argument alignment, #include directives etc. etc. etc..
* gtk/Makefile.am (gtk_public_h_sources): install gtkhsv.h.
Wed May 10 23:29:52 2000 Tim Janik <timj@gtk.org>
* gtk/gtktoolbar.c (gtk_toolbar_destroy): don't unref a NULL tooltips.
* gtk/gtkfilesel.c (gtk_file_selection_destroy): don't free a cmpl_state
of NULL.
* gtk/gtkcombo.c (gtk_combo_item_destroy): don#t keep references
to freed data.
(gtk_combo_destroy): don't keep a pointer to a destroyed window.
* gtk/gtkmenu.c (gtk_menu_init): reset the menu's toplevel pointer
to NULL when the toplevel is getting destroyed.
(gtk_menu_set_tearoff_state): same here for the tearoff_window.
(gtk_menu_destroy):
(gtk_menu_init): store the information of whether we have to
readd the initial child ref_count during destruction in a new
GtkMenu field needs_destruction_ref_count.
* gtk/gtkviewport.c: SHAME! ok this one is tricky, so i note it
here, those reading: learn from my mistake! ;)
in order for set_?adjustment to support a default adjustemnt if
invoked with an adjustment pointer of NULL, the code read (pseudo):
if (v->adjustment) unref (v->adjustment);
if (!adjustment) adjustment = adjustment_new ();
if (v->adjustment != adjustment) v->adjustment = ref (adjustment);
now imagine the first unref to actually free the old adjustment and
adjustment_new() creating a new adjustment from the very same memory
portion. here, the latter comparision will unintendedly fail, and
all hell breaks loose.
(gtk_viewport_set_hadjustment):
(gtk_viewport_set_vadjustment): reset viewport->?adjustment to NULL
after unreferencing it.
* gtk/gtkcontainer.[hc]: removed toplevel registration
functions: gtk_container_register_toplevel(),
gtk_container_unregister_toplevel() and
gtk_container_get_toplevels() which had wrong semantics
anyways: it didn't reference and copy the list.
* gtk/gtkwindow.c: we take over the container toplevel registration
bussiness now. windows are registered across multiple destructions,
untill they are finalized. the initial implicit reference count
users are holding on windows is removed with the first destruction
though.
(gtk_window_init): ref & sink and set has_user_ref_count, got
rid of gtk_container_register_toplevel() call. add window to
toplevel_list.
(gtk_window_destroy): unref the window if has_user_ref_count
is still set, got rid of call to
gtk_container_unregister_toplevel().
(gtk_window_finalize): remove window from toplevel list.
(gtk_window_list_toplevels): new function to return a newly
created list with referenced toplevels.
(gtk_window_read_rcfiles): use gtk_window_list_toplevels().
* gtk/gtkhscale.c (gtk_hscale_class_init): made the GtkRange
adjustment a non-construct arg.
* gtk/gtkvscale.c (gtk_vscale_class_init): likewise.
* gtk/gtkhscrollbar.c (gtk_vscrollbar_class_init): likewise.
* gtk/gtkvscrollbar.c (gtk_vscrollbar_class_init): likewise.
* gtk/gtkrange.c: added some realized checks.
(gtk_range_destroy): get rid of the h/v adjustments in the
destroy handler instead of finalize. remove timer.
(gtk_range_get_adjustment): demand create adjustment.
* gtk/gtkviewport.c: made h/v adjustment non-construct args.
we simply create them on demand now and get rid of them in
the destroy handler.
(gtk_viewport_destroy): get rid of the h/v adjustments in the
destroy handler instead of finalize.
(gtk_viewport_get_hadjustment):
(gtk_viewport_get_vadjustment):
(gtk_viewport_size_allocate): demand create h/v adjustment
if required.
* gtk/gtkwidget.c (gtk_widget_finalize): duplicate part of the
gtk_widget_real_destroy () functionality.
(gtk_widget_real_destroy): reinitialize with a new style, instead
of setting widget->style to NULL.
Fri May 5 13:02:09 2000 Tim Janik <timj@gtk.org>
* gtk/gtkcalendar.c:
* gtk/gtkbutton.c: ported _get_type() implementation over to
GType, either to preserve memchunks allocation facilities,
or because Gtk+ 1.0 GtkTypeInfo was still being used.
* gtk/gtkobject.[hc]: derive from GObject. ported various functions
over. prepare for ::destroy to be emitted multiple times.
removed reference tracer magic. chain into GObjectClass.shutdown()
to emit ::destroy signal.
* gtk/gtksignal.c: removed assumptions about GTK_TYPE_OBJECT being
fundamental.
* gtk/gtkmain.c: removed gtk_object_post_arg_parsing_init()
cludge.
* gtk/gtksocket.c:
* gtk/gtkplug.c:
* gtk/gtklayout.c:
* gtk/gtklabel.c:
* gtk/gtkargcollector.c:
* gtk/gtkarg.c: various fixups to work with GTK_TYPE_OBJECT
not being a fundamental anymore, and to work with the new
type system (nuked fundamental type varargs clutter).
* gtk/*.c: install finalize handlers in the GObjectClass
part of the class structure.
changed direct GTK_OBJECT()->klass accesses to
GTK_*_GET_CLASS().
changed direct object_class->type accesses to GTK_CLASS_TYPE().
* gtktypeutils.[hc]: use the reserved fundamental ids provided by
GType. made most of the GTK_*() type macros and Gtk* typedefs
simple wrappers around macros and types provided by GType.
most notably, a significant portion of the old API vanished:
GTK_TYPE_MAKE(),
GTK_TYPE_SEQNO(),
GTK_TYPE_FLAT_FIRST, GTK_TYPE_FLAT_LAST,
GTK_TYPE_STRUCTURED_FIRST, GTK_TYPE_STRUCTURED_LAST,
GTK_TYPE_ARGS,
GTK_TYPE_CALLBACK,
GTK_TYPE_C_CALLBACK,
GTK_TYPE_FOREIGN,
GtkTypeQuery,
gtk_type_query(),
gtk_type_set_varargs_type(),
gtk_type_get_varargs_type(),
gtk_type_check_object_cast(),
gtk_type_check_class_cast(),
gtk_type_describe_tree(),
gtk_type_describe_heritage(),
gtk_type_free(),
gtk_type_children_types(),
gtk_type_set_chunk_alloc(),
gtk_type_register_enum(),
gtk_type_register_flags(),
gtk_type_parent_class().
replacements, where available are described in ../docs/Changes-1.4.txt.
implemented compatibility functions for the remaining API.
* configure.in: depend on glib 1.3.1, use gobject module.
2000-05-12 15:25:50 +00:00
|
|
|
static const GTypeInfo socket_info =
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
sizeof (GtkSocketClass),
|
documented necessary changes for 1.4 transition.
Fri May 12 17:13:32 2000 Tim Janik <timj@gtk.org>
* docs/Changes-1.4.txt: documented necessary changes for 1.4 transition.
* gtk/gtktext.c: made the adjustments no-construct args, simply
provide default adjustments.
(gtk_text_destroy): release adjustments.
* gtk/gtkprogressbar.c (gtk_progress_bar_class_init): made the
adjustment argument non-construct.
* gtk/gtkprogress.c (gtk_progress_destroy): release adjustment here,
instead of in finalize.
(gtk_progress_get_text_from_value):
(gtk_progress_get_current_text):
(gtk_progress_set_value):
(gtk_progress_get_percentage_from_value):
(gtk_progress_get_current_percentage):
(gtk_progress_set_percentage):
(gtk_progress_configure): ensure an adjustment is present.
Thu May 11 01:24:08 2000 Tim Janik <timj@gtk.org>
* gtk/gtkcolorsel.[hc]:
* gtk/gtkcolorseldialog.[hc]:
* gtk/gtkhsv.[hc]: major code cleanups, destroy handlers need to chain
their parent implementation, use bit fields for boolean values, don't
create unused widgets, usage of glib types, braces go on their own
lines, function argument alignment, #include directives etc. etc. etc..
* gtk/Makefile.am (gtk_public_h_sources): install gtkhsv.h.
Wed May 10 23:29:52 2000 Tim Janik <timj@gtk.org>
* gtk/gtktoolbar.c (gtk_toolbar_destroy): don't unref a NULL tooltips.
* gtk/gtkfilesel.c (gtk_file_selection_destroy): don't free a cmpl_state
of NULL.
* gtk/gtkcombo.c (gtk_combo_item_destroy): don#t keep references
to freed data.
(gtk_combo_destroy): don't keep a pointer to a destroyed window.
* gtk/gtkmenu.c (gtk_menu_init): reset the menu's toplevel pointer
to NULL when the toplevel is getting destroyed.
(gtk_menu_set_tearoff_state): same here for the tearoff_window.
(gtk_menu_destroy):
(gtk_menu_init): store the information of whether we have to
readd the initial child ref_count during destruction in a new
GtkMenu field needs_destruction_ref_count.
* gtk/gtkviewport.c: SHAME! ok this one is tricky, so i note it
here, those reading: learn from my mistake! ;)
in order for set_?adjustment to support a default adjustemnt if
invoked with an adjustment pointer of NULL, the code read (pseudo):
if (v->adjustment) unref (v->adjustment);
if (!adjustment) adjustment = adjustment_new ();
if (v->adjustment != adjustment) v->adjustment = ref (adjustment);
now imagine the first unref to actually free the old adjustment and
adjustment_new() creating a new adjustment from the very same memory
portion. here, the latter comparision will unintendedly fail, and
all hell breaks loose.
(gtk_viewport_set_hadjustment):
(gtk_viewport_set_vadjustment): reset viewport->?adjustment to NULL
after unreferencing it.
* gtk/gtkcontainer.[hc]: removed toplevel registration
functions: gtk_container_register_toplevel(),
gtk_container_unregister_toplevel() and
gtk_container_get_toplevels() which had wrong semantics
anyways: it didn't reference and copy the list.
* gtk/gtkwindow.c: we take over the container toplevel registration
bussiness now. windows are registered across multiple destructions,
untill they are finalized. the initial implicit reference count
users are holding on windows is removed with the first destruction
though.
(gtk_window_init): ref & sink and set has_user_ref_count, got
rid of gtk_container_register_toplevel() call. add window to
toplevel_list.
(gtk_window_destroy): unref the window if has_user_ref_count
is still set, got rid of call to
gtk_container_unregister_toplevel().
(gtk_window_finalize): remove window from toplevel list.
(gtk_window_list_toplevels): new function to return a newly
created list with referenced toplevels.
(gtk_window_read_rcfiles): use gtk_window_list_toplevels().
* gtk/gtkhscale.c (gtk_hscale_class_init): made the GtkRange
adjustment a non-construct arg.
* gtk/gtkvscale.c (gtk_vscale_class_init): likewise.
* gtk/gtkhscrollbar.c (gtk_vscrollbar_class_init): likewise.
* gtk/gtkvscrollbar.c (gtk_vscrollbar_class_init): likewise.
* gtk/gtkrange.c: added some realized checks.
(gtk_range_destroy): get rid of the h/v adjustments in the
destroy handler instead of finalize. remove timer.
(gtk_range_get_adjustment): demand create adjustment.
* gtk/gtkviewport.c: made h/v adjustment non-construct args.
we simply create them on demand now and get rid of them in
the destroy handler.
(gtk_viewport_destroy): get rid of the h/v adjustments in the
destroy handler instead of finalize.
(gtk_viewport_get_hadjustment):
(gtk_viewport_get_vadjustment):
(gtk_viewport_size_allocate): demand create h/v adjustment
if required.
* gtk/gtkwidget.c (gtk_widget_finalize): duplicate part of the
gtk_widget_real_destroy () functionality.
(gtk_widget_real_destroy): reinitialize with a new style, instead
of setting widget->style to NULL.
Fri May 5 13:02:09 2000 Tim Janik <timj@gtk.org>
* gtk/gtkcalendar.c:
* gtk/gtkbutton.c: ported _get_type() implementation over to
GType, either to preserve memchunks allocation facilities,
or because Gtk+ 1.0 GtkTypeInfo was still being used.
* gtk/gtkobject.[hc]: derive from GObject. ported various functions
over. prepare for ::destroy to be emitted multiple times.
removed reference tracer magic. chain into GObjectClass.shutdown()
to emit ::destroy signal.
* gtk/gtksignal.c: removed assumptions about GTK_TYPE_OBJECT being
fundamental.
* gtk/gtkmain.c: removed gtk_object_post_arg_parsing_init()
cludge.
* gtk/gtksocket.c:
* gtk/gtkplug.c:
* gtk/gtklayout.c:
* gtk/gtklabel.c:
* gtk/gtkargcollector.c:
* gtk/gtkarg.c: various fixups to work with GTK_TYPE_OBJECT
not being a fundamental anymore, and to work with the new
type system (nuked fundamental type varargs clutter).
* gtk/*.c: install finalize handlers in the GObjectClass
part of the class structure.
changed direct GTK_OBJECT()->klass accesses to
GTK_*_GET_CLASS().
changed direct object_class->type accesses to GTK_CLASS_TYPE().
* gtktypeutils.[hc]: use the reserved fundamental ids provided by
GType. made most of the GTK_*() type macros and Gtk* typedefs
simple wrappers around macros and types provided by GType.
most notably, a significant portion of the old API vanished:
GTK_TYPE_MAKE(),
GTK_TYPE_SEQNO(),
GTK_TYPE_FLAT_FIRST, GTK_TYPE_FLAT_LAST,
GTK_TYPE_STRUCTURED_FIRST, GTK_TYPE_STRUCTURED_LAST,
GTK_TYPE_ARGS,
GTK_TYPE_CALLBACK,
GTK_TYPE_C_CALLBACK,
GTK_TYPE_FOREIGN,
GtkTypeQuery,
gtk_type_query(),
gtk_type_set_varargs_type(),
gtk_type_get_varargs_type(),
gtk_type_check_object_cast(),
gtk_type_check_class_cast(),
gtk_type_describe_tree(),
gtk_type_describe_heritage(),
gtk_type_free(),
gtk_type_children_types(),
gtk_type_set_chunk_alloc(),
gtk_type_register_enum(),
gtk_type_register_flags(),
gtk_type_parent_class().
replacements, where available are described in ../docs/Changes-1.4.txt.
implemented compatibility functions for the remaining API.
* configure.in: depend on glib 1.3.1, use gobject module.
2000-05-12 15:25:50 +00:00
|
|
|
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,
|
1998-11-24 04:45:29 +00:00
|
|
|
};
|
|
|
|
|
urg, removed implementation of gtk_marshal_VOID__INT_INT_INT_INT. if
Wed Oct 25 20:47:41 2000 Tim Janik <timj@gtk.org>
* gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init): urg, removed
implementation of gtk_marshal_VOID__INT_INT_INT_INT. if people do that,
couldn't they at least give it a non-standard name?
* gtk/gtktextlayout.c: arg! yet another implementation of
gtk_marshal_VOID__INT_INT_INT_INT(), is this a conspiracy?
* gtk/gtktextbuffer.c: gotcha! captured a vagabonding
gtk_marshal_VOID__INT_POINTER_INT() implementation, braught it back
home. now i know this _is_ a conspiracy.
* gtk/gtkwidget.c (gtk_widget_class_init): marshaller fixups for
::state-changed.
* gtk/gtkaccelgroup.c (gtk_accel_group_create_remove):
(gtk_accel_group_create_add): marshaller signature fixups.
* gtk/gtklistitem.c (gtk_list_item_class_init): signal creation fixups,
pass in GTK_TYPE_SCROLL_TYPE instead of GTK_TYPE_ENUM.
* gtk/gtkobject.[hc]: removed GTK_CONNECTED flag, it's not valid
anymore.
Tue Oct 24 23:59:21 2000 Tim Janik <timj@gtk.org>
* docs/reference/Makefile.am: disabled SUBDIRS for the moment, since
due to the signal system changes, it wouldn't build currently. to
be fixed soon.
* docs/Changes-2.0.txt: GtkSignal/GSignal updates.
* gtk/gtkwidget.c: ::direction_changed takes an enum as argument,
so it needs gtk_marshal_VOID__ENUM() instead of
gtk_marshal_NONE__UINT().
* gdk/gdk*.c: adapted type registration functions.
* gtk/gtkbindings.c:
* gtk/gtkaccelgroup.c: operate on GSignalQuery, GtkSignalQuery is
gone.
* gtk/gtkenums.h: define GtkSignalRunType in terms of GSignalType.
* gtk/gtkobject.c:
(gtk_object_destroy):
(gtk_object_shutdown): fixed recursion guards. basically we have to
catch the case where any of GObject.shutdown() or gtk_object_destroy()
is called during ::destroy, and avoid recursion there.
* gtk/gtktypeutils.c:
* gtk/maketypes.awk: awk-script hackup to provide gtk_type_init() with
boxed_copy/boxed_free. this needs a more general solution based on a
publically installed code-generator utility.
* gtk/gtktypeutils.[hc]: compat aliased GTK_TYPE_BOXED to G_TYPE_BOXED,
glib's gobject has support for that now.
define GtkSignalMarshaller in terms of GSignalCMarshaller.
Mon Oct 23 09:36:42 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]:
* gtk/gtkmarshal.[hc]:
* gtk/Makefile.am: generate marshallers with glib-genmarshal and don't
compile gtkmarshal.c on its own anymore, just include it in gtksignal.c.
removed #include <gtkmarshal.h>s all over the place, gtksignal.h takes
care of that.
* *.c: marshaller name fixups.
* gtk/gtkmarshal.list: added a comment briefing the format.
Sun Oct 22 23:14:39 2000 Tim Janik <timj@gtk.org>
* gtk/gtksignal.[hc]: nuked old implementation. we mostly have
compatibility macros here now. more specifically, most of
the API is preserved (yes, _most_, nonwithstanding the
following exceptions listed, the API is stil lHUGE ;)
things that got removed completely:
GtkSignalQuery, gtk_signal_query(), gtk_signal_n_emissions(),
gtk_signal_n_emissions_by_name(), gtk_signal_handlers_destroy(),
gtk_signal_set_funcs(), gtk_signal_handler_pending_by_id(),
gtk_signal_add_emission_hook(), gtk_signal_add_emission_hook_full(),
gtk_signal_remove_emission_hook().
non-functional functions variants:
gtk_signal_add_emission_hook(), gtk_signal_remove_emission_hook().
the GtkCallbackMarshal argument to gtk_signal_connect_full() is
not supported anymore.
(gtk_signal_compat_matched): new internal function to aid
implementation of the compatibility macros, it provides
functionality to block/unblock/disconnect handlers based
on func/data.
* gtk/gtkenums.h: define GtkSignalRunType in terms of GSignalType,
* *.c: adaptions to new type registration API signatures.
Fri Oct 20 15:26:33 2000 Tim Janik <timj@gtk.org>
* gtk/gtktypeutils.[hc]: removed G_TYPE_GTK_POINTER cludge.
2000-10-25 22:34:14 +00:00
|
|
|
socket_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkSocket", &socket_info, 0);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return socket_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_socket_class_init (GtkSocketClass *class)
|
|
|
|
{
|
|
|
|
GtkWidgetClass *widget_class;
|
|
|
|
GtkContainerClass *container_class;
|
|
|
|
|
|
|
|
widget_class = (GtkWidgetClass*) class;
|
|
|
|
container_class = (GtkContainerClass*) class;
|
|
|
|
|
2000-02-13 08:16:48 +00:00
|
|
|
parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
widget_class->realize = gtk_socket_realize;
|
|
|
|
widget_class->unrealize = gtk_socket_unrealize;
|
|
|
|
widget_class->size_request = gtk_socket_size_request;
|
|
|
|
widget_class->size_allocate = gtk_socket_size_allocate;
|
2001-04-19 20:36:46 +00:00
|
|
|
widget_class->hierarchy_changed = gtk_socket_hierarchy_changed;
|
|
|
|
widget_class->grab_notify = gtk_socket_grab_notify;
|
|
|
|
widget_class->key_press_event = gtk_socket_key_press_event;
|
1998-11-24 04:45:29 +00:00
|
|
|
widget_class->focus_in_event = gtk_socket_focus_in_event;
|
|
|
|
widget_class->focus_out_event = gtk_socket_focus_out_event;
|
2001-06-08 18:09:34 +00:00
|
|
|
widget_class->focus = gtk_socket_focus;
|
2001-07-03 14:14:30 +00:00
|
|
|
|
|
|
|
container_class->remove = gtk_socket_remove;
|
|
|
|
container_class->forall = gtk_socket_forall;
|
2001-07-05 02:58:34 +00:00
|
|
|
|
|
|
|
socket_signals[PLUG_ADDED] =
|
|
|
|
g_signal_new ("plug_added",
|
|
|
|
G_OBJECT_CLASS_TYPE (class),
|
|
|
|
G_SIGNAL_RUN_LAST,
|
|
|
|
G_STRUCT_OFFSET (GtkSocketClass, plug_added),
|
|
|
|
NULL, NULL,
|
|
|
|
gtk_marshal_VOID__VOID,
|
|
|
|
GTK_TYPE_NONE, 0);
|
|
|
|
socket_signals[PLUG_REMOVED] =
|
|
|
|
g_signal_new ("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);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
2001-07-03 14:14:30 +00:00
|
|
|
socket->plug_widget = NULL;
|
1998-11-24 04:45:29 +00:00
|
|
|
socket->focus_in = FALSE;
|
|
|
|
socket->have_size = FALSE;
|
|
|
|
socket->need_map = FALSE;
|
|
|
|
}
|
|
|
|
|
2001-07-05 02:58:34 +00:00
|
|
|
/**
|
|
|
|
* gtk_socket_new:
|
|
|
|
*
|
|
|
|
* Create a new empty #GtkSocket.
|
|
|
|
*
|
|
|
|
* Return value: the new #GtkSocket.
|
|
|
|
**/
|
1998-11-24 04:45:29 +00:00
|
|
|
GtkWidget*
|
2000-02-13 08:16:48 +00:00
|
|
|
gtk_socket_new (void)
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
GtkSocket *socket;
|
|
|
|
|
2001-04-19 20:36:46 +00:00
|
|
|
socket = g_object_new (GTK_TYPE_SOCKET, NULL);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
return GTK_WIDGET (socket);
|
|
|
|
}
|
|
|
|
|
2001-07-05 02:58:34 +00:00
|
|
|
/**
|
|
|
|
* gtk_socket_steal:
|
|
|
|
* @socket: a #GtkSocket
|
2001-09-08 06:24:46 +00:00
|
|
|
* @wid: the XID of an existing toplevel window.
|
2001-07-05 02:58:34 +00:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
**/
|
1998-11-24 04:45:29 +00:00
|
|
|
void
|
2001-09-08 06:24:46 +00:00
|
|
|
gtk_socket_steal (GtkSocket *socket, GdkNativeWindow wid)
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
2001-07-05 02:58:34 +00:00
|
|
|
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));
|
|
|
|
|
2001-09-08 06:24:46 +00:00
|
|
|
gtk_socket_add_window (socket, wid, TRUE);
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
2001-07-05 02:58:34 +00:00
|
|
|
/**
|
|
|
|
* gtk_socket_add_id:
|
|
|
|
* @socket: a #GtkSocket
|
|
|
|
* @id: the XID 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.
|
|
|
|
*
|
|
|
|
* To embed a #GtkPlug in a #GtkSocket, you can either create the
|
|
|
|
* #GtkPlug with gtk_plug_new (0), call gtk_plug_get_id() to get the
|
|
|
|
* window ID of the plug, and then pass that to the
|
|
|
|
* gtk_socket_add_id(), or you can call gtk_socket_get_id() to get the
|
|
|
|
* window ID for the socket, and call gtk_plug_new() passing in that
|
|
|
|
* ID.
|
|
|
|
*
|
|
|
|
* The #GtkSocket must have already be added into a toplevel window
|
|
|
|
* before you can make this call.
|
|
|
|
**/
|
|
|
|
void
|
|
|
|
gtk_socket_add_id (GtkSocket *socket, GdkNativeWindow id)
|
|
|
|
{
|
|
|
|
g_return_if_fail (GTK_IS_SOCKET (socket));
|
|
|
|
g_return_if_fail (GTK_WIDGET_ANCHORED (socket));
|
|
|
|
|
|
|
|
if (!GTK_WIDGET_REALIZED (socket))
|
|
|
|
gtk_widget_realize (GTK_WIDGET (socket));
|
|
|
|
|
|
|
|
gtk_socket_add_window (socket, id, TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* gtk_socket_get_id:
|
|
|
|
* @socket: a #GtkSocket.
|
|
|
|
*
|
|
|
|
* Gets the window ID of a #GtkSocket widget, which can then
|
|
|
|
* be used to create a client embedded inside the socket, for
|
|
|
|
* instance with gtk_socket_new (id). The #GtkSocket must
|
|
|
|
* have already be added into a toplevel window before you
|
|
|
|
* can make this call.
|
|
|
|
*
|
|
|
|
* Return value: the window ID for the socket
|
|
|
|
**/
|
|
|
|
GdkNativeWindow
|
|
|
|
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);
|
|
|
|
|
|
|
|
if (!GTK_WIDGET_REALIZED (socket))
|
|
|
|
gtk_widget_realize (GTK_WIDGET (socket));
|
|
|
|
|
|
|
|
return GDK_WINDOW_XWINDOW (GTK_WIDGET (socket)->window);
|
|
|
|
}
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
static void
|
|
|
|
gtk_socket_realize (GtkWidget *widget)
|
|
|
|
{
|
|
|
|
GtkSocket *socket;
|
|
|
|
GdkWindowAttr attributes;
|
|
|
|
gint attributes_mask;
|
|
|
|
XWindowAttributes xattrs;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_SOCKET (widget));
|
|
|
|
|
|
|
|
socket = GTK_SOCKET (widget);
|
|
|
|
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
|
|
|
|
|
|
|
|
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.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;
|
|
|
|
|
|
|
|
widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
|
|
|
|
&attributes, attributes_mask);
|
|
|
|
gdk_window_set_user_data (widget->window, socket);
|
|
|
|
|
|
|
|
widget->style = gtk_style_attach (widget->style, widget->window);
|
|
|
|
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
|
|
|
|
|
|
|
|
XGetWindowAttributes (GDK_DISPLAY (),
|
|
|
|
GDK_WINDOW_XWINDOW (widget->window),
|
|
|
|
&xattrs);
|
|
|
|
|
|
|
|
XSelectInput (GDK_DISPLAY (),
|
|
|
|
GDK_WINDOW_XWINDOW(widget->window),
|
|
|
|
xattrs.your_event_mask |
|
|
|
|
SubstructureNotifyMask | SubstructureRedirectMask);
|
|
|
|
|
|
|
|
gdk_window_add_filter (widget->window, gtk_socket_filter_func, widget);
|
|
|
|
|
|
|
|
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
|
|
|
|
|
|
|
|
/* We sync here so that we make sure that if the XID for
|
|
|
|
* our window is passed to another application, SubstructureRedirectMask
|
|
|
|
* will be set by the time the other app creates its window.
|
|
|
|
*/
|
|
|
|
gdk_flush();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_socket_unrealize (GtkWidget *widget)
|
|
|
|
{
|
2001-07-05 02:58:34 +00:00
|
|
|
GtkSocket *socket = GTK_SOCKET (widget);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
2001-07-05 02:58:34 +00:00
|
|
|
if (socket->plug_widget)
|
|
|
|
{
|
|
|
|
_gtk_plug_remove_from_socket (GTK_PLUG (socket->plug_widget), socket);
|
|
|
|
}
|
|
|
|
else if (socket->plug_window)
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
|
|
|
|
if (toplevel && GTK_IS_WINDOW (toplevel))
|
|
|
|
gtk_window_remove_embedded_xid (GTK_WINDOW (toplevel),
|
|
|
|
GDK_WINDOW_XWINDOW (socket->plug_window));
|
2001-04-19 20:36:46 +00:00
|
|
|
|
2001-07-05 02:58:34 +00:00
|
|
|
g_object_unref (socket->plug_window);
|
2001-04-19 20:36:46 +00:00
|
|
|
socket->plug_window = NULL;
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
2001-04-19 20:36:46 +00:00
|
|
|
#if 0
|
|
|
|
if (socket->grabbed_keys)
|
|
|
|
{
|
|
|
|
g_hash_table_foreach (socket->grabbed_keys, (GHFunc)g_free, NULL);
|
|
|
|
g_hash_table_destroy (socket->grabbed_keys);
|
|
|
|
socket->grabbed_keys = NULL;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
if (GTK_WIDGET_CLASS (parent_class)->unrealize)
|
|
|
|
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_socket_size_request (GtkWidget *widget,
|
|
|
|
GtkRequisition *requisition)
|
|
|
|
{
|
2001-07-05 02:58:34 +00:00
|
|
|
GtkSocket *socket = GTK_SOCKET (widget);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
2001-07-03 14:14:30 +00:00
|
|
|
if (socket->plug_widget)
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
2001-07-03 14:14:30 +00:00
|
|
|
gtk_widget_size_request (socket->plug_widget, requisition);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (socket->is_mapped && !socket->have_size && socket->plug_window)
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
2001-07-03 14:14:30 +00:00
|
|
|
XSizeHints hints;
|
|
|
|
long supplied;
|
|
|
|
|
|
|
|
gdk_error_trap_push ();
|
|
|
|
|
|
|
|
if (XGetWMNormalHints (GDK_DISPLAY(),
|
|
|
|
GDK_WINDOW_XWINDOW (socket->plug_window),
|
|
|
|
&hints, &supplied))
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
2001-07-03 14:14:30 +00:00
|
|
|
/* This is obsolete, according the X docs, but many programs
|
|
|
|
* still use it */
|
|
|
|
if (hints.flags & (PSize | USSize))
|
|
|
|
{
|
|
|
|
socket->request_width = hints.width;
|
|
|
|
socket->request_height = hints.height;
|
|
|
|
}
|
|
|
|
else 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;
|
|
|
|
}
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
2001-07-03 14:14:30 +00:00
|
|
|
socket->have_size = TRUE; /* don't check again? */
|
|
|
|
|
|
|
|
gdk_error_trap_pop ();
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
1999-02-21 19:25:53 +00:00
|
|
|
|
2001-07-03 14:14:30 +00:00
|
|
|
if (socket->is_mapped && socket->have_size)
|
|
|
|
{
|
|
|
|
requisition->width = MAX (socket->request_width, 1);
|
|
|
|
requisition->height = MAX (socket->request_height, 1);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
requisition->width = 1;
|
|
|
|
requisition->height = 1;
|
|
|
|
}
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_socket_size_allocate (GtkWidget *widget,
|
|
|
|
GtkAllocation *allocation)
|
|
|
|
{
|
|
|
|
GtkSocket *socket;
|
|
|
|
|
|
|
|
g_return_if_fail (GTK_IS_SOCKET (widget));
|
|
|
|
g_return_if_fail (allocation != NULL);
|
|
|
|
|
|
|
|
socket = GTK_SOCKET (widget);
|
|
|
|
|
|
|
|
widget->allocation = *allocation;
|
|
|
|
if (GTK_WIDGET_REALIZED (widget))
|
|
|
|
{
|
|
|
|
gdk_window_move_resize (widget->window,
|
|
|
|
allocation->x, allocation->y,
|
|
|
|
allocation->width, allocation->height);
|
|
|
|
|
2001-07-03 14:14:30 +00:00
|
|
|
if (socket->plug_widget)
|
|
|
|
{
|
|
|
|
GtkAllocation child_allocation;
|
|
|
|
|
|
|
|
child_allocation.x = 0;
|
|
|
|
child_allocation.y = 0;
|
|
|
|
child_allocation.width = allocation->width;
|
|
|
|
child_allocation.height = allocation->height;
|
|
|
|
|
|
|
|
gtk_widget_size_allocate (socket->plug_widget, &child_allocation);
|
|
|
|
}
|
|
|
|
else if (socket->plug_window)
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
1999-02-21 19:25:53 +00:00
|
|
|
gdk_error_trap_push ();
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
if (!socket->need_map &&
|
|
|
|
(allocation->width == socket->current_width) &&
|
|
|
|
(allocation->height == socket->current_height))
|
|
|
|
{
|
|
|
|
gtk_socket_send_configure_event (socket);
|
1999-02-18 16:43:42 +00:00
|
|
|
GTK_NOTE(PLUGSOCKET,
|
|
|
|
g_message ("GtkSocket - allocated no change: %d %d",
|
|
|
|
allocation->width, allocation->height));
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
gdk_window_move_resize (socket->plug_window,
|
|
|
|
0, 0,
|
|
|
|
allocation->width, allocation->height);
|
1999-02-18 16:43:42 +00:00
|
|
|
GTK_NOTE(PLUGSOCKET,
|
|
|
|
g_message ("GtkSocket - allocated: %d %d",
|
|
|
|
allocation->width, allocation->height));
|
1998-11-24 04:45:29 +00:00
|
|
|
socket->current_width = allocation->width;
|
|
|
|
socket->current_height = allocation->height;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (socket->need_map)
|
|
|
|
{
|
|
|
|
gdk_window_show (socket->plug_window);
|
|
|
|
socket->need_map = FALSE;
|
|
|
|
}
|
|
|
|
|
1999-02-21 19:25:53 +00:00
|
|
|
gdk_flush ();
|
|
|
|
gdk_error_trap_pop ();
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-04-19 20:36:46 +00:00
|
|
|
#if 0
|
|
|
|
|
|
|
|
typedef struct
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
2001-04-19 20:36:46 +00:00
|
|
|
guint accelerator_key;
|
|
|
|
GdkModifierType accelerator_mods;
|
|
|
|
} GrabbedKey;
|
|
|
|
|
|
|
|
static guint
|
|
|
|
grabbed_key_hash (gconstpointer a)
|
|
|
|
{
|
|
|
|
const GrabbedKey *key = a;
|
|
|
|
guint h;
|
|
|
|
|
|
|
|
h = key->accelerator_key << 16;
|
|
|
|
h ^= key->accelerator_key >> 16;
|
|
|
|
h ^= key->accelerator_mods;
|
1998-11-24 04:45:29 +00:00
|
|
|
|
2001-04-19 20:36:46 +00:00
|
|
|
return h;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
grabbed_key_equal (gconstpointer a, gconstpointer b)
|
|
|
|
{
|
|
|
|
const GrabbedKey *keya = a;
|
|
|
|
const GrabbedKey *keyb = b;
|
|
|
|
|
|
|
|
return (keya->accelerator_key == keyb->accelerator_key &&
|
|
|
|
keya->accelerator_mods == keyb->accelerator_mods);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
add_grabbed_key (GtkSocket *socket,
|
|
|
|
guint hardware_keycode,
|
|
|
|
GdkModifierType mods)
|
|
|
|
{
|
|
|
|
GrabbedKey key;
|
|
|
|
GrabbedKey *new_key;
|
|
|
|
GrabbedKey *found_key;
|
|
|
|
|
|
|
|
if (socket->grabbed_keys)
|
1999-02-21 19:25:53 +00:00
|
|
|
{
|
2001-04-19 20:36:46 +00:00
|
|
|
key.accelerator_key = hardware_keycode;
|
|
|
|
key.accelerator_mods = mods;
|
|
|
|
|
|
|
|
found_key = g_hash_table_lookup (socket->grabbed_keys, &key);
|
|
|
|
|
|
|
|
if (found_key)
|
|
|
|
{
|
|
|
|
g_warning ("GtkSocket: request to add already present grabbed key %u,%#x\n",
|
|
|
|
hardware_keycode, mods);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!socket->grabbed_keys)
|
|
|
|
socket->grabbed_keys = g_hash_table_new (grabbed_key_hash, grabbed_key_equal);
|
|
|
|
|
|
|
|
new_key = g_new (GrabbedKey, 1);
|
|
|
|
|
|
|
|
new_key->accelerator_key = hardware_keycode;
|
|
|
|
new_key->accelerator_mods = mods;
|
|
|
|
|
|
|
|
g_hash_table_insert (socket->grabbed_keys, new_key, new_key);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
remove_grabbed_key (GtkSocket *socket,
|
|
|
|
guint hardware_keycode,
|
|
|
|
GdkModifierType mods)
|
|
|
|
{
|
|
|
|
GrabbedKey key;
|
|
|
|
GrabbedKey *found_key = NULL;
|
|
|
|
|
|
|
|
if (socket->grabbed_keys)
|
|
|
|
{
|
|
|
|
key.accelerator_key = hardware_keycode;
|
|
|
|
key.accelerator_mods = mods;
|
|
|
|
|
|
|
|
found_key = g_hash_table_lookup (socket->grabbed_keys, &key);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (found_key)
|
|
|
|
{
|
|
|
|
g_hash_table_remove (socket->grabbed_keys, &key);
|
|
|
|
g_free (found_key);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
g_warning ("GtkSocket: request to remove non-present grabbed key %u,%#x\n",
|
|
|
|
hardware_keycode, mods);
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
toplevel_key_press_handler (GtkWidget *toplevel,
|
|
|
|
GdkEventKey *event,
|
|
|
|
GtkSocket *socket)
|
|
|
|
{
|
|
|
|
GrabbedKey search_key;
|
|
|
|
|
|
|
|
search_key.accelerator_key = event->hardware_keycode;
|
|
|
|
search_key.accelerator_mods = event->state;
|
|
|
|
|
|
|
|
if (socket->grabbed_keys &&
|
|
|
|
g_hash_table_lookup (socket->grabbed_keys, &search_key))
|
|
|
|
{
|
|
|
|
gtk_socket_key_press_event (GTK_WIDGET (socket), event);
|
|
|
|
gtk_signal_emit_stop_by_name (GTK_OBJECT (toplevel), "key_press_event");
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static void
|
|
|
|
toplevel_focus_in_handler (GtkWidget *toplevel,
|
|
|
|
GdkEventFocus *event,
|
|
|
|
GtkSocket *socket)
|
|
|
|
{
|
|
|
|
/* It appears spurious focus in events can occur when
|
|
|
|
* the window is hidden. So we'll just check to see if
|
|
|
|
* the window is visible before actually handling the
|
|
|
|
* event. (Comment from gtkwindow.c)
|
|
|
|
*/
|
|
|
|
if (GTK_WIDGET_VISIBLE (toplevel))
|
|
|
|
send_xembed_message (socket, XEMBED_WINDOW_ACTIVATE, 0, 0, 0,
|
|
|
|
gtk_get_current_event_time ()); /* Will be GDK_CURRENT_TIME */
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
toplevel_focus_out_handler (GtkWidget *toplevel,
|
|
|
|
GdkEventFocus *event,
|
|
|
|
GtkSocket *socket)
|
|
|
|
{
|
|
|
|
send_xembed_message (socket, XEMBED_WINDOW_DEACTIVATE, 0, 0, 0,
|
|
|
|
gtk_get_current_event_time ()); /* Will be GDK_CURRENT_TIME */
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2001-07-01 00:57:21 +00:00
|
|
|
gtk_socket_hierarchy_changed (GtkWidget *widget,
|
|
|
|
GtkWidget *old_toplevel)
|
2001-04-19 20:36:46 +00:00
|
|
|
{
|
|
|
|
GtkSocket *socket = GTK_SOCKET (widget);
|
|
|
|
GtkWidget *toplevel = gtk_widget_get_toplevel (widget);
|
|
|
|
|
|
|
|
if (toplevel && !GTK_IS_WINDOW (toplevel))
|
|
|
|
toplevel = NULL;
|
|
|
|
|
|
|
|
if (toplevel != socket->toplevel)
|
|
|
|
{
|
|
|
|
if (socket->toplevel)
|
|
|
|
{
|
|
|
|
#if 0
|
|
|
|
gtk_signal_disconnect_by_func (GTK_OBJECT (socket->toplevel), GTK_SIGNAL_FUNC (toplevel_key_press_handler), socket);
|
|
|
|
#endif
|
|
|
|
gtk_signal_disconnect_by_func (GTK_OBJECT (socket->toplevel), GTK_SIGNAL_FUNC (toplevel_focus_in_handler), socket);
|
|
|
|
gtk_signal_disconnect_by_func (GTK_OBJECT (socket->toplevel), GTK_SIGNAL_FUNC (toplevel_focus_out_handler), socket);
|
|
|
|
}
|
|
|
|
|
|
|
|
socket->toplevel = toplevel;
|
|
|
|
|
|
|
|
if (toplevel)
|
|
|
|
{
|
|
|
|
#if 0
|
|
|
|
gtk_signal_connect (GTK_OBJECT (socket->toplevel), "key_press_event",
|
|
|
|
GTK_SIGNAL_FUNC (toplevel_key_press_handler), socket);
|
|
|
|
#endif
|
|
|
|
gtk_signal_connect (GTK_OBJECT (socket->toplevel), "focus_in_event",
|
|
|
|
GTK_SIGNAL_FUNC (toplevel_focus_in_handler), socket);
|
|
|
|
gtk_signal_connect (GTK_OBJECT (socket->toplevel), "focus_out_event",
|
|
|
|
GTK_SIGNAL_FUNC (toplevel_focus_out_handler), socket);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_socket_grab_notify (GtkWidget *widget,
|
|
|
|
gboolean was_grabbed)
|
|
|
|
{
|
|
|
|
send_xembed_message (GTK_SOCKET (widget),
|
|
|
|
was_grabbed ? XEMBED_MODALITY_OFF : XEMBED_MODALITY_ON,
|
|
|
|
0, 0, 0, gtk_get_current_event_time ());
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
gtk_socket_key_press_event (GtkWidget *widget,
|
|
|
|
GdkEventKey *event)
|
|
|
|
{
|
|
|
|
GtkSocket *socket = GTK_SOCKET (widget);
|
|
|
|
|
|
|
|
if (socket->plug_window)
|
|
|
|
{
|
|
|
|
XEvent xevent;
|
|
|
|
|
|
|
|
xevent.xkey.type = KeyPress;
|
|
|
|
xevent.xkey.display = GDK_WINDOW_XDISPLAY (event->window);
|
|
|
|
xevent.xkey.window = GDK_WINDOW_XWINDOW (socket->plug_window);
|
|
|
|
xevent.xkey.root = GDK_ROOT_WINDOW ();
|
|
|
|
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 ? */
|
|
|
|
|
1999-02-21 19:25:53 +00:00
|
|
|
gdk_error_trap_push ();
|
Make gdkx.h the only installed header from gdk/x11. All structures in
Fri Sep 7 11:51:44 2001 Owen Taylor <otaylor@redhat.com>
Make gdkx.h the only installed header from gdk/x11.
All structures in gdk/x11 are opaque.
* gdk/x11/Makefile.am gdk/x11/gdkx.h gdk/x11/gdkprivate-x11.h:
Don't install gdk{drawable,pixmap,window}-x11.h.
* gdk/x11/{gdkcolormap-x11.c, gdkfont-x11.c, gdkx.h, gdkvisual-x11.c:
Move GdkColormapPrivateX11, GdkFontPrivateX GdkImagePrivateX11,
GdkVisualClass into C files.
* gdk/gdkpixmap-x11.[ch]: Make gdk_pixmap_impl_get_type() static.
* gdk/x11/{gdkcolor-x11.c, gdkcursor-x11.c, gdkdrawable-x11.c,
gdkfont-x11.c, gdkgc-x11.c, gdkx.h, gdkimage-x11,gdkvisual-x11.c}
Add public functions to replace previously exported direct
structure access.
gdk_x11_colormap_get_{xdisplay,xcolormap}
gdk_x11_cursor_get_{xdisplay,xcursor},
gdk_x11_drawable_get_{xdisplay,xcursor,gdk_x11_visual_get_xvisual,
gdk_x11_font_get_{xdisplay,xfont}, gdk_x11_image_get_{xdisplay,ximage},
gdk_x11_gc_get_{xdisplay,ximage}
* gdk/gdkprivate.h gdk/gdkinternals.h: Move GdkColorInfo,
GdkEventFilter, GdkClientFilter, GdkFontPrivate to gdkinternals.
Fix a number of variables and functions that were exported
"accidentally" from GDK.
* gdk/**.[ch]: gdk => _gdk for gdk_visual_init,
gdk_events_init, gdk_input_init, gdk_dnd_init, gdk_image_exit,
gdk_input_exit, gdk_windowing_exit, gdk_event_func, gdk_event_data,
gdk_event_notify, gdk_queued_events, gdk_queued_tail,
gdk_event_new, gdk_events_queue, gdk_events_unqueue,
gdk_event_queue_find_first, gdk_event_queue_remove_link,
gdk_event_queue_append, gdk_event_button_generate,
gdk_debug_flags, gdk_default_filters, gdk_parent_root.
* gdk/x11/{gdkevents-x11.c, gdkglobals-x11.c, gdkimage-x11.c,
gdkmain-x11.c, gdkprivate-x11.h, gdk/x11/gdkwindow-x11.c}:
gdk => _gdk for gdk_event_mask_table, gkd_nevent_masks,
gdk_wm_window_protocols, gdk_leader_window, gdk_xgrab_window,
gdk_use_xshm, gdk_input_ignore_core.
* gdk/x11/xsettings-common.h (xsettings_list_insert): Add
#defines to namespace functions into the private _gdk_
namespace.
* gdk/gdkwindow.[ch] gdk/x11/gdkx.h: Add gdk_get_default_root_window ()
to replace gdk_parent_root exported variable. Adjust and
deprecate GDK_ROOT_PARENT().
* demos/{testpixbuf-drawable.c,testpixbuf-save.c}: Fix
GDK_ROOT_PARENT usage, remove includes of port-specific
headers.
* gdk/{win32,x11,fb}/gdkinput*.[ch]: s/gdk/_gdk/ for
_gdk_input_gxid_host, _gdk_input_gxid_port, _gdk_input_ignore_core,
gdk_input_devices, _gdk_input_windows, gdk_init_input_core.
* gdk/x11/{gdkevents-x11.,c gdkglobals-x11.c, gdkmain-x11.c}
docs/Changes-2.0.txt: Remove gdk_wm_protocols,
gdk_wm_delete_window functions, gdk_wm_take_focus,
use gdk_atom_intern() instead.
* gdk/linux-fb/{gdkselection-fb.c, gdkmain-fb.c, gdkprivatefb.h}
gdk/win32/{gdkselection-win32.c, gdkmgdkwin32.h, gdkprivate-win32.h}
gdk/x11/{gdkselection-x11.c gdkx.h, gtkprivate-x11.h}
gtk/gtkselection.c
Unexport gdk_selection_property, just use
gdk_atom_intern ("GDK_SELECTION").
* gdk/x11/{gdkprivate-x11.h,gdkdrawable-x11h,gdkgc-x11.c,gdkx.h}:
Unexport gdk_drawable_impl_x11_get_type, gdk_gc_x11_get_type,
GDK_GC_X11 cast macros, GdkGCX11 structures, GdkCursorPrivate,
GdkVisualprivate, gdk_x11_gc_flush.
Make a number of public exports of variables into functions
to increase encapsulation.
* gdk/gdkinternals.h gdk/gdkinput.h gdk/gdkevents.h
gdk/linux-fb/gdkmouse-fb.c: gdk_core_pointer => _gdk_core_pointer,
move to gdkinternals.h. Add gdk_device_get_core_pointer ().
* gdk/gdkprivate.h gdk/gdkpango.c gdk/gdkinternals.h
docs/Changes-2.0.txt: Unexport gdk_parent_root, gdk_error_code,
gdk_error_warnings.
* gdk/x11/{gdkcolormap-x11.c, gdkmain-x11.c, gdkx.h}
docs/Changes-2.0.txt:
s/gdk_screen/_gdk_screen/, add gdk_x11_get_default_screen()
s/gdk_root_window/_gdk_root_window/, add gdk_x11_get_default_root_xwindow()
Add gdk_x11_get_default_xdisplay().
* gdk/gdk.h gdk/gdk.c linux-fb/gdkfb.h linux-fb/gdkglobals-fb.c
win32/gdkwin32.h x11/gdkglobals-x11.c gdk/x11/gdkmain-x11.c
gdk/x11/gdkx.h: gdk/gdk.def: Add gdk_get/set_program_class,
Don't export gdk_progclass, move --class command line
option and handling to common portion of GDK.
Miscellaneous fixes:
* gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): Fix
g_return_val_if_fail that should have been g_return_if_fail.
* gdk/gdkinternals.h gdk/gdkprivate.h: Move
gdk_synthesize_window_state() to the semi-public gdkprivate.h.
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Remove uneeded
X11 dependency.
* gdk/linux-fb/gdkmain-fb.c gdk/win32/gdkmain-win32.c gdk/TODO:
Remove unused gdk_key_repeat_disable/restore.
* linux-fb/gdkglobals-fb.c win32/gdkglobals-win32.c
x11/gdkglobals-x11.c x11/gdkprivate-x11.h gdk/gdk.def:
Remove unused gdk_null_window_warnings variable.
* gdk/Makefile.am (DIST_SUBDIRS) nanox/*: cvs remove nanox;
it can be retrieved from the repository; it is too far
from functional to be worth having people check out;
it would be easier to start from scratch, I suspect.
* gdk/x11/gdkpixmap-x11.c: Fix lvalue usage of GDK_PIXMAP_XID().
* gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c
gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c:
Fix some accidentally global variables and unused global variables.
* gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c
gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c:
Fix some accidentally global variables and unused global variables.
Add some space for future expansion to multihead.
* gdk/gdkdrawable.h: Add four reserved function pointers
for future expansion of GdkDrawableClass.
* gtk/gtkwindow.h gtk/gtkinvisible.h: Add reserved pointer
where we can put a GdkScreen * later.
2001-09-07 21:50:20 +00:00
|
|
|
XSendEvent (GDK_DISPLAY (),
|
2001-04-19 20:36:46 +00:00
|
|
|
GDK_WINDOW_XWINDOW (socket->plug_window),
|
|
|
|
False, NoEventMask, &xevent);
|
|
|
|
gdk_flush ();
|
1999-02-21 19:25:53 +00:00
|
|
|
gdk_error_trap_pop ();
|
2001-04-19 20:36:46 +00:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
gtk_socket_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
|
|
|
|
{
|
|
|
|
GtkSocket *socket = GTK_SOCKET (widget);
|
|
|
|
|
|
|
|
if (!GTK_WIDGET_HAS_FOCUS (widget))
|
|
|
|
{
|
|
|
|
GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
|
|
|
|
|
|
|
|
if (socket->plug_window)
|
|
|
|
{
|
|
|
|
send_xembed_message (socket, XEMBED_FOCUS_IN, XEMBED_FOCUS_CURRENT, 0, 0,
|
|
|
|
gtk_get_current_event_time ());
|
|
|
|
}
|
1999-02-21 19:25:53 +00:00
|
|
|
}
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2001-04-19 20:36:46 +00:00
|
|
|
static gboolean
|
1998-11-24 04:45:29 +00:00
|
|
|
gtk_socket_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
|
|
|
|
{
|
2001-04-19 20:36:46 +00:00
|
|
|
GtkSocket *socket = GTK_SOCKET (widget);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
2001-04-19 20:36:46 +00:00
|
|
|
GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
2001-04-19 20:36:46 +00:00
|
|
|
#if 0
|
|
|
|
GtkWidget *toplevel;
|
2001-07-03 14:14:30 +00:00
|
|
|
toplevel = gtk_widget_get_toplevel (widget);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
2001-07-03 14:14:30 +00:00
|
|
|
if (toplevel && GTK_IS_WINDOW (toplevel))
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
XSetInputFocus (GDK_DISPLAY (),
|
|
|
|
GDK_WINDOW_XWINDOW (toplevel->window),
|
|
|
|
RevertToParent, CurrentTime); /* FIXME? */
|
|
|
|
}
|
|
|
|
|
2001-04-19 20:36:46 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
if (socket->plug_window)
|
|
|
|
{
|
|
|
|
send_xembed_message (socket, XEMBED_FOCUS_OUT, 0, 0, 0,
|
|
|
|
gtk_get_current_event_time ());
|
|
|
|
}
|
1998-11-24 04:45:29 +00:00
|
|
|
|
2001-04-19 20:36:46 +00:00
|
|
|
socket->focus_in = FALSE;
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_socket_claim_focus (GtkSocket *socket)
|
|
|
|
{
|
|
|
|
|
|
|
|
socket->focus_in = TRUE;
|
|
|
|
|
|
|
|
/* 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);
|
|
|
|
|
|
|
|
/* FIXME: we might grab the focus even if we don't have
|
|
|
|
* it as an app... (and see _focus_in ()) */
|
|
|
|
if (socket->plug_window)
|
1999-02-21 19:25:53 +00:00
|
|
|
{
|
2001-04-19 20:36:46 +00:00
|
|
|
#if 0
|
1999-02-21 19:25:53 +00:00
|
|
|
gdk_error_trap_push ();
|
|
|
|
XSetInputFocus (GDK_DISPLAY (),
|
|
|
|
GDK_WINDOW_XWINDOW (socket->plug_window),
|
|
|
|
RevertToParent, GDK_CURRENT_TIME);
|
|
|
|
gdk_flush ();
|
|
|
|
gdk_error_trap_pop ();
|
2001-04-19 20:36:46 +00:00
|
|
|
#endif
|
1999-02-21 19:25:53 +00:00
|
|
|
}
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
2001-04-19 20:36:46 +00:00
|
|
|
static gboolean
|
2001-06-08 18:09:34 +00:00
|
|
|
gtk_socket_focus (GtkWidget *widget, GtkDirectionType direction)
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
GtkSocket *socket;
|
2001-04-19 20:36:46 +00:00
|
|
|
gint detail = -1;
|
1998-11-24 04:45:29 +00:00
|
|
|
|
2001-06-08 18:09:34 +00:00
|
|
|
g_return_val_if_fail (GTK_IS_SOCKET (widget), FALSE);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
2001-06-08 18:09:34 +00:00
|
|
|
socket = GTK_SOCKET (widget);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
2001-07-03 14:14:30 +00:00
|
|
|
if (socket->plug_widget)
|
|
|
|
return gtk_widget_child_focus (socket->plug_widget, direction);
|
|
|
|
|
2001-06-08 18:09:34 +00:00
|
|
|
if (!GTK_WIDGET_HAS_FOCUS (widget))
|
2001-04-19 20:36:46 +00:00
|
|
|
{
|
|
|
|
switch (direction)
|
|
|
|
{
|
|
|
|
case GTK_DIR_UP:
|
|
|
|
case GTK_DIR_LEFT:
|
|
|
|
case GTK_DIR_TAB_BACKWARD:
|
|
|
|
detail = XEMBED_FOCUS_LAST;
|
|
|
|
break;
|
|
|
|
case GTK_DIR_DOWN:
|
|
|
|
case GTK_DIR_RIGHT:
|
|
|
|
case GTK_DIR_TAB_FORWARD:
|
|
|
|
detail = XEMBED_FOCUS_FIRST;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
send_xembed_message (socket, XEMBED_FOCUS_IN, detail, 0, 0,
|
|
|
|
gtk_get_current_event_time ());
|
|
|
|
|
2001-06-08 18:09:34 +00:00
|
|
|
GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
|
|
|
|
gtk_widget_grab_focus (widget);
|
2001-04-19 20:36:46 +00:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
#if 0
|
1998-11-24 04:45:29 +00:00
|
|
|
if (!socket->focus_in && socket->plug_window)
|
|
|
|
{
|
|
|
|
XEvent xevent;
|
|
|
|
|
|
|
|
gtk_socket_claim_focus (socket);
|
|
|
|
|
|
|
|
xevent.xkey.type = KeyPress;
|
|
|
|
xevent.xkey.display = GDK_DISPLAY ();
|
|
|
|
xevent.xkey.window = GDK_WINDOW_XWINDOW (socket->plug_window);
|
|
|
|
xevent.xkey.root = GDK_ROOT_WINDOW (); /* FIXME */
|
|
|
|
xevent.xkey.time = GDK_CURRENT_TIME; /* FIXME */
|
|
|
|
/* FIXME, the following might cause big 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 = 0;
|
|
|
|
xevent.xkey.same_screen = TRUE; /* FIXME ? */
|
|
|
|
|
|
|
|
switch (direction)
|
|
|
|
{
|
|
|
|
case GTK_DIR_UP:
|
|
|
|
xevent.xkey.keycode = XKeysymToKeycode(GDK_DISPLAY(), GDK_Up);
|
|
|
|
break;
|
|
|
|
case GTK_DIR_DOWN:
|
|
|
|
xevent.xkey.keycode = XKeysymToKeycode(GDK_DISPLAY(), GDK_Down);
|
|
|
|
break;
|
|
|
|
case GTK_DIR_LEFT:
|
|
|
|
xevent.xkey.keycode = XKeysymToKeycode(GDK_DISPLAY(), GDK_Left);
|
|
|
|
break;
|
|
|
|
case GTK_DIR_RIGHT:
|
|
|
|
xevent.xkey.keycode = XKeysymToKeycode(GDK_DISPLAY(), GDK_Right);
|
|
|
|
break;
|
|
|
|
case GTK_DIR_TAB_FORWARD:
|
|
|
|
xevent.xkey.keycode = XKeysymToKeycode(GDK_DISPLAY(), GDK_Tab);
|
|
|
|
break;
|
|
|
|
case GTK_DIR_TAB_BACKWARD:
|
|
|
|
xevent.xkey.keycode = XKeysymToKeycode(GDK_DISPLAY(), GDK_Tab);
|
|
|
|
xevent.xkey.state = ShiftMask;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1999-02-21 19:25:53 +00:00
|
|
|
|
|
|
|
gdk_error_trap_push ();
|
Make gdkx.h the only installed header from gdk/x11. All structures in
Fri Sep 7 11:51:44 2001 Owen Taylor <otaylor@redhat.com>
Make gdkx.h the only installed header from gdk/x11.
All structures in gdk/x11 are opaque.
* gdk/x11/Makefile.am gdk/x11/gdkx.h gdk/x11/gdkprivate-x11.h:
Don't install gdk{drawable,pixmap,window}-x11.h.
* gdk/x11/{gdkcolormap-x11.c, gdkfont-x11.c, gdkx.h, gdkvisual-x11.c:
Move GdkColormapPrivateX11, GdkFontPrivateX GdkImagePrivateX11,
GdkVisualClass into C files.
* gdk/gdkpixmap-x11.[ch]: Make gdk_pixmap_impl_get_type() static.
* gdk/x11/{gdkcolor-x11.c, gdkcursor-x11.c, gdkdrawable-x11.c,
gdkfont-x11.c, gdkgc-x11.c, gdkx.h, gdkimage-x11,gdkvisual-x11.c}
Add public functions to replace previously exported direct
structure access.
gdk_x11_colormap_get_{xdisplay,xcolormap}
gdk_x11_cursor_get_{xdisplay,xcursor},
gdk_x11_drawable_get_{xdisplay,xcursor,gdk_x11_visual_get_xvisual,
gdk_x11_font_get_{xdisplay,xfont}, gdk_x11_image_get_{xdisplay,ximage},
gdk_x11_gc_get_{xdisplay,ximage}
* gdk/gdkprivate.h gdk/gdkinternals.h: Move GdkColorInfo,
GdkEventFilter, GdkClientFilter, GdkFontPrivate to gdkinternals.
Fix a number of variables and functions that were exported
"accidentally" from GDK.
* gdk/**.[ch]: gdk => _gdk for gdk_visual_init,
gdk_events_init, gdk_input_init, gdk_dnd_init, gdk_image_exit,
gdk_input_exit, gdk_windowing_exit, gdk_event_func, gdk_event_data,
gdk_event_notify, gdk_queued_events, gdk_queued_tail,
gdk_event_new, gdk_events_queue, gdk_events_unqueue,
gdk_event_queue_find_first, gdk_event_queue_remove_link,
gdk_event_queue_append, gdk_event_button_generate,
gdk_debug_flags, gdk_default_filters, gdk_parent_root.
* gdk/x11/{gdkevents-x11.c, gdkglobals-x11.c, gdkimage-x11.c,
gdkmain-x11.c, gdkprivate-x11.h, gdk/x11/gdkwindow-x11.c}:
gdk => _gdk for gdk_event_mask_table, gkd_nevent_masks,
gdk_wm_window_protocols, gdk_leader_window, gdk_xgrab_window,
gdk_use_xshm, gdk_input_ignore_core.
* gdk/x11/xsettings-common.h (xsettings_list_insert): Add
#defines to namespace functions into the private _gdk_
namespace.
* gdk/gdkwindow.[ch] gdk/x11/gdkx.h: Add gdk_get_default_root_window ()
to replace gdk_parent_root exported variable. Adjust and
deprecate GDK_ROOT_PARENT().
* demos/{testpixbuf-drawable.c,testpixbuf-save.c}: Fix
GDK_ROOT_PARENT usage, remove includes of port-specific
headers.
* gdk/{win32,x11,fb}/gdkinput*.[ch]: s/gdk/_gdk/ for
_gdk_input_gxid_host, _gdk_input_gxid_port, _gdk_input_ignore_core,
gdk_input_devices, _gdk_input_windows, gdk_init_input_core.
* gdk/x11/{gdkevents-x11.,c gdkglobals-x11.c, gdkmain-x11.c}
docs/Changes-2.0.txt: Remove gdk_wm_protocols,
gdk_wm_delete_window functions, gdk_wm_take_focus,
use gdk_atom_intern() instead.
* gdk/linux-fb/{gdkselection-fb.c, gdkmain-fb.c, gdkprivatefb.h}
gdk/win32/{gdkselection-win32.c, gdkmgdkwin32.h, gdkprivate-win32.h}
gdk/x11/{gdkselection-x11.c gdkx.h, gtkprivate-x11.h}
gtk/gtkselection.c
Unexport gdk_selection_property, just use
gdk_atom_intern ("GDK_SELECTION").
* gdk/x11/{gdkprivate-x11.h,gdkdrawable-x11h,gdkgc-x11.c,gdkx.h}:
Unexport gdk_drawable_impl_x11_get_type, gdk_gc_x11_get_type,
GDK_GC_X11 cast macros, GdkGCX11 structures, GdkCursorPrivate,
GdkVisualprivate, gdk_x11_gc_flush.
Make a number of public exports of variables into functions
to increase encapsulation.
* gdk/gdkinternals.h gdk/gdkinput.h gdk/gdkevents.h
gdk/linux-fb/gdkmouse-fb.c: gdk_core_pointer => _gdk_core_pointer,
move to gdkinternals.h. Add gdk_device_get_core_pointer ().
* gdk/gdkprivate.h gdk/gdkpango.c gdk/gdkinternals.h
docs/Changes-2.0.txt: Unexport gdk_parent_root, gdk_error_code,
gdk_error_warnings.
* gdk/x11/{gdkcolormap-x11.c, gdkmain-x11.c, gdkx.h}
docs/Changes-2.0.txt:
s/gdk_screen/_gdk_screen/, add gdk_x11_get_default_screen()
s/gdk_root_window/_gdk_root_window/, add gdk_x11_get_default_root_xwindow()
Add gdk_x11_get_default_xdisplay().
* gdk/gdk.h gdk/gdk.c linux-fb/gdkfb.h linux-fb/gdkglobals-fb.c
win32/gdkwin32.h x11/gdkglobals-x11.c gdk/x11/gdkmain-x11.c
gdk/x11/gdkx.h: gdk/gdk.def: Add gdk_get/set_program_class,
Don't export gdk_progclass, move --class command line
option and handling to common portion of GDK.
Miscellaneous fixes:
* gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): Fix
g_return_val_if_fail that should have been g_return_if_fail.
* gdk/gdkinternals.h gdk/gdkprivate.h: Move
gdk_synthesize_window_state() to the semi-public gdkprivate.h.
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Remove uneeded
X11 dependency.
* gdk/linux-fb/gdkmain-fb.c gdk/win32/gdkmain-win32.c gdk/TODO:
Remove unused gdk_key_repeat_disable/restore.
* linux-fb/gdkglobals-fb.c win32/gdkglobals-win32.c
x11/gdkglobals-x11.c x11/gdkprivate-x11.h gdk/gdk.def:
Remove unused gdk_null_window_warnings variable.
* gdk/Makefile.am (DIST_SUBDIRS) nanox/*: cvs remove nanox;
it can be retrieved from the repository; it is too far
from functional to be worth having people check out;
it would be easier to start from scratch, I suspect.
* gdk/x11/gdkpixmap-x11.c: Fix lvalue usage of GDK_PIXMAP_XID().
* gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c
gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c:
Fix some accidentally global variables and unused global variables.
* gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c
gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c:
Fix some accidentally global variables and unused global variables.
Add some space for future expansion to multihead.
* gdk/gdkdrawable.h: Add four reserved function pointers
for future expansion of GdkDrawableClass.
* gtk/gtkwindow.h gtk/gtkinvisible.h: Add reserved pointer
where we can put a GdkScreen * later.
2001-09-07 21:50:20 +00:00
|
|
|
XSendEvent (GDK_DISPLAY (),
|
1998-11-24 04:45:29 +00:00
|
|
|
GDK_WINDOW_XWINDOW (socket->plug_window),
|
|
|
|
False, NoEventMask, &xevent);
|
1999-02-21 19:25:53 +00:00
|
|
|
gdk_flush();
|
|
|
|
gdk_error_trap_pop ();
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return FALSE;
|
|
|
|
}
|
2001-04-19 20:36:46 +00:00
|
|
|
#endif
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
2001-07-03 14:14:30 +00:00
|
|
|
static void
|
|
|
|
gtk_socket_remove (GtkContainer *container,
|
|
|
|
GtkWidget *child)
|
|
|
|
{
|
|
|
|
GtkSocket *socket = GTK_SOCKET (container);
|
|
|
|
|
|
|
|
g_return_if_fail (child == socket->plug_widget);
|
|
|
|
|
2001-07-05 02:58:34 +00:00
|
|
|
_gtk_plug_remove_from_socket (GTK_PLUG (socket->plug_widget), socket);
|
2001-07-03 14:14:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gtk_socket_forall (GtkContainer *container,
|
|
|
|
gboolean include_internals,
|
|
|
|
GtkCallback callback,
|
|
|
|
gpointer callback_data)
|
|
|
|
{
|
|
|
|
GtkSocket *socket = GTK_SOCKET (container);
|
|
|
|
|
|
|
|
if (socket->plug_widget)
|
|
|
|
(* callback) (socket->plug_widget, callback_data);
|
|
|
|
}
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
static void
|
|
|
|
gtk_socket_send_configure_event (GtkSocket *socket)
|
|
|
|
{
|
|
|
|
XEvent event;
|
|
|
|
|
|
|
|
g_return_if_fail (socket->plug_window != NULL);
|
|
|
|
|
|
|
|
event.xconfigure.type = ConfigureNotify;
|
Make gdkx.h the only installed header from gdk/x11. All structures in
Fri Sep 7 11:51:44 2001 Owen Taylor <otaylor@redhat.com>
Make gdkx.h the only installed header from gdk/x11.
All structures in gdk/x11 are opaque.
* gdk/x11/Makefile.am gdk/x11/gdkx.h gdk/x11/gdkprivate-x11.h:
Don't install gdk{drawable,pixmap,window}-x11.h.
* gdk/x11/{gdkcolormap-x11.c, gdkfont-x11.c, gdkx.h, gdkvisual-x11.c:
Move GdkColormapPrivateX11, GdkFontPrivateX GdkImagePrivateX11,
GdkVisualClass into C files.
* gdk/gdkpixmap-x11.[ch]: Make gdk_pixmap_impl_get_type() static.
* gdk/x11/{gdkcolor-x11.c, gdkcursor-x11.c, gdkdrawable-x11.c,
gdkfont-x11.c, gdkgc-x11.c, gdkx.h, gdkimage-x11,gdkvisual-x11.c}
Add public functions to replace previously exported direct
structure access.
gdk_x11_colormap_get_{xdisplay,xcolormap}
gdk_x11_cursor_get_{xdisplay,xcursor},
gdk_x11_drawable_get_{xdisplay,xcursor,gdk_x11_visual_get_xvisual,
gdk_x11_font_get_{xdisplay,xfont}, gdk_x11_image_get_{xdisplay,ximage},
gdk_x11_gc_get_{xdisplay,ximage}
* gdk/gdkprivate.h gdk/gdkinternals.h: Move GdkColorInfo,
GdkEventFilter, GdkClientFilter, GdkFontPrivate to gdkinternals.
Fix a number of variables and functions that were exported
"accidentally" from GDK.
* gdk/**.[ch]: gdk => _gdk for gdk_visual_init,
gdk_events_init, gdk_input_init, gdk_dnd_init, gdk_image_exit,
gdk_input_exit, gdk_windowing_exit, gdk_event_func, gdk_event_data,
gdk_event_notify, gdk_queued_events, gdk_queued_tail,
gdk_event_new, gdk_events_queue, gdk_events_unqueue,
gdk_event_queue_find_first, gdk_event_queue_remove_link,
gdk_event_queue_append, gdk_event_button_generate,
gdk_debug_flags, gdk_default_filters, gdk_parent_root.
* gdk/x11/{gdkevents-x11.c, gdkglobals-x11.c, gdkimage-x11.c,
gdkmain-x11.c, gdkprivate-x11.h, gdk/x11/gdkwindow-x11.c}:
gdk => _gdk for gdk_event_mask_table, gkd_nevent_masks,
gdk_wm_window_protocols, gdk_leader_window, gdk_xgrab_window,
gdk_use_xshm, gdk_input_ignore_core.
* gdk/x11/xsettings-common.h (xsettings_list_insert): Add
#defines to namespace functions into the private _gdk_
namespace.
* gdk/gdkwindow.[ch] gdk/x11/gdkx.h: Add gdk_get_default_root_window ()
to replace gdk_parent_root exported variable. Adjust and
deprecate GDK_ROOT_PARENT().
* demos/{testpixbuf-drawable.c,testpixbuf-save.c}: Fix
GDK_ROOT_PARENT usage, remove includes of port-specific
headers.
* gdk/{win32,x11,fb}/gdkinput*.[ch]: s/gdk/_gdk/ for
_gdk_input_gxid_host, _gdk_input_gxid_port, _gdk_input_ignore_core,
gdk_input_devices, _gdk_input_windows, gdk_init_input_core.
* gdk/x11/{gdkevents-x11.,c gdkglobals-x11.c, gdkmain-x11.c}
docs/Changes-2.0.txt: Remove gdk_wm_protocols,
gdk_wm_delete_window functions, gdk_wm_take_focus,
use gdk_atom_intern() instead.
* gdk/linux-fb/{gdkselection-fb.c, gdkmain-fb.c, gdkprivatefb.h}
gdk/win32/{gdkselection-win32.c, gdkmgdkwin32.h, gdkprivate-win32.h}
gdk/x11/{gdkselection-x11.c gdkx.h, gtkprivate-x11.h}
gtk/gtkselection.c
Unexport gdk_selection_property, just use
gdk_atom_intern ("GDK_SELECTION").
* gdk/x11/{gdkprivate-x11.h,gdkdrawable-x11h,gdkgc-x11.c,gdkx.h}:
Unexport gdk_drawable_impl_x11_get_type, gdk_gc_x11_get_type,
GDK_GC_X11 cast macros, GdkGCX11 structures, GdkCursorPrivate,
GdkVisualprivate, gdk_x11_gc_flush.
Make a number of public exports of variables into functions
to increase encapsulation.
* gdk/gdkinternals.h gdk/gdkinput.h gdk/gdkevents.h
gdk/linux-fb/gdkmouse-fb.c: gdk_core_pointer => _gdk_core_pointer,
move to gdkinternals.h. Add gdk_device_get_core_pointer ().
* gdk/gdkprivate.h gdk/gdkpango.c gdk/gdkinternals.h
docs/Changes-2.0.txt: Unexport gdk_parent_root, gdk_error_code,
gdk_error_warnings.
* gdk/x11/{gdkcolormap-x11.c, gdkmain-x11.c, gdkx.h}
docs/Changes-2.0.txt:
s/gdk_screen/_gdk_screen/, add gdk_x11_get_default_screen()
s/gdk_root_window/_gdk_root_window/, add gdk_x11_get_default_root_xwindow()
Add gdk_x11_get_default_xdisplay().
* gdk/gdk.h gdk/gdk.c linux-fb/gdkfb.h linux-fb/gdkglobals-fb.c
win32/gdkwin32.h x11/gdkglobals-x11.c gdk/x11/gdkmain-x11.c
gdk/x11/gdkx.h: gdk/gdk.def: Add gdk_get/set_program_class,
Don't export gdk_progclass, move --class command line
option and handling to common portion of GDK.
Miscellaneous fixes:
* gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): Fix
g_return_val_if_fail that should have been g_return_if_fail.
* gdk/gdkinternals.h gdk/gdkprivate.h: Move
gdk_synthesize_window_state() to the semi-public gdkprivate.h.
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Remove uneeded
X11 dependency.
* gdk/linux-fb/gdkmain-fb.c gdk/win32/gdkmain-win32.c gdk/TODO:
Remove unused gdk_key_repeat_disable/restore.
* linux-fb/gdkglobals-fb.c win32/gdkglobals-win32.c
x11/gdkglobals-x11.c x11/gdkprivate-x11.h gdk/gdk.def:
Remove unused gdk_null_window_warnings variable.
* gdk/Makefile.am (DIST_SUBDIRS) nanox/*: cvs remove nanox;
it can be retrieved from the repository; it is too far
from functional to be worth having people check out;
it would be easier to start from scratch, I suspect.
* gdk/x11/gdkpixmap-x11.c: Fix lvalue usage of GDK_PIXMAP_XID().
* gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c
gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c:
Fix some accidentally global variables and unused global variables.
* gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c
gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c:
Fix some accidentally global variables and unused global variables.
Add some space for future expansion to multihead.
* gdk/gdkdrawable.h: Add four reserved function pointers
for future expansion of GdkDrawableClass.
* gtk/gtkwindow.h gtk/gtkinvisible.h: Add reserved pointer
where we can put a GdkScreen * later.
2001-09-07 21:50:20 +00:00
|
|
|
event.xconfigure.display = GDK_DISPLAY ();
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
event.xconfigure.event = GDK_WINDOW_XWINDOW (socket->plug_window);
|
|
|
|
event.xconfigure.window = GDK_WINDOW_XWINDOW (socket->plug_window);
|
|
|
|
|
|
|
|
event.xconfigure.x = 0;
|
|
|
|
event.xconfigure.y = 0;
|
|
|
|
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;
|
1999-02-21 19:25:53 +00:00
|
|
|
|
|
|
|
gdk_error_trap_push ();
|
Make gdkx.h the only installed header from gdk/x11. All structures in
Fri Sep 7 11:51:44 2001 Owen Taylor <otaylor@redhat.com>
Make gdkx.h the only installed header from gdk/x11.
All structures in gdk/x11 are opaque.
* gdk/x11/Makefile.am gdk/x11/gdkx.h gdk/x11/gdkprivate-x11.h:
Don't install gdk{drawable,pixmap,window}-x11.h.
* gdk/x11/{gdkcolormap-x11.c, gdkfont-x11.c, gdkx.h, gdkvisual-x11.c:
Move GdkColormapPrivateX11, GdkFontPrivateX GdkImagePrivateX11,
GdkVisualClass into C files.
* gdk/gdkpixmap-x11.[ch]: Make gdk_pixmap_impl_get_type() static.
* gdk/x11/{gdkcolor-x11.c, gdkcursor-x11.c, gdkdrawable-x11.c,
gdkfont-x11.c, gdkgc-x11.c, gdkx.h, gdkimage-x11,gdkvisual-x11.c}
Add public functions to replace previously exported direct
structure access.
gdk_x11_colormap_get_{xdisplay,xcolormap}
gdk_x11_cursor_get_{xdisplay,xcursor},
gdk_x11_drawable_get_{xdisplay,xcursor,gdk_x11_visual_get_xvisual,
gdk_x11_font_get_{xdisplay,xfont}, gdk_x11_image_get_{xdisplay,ximage},
gdk_x11_gc_get_{xdisplay,ximage}
* gdk/gdkprivate.h gdk/gdkinternals.h: Move GdkColorInfo,
GdkEventFilter, GdkClientFilter, GdkFontPrivate to gdkinternals.
Fix a number of variables and functions that were exported
"accidentally" from GDK.
* gdk/**.[ch]: gdk => _gdk for gdk_visual_init,
gdk_events_init, gdk_input_init, gdk_dnd_init, gdk_image_exit,
gdk_input_exit, gdk_windowing_exit, gdk_event_func, gdk_event_data,
gdk_event_notify, gdk_queued_events, gdk_queued_tail,
gdk_event_new, gdk_events_queue, gdk_events_unqueue,
gdk_event_queue_find_first, gdk_event_queue_remove_link,
gdk_event_queue_append, gdk_event_button_generate,
gdk_debug_flags, gdk_default_filters, gdk_parent_root.
* gdk/x11/{gdkevents-x11.c, gdkglobals-x11.c, gdkimage-x11.c,
gdkmain-x11.c, gdkprivate-x11.h, gdk/x11/gdkwindow-x11.c}:
gdk => _gdk for gdk_event_mask_table, gkd_nevent_masks,
gdk_wm_window_protocols, gdk_leader_window, gdk_xgrab_window,
gdk_use_xshm, gdk_input_ignore_core.
* gdk/x11/xsettings-common.h (xsettings_list_insert): Add
#defines to namespace functions into the private _gdk_
namespace.
* gdk/gdkwindow.[ch] gdk/x11/gdkx.h: Add gdk_get_default_root_window ()
to replace gdk_parent_root exported variable. Adjust and
deprecate GDK_ROOT_PARENT().
* demos/{testpixbuf-drawable.c,testpixbuf-save.c}: Fix
GDK_ROOT_PARENT usage, remove includes of port-specific
headers.
* gdk/{win32,x11,fb}/gdkinput*.[ch]: s/gdk/_gdk/ for
_gdk_input_gxid_host, _gdk_input_gxid_port, _gdk_input_ignore_core,
gdk_input_devices, _gdk_input_windows, gdk_init_input_core.
* gdk/x11/{gdkevents-x11.,c gdkglobals-x11.c, gdkmain-x11.c}
docs/Changes-2.0.txt: Remove gdk_wm_protocols,
gdk_wm_delete_window functions, gdk_wm_take_focus,
use gdk_atom_intern() instead.
* gdk/linux-fb/{gdkselection-fb.c, gdkmain-fb.c, gdkprivatefb.h}
gdk/win32/{gdkselection-win32.c, gdkmgdkwin32.h, gdkprivate-win32.h}
gdk/x11/{gdkselection-x11.c gdkx.h, gtkprivate-x11.h}
gtk/gtkselection.c
Unexport gdk_selection_property, just use
gdk_atom_intern ("GDK_SELECTION").
* gdk/x11/{gdkprivate-x11.h,gdkdrawable-x11h,gdkgc-x11.c,gdkx.h}:
Unexport gdk_drawable_impl_x11_get_type, gdk_gc_x11_get_type,
GDK_GC_X11 cast macros, GdkGCX11 structures, GdkCursorPrivate,
GdkVisualprivate, gdk_x11_gc_flush.
Make a number of public exports of variables into functions
to increase encapsulation.
* gdk/gdkinternals.h gdk/gdkinput.h gdk/gdkevents.h
gdk/linux-fb/gdkmouse-fb.c: gdk_core_pointer => _gdk_core_pointer,
move to gdkinternals.h. Add gdk_device_get_core_pointer ().
* gdk/gdkprivate.h gdk/gdkpango.c gdk/gdkinternals.h
docs/Changes-2.0.txt: Unexport gdk_parent_root, gdk_error_code,
gdk_error_warnings.
* gdk/x11/{gdkcolormap-x11.c, gdkmain-x11.c, gdkx.h}
docs/Changes-2.0.txt:
s/gdk_screen/_gdk_screen/, add gdk_x11_get_default_screen()
s/gdk_root_window/_gdk_root_window/, add gdk_x11_get_default_root_xwindow()
Add gdk_x11_get_default_xdisplay().
* gdk/gdk.h gdk/gdk.c linux-fb/gdkfb.h linux-fb/gdkglobals-fb.c
win32/gdkwin32.h x11/gdkglobals-x11.c gdk/x11/gdkmain-x11.c
gdk/x11/gdkx.h: gdk/gdk.def: Add gdk_get/set_program_class,
Don't export gdk_progclass, move --class command line
option and handling to common portion of GDK.
Miscellaneous fixes:
* gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): Fix
g_return_val_if_fail that should have been g_return_if_fail.
* gdk/gdkinternals.h gdk/gdkprivate.h: Move
gdk_synthesize_window_state() to the semi-public gdkprivate.h.
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Remove uneeded
X11 dependency.
* gdk/linux-fb/gdkmain-fb.c gdk/win32/gdkmain-win32.c gdk/TODO:
Remove unused gdk_key_repeat_disable/restore.
* linux-fb/gdkglobals-fb.c win32/gdkglobals-win32.c
x11/gdkglobals-x11.c x11/gdkprivate-x11.h gdk/gdk.def:
Remove unused gdk_null_window_warnings variable.
* gdk/Makefile.am (DIST_SUBDIRS) nanox/*: cvs remove nanox;
it can be retrieved from the repository; it is too far
from functional to be worth having people check out;
it would be easier to start from scratch, I suspect.
* gdk/x11/gdkpixmap-x11.c: Fix lvalue usage of GDK_PIXMAP_XID().
* gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c
gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c:
Fix some accidentally global variables and unused global variables.
* gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c
gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c:
Fix some accidentally global variables and unused global variables.
Add some space for future expansion to multihead.
* gdk/gdkdrawable.h: Add four reserved function pointers
for future expansion of GdkDrawableClass.
* gtk/gtkwindow.h gtk/gtkinvisible.h: Add reserved pointer
where we can put a GdkScreen * later.
2001-09-07 21:50:20 +00:00
|
|
|
XSendEvent (GDK_DISPLAY (),
|
1998-11-24 04:45:29 +00:00
|
|
|
GDK_WINDOW_XWINDOW (socket->plug_window),
|
|
|
|
False, NoEventMask, &event);
|
1999-02-21 19:25:53 +00:00
|
|
|
gdk_flush ();
|
|
|
|
gdk_error_trap_pop ();
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2001-07-03 14:14:30 +00:00
|
|
|
gtk_socket_add_window (GtkSocket *socket,
|
|
|
|
GdkNativeWindow xid,
|
|
|
|
gboolean need_reparent)
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
2001-07-03 14:14:30 +00:00
|
|
|
|
|
|
|
GtkWidget *widget = GTK_WIDGET (socket);
|
|
|
|
gpointer user_data = NULL;
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
socket->plug_window = gdk_window_lookup (xid);
|
|
|
|
|
2001-07-03 14:14:30 +00:00
|
|
|
if (socket->plug_window)
|
|
|
|
{
|
|
|
|
g_object_ref (socket->plug_window);
|
|
|
|
gdk_window_get_user_data (socket->plug_window, &user_data);
|
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
_gtk_plug_add_to_socket (GTK_PLUG (child_widget), socket);
|
|
|
|
}
|
|
|
|
else /* A foreign window */
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
GtkWidget *toplevel;
|
|
|
|
GdkDragProtocol protocol;
|
2001-07-03 14:14:30 +00:00
|
|
|
unsigned long version;
|
|
|
|
unsigned long flags;
|
1999-02-21 19:25:53 +00:00
|
|
|
|
|
|
|
gdk_error_trap_push ();
|
2001-07-03 14:14:30 +00:00
|
|
|
|
|
|
|
if (!socket->plug_window)
|
|
|
|
{
|
|
|
|
socket->plug_window = gdk_window_foreign_new (xid);
|
|
|
|
if (!socket->plug_window) /* was deleted before we could get it */
|
|
|
|
{
|
|
|
|
gdk_error_trap_pop ();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
XSelectInput (GDK_DISPLAY (),
|
|
|
|
GDK_WINDOW_XWINDOW(socket->plug_window),
|
|
|
|
StructureNotifyMask | PropertyChangeMask);
|
1999-02-21 19:25:53 +00:00
|
|
|
|
2001-07-03 14:14:30 +00:00
|
|
|
if (gdk_error_trap_pop ())
|
|
|
|
{
|
|
|
|
gdk_window_unref (socket->plug_window);
|
|
|
|
socket->plug_window = NULL;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* OK, we now will reliably get destroy notification on socket->plug_window */
|
|
|
|
|
|
|
|
gdk_error_trap_push ();
|
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
socket->have_size = FALSE;
|
|
|
|
|
|
|
|
socket->xembed_version = -1;
|
|
|
|
if (xembed_get_info (socket->plug_window, &version, &flags))
|
|
|
|
{
|
|
|
|
socket->xembed_version = version;
|
|
|
|
socket->is_mapped = (flags & XEMBED_MAPPED) != 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* FIXME, we should probably actually check the state before we started */
|
|
|
|
|
|
|
|
socket->is_mapped = need_reparent ? TRUE : FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
socket->need_map = socket->is_mapped;
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
if (gdk_drag_get_protocol (xid, &protocol))
|
|
|
|
gtk_drag_dest_set_proxy (GTK_WIDGET (socket), socket->plug_window,
|
|
|
|
protocol, TRUE);
|
2001-07-03 14:14:30 +00:00
|
|
|
|
1999-02-21 19:25:53 +00:00
|
|
|
gdk_flush ();
|
|
|
|
gdk_error_trap_pop ();
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
gdk_window_add_filter (socket->plug_window,
|
|
|
|
gtk_socket_filter_func, socket);
|
|
|
|
|
|
|
|
/* Add a pointer to the socket on our toplevel window */
|
|
|
|
|
|
|
|
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
|
|
|
|
if (toplevel && GTK_IS_WINDOW (toplevel))
|
2001-07-03 14:14:30 +00:00
|
|
|
gtk_window_add_embedded_xid (GTK_WINDOW (toplevel), xid);
|
2001-04-19 20:36:46 +00:00
|
|
|
|
|
|
|
gtk_widget_queue_resize (GTK_WIDGET (socket));
|
|
|
|
}
|
2001-07-05 02:58:34 +00:00
|
|
|
|
|
|
|
if (socket->plug_window)
|
|
|
|
g_signal_emit (G_OBJECT (socket), socket_signals[PLUG_ADDED], 0);
|
2001-04-19 20:36:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
send_xembed_message (GtkSocket *socket,
|
|
|
|
glong message,
|
|
|
|
glong detail,
|
|
|
|
glong data1,
|
|
|
|
glong data2,
|
|
|
|
guint32 time)
|
|
|
|
{
|
|
|
|
GTK_NOTE(PLUGSOCKET,
|
|
|
|
g_message ("GtkSocket: Sending XEMBED message of type %d", message));
|
|
|
|
|
|
|
|
if (socket->plug_window)
|
|
|
|
{
|
|
|
|
XEvent xevent;
|
|
|
|
|
|
|
|
xevent.xclient.window = GDK_WINDOW_XWINDOW (socket->plug_window);
|
|
|
|
xevent.xclient.type = ClientMessage;
|
Fix problem with g_return_if_fail return value.
Sun Oct 21 23:27:00 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_translate_coordinates): Fix
problem with g_return_if_fail return value.
* gdk/x11/gdkproperty-x11.c docs/Changes-2.0.txt: Move over the
virtual atom code from the gdk-multihead branch, removing the per-display
part. Virtualizing atoms needs to be done now to prevent compat
breakage in direct Xlib accessing code in the future. (#62208)
* gdk/x11/gdkx.h: gdk/gdk/x11/gdkproperty-x11.c: Export
gdk_x11_xatom_to_atom, gdk_x11_atom_to_xatom().
* gdk/gdktypes.h docs/Changes-2.0.txt: Make GdkAtom
an opaque pointer type so the compiler catches attempts
to mingle it with X atoms.
* gdk/x11/{gdkdnd-x11.c,gdkevents-x11.c,gdkglobals-x11.c,
gdkkeys-x11.c, gdkmain-x11.c, gdkprivate-x11.c,
gdkproperty-x11.c, gdkselection-x11.c, gdkwindow-x11.c}
gtk/{gtkclist.c,gtkctree.c,gtkdnd.c,gtkplug.c,gtksocket.c}
tests/testdnd.c,tests/testselection.c:
Fix up for above atom changes.
* gdk/gdkselection.h (GDK_SELECTION_CLIPBOARD): Add, since we
now have the ability to add custom predefines.
* gtk/{gtkentry.c,gtklabel.c,gtkoldeditable.c,gtktextview.c}:
Use GDK_SELECTION_CLIPBOARD instead of GDK_NONE in calls
to gtk_clipboard_get().
* gdk/win32/gdkproperty-win32.c: Add CLIPBOARD, fix up
for GdkAtom => pointer change.
* gdk/linux-fb/gdkproperty-fb.c: Fix handling of predefined
atoms, fix for GdkAtom => pointer change.
2001-10-22 04:34:42 +00:00
|
|
|
xevent.xclient.message_type = gdk_x11_get_xatom_by_name ("_XEMBED");
|
2001-04-19 20:36:46 +00:00
|
|
|
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 ();
|
Make gdkx.h the only installed header from gdk/x11. All structures in
Fri Sep 7 11:51:44 2001 Owen Taylor <otaylor@redhat.com>
Make gdkx.h the only installed header from gdk/x11.
All structures in gdk/x11 are opaque.
* gdk/x11/Makefile.am gdk/x11/gdkx.h gdk/x11/gdkprivate-x11.h:
Don't install gdk{drawable,pixmap,window}-x11.h.
* gdk/x11/{gdkcolormap-x11.c, gdkfont-x11.c, gdkx.h, gdkvisual-x11.c:
Move GdkColormapPrivateX11, GdkFontPrivateX GdkImagePrivateX11,
GdkVisualClass into C files.
* gdk/gdkpixmap-x11.[ch]: Make gdk_pixmap_impl_get_type() static.
* gdk/x11/{gdkcolor-x11.c, gdkcursor-x11.c, gdkdrawable-x11.c,
gdkfont-x11.c, gdkgc-x11.c, gdkx.h, gdkimage-x11,gdkvisual-x11.c}
Add public functions to replace previously exported direct
structure access.
gdk_x11_colormap_get_{xdisplay,xcolormap}
gdk_x11_cursor_get_{xdisplay,xcursor},
gdk_x11_drawable_get_{xdisplay,xcursor,gdk_x11_visual_get_xvisual,
gdk_x11_font_get_{xdisplay,xfont}, gdk_x11_image_get_{xdisplay,ximage},
gdk_x11_gc_get_{xdisplay,ximage}
* gdk/gdkprivate.h gdk/gdkinternals.h: Move GdkColorInfo,
GdkEventFilter, GdkClientFilter, GdkFontPrivate to gdkinternals.
Fix a number of variables and functions that were exported
"accidentally" from GDK.
* gdk/**.[ch]: gdk => _gdk for gdk_visual_init,
gdk_events_init, gdk_input_init, gdk_dnd_init, gdk_image_exit,
gdk_input_exit, gdk_windowing_exit, gdk_event_func, gdk_event_data,
gdk_event_notify, gdk_queued_events, gdk_queued_tail,
gdk_event_new, gdk_events_queue, gdk_events_unqueue,
gdk_event_queue_find_first, gdk_event_queue_remove_link,
gdk_event_queue_append, gdk_event_button_generate,
gdk_debug_flags, gdk_default_filters, gdk_parent_root.
* gdk/x11/{gdkevents-x11.c, gdkglobals-x11.c, gdkimage-x11.c,
gdkmain-x11.c, gdkprivate-x11.h, gdk/x11/gdkwindow-x11.c}:
gdk => _gdk for gdk_event_mask_table, gkd_nevent_masks,
gdk_wm_window_protocols, gdk_leader_window, gdk_xgrab_window,
gdk_use_xshm, gdk_input_ignore_core.
* gdk/x11/xsettings-common.h (xsettings_list_insert): Add
#defines to namespace functions into the private _gdk_
namespace.
* gdk/gdkwindow.[ch] gdk/x11/gdkx.h: Add gdk_get_default_root_window ()
to replace gdk_parent_root exported variable. Adjust and
deprecate GDK_ROOT_PARENT().
* demos/{testpixbuf-drawable.c,testpixbuf-save.c}: Fix
GDK_ROOT_PARENT usage, remove includes of port-specific
headers.
* gdk/{win32,x11,fb}/gdkinput*.[ch]: s/gdk/_gdk/ for
_gdk_input_gxid_host, _gdk_input_gxid_port, _gdk_input_ignore_core,
gdk_input_devices, _gdk_input_windows, gdk_init_input_core.
* gdk/x11/{gdkevents-x11.,c gdkglobals-x11.c, gdkmain-x11.c}
docs/Changes-2.0.txt: Remove gdk_wm_protocols,
gdk_wm_delete_window functions, gdk_wm_take_focus,
use gdk_atom_intern() instead.
* gdk/linux-fb/{gdkselection-fb.c, gdkmain-fb.c, gdkprivatefb.h}
gdk/win32/{gdkselection-win32.c, gdkmgdkwin32.h, gdkprivate-win32.h}
gdk/x11/{gdkselection-x11.c gdkx.h, gtkprivate-x11.h}
gtk/gtkselection.c
Unexport gdk_selection_property, just use
gdk_atom_intern ("GDK_SELECTION").
* gdk/x11/{gdkprivate-x11.h,gdkdrawable-x11h,gdkgc-x11.c,gdkx.h}:
Unexport gdk_drawable_impl_x11_get_type, gdk_gc_x11_get_type,
GDK_GC_X11 cast macros, GdkGCX11 structures, GdkCursorPrivate,
GdkVisualprivate, gdk_x11_gc_flush.
Make a number of public exports of variables into functions
to increase encapsulation.
* gdk/gdkinternals.h gdk/gdkinput.h gdk/gdkevents.h
gdk/linux-fb/gdkmouse-fb.c: gdk_core_pointer => _gdk_core_pointer,
move to gdkinternals.h. Add gdk_device_get_core_pointer ().
* gdk/gdkprivate.h gdk/gdkpango.c gdk/gdkinternals.h
docs/Changes-2.0.txt: Unexport gdk_parent_root, gdk_error_code,
gdk_error_warnings.
* gdk/x11/{gdkcolormap-x11.c, gdkmain-x11.c, gdkx.h}
docs/Changes-2.0.txt:
s/gdk_screen/_gdk_screen/, add gdk_x11_get_default_screen()
s/gdk_root_window/_gdk_root_window/, add gdk_x11_get_default_root_xwindow()
Add gdk_x11_get_default_xdisplay().
* gdk/gdk.h gdk/gdk.c linux-fb/gdkfb.h linux-fb/gdkglobals-fb.c
win32/gdkwin32.h x11/gdkglobals-x11.c gdk/x11/gdkmain-x11.c
gdk/x11/gdkx.h: gdk/gdk.def: Add gdk_get/set_program_class,
Don't export gdk_progclass, move --class command line
option and handling to common portion of GDK.
Miscellaneous fixes:
* gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): Fix
g_return_val_if_fail that should have been g_return_if_fail.
* gdk/gdkinternals.h gdk/gdkprivate.h: Move
gdk_synthesize_window_state() to the semi-public gdkprivate.h.
* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Remove uneeded
X11 dependency.
* gdk/linux-fb/gdkmain-fb.c gdk/win32/gdkmain-win32.c gdk/TODO:
Remove unused gdk_key_repeat_disable/restore.
* linux-fb/gdkglobals-fb.c win32/gdkglobals-win32.c
x11/gdkglobals-x11.c x11/gdkprivate-x11.h gdk/gdk.def:
Remove unused gdk_null_window_warnings variable.
* gdk/Makefile.am (DIST_SUBDIRS) nanox/*: cvs remove nanox;
it can be retrieved from the repository; it is too far
from functional to be worth having people check out;
it would be easier to start from scratch, I suspect.
* gdk/x11/gdkpixmap-x11.c: Fix lvalue usage of GDK_PIXMAP_XID().
* gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c
gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c:
Fix some accidentally global variables and unused global variables.
* gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c
gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c:
Fix some accidentally global variables and unused global variables.
Add some space for future expansion to multihead.
* gdk/gdkdrawable.h: Add four reserved function pointers
for future expansion of GdkDrawableClass.
* gtk/gtkwindow.h gtk/gtkinvisible.h: Add reserved pointer
where we can put a GdkScreen * later.
2001-09-07 21:50:20 +00:00
|
|
|
XSendEvent (GDK_DISPLAY (),
|
2001-04-19 20:36:46 +00:00
|
|
|
GDK_WINDOW_XWINDOW (socket->plug_window),
|
|
|
|
False, NoEventMask, &xevent);
|
|
|
|
gdk_flush ();
|
|
|
|
gdk_error_trap_pop ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-07-03 14:14:30 +00:00
|
|
|
static gboolean
|
|
|
|
xembed_get_info (GdkWindow *gdk_window,
|
|
|
|
unsigned long *version,
|
|
|
|
unsigned long *flags)
|
|
|
|
{
|
|
|
|
Display *display = GDK_WINDOW_XDISPLAY (gdk_window);
|
|
|
|
Window window = GDK_WINDOW_XWINDOW (gdk_window);
|
Fix problem with g_return_if_fail return value.
Sun Oct 21 23:27:00 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_translate_coordinates): Fix
problem with g_return_if_fail return value.
* gdk/x11/gdkproperty-x11.c docs/Changes-2.0.txt: Move over the
virtual atom code from the gdk-multihead branch, removing the per-display
part. Virtualizing atoms needs to be done now to prevent compat
breakage in direct Xlib accessing code in the future. (#62208)
* gdk/x11/gdkx.h: gdk/gdk/x11/gdkproperty-x11.c: Export
gdk_x11_xatom_to_atom, gdk_x11_atom_to_xatom().
* gdk/gdktypes.h docs/Changes-2.0.txt: Make GdkAtom
an opaque pointer type so the compiler catches attempts
to mingle it with X atoms.
* gdk/x11/{gdkdnd-x11.c,gdkevents-x11.c,gdkglobals-x11.c,
gdkkeys-x11.c, gdkmain-x11.c, gdkprivate-x11.c,
gdkproperty-x11.c, gdkselection-x11.c, gdkwindow-x11.c}
gtk/{gtkclist.c,gtkctree.c,gtkdnd.c,gtkplug.c,gtksocket.c}
tests/testdnd.c,tests/testselection.c:
Fix up for above atom changes.
* gdk/gdkselection.h (GDK_SELECTION_CLIPBOARD): Add, since we
now have the ability to add custom predefines.
* gtk/{gtkentry.c,gtklabel.c,gtkoldeditable.c,gtktextview.c}:
Use GDK_SELECTION_CLIPBOARD instead of GDK_NONE in calls
to gtk_clipboard_get().
* gdk/win32/gdkproperty-win32.c: Add CLIPBOARD, fix up
for GdkAtom => pointer change.
* gdk/linux-fb/gdkproperty-fb.c: Fix handling of predefined
atoms, fix for GdkAtom => pointer change.
2001-10-22 04:34:42 +00:00
|
|
|
Atom xembed_info_atom = gdk_x11_get_xatom_by_name ("_XEMBED_INFO");
|
2001-07-03 14:14:30 +00:00
|
|
|
Atom type;
|
|
|
|
int format;
|
|
|
|
unsigned long nitems, bytes_after;
|
|
|
|
unsigned char *data;
|
|
|
|
unsigned long *data_long;
|
|
|
|
int status;
|
|
|
|
|
|
|
|
gdk_error_trap_push();
|
|
|
|
status = XGetWindowProperty (display, window,
|
|
|
|
xembed_info_atom,
|
|
|
|
0, 2, False,
|
|
|
|
xembed_info_atom, &type, &format,
|
|
|
|
&nitems, &bytes_after, &data);
|
|
|
|
gdk_error_trap_pop();
|
|
|
|
|
|
|
|
if (status != Success)
|
|
|
|
return FALSE; /* Window vanished? */
|
|
|
|
|
|
|
|
if (type == None) /* No info property */
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
if (type != xembed_info_atom)
|
|
|
|
{
|
|
|
|
g_warning ("_XEMBED_INFO property has wrong type\n");
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nitems < 2)
|
|
|
|
{
|
|
|
|
g_warning ("_XEMBED_INFO too short\n");
|
|
|
|
XFree (data);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
data_long = (unsigned long *)data;
|
|
|
|
if (version)
|
|
|
|
*version = data_long[0];
|
|
|
|
if (flags)
|
|
|
|
*flags = data_long[1] & XEMBED_MAPPED;
|
|
|
|
|
|
|
|
XFree (data);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2001-04-19 20:36:46 +00:00
|
|
|
static void
|
|
|
|
handle_xembed_message (GtkSocket *socket,
|
|
|
|
glong message,
|
|
|
|
glong detail,
|
|
|
|
glong data1,
|
|
|
|
glong data2,
|
|
|
|
guint32 time)
|
|
|
|
{
|
|
|
|
switch (message)
|
|
|
|
{
|
|
|
|
case XEMBED_EMBEDDED_NOTIFY:
|
|
|
|
case XEMBED_WINDOW_ACTIVATE:
|
|
|
|
case XEMBED_WINDOW_DEACTIVATE:
|
|
|
|
case XEMBED_MODALITY_ON:
|
|
|
|
case XEMBED_MODALITY_OFF:
|
|
|
|
case XEMBED_FOCUS_IN:
|
|
|
|
case XEMBED_FOCUS_OUT:
|
|
|
|
g_warning ("GtkSocket: Invalid _XEMBED message of type %ld received", message);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case XEMBED_REQUEST_FOCUS:
|
|
|
|
gtk_socket_claim_focus (socket);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case XEMBED_FOCUS_NEXT:
|
|
|
|
case XEMBED_FOCUS_PREV:
|
|
|
|
{
|
|
|
|
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
|
2001-06-08 18:09:34 +00:00
|
|
|
if (toplevel)
|
2001-04-19 20:36:46 +00:00
|
|
|
{
|
2001-06-08 18:09:34 +00:00
|
|
|
gtk_widget_child_focus (toplevel,
|
|
|
|
(message == XEMBED_FOCUS_NEXT ?
|
|
|
|
GTK_DIR_TAB_FORWARD : GTK_DIR_TAB_BACKWARD));
|
2001-04-19 20:36:46 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case XEMBED_GRAB_KEY:
|
|
|
|
#if 0
|
|
|
|
add_grabbed_key (socket, data1, data2);
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
case XEMBED_UNGRAB_KEY:
|
|
|
|
#if 0
|
|
|
|
remove_grabbed_key (socket, data1, data2);
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
GTK_NOTE(PLUGSOCKET,
|
|
|
|
g_message ("GtkSocket: Ignoring unknown _XEMBED message of type %ld", message));
|
|
|
|
break;
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-07-03 14:14:30 +00:00
|
|
|
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));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
static GdkFilterReturn
|
|
|
|
gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
|
|
|
|
{
|
|
|
|
GtkSocket *socket;
|
|
|
|
GtkWidget *widget;
|
|
|
|
XEvent *xevent;
|
|
|
|
|
|
|
|
GdkFilterReturn return_val;
|
|
|
|
|
|
|
|
socket = GTK_SOCKET (data);
|
|
|
|
widget = GTK_WIDGET (socket);
|
|
|
|
xevent = (XEvent *)gdk_xevent;
|
|
|
|
|
|
|
|
return_val = GDK_FILTER_CONTINUE;
|
|
|
|
|
2001-07-03 14:14:30 +00:00
|
|
|
if (socket->plug_widget)
|
|
|
|
return return_val;
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
switch (xevent->type)
|
|
|
|
{
|
2001-07-03 14:14:30 +00:00
|
|
|
case ClientMessage:
|
Fix problem with g_return_if_fail return value.
Sun Oct 21 23:27:00 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_translate_coordinates): Fix
problem with g_return_if_fail return value.
* gdk/x11/gdkproperty-x11.c docs/Changes-2.0.txt: Move over the
virtual atom code from the gdk-multihead branch, removing the per-display
part. Virtualizing atoms needs to be done now to prevent compat
breakage in direct Xlib accessing code in the future. (#62208)
* gdk/x11/gdkx.h: gdk/gdk/x11/gdkproperty-x11.c: Export
gdk_x11_xatom_to_atom, gdk_x11_atom_to_xatom().
* gdk/gdktypes.h docs/Changes-2.0.txt: Make GdkAtom
an opaque pointer type so the compiler catches attempts
to mingle it with X atoms.
* gdk/x11/{gdkdnd-x11.c,gdkevents-x11.c,gdkglobals-x11.c,
gdkkeys-x11.c, gdkmain-x11.c, gdkprivate-x11.c,
gdkproperty-x11.c, gdkselection-x11.c, gdkwindow-x11.c}
gtk/{gtkclist.c,gtkctree.c,gtkdnd.c,gtkplug.c,gtksocket.c}
tests/testdnd.c,tests/testselection.c:
Fix up for above atom changes.
* gdk/gdkselection.h (GDK_SELECTION_CLIPBOARD): Add, since we
now have the ability to add custom predefines.
* gtk/{gtkentry.c,gtklabel.c,gtkoldeditable.c,gtktextview.c}:
Use GDK_SELECTION_CLIPBOARD instead of GDK_NONE in calls
to gtk_clipboard_get().
* gdk/win32/gdkproperty-win32.c: Add CLIPBOARD, fix up
for GdkAtom => pointer change.
* gdk/linux-fb/gdkproperty-fb.c: Fix handling of predefined
atoms, fix for GdkAtom => pointer change.
2001-10-22 04:34:42 +00:00
|
|
|
if (xevent->xclient.message_type == gdk_x11_get_xatom_by_name ("_XEMBED"))
|
2001-07-03 14:14:30 +00:00
|
|
|
{
|
|
|
|
handle_xembed_message (socket,
|
|
|
|
xevent->xclient.data.l[1],
|
|
|
|
xevent->xclient.data.l[2],
|
|
|
|
xevent->xclient.data.l[3],
|
|
|
|
xevent->xclient.data.l[4],
|
|
|
|
xevent->xclient.data.l[0]);
|
|
|
|
|
|
|
|
|
|
|
|
return_val = GDK_FILTER_REMOVE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
case CreateNotify:
|
|
|
|
{
|
|
|
|
XCreateWindowEvent *xcwe = &xevent->xcreatewindow;
|
|
|
|
|
|
|
|
if (!socket->plug_window)
|
2001-07-03 14:14:30 +00:00
|
|
|
{
|
2001-07-05 02:58:34 +00:00
|
|
|
gtk_socket_add_window (socket, xcwe->window, FALSE);
|
1999-02-18 16:43:42 +00:00
|
|
|
|
2001-07-05 02:58:34 +00:00
|
|
|
if (socket->plug_window)
|
|
|
|
{
|
|
|
|
socket->request_width = xcwe->width;
|
|
|
|
socket->request_height = xcwe->height;
|
|
|
|
socket->have_size = TRUE;
|
|
|
|
|
|
|
|
GTK_NOTE(PLUGSOCKET,
|
|
|
|
g_message ("GtkSocket - window created with size: %d %d",
|
|
|
|
socket->request_width,
|
|
|
|
socket->request_height));
|
|
|
|
}
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return_val = GDK_FILTER_REMOVE;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case ConfigureRequest:
|
|
|
|
{
|
|
|
|
XConfigureRequestEvent *xcre = &xevent->xconfigurerequest;
|
|
|
|
|
|
|
|
if (!socket->plug_window)
|
2001-07-03 14:14:30 +00:00
|
|
|
gtk_socket_add_window (socket, xcre->window, FALSE);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
2001-07-03 14:14:30 +00:00
|
|
|
if (socket->plug_window)
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
if (xcre->value_mask & (CWWidth | CWHeight))
|
|
|
|
{
|
|
|
|
socket->request_width = xcre->width;
|
|
|
|
socket->request_height = xcre->height;
|
|
|
|
socket->have_size = TRUE;
|
|
|
|
|
1999-02-18 16:43:42 +00:00
|
|
|
GTK_NOTE(PLUGSOCKET,
|
|
|
|
g_message ("GtkSocket - configure request: %d %d",
|
|
|
|
socket->request_width,
|
|
|
|
socket->request_height));
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
gtk_widget_queue_resize (widget);
|
|
|
|
}
|
|
|
|
else if (xcre->value_mask & (CWX | CWY))
|
|
|
|
{
|
|
|
|
gtk_socket_send_configure_event (socket);
|
|
|
|
}
|
|
|
|
/* Ignore stacking requests. */
|
|
|
|
|
|
|
|
return_val = GDK_FILTER_REMOVE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case DestroyNotify:
|
|
|
|
{
|
|
|
|
XDestroyWindowEvent *xdwe = &xevent->xdestroywindow;
|
|
|
|
|
2001-07-05 02:58:34 +00:00
|
|
|
/* Note that we get destroy notifies both from SubstructureNotify on
|
|
|
|
* our window and StructureNotify on socket->plug_window
|
|
|
|
*/
|
2001-07-03 14:14:30 +00:00
|
|
|
if (socket->plug_window && (xdwe->window == GDK_WINDOW_XWINDOW (socket->plug_window)))
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
GtkWidget *toplevel;
|
2001-07-05 02:58:34 +00:00
|
|
|
gboolean result;
|
|
|
|
|
1999-02-18 16:43:42 +00:00
|
|
|
GTK_NOTE(PLUGSOCKET,
|
|
|
|
g_message ("GtkSocket - destroy notify"));
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
|
|
|
|
if (toplevel && GTK_IS_WINDOW (toplevel))
|
|
|
|
gtk_window_remove_embedded_xid (GTK_WINDOW (toplevel), xdwe->window);
|
2001-04-19 20:36:46 +00:00
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
gdk_window_destroy_notify (socket->plug_window);
|
2001-07-05 02:58:34 +00:00
|
|
|
g_object_unref (socket->plug_window);
|
1998-11-24 04:45:29 +00:00
|
|
|
socket->plug_window = NULL;
|
2001-07-05 02:58:34 +00:00
|
|
|
|
|
|
|
g_object_ref (widget);
|
|
|
|
g_signal_emit (G_OBJECT (widget), socket_signals[PLUG_REMOVED], 0, &result);
|
|
|
|
if (!result)
|
|
|
|
gtk_widget_destroy (widget);
|
|
|
|
g_object_unref (widget);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
|
|
|
return_val = GDK_FILTER_REMOVE;
|
|
|
|
}
|
|
|
|
break;
|
2001-04-19 20:36:46 +00:00
|
|
|
}
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
case FocusIn:
|
|
|
|
if (xevent->xfocus.mode == EMBEDDED_APP_WANTS_FOCUS)
|
|
|
|
{
|
|
|
|
gtk_socket_claim_focus (socket);
|
|
|
|
}
|
|
|
|
else if (xevent->xfocus.detail == NotifyInferior)
|
|
|
|
{
|
|
|
|
#if 0
|
|
|
|
GtkWidget *toplevel;
|
2001-07-03 14:14:30 +00:00
|
|
|
toplevel = gtk_widget_get_toplevel (widget);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
2001-07-03 14:14:30 +00:00
|
|
|
if (toplevel && GTK_IS_WINDOW (topelevel))
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
XSetInputFocus (GDK_DISPLAY (),
|
|
|
|
GDK_WINDOW_XWINDOW (toplevel->window),
|
|
|
|
RevertToParent, CurrentTime); /* FIXME? */
|
|
|
|
}
|
2001-04-23 23:03:53 +00:00
|
|
|
#endif
|
|
|
|
}
|
1998-11-24 04:45:29 +00:00
|
|
|
return_val = GDK_FILTER_REMOVE;
|
|
|
|
break;
|
|
|
|
case FocusOut:
|
|
|
|
return_val = GDK_FILTER_REMOVE;
|
|
|
|
break;
|
|
|
|
case MapRequest:
|
|
|
|
if (!socket->plug_window)
|
2001-07-03 14:14:30 +00:00
|
|
|
gtk_socket_add_window (socket, xevent->xmaprequest.window, FALSE);
|
1998-11-24 04:45:29 +00:00
|
|
|
|
2001-07-03 14:14:30 +00:00
|
|
|
if (socket->plug_window)
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
1999-02-18 16:43:42 +00:00
|
|
|
GTK_NOTE(PLUGSOCKET,
|
|
|
|
g_message ("GtkSocket - Map Request"));
|
1998-11-24 04:45:29 +00:00
|
|
|
|
2001-07-03 14:14:30 +00:00
|
|
|
map_request (socket);
|
1998-11-24 04:45:29 +00:00
|
|
|
return_val = GDK_FILTER_REMOVE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case PropertyNotify:
|
2001-07-03 14:14:30 +00:00
|
|
|
if (socket->plug_window &&
|
|
|
|
xevent->xproperty.window == GDK_WINDOW_XWINDOW (socket->plug_window))
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
|
|
|
GdkDragProtocol protocol;
|
|
|
|
|
Fix problem with g_return_if_fail return value.
Sun Oct 21 23:27:00 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_translate_coordinates): Fix
problem with g_return_if_fail return value.
* gdk/x11/gdkproperty-x11.c docs/Changes-2.0.txt: Move over the
virtual atom code from the gdk-multihead branch, removing the per-display
part. Virtualizing atoms needs to be done now to prevent compat
breakage in direct Xlib accessing code in the future. (#62208)
* gdk/x11/gdkx.h: gdk/gdk/x11/gdkproperty-x11.c: Export
gdk_x11_xatom_to_atom, gdk_x11_atom_to_xatom().
* gdk/gdktypes.h docs/Changes-2.0.txt: Make GdkAtom
an opaque pointer type so the compiler catches attempts
to mingle it with X atoms.
* gdk/x11/{gdkdnd-x11.c,gdkevents-x11.c,gdkglobals-x11.c,
gdkkeys-x11.c, gdkmain-x11.c, gdkprivate-x11.c,
gdkproperty-x11.c, gdkselection-x11.c, gdkwindow-x11.c}
gtk/{gtkclist.c,gtkctree.c,gtkdnd.c,gtkplug.c,gtksocket.c}
tests/testdnd.c,tests/testselection.c:
Fix up for above atom changes.
* gdk/gdkselection.h (GDK_SELECTION_CLIPBOARD): Add, since we
now have the ability to add custom predefines.
* gtk/{gtkentry.c,gtklabel.c,gtkoldeditable.c,gtktextview.c}:
Use GDK_SELECTION_CLIPBOARD instead of GDK_NONE in calls
to gtk_clipboard_get().
* gdk/win32/gdkproperty-win32.c: Add CLIPBOARD, fix up
for GdkAtom => pointer change.
* gdk/linux-fb/gdkproperty-fb.c: Fix handling of predefined
atoms, fix for GdkAtom => pointer change.
2001-10-22 04:34:42 +00:00
|
|
|
if ((xevent->xproperty.atom == gdk_x11_get_xatom_by_name ("XdndAware")) ||
|
|
|
|
(xevent->xproperty.atom == gdk_x11_get_xatom_by_name ("_MOTIF_DRAG_RECEIVER_INFO")))
|
1998-11-24 04:45:29 +00:00
|
|
|
{
|
1999-02-21 19:25:53 +00:00
|
|
|
gdk_error_trap_push ();
|
1998-11-24 04:45:29 +00:00
|
|
|
if (gdk_drag_get_protocol (xevent->xproperty.window, &protocol))
|
|
|
|
gtk_drag_dest_set_proxy (GTK_WIDGET (socket),
|
|
|
|
socket->plug_window,
|
|
|
|
protocol, TRUE);
|
1999-02-21 19:25:53 +00:00
|
|
|
gdk_flush ();
|
|
|
|
gdk_error_trap_pop ();
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
Fix problem with g_return_if_fail return value.
Sun Oct 21 23:27:00 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_translate_coordinates): Fix
problem with g_return_if_fail return value.
* gdk/x11/gdkproperty-x11.c docs/Changes-2.0.txt: Move over the
virtual atom code from the gdk-multihead branch, removing the per-display
part. Virtualizing atoms needs to be done now to prevent compat
breakage in direct Xlib accessing code in the future. (#62208)
* gdk/x11/gdkx.h: gdk/gdk/x11/gdkproperty-x11.c: Export
gdk_x11_xatom_to_atom, gdk_x11_atom_to_xatom().
* gdk/gdktypes.h docs/Changes-2.0.txt: Make GdkAtom
an opaque pointer type so the compiler catches attempts
to mingle it with X atoms.
* gdk/x11/{gdkdnd-x11.c,gdkevents-x11.c,gdkglobals-x11.c,
gdkkeys-x11.c, gdkmain-x11.c, gdkprivate-x11.c,
gdkproperty-x11.c, gdkselection-x11.c, gdkwindow-x11.c}
gtk/{gtkclist.c,gtkctree.c,gtkdnd.c,gtkplug.c,gtksocket.c}
tests/testdnd.c,tests/testselection.c:
Fix up for above atom changes.
* gdk/gdkselection.h (GDK_SELECTION_CLIPBOARD): Add, since we
now have the ability to add custom predefines.
* gtk/{gtkentry.c,gtklabel.c,gtkoldeditable.c,gtktextview.c}:
Use GDK_SELECTION_CLIPBOARD instead of GDK_NONE in calls
to gtk_clipboard_get().
* gdk/win32/gdkproperty-win32.c: Add CLIPBOARD, fix up
for GdkAtom => pointer change.
* gdk/linux-fb/gdkproperty-fb.c: Fix handling of predefined
atoms, fix for GdkAtom => pointer change.
2001-10-22 04:34:42 +00:00
|
|
|
else if (xevent->xproperty.atom == gdk_x11_get_xatom_by_name ("_XEMBED_INFO"))
|
2001-07-03 14:14:30 +00:00
|
|
|
{
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
if (xembed_get_info (socket->plug_window, NULL, &flags))
|
|
|
|
{
|
|
|
|
gboolean was_mapped = socket->is_mapped;
|
|
|
|
gboolean is_mapped = (flags & XEMBED_MAPPED) != 0;
|
|
|
|
|
|
|
|
if (was_mapped != is_mapped)
|
|
|
|
{
|
|
|
|
if (is_mapped)
|
|
|
|
map_request (socket);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
gdk_error_trap_push ();
|
|
|
|
gdk_window_show (socket->plug_window);
|
|
|
|
gdk_flush ();
|
|
|
|
gdk_error_trap_pop ();
|
|
|
|
|
|
|
|
unmap_notify (socket);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
return_val = GDK_FILTER_REMOVE;
|
|
|
|
}
|
2001-04-19 20:36:46 +00:00
|
|
|
break;
|
2001-07-05 02:58:34 +00:00
|
|
|
case ReparentNotify:
|
|
|
|
{
|
|
|
|
XReparentEvent *xre = &xevent->xreparent;
|
|
|
|
|
|
|
|
if (!socket->plug_window && xre->parent == GDK_WINDOW_XWINDOW (widget->window))
|
|
|
|
{
|
|
|
|
gtk_socket_add_window (socket, xre->window, FALSE);
|
|
|
|
|
|
|
|
if (socket->plug_window)
|
|
|
|
{
|
|
|
|
GTK_NOTE(PLUGSOCKET,
|
2001-09-20 15:08:00 +00:00
|
|
|
g_message ("GtkSocket - window reparented"));
|
2001-07-05 02:58:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return_val = GDK_FILTER_REMOVE;
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
2001-07-03 14:14:30 +00:00
|
|
|
case UnmapNotify:
|
|
|
|
if (socket->plug_window &&
|
|
|
|
xevent->xunmap.window == GDK_WINDOW_XWINDOW (socket->plug_window))
|
2001-04-19 20:36:46 +00:00
|
|
|
{
|
2001-07-03 14:14:30 +00:00
|
|
|
GTK_NOTE(PLUGSOCKET,
|
|
|
|
g_message ("GtkSocket - Unmap notify"));
|
|
|
|
|
|
|
|
unmap_notify (socket);
|
2001-04-19 20:36:46 +00:00
|
|
|
return_val = GDK_FILTER_REMOVE;
|
|
|
|
}
|
|
|
|
break;
|
2001-07-03 14:14:30 +00:00
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
}
|
2001-04-19 20:36:46 +00:00
|
|
|
|
1998-11-24 04:45:29 +00:00
|
|
|
return return_val;
|
|
|
|
}
|