Start of integration of Erwann Chenede's multihead work from the

Thu Apr 25 16:51:40 2002  Owen Taylor  <otaylor@redhat.com>

        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.

1 files changed, 142 insertions, 0 deletions

diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
new file mode 100644
index 000000000..cfdf490ea
--- /dev/null
+++ b/gdk/x11/gdkdisplay-x11.h
@@ -0,0 +1,142 @@
+/*
+ * gdkdisplay-x11.h
+ * 
+ * Copyright 2001 Sun Microsystems Inc. 
+ *
+ * Erwann Chenede <erwann.chenede@sun.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GDK_DISPLAY_X11__
+#define __GDK_DISPLAY_X11__
+
+#include <X11/X.h>
+#include <X11/Xlib.h>
+#include <glib.h>
+#include <gdk/gdkdisplay.h>
+#include <gdk/gdkkeys.h>
+#include <gdk/gdkwindow.h>
+#include <gdk/gdk.h>		/* For gdk_get_program_class() */
+
+G_BEGIN_DECLS
+
+typedef struct _GdkDisplayX11 GdkDisplayX11;
+typedef struct _GdkDisplayX11Class GdkDisplayX11Class;
+
+#define GDK_TYPE_DISPLAY_X11              (gdk_display_x11_get_type())
+#define GDK_DISPLAY_X11(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY_X11, GdkDisplayX11))
+#define GDK_DISPLAY_X11_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY_X11, GdkDisplayX11Class))
+#define GDK_IS_DISPLAY_X11(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY_X11))
+#define GDK_IS_DISPLAY_X11_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY_X11))
+#define GDK_DISPLAY_X11_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DISPLAY_X11, GdkDisplayX11Class))
+
+struct _GdkDisplayX11
+{
+  GdkDisplay parent_instance;
+  Display *xdisplay;
+  GdkScreen *default_screen;
+  GSList *screen_list;
+
+  gint grab_count;
+
+  /* Keyboard related information */
+
+  gint xkb_event_type;
+  gboolean use_xkb;
+  
+  /* Whether we were able to turn on detectable-autorepeat using
+   * XkbSetDetectableAutorepeat. If FALSE, we'll fall back
+   * to checking the next event with XPending(). */
+  gboolean have_xkb_autorepeat;
+
+  GdkKeymap *keymap;
+  guint	    keymap_serial;
+
+  gboolean use_xshm;
+  gboolean have_shm_pixmaps;
+  gint     have_shape;
+  
+  /* Information about current pointer and keyboard grabs held by this
+   * client. If gdk_pointer_xgrab_window or gdk_keyboard_xgrab_window
+   * window is NULL, then the other associated fields are ignored
+   */
+  GdkWindowObject *pointer_xgrab_window;
+  gulong pointer_xgrab_serial;
+  gboolean pointer_xgrab_owner_events;
+
+  GdkWindowObject *keyboard_xgrab_window;
+  gulong keyboard_xgrab_serial;
+  gboolean keyboard_xgrab_owner_events;
+
+  /* drag and drop information */
+  GdkDragContext *current_dest_drag;
+
+  /* data needed for MOTIF DnD */
+
+  Window motif_drag_window;
+  GdkWindow *motif_drag_gdk_window;
+  GList **motif_target_lists;
+  gint motif_n_target_lists;
+
+  /* Mapping to/from virtual atoms */
+
+  GHashTable *atom_from_virtual;
+  GHashTable *atom_to_virtual;
+
+  /* Session Management leader window see ICCCM */
+  Window leader_window;
+  
+  /* list of filters for client messages */
+  GList *client_filters;	            
+  
+  /* X ID hashtable */
+  GHashTable *xid_ht;
+
+  /* translation queue */
+  GQueue *translate_queue;
+
+  /* Input device */
+  /* input GdkDevice list */
+  GList *input_devices;
+
+  /* input GdkWindow list */
+  GList *input_windows;
+
+  gint input_ignore_core;
+  /* information about network port and host for gxid daemon */
+  gchar *input_gxid_host;
+  gint   input_gxid_port;
+
+  gint   use_xft; 
+};
+
+struct _GdkDisplayX11Class
+{
+  GdkDisplayClass parent_class;
+};
+
+GType       gdk_display_x11_get_type     (void);
+
+void	    gdk_x11_display_grab	      (GdkDisplay *display);
+void	    gdk_x11_display_ungrab	      (GdkDisplay *display);
+
+GdkScreen *_gdk_x11_display_screen_for_xrootwin (GdkDisplay *display,
+						 Window      xrootwin);
+
+G_END_DECLS
+
+#endif				/* __GDK_DISPLAY_X11__ */