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.

gdk/x11/gdkinputprivate.h

@@ -27,6 +27,10 @@
 #ifndef __GDK_INPUTPRIVATE_H__
 #define __GDK_INPUTPRIVATE_H__
 
+#include "config.h"
+#include "gdkinput.h"
+#include "gdkevents.h"
+
 #ifndef XINPUT_NONE
 #include <X11/extensions/XInput.h>
 #endif
@@ -147,6 +151,10 @@ struct _GdkInputWindow
 
 /* Global data */
 
+extern const GdkDeviceInfo gdk_input_core_info;
+extern GList *gdk_input_devices;
+extern GList *gdk_input_windows;
+
 extern GdkInputVTable gdk_input_vtable;
 /* information about network port and host for gxid daemon */
 extern gchar           *gdk_input_gxid_host;
@@ -155,8 +163,63 @@ extern gint             gdk_input_ignore_core;
 
 /* Function declarations */
 
+GdkDevicePrivate * gdk_input_find_device    (guint32           id);
+GdkInputWindow *   gdk_input_window_find    (GdkWindow        *window);
+void               gdk_input_window_destroy (GdkWindow        *window);
+void               gdk_input_init           (void);
+void               gdk_input_exit           (void);
+gint               gdk_input_enable_window  (GdkWindow        *window,
+					     GdkDevicePrivate *gdkdev);
+gint               gdk_input_disable_window (GdkWindow        *window,
+					     GdkDevicePrivate *gdkdev);
+
+#ifndef XINPUT_NONE
+
+#define GDK_MAX_DEVICE_CLASSES 13
+
+gint           gdk_input_common_init                (gint              include_core);
+void           gdk_input_get_root_relative_geometry (Display          *dpy,
+						     Window            w,
+						     int              *x_ret,
+						     int              *y_ret,
+						     int              *width_ret,
+						     int              *height_ret);
+void           gdk_input_common_find_events         (GdkWindow        *window,
+						     GdkDevicePrivate *gdkdev,
+						     gint              mask,
+						     XEventClass      *classes,
+						     int              *num_classes);
+void           gdk_input_common_select_events       (GdkWindow        *window,
+						     GdkDevicePrivate *gdkdev);
+gint           gdk_input_common_other_event         (GdkEvent         *event,
+						     XEvent           *xevent,
+						     GdkInputWindow   *input_window,
+						     GdkDevicePrivate *gdkdev);
+void           gdk_input_common_get_pointer         (GdkWindow        *window,
+						     guint32           deviceid,
+						     gdouble          *x,
+						     gdouble          *y,
+						     gdouble          *pressure,
+						     gdouble          *xtilt,
+						     gdouble          *ytilt,
+						     GdkModifierType  *mask);
+void           gdk_input_common_set_key             (guint32           deviceid,
+						     guint             index,
+						     guint             keyval,
+						     GdkModifierType   modifiers);
+void           gdk_input_common_set_axes            (guint32           deviceid,
+						     GdkAxisUse       *axes);
+GdkTimeCoord * gdk_input_common_motion_events       (GdkWindow        *window,
+						     guint32           deviceid,
+						     guint32           start,
+						     guint32           stop,
+						     gint             *nevents_return);
+
+#endif /* !XINPUT_NONE */
+
+GdkDevicePrivate *gdk_input_find_device (guint32 id);
+GdkInputWindow *gdk_input_window_find (GdkWindow *window);
 void gdk_input_window_destroy (GdkWindow *window);
-void gdk_input_init           (void);
 void gdk_input_exit           (void);
 
 #endif /* __GDK_INPUTPRIVATE_H__ */