From 425b9886c9e042bc4e8c789e6983127981aca6cf Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 25 Apr 2002 22:29:14 +0000 Subject: Start of integration of Erwann Chenede's multihead work from the Thu Apr 25 16:51:40 2002 Owen Taylor Start of integration of Erwann Chenede's multihead work from the gtk-multihead branch. * gdk/gdkdisplay.[ch] gdk/gdkscreen.[ch] gdk/x11/gdkdisplay-x11.[ch] gdk/x11/gdkscreen-x11.[ch] New classes representing a set of screens with attached input devices and a single contiguous area, respectively. * gdk/gdk.[ch] gdk/gdkinternals.h gdk/x11/gdkmain-x11.c: gdk/x11/gdkprivate-x11.h: Make the initialization interface simple _gdk_windowing_init() and do the rest in gdk_open_display() calls. * gdk/gdk.[ch]: Add gdk_parse_args() which can be used to do the display-independent part of initialization instead of gdk_init_[check]. * gdk/gdkcursor.h gdk/gdkfont.h gdk/gdkkeys.h gdk/gdkpixmap.h gdk/gdkproperty.h gdk/gdkselection.h gdk/gdkwindow.h: Add multihead variants (_for_display(), for_screen()) of functions getting information specific to a particular screen screen or display. * gdk/gdkscreen.[ch]: Add gdk_screen__* variants of functions like gdk_rgb_get_colormap() that used to get/list global objects. * gdk/x11/gdkx.h: Add functions for converting GdkScreen and GdkDisplay into the X equivalents. * gdk/x11/gdkwindow-x11.c: Removed gdk_window_xid_at_coords() not in the headers and unused. * configure.in gdk/x11/{gxid.c,gxid_lib.[ch],gdkinput-gxi.c}: Remove gxid support ... has not been tested for a long time... "xfree" support is more portable to non XFree86. * gdk/**.h: Add a GDK_MULTIHEAD_SAFE define that can be used to turn off functions that are inherently non-multihead safe. * gdk/**.c: add GDK_NOTE(multihead, ...) calls when functions are used in non-multihead-safe ways. * gdk/*.c gdk/x11/*.c: Changes to make the internals of GDK multihead safe. --- gdk/gdkwindow.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gdk/gdkwindow.h') diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h index 7235ce2e36..2495dc4104 100644 --- a/gdk/gdkwindow.h +++ b/gdk/gdkwindow.h @@ -197,10 +197,6 @@ struct _GdkGeometry GdkGravity win_gravity; }; -/* Dummy typedef for placeholder in GdkPointerHooks.window_at_pointer - */ -typedef struct _GdkScreen GdkScreen; - struct _GdkPointerHooks { GdkWindow* (*get_pointer) (GdkWindow *window, @@ -378,8 +374,14 @@ gboolean gdk_window_set_static_gravities (GdkWindow *window, gboolean use_static); /* Functions to create/lookup windows from their native equivalents */ +#ifndef GDK_MULTIHEAD_SAFE GdkWindow* gdk_window_foreign_new (GdkNativeWindow anid); GdkWindow* gdk_window_lookup (GdkNativeWindow anid); +#endif +GdkWindow *gdk_window_foreign_new_for_display (GdkDisplay *display, + GdkNativeWindow anid); +GdkWindow* gdk_window_lookup_for_display (GdkDisplay *display, + GdkNativeWindow anid); /* GdkWindow */ @@ -477,7 +479,10 @@ gboolean gdk_window_get_decorations (GdkWindow *window, GdkWMDecoration *decorations); void gdk_window_set_functions (GdkWindow *window, GdkWMFunction functions); +#ifndef GDK_MULTIHEAD_SAFE GList * gdk_window_get_toplevels (void); +void gdk_set_sm_client_id (const gchar *sm_client_id); +#endif void gdk_window_iconify (GdkWindow *window); void gdk_window_deiconify (GdkWindow *window); -- cgit v1.2.1