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, 48 insertions, 17 deletions

diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c
index 8c46073a2a..0d8407371b 100644
--- a/gdk/x11/gdkxid.c
+++ b/gdk/x11/gdkxid.c
@@ -25,6 +25,7 @@
  */
 
 #include "gdkprivate-x11.h"
+#include "gdkdisplay-x11.h"
 #include <stdio.h>
 
 static guint     gdk_xid_hash  (XID *xid);
@@ -32,43 +33,73 @@ static gboolean  gdk_xid_equal (XID *a,
 				XID *b);
 
 
-static GHashTable *xid_ht = NULL;
-
-
 void
-gdk_xid_table_insert (XID      *xid,
-		      gpointer  data)
+_gdk_xid_table_insert (GdkDisplay *display,
+		       XID	  *xid,
+		       gpointer    data)
 {
+  GdkDisplayX11 *display_x11;
+  
   g_return_if_fail (xid != NULL);
+  g_return_if_fail (GDK_IS_DISPLAY (display));
+  
+  display_x11 = GDK_DISPLAY_X11 (display);
 
-  if (!xid_ht)
-    xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
-			       (GEqualFunc) gdk_xid_equal);
+  if (!display_x11->xid_ht)
+    display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
+					    (GEqualFunc) gdk_xid_equal);
 
-  g_hash_table_insert (xid_ht, xid, data);
+  g_hash_table_insert (display_x11->xid_ht, xid, data);
 }
 
 void
-gdk_xid_table_remove (XID xid)
+_gdk_xid_table_remove (GdkDisplay *display,
+		       XID	   xid)
 {
-  if (!xid_ht)
-    xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
-			       (GEqualFunc) gdk_xid_equal);
+  GdkDisplayX11 *display_x11;
+  
+  g_return_if_fail (GDK_IS_DISPLAY (display));
+  
+  display_x11 = GDK_DISPLAY_X11 (display);
+  
+  if (!display_x11->xid_ht)
+    display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
+					    (GEqualFunc) gdk_xid_equal);
 
-  g_hash_table_remove (xid_ht, &xid);
+  g_hash_table_remove (display_x11->xid_ht, &xid);
 }
 
+/** 
+ * gdk_xid_table_lookup_for_display:
+ * @display : the #GdkDisplay.
+ * @xid : an X id.
+ *
+ * Returns the Gdk object associated with the given X id.
+ *
+ * Returns: an GdkObject associated with the given X id.
+ */
 gpointer
-gdk_xid_table_lookup (XID xid)
+gdk_xid_table_lookup_for_display (GdkDisplay  *display,
+				  XID	       xid)
 {
+  GdkDisplayX11 *display_x11;
   gpointer data = NULL;
+  
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+  
+  display_x11 = GDK_DISPLAY_X11 (display);
 
-  if (xid_ht)
-    data = g_hash_table_lookup (xid_ht, &xid);
+  if (display_x11->xid_ht)
+    data = g_hash_table_lookup (display_x11->xid_ht, &xid);
   
   return data;
 }
 
+gpointer
+gdk_xid_table_lookup (XID xid)
+{
+  return gdk_xid_table_lookup_for_display (gdk_get_default_display (), xid);
+}
 
 static guint
 gdk_xid_hash (XID *xid)