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.

9 files changed, 19 insertions, 43 deletions

diff --git a/docs/reference/gdk/tmpl/colors.sgml b/docs/reference/gdk/tmpl/colors.sgml
index e684089b1..dc6e08713 100644
--- a/docs/reference/gdk/tmpl/colors.sgml
+++ b/docs/reference/gdk/tmpl/colors.sgml
@@ -101,10 +101,9 @@ Creates a new colormap for the given visual.
 
 <!-- ##### FUNCTION gdk_colormap_get_system ##### -->
 <para>
-Returns the system's default colormap.
 </para>
 
-@Returns: the default colormap.
+@Returns:
 
 
 <!-- ##### FUNCTION gdk_colormap_get_system_size ##### -->
diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml
index 49f64d86d..c3b24d497 100644
--- a/docs/reference/gdk/tmpl/general.sgml
+++ b/docs/reference/gdk/tmpl/general.sgml
@@ -79,24 +79,9 @@ locale.
 
 <!-- ##### FUNCTION gdk_set_sm_client_id ##### -->
 <para>
-Sets the <literal>SM_CLIENT_ID</literal> property on the application's leader window so that
-the window manager can save the application's state using the X11R6 ICCCM
-session management protocol.
-</para>
-<para>
-The leader window is automatically created by GDK and never shown. It's only
-use is for session management. The <literal>WM_CLIENT_LEADER</literal> property is automatically
-set on all X windows created by the application to point to the leader window.
-</para>
-<para>
-See the X Session Management Library documentation for more information on
-session management and the Inter-Client Communication Conventions Manual
-(ICCCM) for information on the <literal>WM_CLIENT_LEADER</literal> property. 
-(Both documents are part of the X Window System distribution.)
 </para>
 
-@sm_client_id: the client id assigned by the session manager when the
-connection was opened, or %NULL to remove the property.
+@sm_client_id:
 
 
 <!-- ##### FUNCTION gdk_exit ##### -->
diff --git a/docs/reference/gdk/tmpl/images.sgml b/docs/reference/gdk/tmpl/images.sgml
index bf71e94cd..c4fb7c5d9 100644
--- a/docs/reference/gdk/tmpl/images.sgml
+++ b/docs/reference/gdk/tmpl/images.sgml
@@ -120,18 +120,14 @@ image is freed.</para></warning>
 
 <!-- ##### FUNCTION gdk_image_get ##### -->
 <para>
-Gets part of a #GdkWindow and stores it in a new #GdkImage.
 </para>
 
 @drawable: 
-@x: the left edge of the rectangle to copy from @window.
-@y: the top edge of the rectangle to copy from @window.
-@width: the width of the area to copy, in pixels.
-@height: the height of the area to copy, in pixels.
-@Returns: a new #GdkImage with a copy of the given area of @window.
-<!-- # Unused Parameters # -->
-@window: the #GdkWindow to copy from.
-
+@x:
+@y:
+@width:
+@height:
+@Returns:
 
 <!-- ##### FUNCTION gdk_image_ref ##### -->
 <para>
diff --git a/docs/reference/gdk/tmpl/keys.sgml b/docs/reference/gdk/tmpl/keys.sgml
index 360733587..a711ac211 100644
--- a/docs/reference/gdk/tmpl/keys.sgml
+++ b/docs/reference/gdk/tmpl/keys.sgml
@@ -90,6 +90,7 @@ in the keymap and see what keyval it corresponds to.
 </para>
 
 @parent_instance: 
+@display: 
 
 <!-- ##### STRUCT GdkKeymapKey ##### -->
 <para>
diff --git a/docs/reference/gdk/tmpl/regions.sgml b/docs/reference/gdk/tmpl/regions.sgml
index e1deaf963..5612e2627 100644
--- a/docs/reference/gdk/tmpl/regions.sgml
+++ b/docs/reference/gdk/tmpl/regions.sgml
@@ -245,9 +245,6 @@ either @region or @rect.
 
 <!-- ##### FUNCTION gdk_region_intersect ##### -->
 <para>
-Sets the area of @source1 to the intersection of the areas of @source1
-and @source2. The resulting area is the set of pixels contained in
-both @source1 and @source2.
 </para>
 
 @source1: a #GdkRegion
@@ -278,13 +275,10 @@ area is the set of pixels contained in @source1 but not in @source2.
 
 <!-- ##### FUNCTION gdk_region_xor ##### -->
 <para>
-Sets the area of @source1 to the exclusive-OR of the areas of @source1
-and @source2. The resulting area is the set of pixels contained in one
-or the other of the two sources but not in both.
 </para>
 
-@source1: a #GdkRegion
-@source2: a #GdkRegion
+@source1:
+@source2:
 
 
 <!-- ##### STRUCT GdkSpan ##### -->
diff --git a/docs/reference/gdk/tmpl/rgb.sgml b/docs/reference/gdk/tmpl/rgb.sgml
index 0b1a7af0d..2c8f066a9 100644
--- a/docs/reference/gdk/tmpl/rgb.sgml
+++ b/docs/reference/gdk/tmpl/rgb.sgml
@@ -407,14 +407,9 @@ private colormap.
 
 <!-- ##### FUNCTION gdk_rgb_get_visual ##### -->
 <para>
-Gets a "preferred visual" chosen by GdkRGB. In previous versions of
-GDK, this was the only visual GdkRGB could use for rendering. In
-current versions, it's simply the visual GdkRGB would have chosen as 
-the optimal one in those previous versions. GdkRGB can now render to 
-drawables with any visual.
 </para>
 
-@Returns: The #GdkVisual chosen by GdkRGB.
+@Returns:
 
 
 <!-- ##### FUNCTION gdk_rgb_get_colormap ##### -->
diff --git a/docs/reference/gdk/tmpl/visuals.sgml b/docs/reference/gdk/tmpl/visuals.sgml
index f353c09d2..00e4c75dd 100644
--- a/docs/reference/gdk/tmpl/visuals.sgml
+++ b/docs/reference/gdk/tmpl/visuals.sgml
@@ -108,6 +108,7 @@ pixel_from_rgb (GdkVisual *visual,
     <structfield>blue_prec</structfield> give an alternate presentation
     of the information in <structfield>blue_mask</structfield>.
 @blue_prec: See above.
+@screen: 
 
 <!-- ##### ENUM GdkVisualType ##### -->
 <para>
diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml
index 287865b66..fb5fad9f0 100644
--- a/docs/reference/gdk/tmpl/windows.sgml
+++ b/docs/reference/gdk/tmpl/windows.sgml
@@ -245,6 +245,7 @@ the @window_at_pointer function in #GdkPointerHooks. It will be used
 when GDK gets multihead support. 
 </para>
 
+@parent_instance: 
 
 <!-- ##### FUNCTION gdk_window_new ##### -->
 <para>
diff --git a/docs/reference/gdk/tmpl/x_interaction.sgml b/docs/reference/gdk/tmpl/x_interaction.sgml
index 76086d2fd..7f964cc8d 100644
--- a/docs/reference/gdk/tmpl/x_interaction.sgml
+++ b/docs/reference/gdk/tmpl/x_interaction.sgml
@@ -59,8 +59,10 @@ Returns the X window belonging to a #GdkWindow.
 Returns the display of a #GdkPixmap.
 </para>
 
-@win: a #GdkPixmap.
+@pix: 
 @Returns: an Xlib <type>Display*</type>.
+<!-- # Unused Parameters # -->
+@win: a #GdkPixmap.
 
 
 <!-- ##### MACRO GDK_PIXMAP_XID ##### -->
@@ -68,8 +70,10 @@ Returns the display of a #GdkPixmap.
 Returns the X pixmap belonging to a #GdkPixmap.
 </para>
 
-@win: a #GdkPixmap.
+@pix: 
 @Returns: the Xlib <type>XPixmap</type> of @win.
+<!-- # Unused Parameters # -->
+@win: a #GdkPixmap.
 
 
 <!-- ##### MACRO GDK_DRAWABLE_XDISPLAY ##### -->