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, 22 insertions, 5 deletions

diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index 4a8f421a1..187e75621 100644
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -27,10 +27,12 @@
 #include <locale.h>
 #include <stdlib.h>
 
+#include "gdkx.h"
 #include "gdk.h"		/* For gdk_flush() */
+#include "gdkx.h"
 #include "gdkpixmap.h"
 #include "gdkinternals.h"
-#include "gdkprivate-x11.h"
+#include "gdkdisplay-x11.h"
 
 #if HAVE_CONFIG_H
 #  include <config.h>
@@ -108,6 +110,17 @@ gdk_set_locale (void)
   return setlocale (LC_ALL, NULL);
 }
 
+static GdkDisplay *
+find_a_display ()
+{
+  GdkDisplay *display = gdk_get_default_display ();
+
+  if (!display)
+    display = _gdk_displays->data;
+
+  return display;
+}
+
 /*
  * gdk_wcstombs 
  *
@@ -123,6 +136,8 @@ gdk_wcstombs (const GdkWChar *src)
 
   if (gdk_use_mb)
     {
+      GdkDisplay *display = find_a_display ();
+      Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
       XTextProperty tpr;
 
       if (sizeof(wchar_t) != sizeof(GdkWChar))
@@ -133,7 +148,7 @@ gdk_wcstombs (const GdkWChar *src)
 	  src_alt = g_new (wchar_t, i+1);
 	  for (; i>=0; i--)
 	    src_alt[i] = src[i];
-	  if (XwcTextListToTextProperty (gdk_display, &src_alt, 1, XTextStyle, &tpr)
+	  if (XwcTextListToTextProperty (xdisplay, &src_alt, 1, XTextStyle, &tpr)
 	      != Success)
 	    {
 	      g_free (src_alt);
@@ -143,7 +158,7 @@ gdk_wcstombs (const GdkWChar *src)
 	}
       else
 	{
-	  if (XwcTextListToTextProperty (gdk_display, (wchar_t**)&src, 1,
+	  if (XwcTextListToTextProperty (xdisplay, (wchar_t**)&src, 1,
 					 XTextStyle, &tpr) != Success)
 	    {
 	      return NULL;
@@ -185,18 +200,20 @@ gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
 {
   if (gdk_use_mb)
     {
+      GdkDisplay *display = find_a_display ();
+      Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
       XTextProperty tpr;
       wchar_t **wstrs, *wstr_src;
       gint num_wstrs;
       gint len_cpy;
-      if (XmbTextListToTextProperty (gdk_display, (char **)&src, 1, XTextStyle,
+      if (XmbTextListToTextProperty (xdisplay, (char **)&src, 1, XTextStyle,
 				     &tpr)
 	  != Success)
 	{
 	  /* NoMem or LocaleNotSupp */
 	  return -1;
 	}
-      if (XwcTextPropertyToTextList (gdk_display, &tpr, &wstrs, &num_wstrs)
+      if (XwcTextPropertyToTextList (xdisplay, &tpr, &wstrs, &num_wstrs)
 	  != Success)
 	{
 	  /* InvalidChar */