Move all X specific code into the x11/ directory. Aside from shuffling

Mon Nov  8 14:47:04 1999  Owen Taylor  <otaylor@redhat.com>

	Move all X specific code into the x11/ directory.
	Aside from shuffling things around, did the following:

       * gdk/gdkprivate.h gdk/gdk.h gdk/x11/gdkmain-x11.h: Add
	 gdk_arg_context_* - a simple argument parsing system
	 in the style of popt.

       * gdk/gdkdrawable.[ch] gdk/gdkprivate.h gdk/gdkwindow.[ch]
	 gdk/x11/gdkprivate-x11.h:
	 Remove X specific stuff from GdkDrawable and GdkWindowPrivate -
	 add ->klass and ->klass_data fields. The klass_data
	 field points to an auxilliary structure that is
	 windowing system dependent.

       * gdk/gdkfont.c: Make most of the measurement functions
	 simply wrappers around gdk_text_extents().

       * gdk/gdkfont.c gdk/gdkprivate.h gdk/x11/gdkfont-x11.c: Add a
	 _gdk_font_strlen() function that hides the weird
	 behavior in gtk+-1.[02] where a string is interpreted
	 differently for 8-bit and 16-bit fonts.

       * gdk/gdkevents.c: Add a new function gdk_event_button_generate()
	 to store common code for synthesizing double/triple
	 press events.

       * gdk/gdkgc.[ch]: Virtualize in the same way as gdkdrawable.h.
	 Make all the function that modify an existing GC
	 simply wrappers around gdk_gc_set_values().

       * gdk/gdkcc.[ch]: Moved into x11/ directory in preparation
	 for throwing out later.

       * gdk/gdkfont.c gdk/gdkimage.c gdk/gdkcolor.c: Change GdkFontPrivate,
	 GdkImagePrivate and GdkColormapPrivate to have a
	 windowing system dependent part (GdkFontPrivateX etc.)
	 that "derives" from the system-independent part.

       * configure.in gdk/x11/Makefile.in gdk/x11/gdkinput*.c:
	 Got rid of the included-source-files for XInput in
	 favor of automake conditionals. (Which didn't exist
	 when XInput support was originally added.)

       * gdk/gdkrgb.c: Remove the visual id from the debugging
	 statements since that is X11 specific; print out
	 type/depth info instead.

1 files changed, 7 insertions, 26 deletions

diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index 334c3d46d..348251458 100644
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@@ -34,21 +34,9 @@
 #include "gdkprivate.h"
 #include "gdkinputprivate.h"
 
-/* Forward declarations */
-
-static gint gdk_input_enable_window (GdkWindow *window,
-				     GdkDevicePrivate *gdkdev);
-static gint gdk_input_disable_window (GdkWindow *window,
-				      GdkDevicePrivate *gdkdev);
-static GdkInputWindow *gdk_input_window_find (GdkWindow *window);
-static GdkDevicePrivate *gdk_input_find_device (guint32 id);
-
-
-/* Incorporate the specific routines depending on compilation options */
-
 static const GdkAxisUse gdk_input_core_axes[] = { GDK_AXIS_X, GDK_AXIS_Y };
 
-static const GdkDeviceInfo gdk_input_core_info =
+const GdkDeviceInfo gdk_input_core_info =
 {
   GDK_CORE_POINTER,
   "Core Pointer",
@@ -67,15 +55,8 @@ gchar            *gdk_input_gxid_host;
 gint              gdk_input_gxid_port;
 gint              gdk_input_ignore_core;
 
-/* Local variables */
-
-static GList            *gdk_input_devices;
-static GList            *gdk_input_windows;
-
-#include "gdkinputnone.h"
-#include "gdkinputcommon.h"
-#include "gdkinputxfree.h"
-#include "gdkinputgxi.h"
+GList            *gdk_input_devices;
+GList            *gdk_input_windows;
 
 GList *
 gdk_input_list_devices (void)
@@ -178,7 +159,7 @@ gdk_input_motion_events (GdkWindow *window,
     }
 }
 
-static gint
+gint
 gdk_input_enable_window (GdkWindow *window, GdkDevicePrivate *gdkdev)
 {
   if (gdk_input_vtable.enable_window)
@@ -187,7 +168,7 @@ gdk_input_enable_window (GdkWindow *window, GdkDevicePrivate *gdkdev)
     return TRUE;
 }
 
-static gint
+gint
 gdk_input_disable_window (GdkWindow *window, GdkDevicePrivate *gdkdev)
 {
   if (gdk_input_vtable.disable_window)
@@ -197,7 +178,7 @@ gdk_input_disable_window (GdkWindow *window, GdkDevicePrivate *gdkdev)
 }
 
 
-static GdkInputWindow *
+GdkInputWindow *
 gdk_input_window_find(GdkWindow *window)
 {
   GList *tmp_list;
@@ -324,7 +305,7 @@ gdk_input_exit (void)
   g_list_free(gdk_input_windows);
 }
 
-static GdkDevicePrivate *
+GdkDevicePrivate *
 gdk_input_find_device(guint32 id)
 {
   GList *tmp_list = gdk_input_devices;