Fixes to the win32 backend to actually be able to compile within a

directory hierarchy like this, with common gdk.h and gdktypes.h
for all backends. gdkrectangles.c and gdkrgb.c is copied before
compilation from the x11 backed (which still is in .., but
eventually will be in ..\x11).

47 files changed, 72 insertions, 5727 deletions

diff --git a/gdk/win32/gdk.c b/gdk/win32/gdk.c
index 49671a79c..78a64e25c 100644
--- a/gdk/win32/gdk.c
+++ b/gdk/win32/gdk.c
@@ -33,12 +33,11 @@
 #include <limits.h>
 #include <io.h>
 
-#include "gdk.h"
-#include "gdkprivate.h"
-#include "gdkinput.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdki18n.h>
 #include "gdkx.h"
-#include "gdkkeysyms.h"
-#include "gdki18n.h"
+#include "gdkinput.h"
 
 static void	 gdkx_XConvertCase	(KeySym	       symbol,
 					 KeySym	      *lower,
@@ -2090,7 +2089,7 @@ gdk_keys_keyval_compare (const void *pkey, const void *pbase)
   return (*(int *) pkey) - ((struct gdk_key *) pbase)->keyval;
 }
 
-const gchar*
+gchar*
 gdk_keyval_name (guint	      keyval)
 {
   struct gdk_key *found =
diff --git a/gdk/win32/gdk.h b/gdk/win32/gdk.h
deleted file mode 100644
index 86335c182..000000000
--- a/gdk/win32/gdk.h
+++ /dev/null
@@ -1,1033 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_H__
-#define __GDK_H__
-
-
-#include <gdk/gdktypes.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/* Initialization, exit and events
- */
-#define	  GDK_PRIORITY_EVENTS		(G_PRIORITY_DEFAULT)
-void 	  gdk_init		   	(gint	   	*argc,
-					 gchar        ***argv);
-gboolean  gdk_init_check   	        (gint	   	*argc,
-					 gchar        ***argv);
-void  	  gdk_exit		   	(gint	    	 error_code);
-gchar*	  gdk_set_locale	   	(void);
-
-/* Push and pop error handlers for X errors
- */
-void      gdk_error_trap_push           (void);
-gint      gdk_error_trap_pop            (void);
-
-
-gboolean  gdk_events_pending	 	(void);
-GdkEvent* gdk_event_get			(void);
-
-GdkEvent* gdk_event_peek                (void);
-GdkEvent* gdk_event_get_graphics_expose (GdkWindow 	*window);
-void      gdk_event_put	 		(GdkEvent  	*event);
-
-GdkEvent* gdk_event_copy     		(GdkEvent 	*event);
-void	  gdk_event_free     		(GdkEvent 	*event);
-guint32   gdk_event_get_time 		(GdkEvent 	*event);
-
-void	  gdk_event_handler_set 	(GdkEventFunc    func,
-					 gpointer        data,
-					 GDestroyNotify  notify);
-
-void	  gdk_set_show_events		(gint		 show_events);
-void	  gdk_set_use_xshm		(gint		 use_xshm);
-
-gint	  gdk_get_show_events		(void);
-gint	  gdk_get_use_xshm		(void);
-gchar*	  gdk_get_display		(void);
-
-guint32 gdk_time_get	  (void);
-guint32 gdk_timer_get	  (void);
-void	gdk_timer_set	  (guint32 milliseconds);
-void	gdk_timer_enable  (void);
-void	gdk_timer_disable (void);
-
-gint gdk_input_add_full	  (gint		     source,
-			   GdkInputCondition condition,
-			   GdkInputFunction  function,
-			   gpointer	     data,
-			   GdkDestroyNotify  destroy);
-gint gdk_input_add	  (gint		     source,
-			   GdkInputCondition condition,
-			   GdkInputFunction  function,
-			   gpointer	     data);
-void gdk_input_remove	  (gint		     tag);
-
-gint gdk_pointer_grab	(GdkWindow *	 window,
-			 gint		 owner_events,
-			 GdkEventMask	 event_mask,
-			 GdkWindow *	 confine_to,
-			 GdkCursor *	 cursor,
-			 guint32	 time);
-void gdk_pointer_ungrab (guint32	 time);
-
-gint gdk_keyboard_grab	 (GdkWindow *	  window,
-			  gint		  owner_events,
-			  guint32	  time);
-void gdk_keyboard_ungrab (guint32	  time);
-
-gint gdk_pointer_is_grabbed (void);
-
-gint gdk_screen_width  (void);
-gint gdk_screen_height (void);
-
-gint gdk_screen_width_mm  (void);
-gint gdk_screen_height_mm (void);
-
-void gdk_flush (void);
-void gdk_beep (void);
-
-void gdk_key_repeat_disable (void);
-void gdk_key_repeat_restore (void);
-
-
-/* Visuals
- */
-gint	      gdk_visual_get_best_depth	     (void);
-GdkVisualType gdk_visual_get_best_type	     (void);
-GdkVisual*    gdk_visual_get_system	     (void);
-GdkVisual*    gdk_visual_get_best	     (void);
-GdkVisual*    gdk_visual_get_best_with_depth (gint	     depth);
-GdkVisual*    gdk_visual_get_best_with_type  (GdkVisualType  visual_type);
-GdkVisual*    gdk_visual_get_best_with_both  (gint	     depth,
-					      GdkVisualType  visual_type);
-
-/* Actually, these are no-ops... */
-GdkVisual* gdk_visual_ref (GdkVisual *visual);
-void	   gdk_visual_unref (GdkVisual *visual);
-
-void gdk_query_depths	    (gint	    **depths,
-			     gint	     *count);
-void gdk_query_visual_types (GdkVisualType  **visual_types,
-			     gint	     *count);
-
-GList* gdk_list_visuals (void);
-
-
-/* Windows
- */
-GdkWindow*    gdk_window_new	     (GdkWindow	    *parent,
-				      GdkWindowAttr *attributes,
-				      gint	     attributes_mask);
-
-void	      gdk_window_destroy     (GdkWindow	    *window);
-GdkWindow*    gdk_window_ref	     (GdkWindow	    *window);
-void	      gdk_window_unref	     (GdkWindow	    *window);
-
-GdkWindow*    gdk_window_at_pointer  (gint	   *win_x,
-				      gint	   *win_y);
-void	      gdk_window_show	     (GdkWindow	   *window);
-void	      gdk_window_hide	     (GdkWindow	   *window);
-void	      gdk_window_withdraw    (GdkWindow	   *window);
-void	      gdk_window_move	     (GdkWindow	   *window,
-				      gint	    x,
-				      gint	    y);
-void	      gdk_window_resize	     (GdkWindow	   *window,
-				      gint	    width,
-				      gint	    height);
-void	      gdk_window_move_resize (GdkWindow	   *window,
-				      gint	    x,
-				      gint	    y,
-				      gint	    width,
-				      gint	    height);
-void	      gdk_window_reparent    (GdkWindow	   *window,
-				      GdkWindow	   *new_parent,
-				      gint	    x,
-				      gint	    y);
-void	      gdk_window_clear	     (GdkWindow	   *window);
-void	      gdk_window_clear_area  (GdkWindow	   *window,
-				      gint	    x,
-				      gint	    y,
-				      gint	    width,
-				      gint	    height);
-void	      gdk_window_clear_area_e(GdkWindow	   *window,
-				      gint	    x,
-				      gint	    y,
-				      gint	    width,
-				      gint	    height);
-void	      gdk_window_copy_area   (GdkWindow	   *window,
-				      GdkGC	   *gc,
-				      gint	    x,
-				      gint	    y,
-				      GdkWindow	   *source_window,
-				      gint	    source_x,
-				      gint	    source_y,
-				      gint	    width,
-				      gint	    height);
-void	      gdk_window_raise	     (GdkWindow	   *window);
-void	      gdk_window_lower	     (GdkWindow	   *window);
-
-void	      gdk_window_set_user_data	 (GdkWindow	  *window,
-					  gpointer	   user_data);
-void	      gdk_window_set_override_redirect(GdkWindow  *window,
-					       gboolean override_redirect);
-
-void	      gdk_window_add_filter	(GdkWindow     *window,
-					 GdkFilterFunc	function,
-					 gpointer	data);
-void	      gdk_window_remove_filter	(GdkWindow     *window,
-					 GdkFilterFunc	function,
-					 gpointer	data);
-
-/* 
- * This allows for making shaped (partially transparent) windows
- * - cool feature, needed for Drag and Drag for example.
- *  The shape_mask can be the mask
- *  from gdk_pixmap_create_from_xpm.   Stefan Wille
- */
-void gdk_window_shape_combine_mask (GdkWindow	    *window,
-				    GdkBitmap	    *shape_mask,
-				    gint	     offset_x,
-				    gint	     offset_y);
-/*
- * This routine allows you to quickly take the shapes of all the child windows
- * of a window and use their shapes as the shape mask for this window - useful
- * for container windows that dont want to look like a big box
- * 
- * - Raster
- */
-void gdk_window_set_child_shapes (GdkWindow *window);
-
-/*
- * This routine allows you to merge (ie ADD) child shapes to your
- * own window's shape keeping its current shape and ADDING the child
- * shapes to it.
- * 
- * - Raster
- */
-void gdk_window_merge_child_shapes (GdkWindow *window);
-
-/*
- * Check if a window has been shown, and whether all it's
- * parents up to a toplevel have been shown, respectively.
- * Note that a window that is_viewable below is not necessarily
- * viewable in the X sense.
- */
-gboolean gdk_window_is_visible     (GdkWindow *window);
-gboolean gdk_window_is_viewable    (GdkWindow *window);
-
-/* Set static bit gravity on the parent, and static
- * window gravity on all children.
- */
-gboolean gdk_window_set_static_gravities (GdkWindow *window,
-					  gboolean   use_static);   
-/*
- * The following function adds a global filter for all client
- * messages of type message_type
- */
-void gdk_add_client_message_filter (GdkAtom       message_type,
-				    GdkFilterFunc func,
-				    gpointer      data);
-
-/* Drag and Drop */
-
-GdkDragContext * gdk_drag_context_new        (void);
-void             gdk_drag_context_ref        (GdkDragContext *context);
-void             gdk_drag_context_unref      (GdkDragContext *context);
-
-/* Destination side */
-
-void             gdk_drag_status        (GdkDragContext   *context,
-				         GdkDragAction     action,
-					 guint32           time);
-void             gdk_drop_reply         (GdkDragContext   *context,
-					 gboolean          ok,
-					 guint32           time);
-void             gdk_drop_finish        (GdkDragContext   *context,
-					 gboolean          success,
-					 guint32           time);
-GdkAtom          gdk_drag_get_selection (GdkDragContext   *context);
-
-/* Source side */
-
-GdkDragContext * gdk_drag_begin      (GdkWindow      *window,
-				      GList          *targets);
-guint32         gdk_drag_get_protocol (guint32          xid,
-				       GdkDragProtocol *protocol);
-void             gdk_drag_find_window (GdkDragContext   *context,
-				       GdkWindow       *drag_window,
-			 	       gint             x_root,
-				       gint             y_root,
-				       GdkWindow      **dest_window,
-				       GdkDragProtocol *protocol);
-gboolean        gdk_drag_motion      (GdkDragContext *context,
-				      GdkWindow      *dest_window,
-				      GdkDragProtocol protocol,
-				      gint            x_root, 
-				      gint            y_root,
-				      GdkDragAction   suggested_action,
-				      GdkDragAction   possible_actions,
-				      guint32         time);
-void            gdk_drag_drop        (GdkDragContext *context,
-				      guint32         time);
-void            gdk_drag_abort       (GdkDragContext *context,
-				      guint32         time);
-
-GdkAtom       gdk_drag_get_selection (GdkDragContext *context);
-
-/* GdkWindow */
-
-void	      gdk_window_set_hints	 (GdkWindow	  *window,
-					  gint		   x,
-					  gint		   y,
-					  gint		   min_width,
-					  gint		   min_height,
-					  gint		   max_width,
-					  gint		   max_height,
-					  gint		   flags);
-void          gdk_window_set_geometry_hints (GdkWindow        *window,
-					     GdkGeometry      *geometry,
-					     GdkWindowHints    flags);
-void          gdk_set_sm_client_id         (const gchar *sm_client_id);
-
-
-void	      gdk_window_set_title	   (GdkWindow	  *window,
-					    const gchar	  *title);
-void          gdk_window_set_role          (GdkWindow       *window,
-					    const gchar     *role);
-void          gdk_window_set_transient_for (GdkWindow       *window, 
-					    GdkWindow       *leader);
-void	      gdk_window_set_background	 (GdkWindow	  *window,
-					  GdkColor	  *color);
-void	      gdk_window_set_back_pixmap (GdkWindow	  *window,
-					  GdkPixmap	  *pixmap,
-					  gint		   parent_relative);
-void	      gdk_window_set_cursor	 (GdkWindow	  *window,
-					  GdkCursor	  *cursor);
-void	      gdk_window_set_colormap	 (GdkWindow	  *window,
-					  GdkColormap	  *colormap);
-void	      gdk_window_get_user_data	 (GdkWindow	  *window,
-					  gpointer	  *data);
-void	      gdk_window_get_geometry	 (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y,
-					  gint		  *width,
-					  gint		  *height,
-					  gint		  *depth);
-void	      gdk_window_get_position	 (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y);
-void	      gdk_window_get_size	 (GdkWindow	  *window,
-					  gint		  *width,
-					  gint		  *height);
-GdkVisual*    gdk_window_get_visual	 (GdkWindow	  *window);
-GdkColormap*  gdk_window_get_colormap	 (GdkWindow	  *window);
-GdkWindowType gdk_window_get_type	 (GdkWindow	  *window);
-gint	      gdk_window_get_origin	 (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y);
-gboolean      gdk_window_get_deskrelative_origin (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y);
-void	      gdk_window_get_root_origin (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y);
-GdkWindow*    gdk_window_get_pointer	 (GdkWindow	  *window,
-					  gint		  *x,
-					  gint		  *y,
-					  GdkModifierType *mask);
-GdkWindow*    gdk_window_get_parent	 (GdkWindow	  *window);
-GdkWindow*    gdk_window_get_toplevel	 (GdkWindow	  *window);
-GList*	      gdk_window_get_children	 (GdkWindow	  *window);
-GdkEventMask  gdk_window_get_events	 (GdkWindow	  *window);
-void	      gdk_window_set_events	 (GdkWindow	  *window,
-					  GdkEventMask	   event_mask);
-
-void	      gdk_window_set_icon	 (GdkWindow	  *window, 
-					  GdkWindow	  *icon_window,
-					  GdkPixmap	  *pixmap,
-					  GdkBitmap	  *mask);
-void	      gdk_window_set_icon_name	 (GdkWindow	  *window, 
-					  gchar		  *name);
-void	      gdk_window_set_group	 (GdkWindow	  *window, 
-					  GdkWindow	  *leader);
-void	      gdk_window_set_decorations (GdkWindow	  *window,
-					  GdkWMDecoration  decorations);
-void	      gdk_window_set_functions	 (GdkWindow	  *window,
-					  GdkWMFunction	   functions);
-GList *       gdk_window_get_toplevels   (void);
-
-void          gdk_window_register_dnd    (GdkWindow       *window);
-
-void          gdk_drawable_set_data      (GdkDrawable     *drawable,
-					  const gchar     *key,
-					  gpointer	   data,
-					  GDestroyNotify   destroy_func);
-					  
-
-/* Cursors
- */
-GdkCursor* gdk_cursor_new		 (GdkCursorType	  cursor_type);
-GdkCursor* gdk_cursor_new_from_pixmap	 (GdkPixmap	  *source,
-					  GdkPixmap	  *mask,
-					  GdkColor	  *fg,
-					  GdkColor	  *bg,
-					  gint		   x,
-					  gint		   y);
-void	   gdk_cursor_destroy		 (GdkCursor	 *cursor);
-
-
-/* GCs
- */
-GdkGC* gdk_gc_new		  (GdkWindow	    *window);
-GdkGC* gdk_gc_new_with_values	  (GdkWindow	    *window,
-				   GdkGCValues	    *values,
-				   GdkGCValuesMask   values_mask);
-GdkGC* gdk_gc_ref		  (GdkGC	    *gc);
-void   gdk_gc_unref		  (GdkGC	    *gc);
-void   gdk_gc_destroy		  (GdkGC	    *gc);
-void   gdk_gc_get_values	  (GdkGC	    *gc,
-				   GdkGCValues	    *values);
-void   gdk_gc_set_foreground	  (GdkGC	    *gc,
-				   GdkColor	    *color);
-void   gdk_gc_set_background	  (GdkGC	    *gc,
-				   GdkColor	    *color);
-void   gdk_gc_set_font		  (GdkGC	    *gc,
-				   GdkFont	    *font);
-void   gdk_gc_set_function	  (GdkGC	    *gc,
-				   GdkFunction	     function);
-void   gdk_gc_set_fill		  (GdkGC	    *gc,
-				   GdkFill	     fill);
-void   gdk_gc_set_tile		  (GdkGC	    *gc,
-				   GdkPixmap	    *tile);
-void   gdk_gc_set_stipple	  (GdkGC	    *gc,
-				   GdkPixmap	    *stipple);
-void   gdk_gc_set_ts_origin	  (GdkGC	    *gc,
-				   gint		     x,
-				   gint		     y);
-void   gdk_gc_set_clip_origin	  (GdkGC	    *gc,
-				   gint		     x,
-				   gint		     y);
-void   gdk_gc_set_clip_mask	  (GdkGC	    *gc,
-				   GdkBitmap	    *mask);
-void   gdk_gc_set_clip_rectangle  (GdkGC	    *gc,
-				   GdkRectangle	    *rectangle);
-void   gdk_gc_set_clip_region	  (GdkGC	    *gc,
-				   GdkRegion	    *region);
-void   gdk_gc_set_subwindow	  (GdkGC	    *gc,
-				   GdkSubwindowMode  mode);
-void   gdk_gc_set_exposures	  (GdkGC	    *gc,
-				   gint		     exposures);
-void   gdk_gc_set_line_attributes (GdkGC	    *gc,
-				   gint		     line_width,
-				   GdkLineStyle	     line_style,
-				   GdkCapStyle	     cap_style,
-				   GdkJoinStyle	     join_style);
-void   gdk_gc_set_dashes          (GdkGC            *gc,
-				   gint	             dash_offset,
-				   gchar             dash_list[],
-				   gint              n);
-void   gdk_gc_copy		  (GdkGC	     *dst_gc,
-				   GdkGC	     *src_gc);
-
-
-/* Pixmaps
- */
-GdkPixmap* gdk_pixmap_new		(GdkWindow  *window,
-					 gint	     width,
-					 gint	     height,
-					 gint	     depth);
-GdkPixmap* gdk_pixmap_create_on_shared_image
-					(GdkImage  **image_return,
-					 GdkWindow  *window,
-					 GdkVisual  *visual,
-					 gint        width,
-					 gint        height,
-					 gint        depth);
-GdkBitmap* gdk_bitmap_create_from_data	(GdkWindow   *window,
-					 const gchar *data,
-					 gint	      width,
-					 gint	      height);
-GdkPixmap* gdk_pixmap_create_from_data	(GdkWindow   *window,
-					 const gchar *data,
-					 gint	      width,
-					 gint	      height,
-					 gint	      depth,
-					 GdkColor    *fg,
-					 GdkColor    *bg);
-GdkPixmap* gdk_pixmap_create_from_xpm	(GdkWindow  *window,
-					 GdkBitmap **mask,
-					 GdkColor   *transparent_color,
-					 const gchar *filename);
-GdkPixmap* gdk_pixmap_colormap_create_from_xpm 
-                                        (GdkWindow   *window,
-					 GdkColormap *colormap,
-					 GdkBitmap  **mask,
-					 GdkColor    *transparent_color,
-					 const gchar *filename);
-GdkPixmap* gdk_pixmap_create_from_xpm_d (GdkWindow  *window,
-					 GdkBitmap **mask,
-					 GdkColor   *transparent_color,
-					 gchar	   **data);
-GdkPixmap* gdk_pixmap_colormap_create_from_xpm_d 
-                                        (GdkWindow   *window,
-					 GdkColormap *colormap,
-					 GdkBitmap  **mask,
-					 GdkColor    *transparent_color,
-					 gchar     **data);
-GdkPixmap *gdk_pixmap_ref		(GdkPixmap  *pixmap);
-void	   gdk_pixmap_unref		(GdkPixmap  *pixmap);
-
-GdkBitmap *gdk_bitmap_ref		(GdkBitmap  *pixmap);
-void	   gdk_bitmap_unref		(GdkBitmap  *pixmap);
-
-
-/* Images
- */
-GdkImage* gdk_image_new_bitmap(GdkVisual     *visual,
-				gpointer      data,
-				gint          width,
-				gint          height);
-GdkImage*  gdk_image_new       (GdkImageType  type,
-				GdkVisual    *visual,
-				gint	      width,
-				gint	      height);
-GdkImage*  gdk_image_bitmap_new(GdkImageType  type,
-				GdkVisual    *visual,
-				gint	      width,
-				gint	      height);
-GdkImage*  gdk_image_get       (GdkWindow    *window,
-				gint	      x,
-				gint	      y,
-				gint	      width,
-				gint	      height);
-void	   gdk_image_put_pixel (GdkImage     *image,
-				gint	      x,
-				gint	      y,
-				guint32	      pixel);
-guint32	   gdk_image_get_pixel (GdkImage     *image,
-				gint	      x,
-				gint	      y);
-void	   gdk_image_destroy   (GdkImage     *image);
-
-
-/* Color
- */
-GdkColormap* gdk_colormap_new	  (GdkVisual   *visual,
-				   gint		allocate);
-GdkColormap* gdk_colormap_ref	  (GdkColormap *cmap);
-void	     gdk_colormap_unref	  (GdkColormap *cmap);
-
-GdkColormap* gdk_colormap_get_system	   (void);
-gint	     gdk_colormap_get_system_size  (void);
-
-void gdk_colormap_change (GdkColormap	*colormap,
-			  gint		 ncolors);
-
-
-gint  gdk_colormap_alloc_colors   (GdkColormap *colormap,
-				   GdkColor    *colors,
-				   gint         ncolors,
-				   gboolean     writeable,
-				   gboolean     best_match,
-				   gboolean    *success);
-gboolean gdk_colormap_alloc_color (GdkColormap *colormap,
-				   GdkColor    *color,
-				   gboolean     writeable,
-				   gboolean     best_match);
-void     gdk_colormap_free_colors (GdkColormap *colormap,
-				   GdkColor    *colors,
-				   gint         ncolors);
-
-GdkVisual *gdk_colormap_get_visual (GdkColormap *colormap);
-     
-GdkColor *gdk_color_copy (GdkColor *color);
-void      gdk_color_free (GdkColor *color);
-
-gint gdk_color_parse	 (const gchar	*spec,
-			  GdkColor	*color);
-guint gdk_color_hash     (const GdkColor *colora);
-gint gdk_color_equal	 (const GdkColor *colora,
-			  const GdkColor *colorb);
-
-
-/* The following functions are deprecated */
-void gdk_colors_store	 (GdkColormap	*colormap,
-			  GdkColor	*colors,
-			  gint		 ncolors);
-gint gdk_colors_alloc	 (GdkColormap	*colormap,
-			  gint		 contiguous,
-			  gulong	*planes,
-			  gint		 nplanes,
-			  gulong	*pixels,
-			  gint		 npixels);
-void gdk_colors_free	 (GdkColormap	*colormap,
-			  gulong	*pixels,
-			  gint		 npixels,
-			  gulong	 planes);
-gint gdk_color_white	 (GdkColormap	*colormap,
-			  GdkColor	*color);
-gint gdk_color_black	 (GdkColormap	*colormap,
-			  GdkColor	*color);
-gint gdk_color_alloc	 (GdkColormap	*colormap,
-			  GdkColor	*color);
-gint gdk_color_change	 (GdkColormap	*colormap,
-			  GdkColor	*color);
-
-
-/* Fonts
- */
-GdkFont* gdk_font_load	    (const gchar    *font_name);
-GdkFont* gdk_fontset_load   (gchar          *fontset_name);
-GdkFont* gdk_font_ref	    (GdkFont        *font);
-void	 gdk_font_unref	    (GdkFont        *font);
-gint	 gdk_font_id	    (const GdkFont  *font);
-gint	 gdk_font_equal	    (const GdkFont  *fonta,
-			     const GdkFont  *fontb);
-gint	 gdk_string_width   (GdkFont        *font,
-			     const gchar    *string);
-gint	 gdk_text_width	    (GdkFont        *font,
-			     const gchar    *text,
-			     gint            text_length);
-gint	 gdk_text_width_wc  (GdkFont        *font,
-			     const GdkWChar *text,
-			     gint            text_length);
-gint	 gdk_char_width	    (GdkFont        *font,
-			     gchar           character);
-gint	 gdk_char_width_wc  (GdkFont        *font,
-			     GdkWChar        character);
-gint	 gdk_string_measure (GdkFont        *font,
-			     const gchar    *string);
-gint	 gdk_text_measure   (GdkFont        *font,
-			     const gchar    *text,
-			     gint            text_length);
-gint	 gdk_char_measure   (GdkFont        *font,
-			     gchar           character);
-gint	 gdk_string_height  (GdkFont        *font,
-			     const gchar    *string);
-gint	 gdk_text_height    (GdkFont        *font,
-			     const gchar    *text,
-			     gint            text_length);
-gint	 gdk_char_height    (GdkFont        *font,
-			     gchar           character);
-
-void     gdk_text_extents   (GdkFont     *font,
-			     const gchar *text,
-			     gint         text_length,
-			     gint        *lbearing,
-			     gint        *rbearing,
-			     gint        *width,
-			     gint        *ascent,
-			     gint        *descent);
-void    gdk_text_extents_wc (GdkFont        *font,
-			     const GdkWChar *text,
-			     gint            text_length,
-			     gint           *lbearing,
-			     gint           *rbearing,
-			     gint           *width,
-			     gint           *ascent,
-			     gint           *descent);
-void     gdk_string_extents (GdkFont     *font,
-			     const gchar *string,
-			     gint        *lbearing,
-			     gint        *rbearing,
-			     gint        *width,
-			     gint        *ascent,
-			     gint        *descent);
-
-/* Drawing
- */
-void gdk_draw_point	 (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  gint		x,
-			  gint		y);
-void gdk_draw_line	 (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  gint		x1,
-			  gint		y1,
-			  gint		x2,
-			  gint		y2);
-void gdk_draw_rectangle	 (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  gint		filled,
-			  gint		x,
-			  gint		y,
-			  gint		width,
-			  gint		height);
-void gdk_draw_arc	 (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  gint		filled,
-			  gint		x,
-			  gint		y,
-			  gint		width,
-			  gint		height,
-			  gint		angle1,
-			  gint		angle2);
-void gdk_draw_polygon	 (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  gint		filled,
-			  GdkPoint     *points,
-			  gint		npoints);
-void gdk_draw_string	 (GdkDrawable  *drawable,
-			  GdkFont      *font,
-			  GdkGC	       *gc,
-			  gint		x,
-			  gint		y,
-			  const gchar  *string);
-void gdk_draw_text	 (GdkDrawable  *drawable,
-			  GdkFont      *font,
-			  GdkGC	       *gc,
-			  gint		x,
-			  gint		y,
-			  const gchar  *text,
-			  gint		text_length);
-void gdk_draw_text_wc	 (GdkDrawable	 *drawable,
-			  GdkFont	 *font,
-			  GdkGC		 *gc,
-			  gint		  x,
-			  gint		  y,
-			  const GdkWChar *text,
-			  gint		  text_length);
-void gdk_draw_pixmap	 (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  GdkDrawable  *src,
-			  gint		xsrc,
-			  gint		ysrc,
-			  gint		xdest,
-			  gint		ydest,
-			  gint		width,
-			  gint		height);
-void gdk_draw_bitmap	 (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  GdkDrawable  *src,
-			  gint		xsrc,
-			  gint		ysrc,
-			  gint		xdest,
-			  gint		ydest,
-			  gint		width,
-			  gint		height);
-void gdk_draw_image	 (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  GdkImage     *image,
-			  gint		xsrc,
-			  gint		ysrc,
-			  gint		xdest,
-			  gint		ydest,
-			  gint		width,
-			  gint		height);
-void gdk_draw_points	 (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  GdkPoint     *points,
-			  gint		npoints);
-void gdk_draw_segments	 (GdkDrawable  *drawable,
-			  GdkGC	       *gc,
-			  GdkSegment   *segs,
-			  gint		nsegs);
-void gdk_draw_lines      (GdkDrawable  *drawable,
-                          GdkGC        *gc,
-                          GdkPoint     *points,
-                          gint          npoints);
- 
-
-
-
-/* Selections
- */
-gint	   gdk_selection_owner_set (GdkWindow	 *owner,
-				    GdkAtom	  selection,
-				    guint32	  time,
-				    gint	  send_event);
-GdkWindow* gdk_selection_owner_get (GdkAtom	  selection);
-void	   gdk_selection_convert   (GdkWindow	 *requestor,
-				    GdkAtom	  selection,
-				    GdkAtom	  target,
-				    guint32	  time);
-gint	   gdk_selection_property_get (GdkWindow  *requestor,
-				       guchar	 **data,
-				       GdkAtom	  *prop_type,
-				       gint	  *prop_format);
-void	   gdk_selection_send_notify (guint32	    requestor,
-				      GdkAtom	    selection,
-				      GdkAtom	    target,
-				      GdkAtom	    property,
-				      guint32	    time);
-
-gint	   gdk_text_property_to_text_list (GdkAtom encoding, gint format,
-					   guchar *text, gint length,
-					   gchar ***list);
-void	   gdk_free_text_list		  (gchar **list);
-gint	   gdk_string_to_compound_text	  (gchar *str,
-					   GdkAtom *encoding, gint *format,
-					   guchar **ctext, gint *length);
-void	   gdk_free_compound_text	  (guchar *ctext);
-
-/* Properties
- */
-GdkAtom gdk_atom_intern	    (const gchar *atom_name,
-			     gint	  only_if_exists);
-gchar*	gdk_atom_name	    (GdkAtom atom);
-gint	gdk_property_get    (GdkWindow	 *window,
-			     GdkAtom	  property,
-			     GdkAtom	  type,
-			     gulong	  offset,
-			     gulong	  length,
-			     gint	  pdelete,
-			     GdkAtom	 *actual_property_type,
-			     gint	 *actual_format,
-			     gint	 *actual_length,
-			     guchar	**data);
-
-void	gdk_property_change (GdkWindow	 *window,
-			     GdkAtom	  property,
-			     GdkAtom	  type,
-			     gint	  format,
-			     GdkPropMode  mode,
-			     guchar	 *data,
-			     gint	  nelements);
-void	gdk_property_delete (GdkWindow	 *window,
-			     GdkAtom	  property);
-
-
-/* Rectangle utilities
- */
-gint gdk_rectangle_intersect (GdkRectangle *src1,
-			      GdkRectangle *src2,
-			      GdkRectangle *dest);
-void gdk_rectangle_union     (GdkRectangle *src1,
-			      GdkRectangle *src2,
-			      GdkRectangle *dest);
-
-/* XInput support
- */
-
-void gdk_input_init			    (void);
-void gdk_input_exit			    (void);
-GList *gdk_input_list_devices		    (void);
-void gdk_input_set_extension_events	    (GdkWindow *window,
-					     gint mask,
-					     GdkExtensionMode mode);
-void gdk_input_set_source		    (guint32 deviceid,
-					     GdkInputSource source);
-gint gdk_input_set_mode			    (guint32 deviceid,
-					     GdkInputMode mode);
-void gdk_input_set_axes			    (guint32 deviceid,
-					     GdkAxisUse *axes);
-void gdk_input_set_key			    (guint32 deviceid,
-					     guint   index,
-					     guint   keyval,
-					     GdkModifierType modifiers);
-void gdk_input_window_get_pointer     (GdkWindow       *window,
-				       guint32	       deviceid,
-				       gdouble	       *x,
-				       gdouble	       *y,
-				       gdouble	       *pressure,
-				       gdouble	       *xtilt,
-				       gdouble	       *ytilt,
-				       GdkModifierType *mask);
-
-GdkTimeCoord *gdk_input_motion_events (GdkWindow *window,
-				       guint32 deviceid,
-				       guint32 start,
-				       guint32 stop,
-				       gint *nevents_return);
-
-/* International Input Method Support Functions
- */
-
-gint         gdk_im_ready	   (void);
-
-void         gdk_im_begin	   (GdkIC               *ic, 
-				    GdkWindow           *window);
-void         gdk_im_end		   (void);
-GdkIMStyle   gdk_im_decide_style   (GdkIMStyle           supported_style);
-GdkIMStyle   gdk_im_set_best_style (GdkIMStyle           best_allowed_style);
-
-GdkIC*       gdk_ic_new		   (GdkICAttr 		*attr,
-				    GdkICAttributesType mask);
-void         gdk_ic_destroy	   (GdkIC               *ic);
-GdkIMStyle   gdk_ic_get_style	   (GdkIC               *ic);
-GdkEventMask gdk_ic_get_events     (GdkIC               *ic);
-
-GdkICAttr*   gdk_ic_attr_new       (void);
-void         gdk_ic_attr_destroy   (GdkICAttr *attr);
-
-GdkICAttributesType  gdk_ic_set_attr (GdkIC              *ic,  
-                                      GdkICAttr          *attr,
-                                      GdkICAttributesType mask);
-GdkICAttributesType  gdk_ic_get_attr (GdkIC              *ic, 
-                                      GdkICAttr          *attr,
-                                      GdkICAttributesType mask);
-
-/* Conversion functions between wide char and multibyte strings. 
- */
-gchar     *gdk_wcstombs          (const GdkWChar   *src);
-gint       gdk_mbstowcs          (GdkWChar         *dest,
-				  const gchar      *src,
-				  gint              dest_max);
-
-
-/* Color Context */
-
-GdkColorContext *gdk_color_context_new			  (GdkVisual   *visual,
-							   GdkColormap *colormap);
-
-GdkColorContext *gdk_color_context_new_mono		  (GdkVisual   *visual,
-							   GdkColormap *colormap);
-
-void		 gdk_color_context_free			  (GdkColorContext *cc);
-
-gulong		 gdk_color_context_get_pixel		  (GdkColorContext *cc,
-							   gushort	    red,
-							   gushort	    green,
-							   gushort	    blue,
-							   gint		   *failed);
-void		 gdk_color_context_get_pixels		  (GdkColorContext *cc,
-							   gushort	   *reds,
-							   gushort	   *greens,
-							   gushort	   *blues,
-							   gint		    ncolors,
-							   gulong	   *colors,
-							   gint		   *nallocated);
-void		 gdk_color_context_get_pixels_incremental (GdkColorContext *cc,
-							   gushort	   *reds,
-							   gushort	   *greens,
-							   gushort	   *blues,
-							   gint		    ncolors,
-							   gint		   *used,
-							   gulong	   *colors,
-							   gint		   *nallocated);
-
-gint		 gdk_color_context_query_color		  (GdkColorContext *cc,
-							   GdkColor	   *color);
-gint		 gdk_color_context_query_colors		  (GdkColorContext *cc,
-							   GdkColor	   *colors,
-							   gint		    num_colors);
-
-gint		 gdk_color_context_add_palette		  (GdkColorContext *cc,
-							   GdkColor	   *palette,
-							   gint		    num_palette);
-
-void		 gdk_color_context_init_dither		  (GdkColorContext *cc);
-void		 gdk_color_context_free_dither		  (GdkColorContext *cc);
-
-gulong		 gdk_color_context_get_pixel_from_palette (GdkColorContext *cc,
-							   gushort	   *red,
-							   gushort	   *green,
-							   gushort	   *blue,
-							   gint		   *failed);
-guchar		 gdk_color_context_get_index_from_palette (GdkColorContext *cc,
-							   gint		   *red,
-							   gint		   *green,
-							   gint		   *blue,
-							   gint		   *failed);
-/* Regions
- */
-
-GdkRegion*     gdk_region_new	    (void);
-void	       gdk_region_destroy   (GdkRegion	   *region);
-
-void	       gdk_region_get_clipbox(GdkRegion    *region,
-				      GdkRectangle *rectangle);
-
-gboolean       gdk_region_empty	    (GdkRegion	   *region);
-gboolean       gdk_region_equal	    (GdkRegion	   *region1,
-				     GdkRegion	   *region2);
-gboolean       gdk_region_point_in  (GdkRegion	   *region,
-				     int		   x,
-				     int		   y);
-GdkOverlapType gdk_region_rect_in   (GdkRegion	   *region,
-				     GdkRectangle  *rect);
-
-GdkRegion*     gdk_region_polygon   (GdkPoint      *points,
-				     gint           npoints,
-				     GdkFillRule    fill_rule);
-
-void	       gdk_region_offset   (GdkRegion	   *region,
-				    gint	   dx,
-				    gint	   dy);
-void	       gdk_region_shrink   (GdkRegion	   *region,
-				    gint	   dx,
-				    gint	   dy);
-
-GdkRegion*    gdk_region_union_with_rect  (GdkRegion	  *region,
-					   GdkRectangle	  *rect);
-GdkRegion*    gdk_regions_intersect	  (GdkRegion	  *source1,
-					   GdkRegion	  *source2);
-GdkRegion*    gdk_regions_union		  (GdkRegion	  *source1,
-					   GdkRegion	  *source2);
-GdkRegion*    gdk_regions_subtract	  (GdkRegion	  *source1,
-					   GdkRegion	  *source2);
-GdkRegion*    gdk_regions_xor		  (GdkRegion	  *source1,
-					   GdkRegion	  *source2);
-
-/* Miscellaneous */
-void     gdk_event_send_clientmessage_toall (GdkEvent    *event);
-gboolean gdk_event_send_client_message (GdkEvent    *event,
-					guint32      xid);
-
-/* Key values
- */
-const gchar* gdk_keyval_name		  (guint	keyval);
-guint	     gdk_keyval_from_name	  (const gchar *keyval_name);
-guint	     gdk_keyval_to_upper	  (guint	keyval);
-guint	     gdk_keyval_to_lower	  (guint	keyval);
-gboolean     gdk_keyval_is_upper	  (guint	keyval);
-gboolean     gdk_keyval_is_lower	  (guint	keyval);
-
-/* Threading
- */
-
-GDKVAR GMutex *gdk_threads_mutex;
-
-void     gdk_threads_enter                (void);
-void     gdk_threads_leave                (void);
-
-#ifdef	G_THREADS_ENABLED
-#  define GDK_THREADS_ENTER()	G_STMT_START {	\
-      if (gdk_threads_mutex)                 	\
-        g_mutex_lock (gdk_threads_mutex);   	\
-   } G_STMT_END
-#  define GDK_THREADS_LEAVE()	G_STMT_START { 	\
-      if (gdk_threads_mutex)                 	\
-        g_mutex_unlock (gdk_threads_mutex); 	\
-   } G_STMT_END
-#else	/* !G_THREADS_ENABLED */
-#  define GDK_THREADS_ENTER()
-#  define GDK_THREADS_LEAVE()
-#endif	/* !G_THREADS_ENABLED */
-
-#include <gdk/gdkrgb.h>
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GDK_H__ */
diff --git a/gdk/win32/gdkcc.c b/gdk/win32/gdkcc.c
index 8bbb7b3c5..a2daba685 100644
--- a/gdk/win32/gdkcc.c
+++ b/gdk/win32/gdkcc.c
@@ -64,8 +64,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "gdk.h"
-#include "gdkprivate.h"
+
 #include "gdkx.h"
 
 #define MAX_IMAGE_COLORS 256
diff --git a/gdk/win32/gdkcolor-win32.c b/gdk/win32/gdkcolor-win32.c
index 4b81f24d5..06273d3be 100644
--- a/gdk/win32/gdkcolor-win32.c
+++ b/gdk/win32/gdkcolor-win32.c
@@ -31,8 +31,6 @@
 #include <string.h>
 #include <time.h>
 
-#include "gdk.h"
-#include "gdkprivate.h"
 #include "gdkx.h"
 
 #ifdef _MSC_VER
diff --git a/gdk/win32/gdkcolor.c b/gdk/win32/gdkcolor.c
index 4b81f24d5..06273d3be 100644
--- a/gdk/win32/gdkcolor.c
+++ b/gdk/win32/gdkcolor.c
@@ -31,8 +31,6 @@
 #include <string.h>
 #include <time.h>
 
-#include "gdk.h"
-#include "gdkprivate.h"
 #include "gdkx.h"
 
 #ifdef _MSC_VER
diff --git a/gdk/win32/gdkconfig.h b/gdk/win32/gdkconfig.h
index e4221b602..502820837 100644
--- a/gdk/win32/gdkconfig.h
+++ b/gdk/win32/gdkconfig.h
@@ -1,3 +1,5 @@
 /* Handcrafted for Win32 */
 
 #define GDK_WINDOWING GDK_WINDOWING_WIN32
+#define GDK_HAVE_WCHAR_H 1
+#define GDK_HAVE_WCTYPE_H 1
diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c
index 8a293d1a5..c5482c92b 100644
--- a/gdk/win32/gdkcursor-win32.c
+++ b/gdk/win32/gdkcursor-win32.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 static const struct { const char *name; int type; } cursors[] = {
diff --git a/gdk/win32/gdkcursor.c b/gdk/win32/gdkcursor.c
index 8a293d1a5..c5482c92b 100644
--- a/gdk/win32/gdkcursor.c
+++ b/gdk/win32/gdkcursor.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 static const struct { const char *name; int type; } cursors[] = {
diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c
index 3cd3716d5..316d411b9 100644
--- a/gdk/win32/gdkdnd-win32.c
+++ b/gdk/win32/gdkdnd-win32.c
@@ -30,13 +30,14 @@
 #define INITGUID
 
 #include <string.h>
-#include "gdk.h"
-#include "gdkx.h"
-#include "gdk/gdkprivate.h"
+
 #include <ole2.h>
 #include <shlobj.h>
 #include <shlguid.h>
 
+#include <gdk/gdk.h>
+#include "gdkx.h"
+
 typedef struct _GdkDragContextPrivate GdkDragContextPrivate;
 
 typedef enum {
diff --git a/gdk/win32/gdkdnd.c b/gdk/win32/gdkdnd.c
index 3cd3716d5..316d411b9 100644
--- a/gdk/win32/gdkdnd.c
+++ b/gdk/win32/gdkdnd.c
@@ -30,13 +30,14 @@
 #define INITGUID
 
 #include <string.h>
-#include "gdk.h"
-#include "gdkx.h"
-#include "gdk/gdkprivate.h"
+
 #include <ole2.h>
 #include <shlobj.h>
 #include <shlguid.h>
 
+#include <gdk/gdk.h>
+#include "gdkx.h"
+
 typedef struct _GdkDragContextPrivate GdkDragContextPrivate;
 
 typedef enum {
diff --git a/gdk/win32/gdkdraw.c b/gdk/win32/gdkdraw.c
index ca867941e..fb347c4ca 100644
--- a/gdk/win32/gdkdraw.c
+++ b/gdk/win32/gdkdraw.c
@@ -27,7 +27,7 @@
 #include "config.h"
 
 #include <math.h>
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 #ifndef M_TWOPI
diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index ca867941e..fb347c4ca 100644
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -27,7 +27,7 @@
 #include "config.h"
 
 #include <math.h>
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 #ifndef M_TWOPI
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 02c947447..461d3a553 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -28,11 +28,10 @@
 #include "config.h"
 
 #include <stdio.h>
-#include "gdk.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
 #include "gdkx.h"
-#include "gdkprivate.h"
 #include "gdkinput.h"
-#include "gdkkeysyms.h"
 
 #define PING() printf("%s: %d\n",__FILE__,__LINE__),fflush(stdout)
 
diff --git a/gdk/win32/gdkevents.c b/gdk/win32/gdkevents.c
index 02c947447..461d3a553 100644
--- a/gdk/win32/gdkevents.c
+++ b/gdk/win32/gdkevents.c
@@ -28,11 +28,10 @@
 #include "config.h"
 
 #include <stdio.h>
-#include "gdk.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
 #include "gdkx.h"
-#include "gdkprivate.h"
 #include "gdkinput.h"
-#include "gdkkeysyms.h"
 
 #define PING() printf("%s: %d\n",__FILE__,__LINE__),fflush(stdout)
 
diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c
index 539dda5de..38b852338 100644
--- a/gdk/win32/gdkfont-win32.c
+++ b/gdk/win32/gdkfont-win32.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 GdkFont*
diff --git a/gdk/win32/gdkfont.c b/gdk/win32/gdkfont.c
index 539dda5de..38b852338 100644
--- a/gdk/win32/gdkfont.c
+++ b/gdk/win32/gdkfont.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 GdkFont*
diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c
index b6d56d1c0..a0ddce727 100644
--- a/gdk/win32/gdkgc-win32.c
+++ b/gdk/win32/gdkgc-win32.c
@@ -27,7 +27,7 @@
 #include "config.h"
 #include <string.h>
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 GdkGC*
diff --git a/gdk/win32/gdkgc.c b/gdk/win32/gdkgc.c
index b6d56d1c0..a0ddce727 100644
--- a/gdk/win32/gdkgc.c
+++ b/gdk/win32/gdkgc.c
@@ -27,7 +27,7 @@
 #include "config.h"
 #include <string.h>
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 GdkGC*
diff --git a/gdk/win32/gdkglobals-win32.c b/gdk/win32/gdkglobals-win32.c
index aef86d96a..f96b092b7 100644
--- a/gdk/win32/gdkglobals-win32.c
+++ b/gdk/win32/gdkglobals-win32.c
@@ -25,7 +25,7 @@
  */
 
 #include <stdio.h>
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 guint             gdk_debug_flags = 0;
diff --git a/gdk/win32/gdkglobals.c b/gdk/win32/gdkglobals.c
index aef86d96a..f96b092b7 100644
--- a/gdk/win32/gdkglobals.c
+++ b/gdk/win32/gdkglobals.c
@@ -25,7 +25,7 @@
  */
 
 #include <stdio.h>
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 guint             gdk_debug_flags = 0;
diff --git a/gdk/win32/gdkim-win32.c b/gdk/win32/gdkim-win32.c
index 4be640d94..8b49733f6 100644
--- a/gdk/win32/gdkim-win32.c
+++ b/gdk/win32/gdkim-win32.c
@@ -31,9 +31,8 @@
 #  endif
 #endif
 
-#include "gdk.h"
-#include "gdkprivate.h"
-#include "gdki18n.h"
+#include <gdk/gdk.h>
+#include <gdk/gdki18n.h>
 #include "gdkx.h"
 
 /* If this variable is FALSE, it indicates that we should
diff --git a/gdk/win32/gdkim.c b/gdk/win32/gdkim.c
index 4be640d94..8b49733f6 100644
--- a/gdk/win32/gdkim.c
+++ b/gdk/win32/gdkim.c
@@ -31,9 +31,8 @@
 #  endif
 #endif
 
-#include "gdk.h"
-#include "gdkprivate.h"
-#include "gdki18n.h"
+#include <gdk/gdk.h>
+#include <gdk/gdki18n.h>
 #include "gdkx.h"
 
 /* If this variable is FALSE, it indicates that we should
diff --git a/gdk/win32/gdkimage-win32.c b/gdk/win32/gdkimage-win32.c
index 60cc31320..f6e56e07c 100644
--- a/gdk/win32/gdkimage-win32.c
+++ b/gdk/win32/gdkimage-win32.c
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 static void gdk_image_put_normal (GdkDrawable *drawable,
diff --git a/gdk/win32/gdkimage.c b/gdk/win32/gdkimage.c
index 60cc31320..f6e56e07c 100644
--- a/gdk/win32/gdkimage.c
+++ b/gdk/win32/gdkimage.c
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 static void gdk_image_put_normal (GdkDrawable *drawable,
diff --git a/gdk/win32/gdkinput-win32.c b/gdk/win32/gdkinput-win32.c
index b80bd3aaf..e6369c73e 100644
--- a/gdk/win32/gdkinput-win32.c
+++ b/gdk/win32/gdkinput-win32.c
@@ -31,10 +31,8 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkx.h"
-#include "gdkprivate.h"
-
 #include "gdkinput.h"
 
 #ifndef M_PI
diff --git a/gdk/win32/gdkinput.c b/gdk/win32/gdkinput.c
index b80bd3aaf..e6369c73e 100644
--- a/gdk/win32/gdkinput.c
+++ b/gdk/win32/gdkinput.c
@@ -31,10 +31,8 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkx.h"
-#include "gdkprivate.h"
-
 #include "gdkinput.h"
 
 #ifndef M_PI
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index 49671a79c..78a64e25c 100644
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -33,12 +33,11 @@
 #include <limits.h>
 #include <io.h>
 
-#include "gdk.h"
-#include "gdkprivate.h"
-#include "gdkinput.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdki18n.h>
 #include "gdkx.h"
-#include "gdkkeysyms.h"
-#include "gdki18n.h"
+#include "gdkinput.h"
 
 static void	 gdkx_XConvertCase	(KeySym	       symbol,
 					 KeySym	      *lower,
@@ -2090,7 +2089,7 @@ gdk_keys_keyval_compare (const void *pkey, const void *pbase)
   return (*(int *) pkey) - ((struct gdk_key *) pbase)->keyval;
 }
 
-const gchar*
+gchar*
 gdk_keyval_name (guint	      keyval)
 {
   struct gdk_key *found =
diff --git a/gdk/win32/gdkpixmap-win32.c b/gdk/win32/gdkpixmap-win32.c
index e8a6c0260..74502c80d 100644
--- a/gdk/win32/gdkpixmap-win32.c
+++ b/gdk/win32/gdkpixmap-win32.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 typedef struct
diff --git a/gdk/win32/gdkpixmap.c b/gdk/win32/gdkpixmap.c
index e8a6c0260..74502c80d 100644
--- a/gdk/win32/gdkpixmap.c
+++ b/gdk/win32/gdkpixmap.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 typedef struct
diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
index 5cc68ecd6..721225eea 100644
--- a/gdk/win32/gdkproperty-win32.c
+++ b/gdk/win32/gdkproperty-win32.c
@@ -27,7 +27,7 @@
 #include "config.h"
 
 #include <string.h>
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 GdkAtom
diff --git a/gdk/win32/gdkproperty.c b/gdk/win32/gdkproperty.c
index 5cc68ecd6..721225eea 100644
--- a/gdk/win32/gdkproperty.c
+++ b/gdk/win32/gdkproperty.c
@@ -27,7 +27,7 @@
 #include "config.h"
 
 #include <string.h>
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 GdkAtom
diff --git a/gdk/win32/gdkrectangle.c b/gdk/win32/gdkrectangle.c
deleted file mode 100644
index 8fd435aa9..000000000
--- a/gdk/win32/gdkrectangle.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#include "gdk.h"
-
-
-
-void
-gdk_rectangle_union (GdkRectangle *src1,
-		     GdkRectangle *src2,
-		     GdkRectangle *dest)
-{
-  g_return_if_fail (src1 != NULL);
-  g_return_if_fail (src2 != NULL);
-  g_return_if_fail (dest != NULL);
-
-  dest->x = MIN (src1->x, src2->x);
-  dest->y = MIN (src1->y, src2->y);
-  dest->width = MAX (src1->x + src1->width, src2->x + src2->width) - dest->x;
-  dest->height = MAX (src1->y + src1->height, src2->y + src2->height) - dest->y;
-}
-
-gint
-gdk_rectangle_intersect (GdkRectangle *src1,
-			 GdkRectangle *src2,
-			 GdkRectangle *dest)
-{
-  GdkRectangle *temp;
-  gint src1_x2, src1_y2;
-  gint src2_x2, src2_y2;
-  gint return_val;
-
-  g_return_val_if_fail (src1 != NULL, FALSE);
-  g_return_val_if_fail (src2 != NULL, FALSE);
-  g_return_val_if_fail (dest != NULL, FALSE);
-
-  return_val = FALSE;
-
-  if (src2->x < src1->x)
-    {
-      temp = src1;
-      src1 = src2;
-      src2 = temp;
-    }
-  dest->x = src2->x;
-
-  src1_x2 = src1->x + src1->width;
-  src2_x2 = src2->x + src2->width;
-
-  if (src2->x < src1_x2)
-    {
-      if (src1_x2 < src2_x2)
-	dest->width = src1_x2 - dest->x;
-      else
-	dest->width = src2_x2 - dest->x;
-
-      if (src2->y < src1->y)
-	{
-	  temp = src1;
-	  src1 = src2;
-	  src2 = temp;
-	}
-      dest->y = src2->y;
-
-      src1_y2 = src1->y + src1->height;
-      src2_y2 = src2->y + src2->height;
-
-      if (src2->y < src1_y2)
-	{
-	  return_val = TRUE;
-
-	  if (src1_y2 < src2_y2)
-	    dest->height = src1_y2 - dest->y;
-	  else
-	    dest->height = src2_y2 - dest->y;
-
-	  if (dest->height == 0)
-	    return_val = FALSE;
-	  if (dest->width == 0)
-	    return_val = FALSE;
-	}
-    }
-
-  return return_val;
-}
diff --git a/gdk/win32/gdkregion-win32.c b/gdk/win32/gdkregion-win32.c
index 4a37c3b10..55f5e98fb 100644
--- a/gdk/win32/gdkregion-win32.c
+++ b/gdk/win32/gdkregion-win32.c
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 
diff --git a/gdk/win32/gdkregion.c b/gdk/win32/gdkregion.c
index 4a37c3b10..55f5e98fb 100644
--- a/gdk/win32/gdkregion.c
+++ b/gdk/win32/gdkregion.c
@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 
diff --git a/gdk/win32/gdkrgb.c b/gdk/win32/gdkrgb.c
deleted file mode 100644
index 4364fc711..000000000
--- a/gdk/win32/gdkrgb.c
+++ /dev/null
@@ -1,3205 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* For more information on GdkRgb, see http://www.levien.com/gdkrgb/
-
-   Raph Levien <raph@acm.org>
-   */
-
-/*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#include <math.h>
-
-#if HAVE_CONFIG_H
-#  include <config.h>
-#  if STDC_HEADERS
-#    include <stdio.h>
-#    include <stdlib.h>
-#    include <string.h>
-#  endif
-#else
-#  include <stdio.h>
-#  include <stdlib.h>
-#endif
-
-
-#define ENABLE_GRAYSCALE
-
-#include "config.h"
-#ifdef GDK_RGB_STANDALONE
-
-/* Compiling as a standalone module (i.e. with Gtk 1.0) */
-/* gtk/gtk.h is already included in gdkrgbstub.c */
-#include "config.h"
-#include <gdk/gdkprivate.h>
-
-#else
-
-/* Compiling as a part of Gtk 1.1 or later */
-#include "../config.h"
-#include "gdk.h"
-#include "gdkprivate.h"
-
-#endif
-
-#include "gdkrgb.h"
-
-typedef struct _GdkRgbInfo   GdkRgbInfo;
-
-typedef void (*GdkRgbConvFunc) (GdkImage *image,
-				gint x0, gint y0,
-				gint width, gint height,
-				guchar *buf, int rowstride,
-				gint x_align, gint y_align,
-				GdkRgbCmap *cmap);
-
-/* Some of these fields should go, as they're not being used at all.
-   Globals should generally migrate into here - it's very likely that
-   we'll want to run more than one GdkRgbInfo context at the same time
-   (i.e. some but not all windows have privately installed
-   colormaps). */
-
-struct _GdkRgbInfo
-{
-  GdkVisual *visual;
-  GdkColormap *cmap;
-
-  gulong *color_pixels;
-  gulong *gray_pixels;
-  gulong *reserved_pixels;
-
-  guint nred_shades;
-  guint ngreen_shades;
-  guint nblue_shades;
-  guint ngray_shades;
-  guint nreserved;
-
-  guint bpp;
-  gint cmap_alloced;
-  gdouble gamma;
-
-  /* Generally, the stage buffer is used to convert 32bit RGB, gray,
-     and indexed images into 24 bit packed RGB. */
-  guchar *stage_buf;
-
-  GdkRgbCmap *gray_cmap;
-
-  gboolean dith_default;
-
-  gboolean bitmap; /* set true if in 1 bit per pixel mode */
-  GdkGC *own_gc;
-
-  /* Convert functions */
-  GdkRgbConvFunc conv;
-  GdkRgbConvFunc conv_d;
-
-  GdkRgbConvFunc conv_32;
-  GdkRgbConvFunc conv_32_d;
-
-  GdkRgbConvFunc conv_gray;
-  GdkRgbConvFunc conv_gray_d;
-
-  GdkRgbConvFunc conv_indexed;
-  GdkRgbConvFunc conv_indexed_d;
-};
-
-static gboolean gdk_rgb_install_cmap = FALSE;
-static gint gdk_rgb_min_colors = 5 * 5 * 5;
-static gboolean gdk_rgb_verbose = FALSE;
-
-#define IMAGE_WIDTH 256
-#define STAGE_ROWSTRIDE (IMAGE_WIDTH * 3)
-#define IMAGE_HEIGHT 64
-#define N_IMAGES 6
-
-static GdkRgbInfo *image_info = NULL;
-static GdkImage *static_image[N_IMAGES];
-static gint static_image_idx;
-
-static guchar *colorcube;
-static guchar *colorcube_d;
-
-static gint
-gdk_rgb_cmap_fail (const char *msg, GdkColormap *cmap, gulong *pixels)
-{
-  gulong free_pixels[256];
-  gint n_free;
-  gint i;
-
-#ifdef VERBOSE
-  g_print ("%s", msg);
-#endif
-  n_free = 0;
-  for (i = 0; i < 256; i++)
-    if (pixels[i] < 256)
-      free_pixels[n_free++] = pixels[i];
-  if (n_free)
-    gdk_colors_free (cmap, free_pixels, n_free, 0);
-  return 0;
-}
-
-static void
-gdk_rgb_make_colorcube (gulong *pixels, gint nr, gint ng, gint nb)
-{
-  guchar rt[16], gt[16], bt[16];
-  gint i;
-
-  colorcube = g_new (guchar, 4096);
-  for (i = 0; i < 16; i++)
-    {
-      rt[i] = ng * nb * ((i * 17 * (nr - 1) + 128) >> 8);
-      gt[i] = nb * ((i * 17 * (ng - 1) + 128) >> 8);
-      bt[i] = ((i * 17 * (nb - 1) + 128) >> 8);
-    }
-
-  for (i = 0; i < 4096; i++)
-    {
-      colorcube[i] = pixels[rt[i >> 8] + gt[(i >> 4) & 0x0f] + bt[i & 0x0f]];
-#ifdef VERBOSE
-      g_print ("%03x %02x %x %x %x\n", i, colorcube[i], rt[i >> 8], gt[(i >> 4) & 0x0f], bt[i & 0x0f]);
-#endif
-    }
-}
-
-/* this is the colorcube suitable for dithering */
-static void
-gdk_rgb_make_colorcube_d (gulong *pixels, gint nr, gint ng, gint nb)
-{
-  gint r, g, b;
-  gint i;
-
-  colorcube_d = g_new (guchar, 512);
-  for (i = 0; i < 512; i++)
-    {
-      r = MIN (nr - 1, i >> 6);
-      g = MIN (ng - 1, (i >> 3) & 7);
-      b = MIN (nb - 1, i & 7);
-      colorcube_d[i] = pixels[(r * ng + g) * nb + b];
-    }
-}
-
-/* Try installing a color cube of the specified size.
-   Make the colorcube and return TRUE on success */
-static gint
-gdk_rgb_try_colormap (gint nr, gint ng, gint nb)
-{
-  gint r, g, b;
-  gint ri, gi, bi;
-  gint r0, g0, b0;
-  GdkColormap *cmap;
-  GdkColor color;
-  gulong pixels[256];
-  gulong junk[256];
-  gint i;
-  gint d2;
-  gint colors_needed;
-  gint idx;
-  gint best[256];
-
-  if (nr * ng * nb < gdk_rgb_min_colors)
-    return FALSE;
-
-  if (image_info->cmap_alloced)
-    cmap = image_info->cmap;
-  else
-    cmap = gdk_colormap_get_system ();
-
-  colors_needed = nr * ng * nb;
-  for (i = 0; i < 256; i++)
-    {
-      best[i] = 192;
-      pixels[i] = 256;
-    }
-
-#ifndef GAMMA
-  if (!gdk_rgb_install_cmap)
-  /* find color cube colors that are already present */
-  for (i = 0; i < MIN (256, cmap->size); i++)
-    {
-      r = cmap->colors[i].red >> 8;
-      g = cmap->colors[i].green >> 8;
-      b = cmap->colors[i].blue >> 8;
-      ri = (r * (nr - 1) + 128) >> 8;
-      gi = (g * (ng - 1) + 128) >> 8;
-      bi = (b * (nb - 1) + 128) >> 8;
-      r0 = ri * 255 / (nr - 1);
-      g0 = gi * 255 / (ng - 1);
-      b0 = bi * 255 / (nb - 1);
-      idx = ((ri * nr) + gi) * nb + bi;
-      d2 = (r - r0) * (r - r0) + (g - g0) * (g - g0) + (b - b0) * (b - b0);
-      if (d2 < best[idx]) {
-	if (pixels[idx] < 256)
-	  gdk_colors_free (cmap, pixels + idx, 1, 0);
-	else
-	  colors_needed--;
-	color = cmap->colors[i];
-	if (!gdk_color_alloc (cmap, &color))
-	  return gdk_rgb_cmap_fail ("error allocating system color\n",
-				    cmap, pixels);
-	pixels[idx] = color.pixel; /* which is almost certainly i */
-	best[idx] = d2;
-      }
-    }
-#endif
-
-  if (colors_needed)
-    {
-      if (!gdk_colors_alloc (cmap, 0, NULL, 0, junk, colors_needed))
-	{
-	  char tmp_str[80];
-	  
-	  sprintf (tmp_str,
-		   "%d %d %d colormap failed (in gdk_colors_alloc)\n",
-		   nr, ng, nb);
-	  return gdk_rgb_cmap_fail (tmp_str, cmap, pixels);
-	}
-
-      gdk_colors_free (cmap, junk, colors_needed, 0);
-    }
-
-  for (r = 0, i = 0; r < nr; r++)
-    for (g = 0; g < ng; g++)
-      for (b = 0; b < nb; b++, i++)
-	{
-	  if (pixels[i] == 256)
-	    {
-	      color.red = r * 65535 / (nr - 1);
-	      color.green = g * 65535 / (ng - 1);
-	      color.blue = b * 65535 / (nb - 1);
-
-#ifdef GAMMA
-	      color.red = 65535 * pow (color.red / 65535.0, 0.5);
-	      color.green = 65535 * pow (color.green / 65535.0, 0.5);
-	      color.blue = 65535 * pow (color.blue / 65535.0, 0.5);
-#endif
-
-	      /* This should be a raw XAllocColor call */
-	      if (!gdk_color_alloc (cmap, &color))
-		{
-		  char tmp_str[80];
-
-		  sprintf (tmp_str, "%d %d %d colormap failed\n",
-			   nr, ng, nb);
-		  return gdk_rgb_cmap_fail (tmp_str,
-					    cmap, pixels);
-		}
-	      pixels[i] = color.pixel;
-	    }
-#ifdef VERBOSE
-	  g_print ("%d: %lx\n", i, pixels[i]);
-#endif
-	}
-
-  image_info->nred_shades = nr;
-  image_info->ngreen_shades = ng;
-  image_info->nblue_shades = nb;
-  gdk_rgb_make_colorcube (pixels, nr, ng, nb);
-  gdk_rgb_make_colorcube_d (pixels, nr, ng, nb);
-  return TRUE;
-}
-
-/* Return TRUE on success. */
-static gboolean
-gdk_rgb_do_colormaps (void)
-{
-  static const gint sizes[][3] = {
-    /*    { 6, 7, 6 }, */
-    { 6, 6, 6 }, 
-    { 6, 6, 5 }, 
-    { 6, 6, 4 }, 
-    { 5, 5, 5 }, 
-    { 5, 5, 4 }, 
-    { 4, 4, 4 }, 
-    { 4, 4, 3 }, 
-    { 3, 3, 3 }, 
-    { 2, 2, 2 }
-  };
-  static const gint n_sizes = sizeof(sizes) / (3 * sizeof(gint));
-  gint i;
-
-  for (i = 0; i < n_sizes; i++)
-    if (gdk_rgb_try_colormap (sizes[i][0], sizes[i][1], sizes[i][2]))
-      return TRUE;
-  return FALSE;
-}
-
-/* Make a 2 x 2 x 2 colorcube */
-static void
-gdk_rgb_colorcube_222 (void)
-{
-  int i;
-  GdkColor color;
-  GdkColormap *cmap;
-
-  if (image_info->cmap_alloced)
-    cmap = image_info->cmap;
-  else
-    cmap = gdk_colormap_get_system ();
-
-  colorcube_d = g_new (guchar, 512);
-
-  for (i = 0; i < 8; i++)
-    {
-      color.red = ((i & 4) >> 2) * 65535;
-      color.green = ((i & 2) >> 1) * 65535;
-      color.blue = (i & 1) * 65535;
-      gdk_color_alloc (cmap, &color);
-      colorcube_d[((i & 4) << 4) | ((i & 2) << 2) | (i & 1)] = color.pixel;
-    }
-}
-
-void
-gdk_rgb_set_verbose (gboolean verbose)
-{
-  gdk_rgb_verbose = verbose;
-}
-
-void
-gdk_rgb_set_install (gboolean install)
-{
-  gdk_rgb_install_cmap = install;
-}
-
-void
-gdk_rgb_set_min_colors (gint min_colors)
-{
-  gdk_rgb_min_colors = min_colors;
-}
-
-/* Return a "score" based on the following criteria (in hex):
-
-   x000 is the quality - 1 is 1bpp, 2 is 4bpp,
-                         4 is 8bpp,
-			 7 is 15bpp truecolor, 8 is 16bpp truecolor,
-			 9 is 24bpp truecolor.
-   0x00 is the speed - 1 is the normal case,
-                       2 means faster than normal
-   00x0 gets a point for being the system visual
-   000x gets a point for being pseudocolor
-
-   A caveat: in the 8bpp modes, being the system visual seems to be
-   quite important. Thus, all of the 8bpp modes should be ranked at
-   the same speed.
-*/
-static guint32
-gdk_rgb_score_visual (GdkVisual *visual)
-{
-  guint32 quality, speed, sys, pseudo;
-  static const gchar* visual_names[] =
-  {
-    "static gray",
-    "grayscale",
-    "static color",
-    "pseudo color",
-    "true color",
-    "direct color",
-  };
-
-
-  quality = 0;
-  speed = 1;
-  sys = 0;
-  if (visual->type == GDK_VISUAL_TRUE_COLOR ||
-      visual->type == GDK_VISUAL_DIRECT_COLOR)
-    {
-      if (visual->depth == 24)
-	{
-	  quality = 9;
-	  /* Should test for MSB visual here, and set speed if so. */
-	}
-      else if (visual->depth == 16)
-	quality = 8;
-      else if (visual->depth == 15)
-	quality = 7;
-      else if (visual->depth == 8)
-	quality = 4;
-    }
-  else if (visual->type == GDK_VISUAL_PSEUDO_COLOR ||
-	   visual->type == GDK_VISUAL_STATIC_COLOR)
-    {
-      if (visual->depth == 8)
-	quality = 4;
-      else if (visual->depth == 4)
-	quality = 2;
-      else if (visual->depth == 1)
-	quality = 1;
-    }
-  else if (visual->type == GDK_VISUAL_STATIC_GRAY
-#ifdef ENABLE_GRAYSCALE
-	   || visual->type == GDK_VISUAL_GRAYSCALE
-#endif
-	   )
-    {
-      if (visual->depth == 8)
-	quality = 4;
-      else if (visual->depth == 4)
-	quality = 2;
-      else if (visual->depth == 1)
-	quality = 1;
-    }
-
-  if (quality == 0)
-    return 0;
-
-  sys = (visual == gdk_visual_get_system ());
-
-  pseudo = (visual->type == GDK_VISUAL_PSEUDO_COLOR || visual->type == GDK_VISUAL_TRUE_COLOR);
-
-  if (gdk_rgb_verbose)
-    g_print ("Visual 0x%x, type = %s, depth = %d, %x:%x:%x%s; score=%x\n",
-	     (gint)(((GdkVisualPrivate *)visual)->xvisual->visualid),
-	     visual_names[visual->type],
-	     visual->depth,
-	     visual->red_mask,
-	     visual->green_mask,
-	     visual->blue_mask,
-	     sys ? " (system)" : "",
-	     (quality << 12) | (speed << 8) | (sys << 4) | pseudo);
-
-  return (quality << 12) | (speed << 8) | (sys << 4) | pseudo;
-}
-
-static void
-gdk_rgb_choose_visual (void)
-{
-  GList *visuals;
-  guint32 score, best_score;
-  GdkVisual *visual, *best_visual;
-
-  visuals = gdk_list_visuals ();
-
-  best_visual = visuals->data;
-  best_score = gdk_rgb_score_visual (best_visual);
-  visuals = visuals->next;
-  while (visuals)
-    {
-      visual = visuals->data;
-      score = gdk_rgb_score_visual (visual);
-      if (score > best_score)
-	{
-	  best_score = score;
-	  best_visual = visual;
-	}
-      visuals = visuals->next;
-    }
-
-  image_info->visual = best_visual;
-}
-
-static void gdk_rgb_select_conv (GdkImage *image);
-
-static void
-gdk_rgb_set_gray_cmap (GdkColormap *cmap)
-{
-  gint i;
-  GdkColor color;
-  gint status;
-  gulong pixels[256];
-  gint r, g, b, gray;
-
-  for (i = 0; i < 256; i++)
-    {
-      color.pixel = i;
-      color.red = i * 257;
-      color.green = i * 257;
-      color.blue = i * 257;
-      status = gdk_color_alloc (cmap, &color);
-      pixels[i] = color.pixel;
-#ifdef VERBOSE
-      g_print ("allocating pixel %d, %x %x %x, result %d\n",
-	       color.pixel, color.red, color.green, color.blue, status);
-#endif
-    }
-
-  /* Now, we make fake colorcubes - we ultimately just use the pseudocolor
-     methods. */
-
-  colorcube = g_new (guchar, 4096);
-
-  for (i = 0; i < 4096; i++)
-    {
-      r = (i >> 4) & 0xf0;
-      r = r | r >> 4;
-      g = i & 0xf0;
-      g = g | g >> 4;
-      b = (i << 4 & 0xf0);
-      b = b | b >> 4;
-      gray = (g + ((r + b) >> 1)) >> 1;
-      colorcube[i] = pixels[gray];
-    }
-}
-
-void
-gdk_rgb_init (void)
-{
-  gint i;
-  static const gint byte_order[1] = { 1 };
-
-  /* check endian sanity */
-#if G_BYTE_ORDER == G_BIG_ENDIAN
-  if (((char *)byte_order)[0] == 1)
-    g_error ("gdk_rgb_init: compiled for big endian, but this is a little endian machine.\n\n");
-#else
-  if (((char *)byte_order)[0] != 1)
-    g_error ("gdk_rgb_init: compiled for little endian, but this is a big endian machine.\n\n");
-#endif
-
-  if (image_info == NULL)
-    {
-      image_info = g_new0 (GdkRgbInfo, 1);
-
-      image_info->visual = NULL;
-      image_info->cmap = NULL;
-
-      image_info->color_pixels = NULL;
-      image_info->gray_pixels = NULL;
-      image_info->reserved_pixels = NULL;
-
-      image_info->nred_shades = 6;
-      image_info->ngreen_shades = 6;
-      image_info->nblue_shades = 4;
-      image_info->ngray_shades = 24;
-      image_info->nreserved = 0;
-
-      image_info->bpp = 0;
-      image_info->cmap_alloced = FALSE;
-      image_info->gamma = 1.0;
-
-      image_info->stage_buf = NULL;
-
-      image_info->own_gc = NULL;
-
-      gdk_rgb_choose_visual ();
-
-      if ((image_info->visual->type == GDK_VISUAL_PSEUDO_COLOR ||
-	   image_info->visual->type == GDK_VISUAL_STATIC_COLOR) &&
-	  image_info->visual->depth < 8 &&
-	  image_info->visual->depth >= 3)
-	{
-	  image_info->cmap = gdk_colormap_get_system ();
-	  gdk_rgb_colorcube_222 ();
-	}
-      else if (image_info->visual->type == GDK_VISUAL_PSEUDO_COLOR)
-	{
-	  if (gdk_rgb_install_cmap ||
-	      image_info->visual != gdk_visual_get_system ())
-	    {
-	      image_info->cmap = gdk_colormap_new (image_info->visual, FALSE);
-	      image_info->cmap_alloced = TRUE;
-	    }
-	  if (!gdk_rgb_do_colormaps ())
-	    {
-	      image_info->cmap = gdk_colormap_new (image_info->visual, FALSE);
-	      image_info->cmap_alloced = TRUE;
-	      gdk_rgb_do_colormaps ();
-	    }
-	  if (gdk_rgb_verbose)
-	    g_print ("color cube: %d x %d x %d\n",
-		     image_info->nred_shades,
-		     image_info->ngreen_shades,
-		     image_info->nblue_shades);
-
-	  if (!image_info->cmap_alloced)
-	      image_info->cmap = gdk_colormap_get_system ();
-	}
-#ifdef ENABLE_GRAYSCALE
-      else if (image_info->visual->type == GDK_VISUAL_GRAYSCALE)
-	{
-	  image_info->cmap = gdk_colormap_new (image_info->visual, FALSE);
-	  gdk_rgb_set_gray_cmap (image_info->cmap);
-	  image_info->cmap_alloced = TRUE;
-     	}
-#endif
-      else
-	{
-	  /* Always install colormap in direct color. */
-	  if (image_info->visual->type != GDK_VISUAL_DIRECT_COLOR &&
-	      image_info->visual == gdk_visual_get_system ())
-	    image_info->cmap = gdk_colormap_get_system ();
-	  else
-	    {
-	      image_info->cmap = gdk_colormap_new (image_info->visual, FALSE);
-	      image_info->cmap_alloced = TRUE;
-	    }
-	}
-
-      image_info->bitmap = (image_info->visual->depth == 1);
-
-      for (i = 0; i < N_IMAGES; i++)
-	if (image_info->bitmap)
-	  /* Use malloc() instead of g_malloc since X will free() this mem */
-	  static_image[i] = gdk_image_new_bitmap (image_info->visual,
-						  (gpointer) malloc (IMAGE_WIDTH * IMAGE_HEIGHT >> 3),
-						  IMAGE_WIDTH, IMAGE_HEIGHT);
-	else
-	  static_image[i] = gdk_image_new (GDK_IMAGE_FASTEST,
-					   image_info->visual,
-					   IMAGE_WIDTH, IMAGE_HEIGHT);
-
-      image_info->bpp = static_image[0]->bpp;
-
-      gdk_rgb_select_conv (static_image[0]);
-
-    }
-}
-
-/* convert an rgb value into an X pixel code */
-gulong
-gdk_rgb_xpixel_from_rgb (guint32 rgb)
-{
-  gulong pixel = 0;
-
-  if (image_info->bitmap)
-    {
-      return ((rgb & 0xff0000) >> 16) +
-	((rgb & 0xff00) >> 7) +
-	(rgb & 0xff) > 510;
-    }
-  else if (image_info->visual->type == GDK_VISUAL_PSEUDO_COLOR)
-    pixel = colorcube[((rgb & 0xf00000) >> 12) |
-		     ((rgb & 0xf000) >> 8) |
-		     ((rgb & 0xf0) >> 4)];
-  else if (image_info->visual->depth < 8 &&
-	   image_info->visual->type == GDK_VISUAL_STATIC_COLOR)
-    {
-      pixel = colorcube_d[((rgb & 0x800000) >> 17) |
-			 ((rgb & 0x8000) >> 12) |
-			 ((rgb & 0x80) >> 7)];
-    }
-  else if (image_info->visual->type == GDK_VISUAL_TRUE_COLOR ||
-	   image_info->visual->type == GDK_VISUAL_DIRECT_COLOR)
-    {
-#ifdef VERBOSE
-      g_print ("shift, prec: r %d %d g %d %d b %d %d\n",
-	       image_info->visual->red_shift,
-	       image_info->visual->red_prec,
-	       image_info->visual->green_shift,
-	       image_info->visual->green_prec,
-	       image_info->visual->blue_shift,
-	       image_info->visual->blue_prec);
-#endif
-
-      pixel = (((((rgb & 0xff0000) >> 16) >>
-		 (8 - image_info->visual->red_prec)) <<
-		image_info->visual->red_shift) +
-	       ((((rgb & 0xff00) >> 8)  >>
-		 (8 - image_info->visual->green_prec)) <<
-		image_info->visual->green_shift) +
-	       (((rgb & 0xff) >>
-		 (8 - image_info->visual->blue_prec)) <<
-		image_info->visual->blue_shift));
-    }
-  else if (image_info->visual->type == GDK_VISUAL_STATIC_GRAY ||
-	   image_info->visual->type == GDK_VISUAL_GRAYSCALE)
-    {
-      int gray = ((rgb & 0xff0000) >> 16) +
-	((rgb & 0xff00) >> 7) +
-	(rgb & 0xff);
-
-      return gray >> (10 - image_info->visual->depth);
-    }
-
-  return pixel;
-}
-
-void
-gdk_rgb_gc_set_foreground (GdkGC *gc, guint32 rgb)
-{
-  GdkColor color;
-
-  color.pixel = gdk_rgb_xpixel_from_rgb (rgb);
-  gdk_gc_set_foreground (gc, &color);
-}
-
-void
-gdk_rgb_gc_set_background (GdkGC *gc, guint32 rgb)
-{
-  GdkColor color;
-
-  color.pixel = gdk_rgb_xpixel_from_rgb (rgb);
-  gdk_gc_set_background (gc, &color);
-}
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define HAIRY_CONVERT_8
-#endif
-
-#ifdef HAIRY_CONVERT_8
-static void
-gdk_rgb_convert_8 (GdkImage *image,
-		   gint x0, gint y0, gint width, gint height,
-		   guchar *buf, int rowstride,
-		   gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  gint bpl;
-  guchar *obuf, *obptr;
-  guchar *bptr, *bp2;
-  gint r, g, b;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      obptr = obuf;
-      if (((unsigned long)obuf | (unsigned long) bp2) & 3)
-	{
-	  for (x = 0; x < width; x++)
-	    {
-	      r = *bp2++;
-	      g = *bp2++;
-	      b = *bp2++;
-	      obptr[0] = colorcube[((r & 0xf0) << 4) |
-				  (g & 0xf0) |
-				  (b >> 4)];
-	      obptr++;
-	    }
-	}
-      else
-	{
-	  for (x = 0; x < width - 3; x += 4)
-	    {
-	      guint32 r1b0g0r0;
-	      guint32 g2r2b1g1;
-	      guint32 b3g3r3b2;
-
-	      r1b0g0r0 = ((guint32 *)bp2)[0];
-	      g2r2b1g1 = ((guint32 *)bp2)[1];
-	      b3g3r3b2 = ((guint32 *)bp2)[2];
-	      ((guint32 *)obptr)[0] =
-		colorcube[((r1b0g0r0 & 0xf0) << 4) | 
-			 ((r1b0g0r0 & 0xf000) >> 8) |
-			 ((r1b0g0r0 & 0xf00000) >> 20)] |
-		(colorcube[((r1b0g0r0 & 0xf0000000) >> 20) |
-			  (g2r2b1g1 & 0xf0) |
-			  ((g2r2b1g1 & 0xf000) >> 12)] << 8) |
-		(colorcube[((g2r2b1g1 & 0xf00000) >> 12) |
-			  ((g2r2b1g1 & 0xf0000000) >> 24) |
-			  ((b3g3r3b2 & 0xf0) >> 4)] << 16) |
-		(colorcube[((b3g3r3b2 & 0xf000) >> 4) |
-			  ((b3g3r3b2 & 0xf00000) >> 16) |
-			  (b3g3r3b2 >> 28)] << 24);
-	      bp2 += 12;
-	      obptr += 4;
-	    }
-	  for (; x < width; x++)
-	    {
-	      r = *bp2++;
-	      g = *bp2++;
-	      b = *bp2++;
-	      obptr[0] = colorcube[((r & 0xf0) << 4) |
-				  (g & 0xf0) |
-				  (b >> 4)];
-	      obptr++;
-	    }
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-#else
-static void
-gdk_rgb_convert_8 (GdkImage *image,
-		   gint x0, gint y0, gint width, gint height,
-		   guchar *buf, int rowstride,
-		   gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  gint bpl;
-  guchar *obuf, *obptr;
-  guchar *bptr, *bp2;
-  gint r, g, b;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      obptr = obuf;
-      for (x = 0; x < width; x++)
-	{
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  obptr[0] = colorcube[((r & 0xf0) << 4) |
-			      (g & 0xf0) |
-			      (b >> 4)];
-	  obptr++;
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-#endif
-
-#if 1
-
-/* This dither table was generated by Raph Levien using patented
-   technology (US Patent 5,276,535). The dither table itself is in the
-   public domain. */
-
-#define DM_WIDTH 128
-#define DM_WIDTH_SHIFT 7
-#define DM_HEIGHT 128
-static const guchar DM[128][128] =
-{
-  { 0, 41, 23, 5, 17, 39, 7, 15, 62, 23, 40, 51, 31, 47, 9, 32, 52, 27, 57, 25, 6, 61, 27, 52, 37, 7, 40, 63, 18, 36, 10, 42, 25, 62, 45, 34, 20, 42, 37, 14, 35, 29, 50, 10, 61, 2, 40, 8, 37, 12, 58, 22, 5, 41, 10, 39, 0, 60, 11, 46, 2, 55, 38, 17, 36, 59, 13, 54, 37, 56, 8, 29, 16, 13, 63, 22, 41, 55, 7, 20, 49, 14, 23, 55, 37, 23, 19, 36, 15, 49, 23, 63, 30, 14, 38, 27, 53, 13, 22, 41, 19, 31, 7, 19, 50, 30, 49, 16, 3, 32, 56, 40, 29, 34, 8, 48, 19, 45, 4, 51, 12, 46, 35, 49, 16, 42, 12, 62 },
-  { 30, 57, 36, 54, 47, 34, 52, 27, 43, 4, 28, 7, 17, 36, 62, 13, 44, 7, 18, 48, 33, 21, 44, 14, 30, 47, 12, 33, 5, 55, 31, 58, 13, 30, 4, 17, 52, 10, 60, 26, 46, 0, 39, 27, 42, 22, 47, 25, 60, 32, 9, 38, 48, 17, 59, 30, 49, 18, 34, 25, 51, 19, 5, 48, 21, 8, 28, 46, 1, 32, 41, 19, 54, 47, 37, 18, 28, 11, 44, 30, 39, 56, 2, 33, 8, 42, 61, 28, 58, 8, 46, 9, 41, 4, 58, 7, 21, 48, 59, 10, 52, 14, 42, 57, 12, 25, 7, 53, 42, 24, 11, 50, 17, 59, 42, 2, 36, 60, 32, 17, 63, 29, 21, 7, 59, 32, 24, 39 },
-  { 22, 8, 16, 32, 3, 25, 13, 57, 18, 45, 58, 39, 55, 20, 5, 42, 23, 34, 63, 1, 51, 10, 58, 4, 60, 23, 53, 27, 44, 21, 3, 48, 8, 50, 43, 54, 27, 32, 5, 55, 21, 58, 12, 53, 6, 36, 14, 50, 17, 29, 53, 15, 24, 52, 7, 36, 13, 42, 4, 53, 9, 35, 61, 26, 56, 32, 49, 15, 62, 23, 6, 60, 2, 31, 4, 48, 58, 38, 15, 61, 5, 25, 47, 28, 50, 15, 7, 40, 3, 32, 33, 52, 25, 50, 35, 42, 61, 3, 28, 36, 23, 63, 4, 33, 46, 62, 36, 23, 60, 6, 54, 28, 4, 37, 23, 55, 25, 8, 42, 54, 14, 6, 56, 38, 19, 52, 4, 46 },
-  { 48, 53, 43, 12, 45, 63, 30, 37, 9, 34, 21, 1, 25, 47, 29, 58, 3, 54, 15, 39, 29, 17, 38, 35, 20, 43, 1, 49, 15, 59, 29, 39, 22, 35, 16, 23, 1, 47, 39, 18, 8, 44, 25, 31, 57, 19, 63, 4, 45, 3, 42, 61, 1, 31, 45, 20, 57, 29, 62, 21, 32, 41, 14, 44, 3, 39, 5, 34, 10, 43, 51, 35, 23, 52, 40, 10, 21, 1, 53, 18, 51, 43, 12, 62, 18, 54, 26, 51, 20, 57, 14, 1, 62, 16, 11, 18, 32, 39, 17, 44, 1, 48, 26, 37, 18, 2, 51, 14, 28, 45, 35, 18, 57, 13, 47, 11, 51, 20, 2, 39, 31, 47, 25, 1, 50, 11, 60, 7 },
-  { 18, 28, 1, 56, 21, 10, 51, 2, 46, 54, 14, 61, 11, 50, 13, 38, 19, 31, 45, 9, 55, 24, 47, 5, 54, 9, 62, 11, 35, 8, 51, 14, 57, 6, 63, 40, 58, 14, 51, 28, 62, 34, 15, 48, 1, 41, 30, 35, 55, 21, 34, 11, 49, 37, 8, 52, 4, 23, 15, 43, 1, 58, 11, 23, 53, 16, 55, 26, 58, 18, 27, 12, 45, 14, 25, 63, 42, 33, 27, 35, 9, 31, 21, 38, 1, 44, 34, 12, 48, 38, 21, 44, 29, 47, 26, 53, 1, 46, 54, 8, 59, 29, 11, 55, 22, 41, 33, 20, 39, 1, 48, 9, 44, 32, 5, 62, 29, 44, 57, 23, 10, 58, 34, 43, 15, 37, 26, 33 },
-  { 51, 38, 59, 24, 35, 42, 19, 60, 5, 32, 41, 26, 43, 33, 7, 53, 48, 11, 59, 23, 42, 2, 61, 30, 16, 40, 32, 24, 56, 41, 19, 33, 37, 26, 47, 9, 31, 22, 2, 45, 9, 54, 4, 37, 21, 52, 11, 23, 7, 57, 16, 25, 55, 18, 63, 27, 46, 39, 56, 10, 50, 37, 29, 47, 19, 63, 24, 9, 46, 2, 39, 60, 9, 57, 30, 7, 49, 11, 59, 3, 45, 57, 5, 60, 29, 22, 5, 60, 30, 9, 59, 18, 40, 6, 57, 36, 30, 12, 24, 34, 15, 40, 52, 6, 49, 9, 58, 4, 63, 12, 26, 61, 22, 53, 38, 16, 35, 14, 28, 50, 42, 17, 5, 28, 62, 20, 54, 12 },
-  { 26, 6, 31, 15, 49, 6, 38, 27, 22, 49, 16, 56, 2, 62, 30, 21, 0, 36, 28, 6, 49, 32, 13, 52, 26, 50, 19, 46, 3, 26, 62, 0, 53, 12, 29, 3, 53, 41, 60, 24, 38, 13, 58, 16, 43, 9, 59, 39, 46, 28, 44, 40, 2, 33, 13, 41, 16, 6, 47, 31, 26, 17, 57, 6, 38, 0, 42, 36, 29, 52, 20, 31, 48, 0, 34, 56, 20, 36, 23, 54, 14, 41, 24, 37, 10, 55, 46, 25, 16, 45, 36, 4, 55, 23, 15, 8, 50, 62, 5, 56, 44, 20, 13, 28, 59, 31, 24, 47, 31, 52, 37, 17, 40, 0, 26, 49, 3, 60, 7, 33, 0, 61, 53, 40, 8, 45, 2, 41 },
-  { 16, 63, 43, 4, 61, 24, 56, 13, 53, 8, 36, 12, 24, 41, 16, 46, 60, 26, 52, 39, 14, 57, 21, 37, 0, 45, 7, 59, 38, 17, 43, 10, 45, 20, 61, 43, 19, 11, 33, 17, 50, 32, 23, 61, 28, 49, 26, 0, 18, 51, 5, 60, 22, 58, 29, 0, 59, 34, 19, 62, 3, 52, 7, 44, 30, 59, 13, 50, 15, 62, 7, 17, 38, 22, 44, 15, 40, 4, 47, 28, 33, 17, 49, 16, 51, 40, 10, 56, 0, 53, 13, 49, 28, 38, 60, 21, 43, 19, 37, 27, 3, 51, 34, 39, 0, 45, 15, 43, 10, 21, 3, 55, 8, 33, 59, 10, 41, 18, 52, 24, 46, 20, 30, 13, 58, 22, 36, 57 },
-  { 50, 34, 11, 47, 29, 17, 44, 0, 33, 63, 28, 46, 52, 5, 57, 10, 42, 18, 4, 63, 20, 8, 44, 10, 56, 34, 14, 29, 5, 54, 23, 59, 32, 49, 7, 34, 49, 27, 56, 0, 42, 7, 46, 3, 40, 6, 54, 32, 62, 13, 36, 10, 47, 8, 35, 49, 24, 51, 12, 40, 22, 35, 60, 12, 22, 51, 33, 4, 40, 25, 43, 55, 5, 54, 12, 61, 26, 51, 8, 62, 0, 53, 7, 63, 2, 32, 19, 34, 42, 24, 31, 63, 2, 10, 45, 33, 0, 48, 9, 61, 22, 47, 8, 62, 18, 56, 7, 54, 27, 57, 46, 30, 50, 19, 45, 30, 56, 36, 22, 47, 11, 38, 3, 51, 32, 48, 18, 9 },
-  { 0, 21, 40, 19, 52, 9, 37, 48, 20, 40, 3, 18, 27, 38, 35, 22, 31, 56, 13, 35, 46, 28, 60, 40, 27, 18, 61, 50, 41, 30, 7, 36, 2, 25, 16, 57, 5, 15, 47, 29, 55, 19, 30, 52, 15, 34, 20, 12, 43, 30, 20, 54, 25, 44, 53, 12, 38, 5, 55, 27, 48, 15, 33, 27, 45, 8, 19, 28, 56, 11, 33, 49, 18, 36, 29, 2, 45, 16, 39, 19, 31, 43, 27, 35, 20, 52, 26, 6, 61, 11, 41, 17, 29, 51, 20, 56, 25, 32, 41, 17, 53, 31, 25, 14, 42, 23, 35, 16, 38, 6, 34, 12, 15, 62, 6, 21, 13, 1, 63, 9, 55, 27, 43, 25, 14, 4, 31, 55 },
-  { 44, 29, 61, 2, 35, 58, 26, 15, 60, 10, 51, 59, 14, 55, 8, 50, 2, 44, 25, 51, 1, 33, 16, 4, 48, 36, 2, 21, 12, 57, 48, 13, 51, 55, 40, 28, 37, 62, 8, 39, 12, 63, 36, 10, 59, 24, 56, 47, 9, 50, 41, 1, 32, 17, 6, 21, 61, 30, 9, 43, 1, 54, 41, 2, 54, 37, 48, 61, 1, 46, 21, 3, 58, 24, 50, 32, 60, 10, 57, 25, 46, 12, 59, 4, 45, 13, 57, 47, 27, 39, 5, 58, 47, 14, 35, 4, 52, 13, 60, 6, 36, 10, 45, 55, 4, 50, 29, 2, 61, 50, 25, 58, 44, 24, 36, 42, 54, 28, 40, 32, 16, 56, 6, 62, 46, 39, 60, 23 },
-  { 7, 48, 14, 54, 23, 40, 4, 45, 30, 22, 42, 32, 1, 44, 20, 29, 58, 8, 37, 19, 41, 54, 24, 58, 9, 53, 25, 46, 34, 16, 23, 38, 27, 11, 18, 1, 52, 21, 35, 22, 48, 5, 25, 45, 18, 38, 2, 27, 35, 4, 57, 15, 62, 39, 57, 28, 42, 16, 36, 60, 24, 18, 10, 63, 20, 5, 16, 23, 37, 14, 59, 27, 41, 8, 13, 42, 21, 35, 6, 50, 3, 38, 15, 48, 30, 39, 17, 3, 49, 14, 53, 33, 24, 7, 61, 44, 11, 39, 23, 49, 19, 58, 1, 32, 36, 12, 60, 41, 20, 13, 41, 4, 39, 1, 48, 8, 18, 51, 14, 44, 5, 37, 21, 34, 1, 26, 10, 37 },
-  { 53, 36, 27, 9, 50, 12, 32, 55, 2, 57, 7, 17, 48, 34, 63, 15, 40, 26, 62, 11, 49, 6, 31, 39, 22, 42, 6, 63, 1, 39, 60, 4, 42, 61, 32, 45, 24, 44, 2, 60, 16, 41, 53, 1, 33, 61, 49, 17, 63, 23, 45, 26, 33, 3, 23, 46, 2, 50, 20, 4, 45, 34, 49, 30, 39, 58, 44, 31, 53, 34, 6, 52, 30, 47, 63, 1, 53, 22, 42, 31, 58, 23, 54, 22, 61, 8, 36, 59, 22, 35, 21, 1, 55, 40, 27, 16, 30, 54, 2, 29, 43, 16, 39, 63, 21, 46, 26, 10, 48, 32, 19, 53, 30, 56, 26, 60, 33, 4, 61, 23, 49, 59, 15, 53, 19, 58, 42, 16 },
-  { 20, 5, 59, 46, 25, 62, 7, 19, 43, 25, 37, 61, 11, 24, 4, 54, 12, 52, 3, 32, 17, 61, 12, 47, 15, 55, 18, 31, 53, 28, 9, 50, 21, 6, 55, 9, 58, 14, 54, 26, 33, 7, 31, 58, 13, 21, 8, 42, 29, 6, 37, 11, 48, 52, 14, 60, 11, 39, 56, 32, 14, 58, 7, 26, 17, 4, 42, 8, 11, 47, 19, 38, 10, 17, 26, 37, 9, 55, 28, 13, 18, 40, 6, 33, 1, 43, 25, 11, 51, 7, 62, 43, 18, 37, 3, 57, 45, 9, 38, 58, 5, 52, 27, 7, 17, 53, 5, 57, 37, 2, 63, 9, 22, 15, 11, 38, 25, 45, 35, 0, 28, 10, 41, 30, 50, 8, 31, 57 },
-  { 49, 33, 16, 38, 1, 42, 51, 34, 53, 14, 28, 49, 30, 56, 36, 23, 43, 20, 38, 56, 22, 45, 28, 0, 62, 35, 26, 44, 11, 19, 52, 35, 44, 15, 30, 38, 10, 31, 40, 4, 46, 50, 20, 40, 27, 44, 51, 14, 56, 53, 19, 59, 7, 29, 41, 19, 35, 25, 8, 52, 22, 44, 13, 53, 50, 32, 61, 24, 56, 25, 63, 0, 45, 57, 33, 59, 16, 46, 4, 62, 50, 11, 60, 37, 52, 19, 55, 29, 37, 46, 13, 26, 48, 10, 50, 34, 21, 63, 26, 13, 42, 33, 22, 55, 35, 28, 43, 15, 24, 51, 27, 34, 46, 49, 58, 3, 52, 9, 57, 19, 48, 55, 3, 35, 12, 45, 24, 3 },
-  { 41, 11, 56, 28, 18, 31, 22, 10, 37, 6, 47, 13, 3, 41, 9, 46, 0, 48, 29, 6, 34, 10, 55, 37, 20, 8, 49, 3, 41, 59, 14, 25, 0, 63, 19, 47, 27, 51, 17, 57, 23, 10, 61, 6, 54, 3, 38, 31, 0, 22, 34, 43, 20, 55, 31, 0, 49, 63, 29, 38, 3, 62, 28, 40, 0, 22, 14, 35, 2, 48, 15, 43, 23, 14, 3, 29, 49, 20, 39, 34, 0, 44, 29, 9, 15, 47, 5, 42, 0, 31, 58, 5, 31, 61, 23, 15, 0, 47, 19, 50, 24, 3, 59, 11, 44, 0, 31, 59, 6, 42, 17, 60, 0, 39, 20, 31, 43, 17, 29, 40, 12, 25, 60, 22, 52, 15, 63, 29 },
-  { 20, 52, 8, 44, 62, 4, 59, 49, 17, 63, 21, 39, 60, 18, 52, 27, 33, 59, 14, 51, 59, 43, 24, 5, 51, 30, 57, 17, 32, 5, 37, 56, 48, 34, 42, 3, 60, 5, 36, 13, 43, 37, 18, 34, 25, 12, 59, 24, 47, 36, 11, 50, 3, 38, 9, 58, 16, 5, 43, 18, 47, 10, 37, 18, 59, 46, 29, 52, 40, 12, 34, 28, 56, 36, 53, 7, 43, 8, 24, 52, 26, 17, 56, 43, 24, 32, 63, 20, 57, 16, 22, 52, 36, 8, 41, 56, 29, 32, 54, 7, 35, 57, 14, 48, 20, 62, 13, 39, 53, 29, 8, 45, 13, 29, 7, 61, 14, 54, 6, 63, 38, 32, 18, 43, 2, 39, 6, 47 },
-  { 0, 58, 23, 35, 13, 46, 12, 39, 0, 31, 55, 24, 5, 35, 15, 61, 17, 5, 39, 25, 18, 2, 50, 33, 41, 13, 39, 23, 62, 46, 29, 12, 22, 8, 56, 25, 20, 49, 32, 62, 0, 56, 11, 46, 63, 42, 9, 16, 55, 5, 60, 15, 62, 26, 45, 21, 36, 51, 13, 57, 31, 24, 55, 6, 35, 9, 57, 5, 20, 60, 7, 51, 5, 19, 40, 25, 61, 32, 56, 12, 36, 48, 21, 2, 58, 12, 39, 28, 9, 50, 40, 12, 44, 18, 25, 49, 6, 38, 11, 62, 18, 46, 30, 9, 40, 25, 49, 19, 10, 36, 55, 22, 33, 52, 41, 18, 37, 27, 49, 21, 2, 46, 7, 53, 33, 61, 27, 35 },
-  { 41, 31, 5, 39, 51, 26, 33, 57, 27, 41, 9, 44, 54, 29, 48, 7, 44, 36, 57, 10, 31, 63, 16, 45, 11, 60, 1, 47, 7, 20, 43, 3, 58, 36, 13, 52, 39, 7, 15, 28, 22, 48, 30, 21, 1, 29, 49, 44, 27, 17, 40, 30, 24, 42, 12, 53, 33, 7, 47, 20, 1, 42, 11, 49, 25, 43, 17, 32, 45, 27, 41, 21, 31, 62, 11, 49, 2, 15, 42, 5, 63, 7, 41, 27, 49, 6, 54, 23, 46, 34, 2, 28, 54, 3, 59, 12, 46, 17, 42, 28, 40, 1, 37, 51, 5, 55, 2, 34, 47, 16, 3, 62, 47, 5, 23, 56, 1, 44, 12, 34, 51, 16, 57, 11, 25, 17, 54, 13 },
-  { 60, 26, 55, 18, 3, 60, 20, 6, 52, 15, 50, 19, 32, 11, 23, 53, 26, 21, 1, 47, 42, 27, 8, 58, 21, 27, 53, 36, 26, 54, 31, 50, 17, 30, 45, 1, 29, 59, 44, 53, 41, 4, 35, 58, 51, 19, 32, 4, 52, 34, 48, 8, 51, 5, 56, 2, 25, 61, 27, 38, 54, 27, 62, 21, 51, 1, 39, 62, 10, 50, 1, 58, 13, 47, 38, 18, 35, 54, 22, 51, 30, 19, 59, 34, 14, 32, 44, 4, 60, 15, 52, 62, 20, 43, 30, 35, 21, 60, 4, 52, 12, 24, 61, 18, 30, 42, 23, 61, 25, 50, 27, 38, 11, 59, 12, 35, 50, 30, 59, 24, 8, 42, 28, 37, 48, 9, 44, 21 },
-  { 10, 47, 15, 50, 30, 43, 8, 45, 29, 2, 36, 59, 1, 58, 41, 3, 63, 31, 54, 20, 13, 55, 35, 38, 4, 44, 15, 9, 61, 2, 14, 38, 61, 10, 23, 54, 18, 12, 24, 2, 14, 55, 16, 8, 38, 14, 41, 60, 10, 23, 1, 58, 32, 17, 28, 37, 41, 15, 3, 60, 15, 33, 4, 36, 16, 59, 28, 14, 23, 55, 37, 18, 44, 28, 2, 57, 30, 10, 27, 46, 14, 38, 3, 53, 21, 61, 17, 35, 10, 41, 26, 7, 33, 9, 57, 1, 53, 37, 26, 20, 56, 48, 9, 33, 58, 16, 37, 7, 45, 1, 57, 15, 32, 26, 42, 23, 7, 20, 4, 54, 31, 62, 22, 1, 59, 30, 4, 51 },
-  { 36, 2, 38, 11, 24, 36, 54, 22, 62, 47, 25, 8, 28, 45, 16, 38, 12, 43, 9, 37, 49, 3, 23, 52, 18, 30, 50, 33, 19, 42, 49, 26, 6, 40, 47, 35, 63, 38, 50, 33, 60, 26, 36, 47, 24, 57, 6, 26, 39, 63, 19, 44, 14, 46, 61, 9, 50, 30, 45, 23, 10, 50, 44, 8, 31, 54, 6, 46, 36, 4, 30, 54, 8, 52, 22, 41, 4, 60, 40, 0, 58, 24, 45, 10, 37, 1, 48, 30, 56, 17, 38, 48, 24, 47, 19, 39, 14, 8, 45, 32, 2, 34, 27, 44, 4, 52, 11, 56, 31, 21, 40, 19, 44, 51, 2, 63, 46, 58, 36, 43, 14, 5, 50, 38, 14, 56, 40, 23 },
-  { 61, 46, 32, 63, 54, 1, 14, 34, 12, 40, 18, 49, 37, 10, 61, 30, 51, 24, 60, 7, 29, 40, 62, 11, 46, 58, 6, 56, 24, 10, 34, 52, 21, 59, 16, 3, 27, 5, 20, 46, 9, 40, 7, 62, 2, 30, 53, 15, 48, 10, 28, 35, 54, 6, 21, 34, 18, 55, 7, 40, 57, 19, 26, 60, 41, 13, 24, 51, 19, 61, 9, 25, 34, 15, 63, 11, 45, 17, 20, 47, 33, 8, 31, 62, 43, 26, 53, 7, 24, 59, 0, 13, 55, 4, 62, 27, 51, 31, 63, 15, 58, 7, 54, 14, 46, 22, 28, 43, 12, 63, 8, 54, 5, 17, 39, 33, 15, 10, 27, 17, 47, 34, 19, 45, 27, 12, 33, 17 },
-  { 5, 28, 21, 7, 17, 48, 42, 58, 23, 4, 63, 14, 55, 21, 34, 5, 19, 0, 45, 17, 52, 15, 25, 32, 0, 22, 40, 13, 45, 62, 18, 0, 43, 11, 33, 55, 30, 42, 57, 19, 51, 31, 22, 43, 18, 45, 34, 0, 43, 31, 56, 3, 23, 40, 59, 0, 44, 13, 48, 35, 2, 32, 46, 0, 21, 48, 35, 3, 40, 32, 43, 59, 0, 48, 33, 26, 53, 36, 55, 12, 51, 16, 55, 5, 18, 29, 11, 39, 51, 19, 45, 31, 42, 21, 35, 6, 22, 47, 10, 38, 23, 50, 20, 36, 0, 60, 38, 4, 50, 35, 48, 34, 24, 57, 9, 53, 28, 48, 61, 0, 56, 24, 53, 3, 63, 6, 42, 57 },
-  { 13, 53, 45, 40, 58, 27, 6, 16, 38, 51, 33, 30, 43, 2, 47, 56, 40, 50, 33, 57, 27, 5, 47, 42, 60, 36, 16, 54, 28, 4, 37, 57, 28, 51, 22, 8, 45, 14, 6, 39, 0, 54, 11, 59, 28, 12, 50, 21, 61, 13, 19, 38, 49, 11, 25, 37, 58, 29, 22, 63, 14, 56, 12, 53, 30, 63, 9, 57, 26, 12, 47, 16, 23, 39, 50, 6, 31, 2, 25, 6, 28, 41, 36, 22, 50, 57, 42, 3, 34, 8, 28, 61, 11, 50, 16, 54, 41, 0, 55, 43, 5, 29, 41, 63, 25, 16, 53, 18, 26, 10, 21, 0, 61, 30, 41, 22, 3, 38, 20, 39, 29, 8, 41, 16, 36, 52, 22, 19 },
-  { 55, 34, 0, 25, 10, 32, 56, 44, 28, 0, 57, 7, 26, 53, 23, 8, 13, 35, 22, 12, 36, 60, 20, 8, 14, 29, 48, 2, 41, 49, 23, 13, 39, 7, 48, 58, 25, 53, 34, 62, 28, 16, 48, 4, 37, 56, 27, 5, 36, 52, 46, 7, 62, 33, 52, 11, 17, 53, 5, 28, 41, 24, 38, 17, 5, 39, 20, 45, 15, 56, 5, 38, 60, 8, 14, 57, 21, 48, 62, 39, 59, 13, 1, 60, 9, 32, 16, 63, 44, 25, 52, 15, 36, 2, 60, 29, 12, 33, 25, 17, 59, 45, 13, 8, 49, 32, 6, 40, 59, 29, 45, 37, 13, 47, 6, 55, 30, 45, 9, 52, 13, 59, 25, 47, 32, 1, 49, 30 },
-  { 9, 39, 14, 61, 49, 37, 3, 20, 50, 13, 41, 19, 46, 17, 38, 59, 28, 62, 4, 44, 54, 1, 34, 51, 55, 7, 63, 32, 21, 8, 56, 31, 62, 19, 36, 1, 41, 17, 24, 12, 42, 35, 25, 52, 20, 8, 44, 59, 25, 2, 22, 42, 16, 29, 4, 46, 20, 36, 43, 9, 51, 8, 49, 26, 58, 33, 54, 1, 37, 29, 52, 20, 27, 45, 19, 35, 42, 16, 10, 32, 20, 49, 46, 27, 40, 4, 47, 22, 13, 55, 4, 47, 26, 44, 23, 40, 58, 19, 48, 13, 31, 2, 57, 34, 42, 19, 61, 32, 14, 55, 5, 51, 26, 19, 58, 16, 49, 14, 62, 5, 33, 44, 21, 7, 60, 26, 11, 41 },
-  { 62, 24, 47, 29, 8, 19, 53, 11, 60, 24, 32, 61, 4, 55, 31, 2, 49, 16, 39, 9, 31, 24, 43, 17, 26, 38, 11, 25, 58, 43, 12, 35, 3, 46, 15, 32, 63, 4, 49, 56, 2, 60, 10, 32, 63, 17, 39, 12, 55, 30, 57, 9, 48, 55, 39, 24, 60, 2, 58, 31, 19, 61, 34, 3, 42, 11, 22, 46, 7, 61, 10, 42, 3, 55, 32, 1, 58, 28, 44, 54, 4, 34, 23, 15, 56, 20, 37, 58, 6, 30, 38, 18, 63, 9, 32, 5, 51, 3, 62, 37, 52, 18, 39, 23, 3, 51, 9, 47, 1, 23, 43, 15, 60, 35, 11, 40, 1, 36, 31, 26, 57, 2, 37, 54, 18, 44, 58, 16 },
-  { 5, 51, 3, 33, 43, 62, 21, 42, 35, 9, 48, 15, 36, 10, 22, 42, 20, 46, 26, 56, 50, 12, 59, 3, 48, 19, 45, 53, 1, 27, 47, 17, 52, 24, 56, 11, 51, 21, 37, 30, 20, 46, 14, 41, 1, 47, 33, 7, 41, 17, 35, 27, 20, 1, 14, 54, 26, 33, 18, 47, 1, 44, 14, 59, 16, 52, 28, 18, 49, 31, 25, 34, 63, 13, 51, 24, 9, 50, 3, 23, 38, 63, 7, 52, 29, 46, 11, 33, 50, 22, 57, 36, 1, 57, 49, 17, 39, 28, 9, 35, 6, 27, 53, 15, 55, 30, 24, 58, 36, 41, 11, 52, 32, 3, 44, 25, 62, 23, 51, 15, 42, 22, 50, 10, 39, 4, 31, 35 },
-  { 46, 22, 57, 17, 12, 39, 26, 5, 31, 59, 1, 45, 27, 62, 52, 7, 58, 33, 6, 18, 39, 22, 33, 41, 57, 5, 35, 18, 40, 16, 60, 5, 29, 42, 7, 39, 27, 44, 9, 47, 8, 26, 54, 22, 51, 29, 24, 49, 15, 61, 4, 51, 31, 63, 43, 6, 50, 8, 39, 12, 53, 37, 23, 30, 40, 6, 62, 43, 14, 53, 2, 49, 7, 36, 17, 41, 61, 37, 18, 56, 11, 18, 44, 35, 2, 19, 61, 0, 41, 14, 8, 30, 43, 12, 24, 46, 14, 54, 42, 21, 44, 61, 10, 46, 37, 11, 44, 7, 18, 63, 20, 29, 7, 49, 28, 54, 8, 43, 4, 48, 18, 63, 12, 29, 48, 24, 59, 20 },
-  { 13, 36, 28, 54, 35, 2, 56, 46, 16, 49, 22, 40, 11, 34, 14, 43, 29, 12, 63, 48, 2, 61, 7, 15, 28, 30, 50, 9, 61, 33, 38, 23, 54, 13, 61, 33, 3, 59, 16, 35, 58, 40, 5, 38, 13, 57, 3, 58, 37, 21, 45, 12, 39, 7, 35, 30, 13, 56, 22, 62, 27, 6, 55, 10, 48, 21, 33, 2, 38, 23, 40, 20, 44, 29, 59, 4, 26, 12, 33, 47, 28, 53, 31, 13, 59, 41, 27, 49, 26, 54, 45, 16, 53, 21, 35, 7, 59, 26, 11, 56, 1, 24, 33, 4, 28, 62, 21, 49, 31, 2, 56, 39, 24, 58, 13, 17, 37, 21, 56, 10, 38, 0, 34, 55, 15, 43, 1, 52 },
-  { 42, 9, 50, 6, 25, 60, 14, 38, 10, 29, 53, 18, 57, 3, 25, 51, 0, 53, 25, 17, 29, 37, 52, 46, 0, 62, 14, 37, 4, 50, 10, 44, 0, 46, 20, 25, 50, 19, 55, 0, 23, 31, 62, 34, 11, 45, 19, 32, 0, 53, 10, 59, 23, 47, 18, 60, 42, 28, 37, 3, 50, 15, 35, 44, 0, 51, 27, 60, 9, 57, 16, 58, 11, 22, 46, 15, 53, 48, 7, 42, 0, 60, 5, 49, 24, 54, 9, 17, 39, 5, 34, 62, 3, 40, 60, 31, 0, 47, 29, 16, 49, 39, 59, 17, 50, 0, 40, 13, 53, 38, 16, 46, 0, 42, 34, 60, 2, 53, 29, 31, 58, 46, 27, 6, 61, 8, 37, 28 },
-  { 0, 63, 21, 40, 45, 18, 51, 23, 63, 34, 6, 43, 28, 38, 55, 19, 40, 35, 8, 41, 54, 10, 21, 32, 39, 23, 53, 26, 55, 28, 22, 63, 30, 34, 9, 48, 6, 38, 29, 43, 49, 6, 18, 52, 27, 61, 9, 43, 28, 42, 33, 26, 56, 3, 51, 23, 0, 48, 16, 45, 32, 25, 63, 20, 57, 17, 42, 12, 35, 47, 5, 31, 39, 56, 6, 30, 34, 21, 61, 25, 14, 40, 22, 38, 15, 6, 36, 56, 20, 60, 25, 12, 51, 27, 10, 56, 42, 20, 36, 63, 32, 6, 21, 41, 12, 34, 60, 26, 5, 48, 27, 10, 62, 19, 6, 47, 39, 14, 45, 7, 24, 17, 41, 32, 23, 51, 19, 56 },
-  { 45, 31, 15, 59, 4, 33, 7, 47, 0, 41, 13, 61, 4, 47, 9, 23, 60, 14, 57, 31, 4, 45, 59, 6, 58, 10, 44, 20, 8, 42, 15, 6, 55, 17, 58, 31, 53, 12, 61, 10, 15, 57, 43, 2, 23, 35, 48, 14, 54, 6, 18, 49, 15, 38, 11, 34, 62, 9, 21, 58, 11, 41, 4, 31, 38, 8, 29, 55, 19, 36, 27, 52, 0, 25, 50, 43, 1, 39, 8, 55, 35, 51, 10, 30, 45, 62, 29, 2, 46, 10, 32, 48, 18, 38, 5, 22, 33, 8, 51, 3, 14, 44, 54, 25, 57, 30, 18, 52, 33, 22, 59, 28, 36, 52, 32, 21, 26, 50, 5, 55, 35, 60, 14, 54, 4, 40, 16, 33 },
-  { 27, 3, 49, 10, 30, 40, 55, 27, 57, 24, 52, 21, 32, 17, 60, 30, 5, 44, 27, 49, 19, 34, 13, 24, 43, 36, 3, 49, 31, 59, 37, 48, 26, 41, 2, 41, 14, 36, 21, 32, 40, 26, 13, 49, 55, 5, 16, 40, 25, 60, 36, 1, 63, 29, 17, 44, 25, 40, 52, 5, 29, 47, 54, 13, 46, 24, 60, 4, 51, 22, 63, 14, 45, 18, 12, 62, 17, 57, 19, 42, 3, 26, 58, 48, 1, 21, 40, 52, 23, 37, 44, 1, 29, 58, 43, 50, 15, 61, 19, 45, 58, 28, 7, 48, 2, 46, 8, 42, 3, 55, 8, 50, 12, 4, 55, 10, 63, 33, 20, 40, 11, 3, 46, 20, 48, 26, 61, 11 },
-  { 44, 56, 24, 36, 53, 19, 12, 37, 16, 44, 7, 36, 49, 54, 11, 37, 48, 21, 15, 1, 62, 25, 47, 56, 16, 18, 51, 12, 40, 1, 24, 11, 52, 16, 23, 59, 28, 1, 45, 53, 4, 60, 37, 21, 39, 30, 63, 20, 52, 10, 30, 45, 8, 41, 54, 4, 57, 7, 34, 55, 36, 18, 23, 59, 2, 48, 11, 32, 44, 1, 41, 8, 33, 54, 38, 23, 30, 46, 6, 29, 62, 18, 32, 16, 55, 34, 14, 11, 61, 7, 55, 16, 53, 13, 23, 2, 55, 37, 26, 10, 33, 23, 36, 16, 38, 22, 56, 15, 24, 43, 35, 17, 44, 40, 25, 46, 16, 1, 57, 25, 49, 36, 28, 62, 9, 35, 7, 53 },
-  { 17, 38, 8, 61, 1, 50, 26, 62, 3, 31, 56, 15, 1, 26, 40, 2, 34, 51, 56, 36, 42, 9, 38, 2, 29, 60, 32, 57, 19, 62, 34, 47, 4, 57, 39, 7, 44, 63, 24, 18, 46, 28, 8, 54, 1, 34, 7, 46, 3, 37, 50, 23, 57, 21, 13, 46, 31, 20, 43, 15, 1, 61, 8, 33, 37, 17, 56, 26, 15, 49, 24, 59, 28, 3, 56, 9, 52, 32, 13, 49, 10, 43, 5, 45, 8, 25, 59, 42, 28, 33, 19, 40, 8, 63, 35, 47, 25, 4, 40, 52, 1, 60, 12, 53, 63, 9, 29, 60, 37, 19, 1, 62, 31, 20, 58, 12, 41, 30, 43, 9, 18, 52, 22, 1, 39, 30, 58, 21 },
-  { 13, 47, 29, 18, 43, 34, 5, 48, 20, 42, 10, 45, 30, 58, 20, 63, 24, 11, 6, 28, 54, 14, 22, 52, 41, 7, 26, 5, 45, 15, 53, 13, 35, 27, 18, 50, 12, 33, 5, 56, 10, 17, 45, 24, 59, 15, 50, 26, 56, 13, 19, 5, 32, 52, 27, 36, 2, 61, 12, 26, 49, 40, 27, 52, 13, 50, 6, 39, 61, 34, 10, 37, 48, 20, 41, 27, 2, 36, 59, 24, 54, 33, 63, 20, 38, 50, 3, 17, 52, 4, 58, 27, 45, 21, 32, 11, 48, 17, 57, 20, 46, 38, 25, 43, 4, 34, 51, 6, 13, 45, 57, 26, 6, 48, 2, 35, 53, 23, 61, 34, 59, 6, 42, 56, 13, 51, 2, 41 },
-  { 32, 5, 55, 23, 58, 14, 22, 52, 29, 15, 61, 25, 51, 8, 43, 13, 53, 41, 46, 20, 3, 33, 63, 11, 48, 21, 54, 38, 28, 3, 30, 43, 21, 62, 9, 31, 55, 22, 51, 29, 37, 62, 32, 12, 42, 29, 41, 9, 33, 44, 62, 28, 43, 1, 59, 19, 48, 30, 51, 39, 24, 4, 58, 19, 42, 29, 22, 43, 3, 18, 53, 5, 13, 50, 16, 60, 45, 21, 7, 40, 15, 0, 26, 53, 13, 31, 43, 24, 47, 31, 15, 49, 2, 41, 6, 59, 29, 42, 9, 30, 14, 7, 49, 18, 31, 47, 20, 39, 49, 32, 11, 41, 54, 15, 61, 18, 7, 38, 4, 13, 44, 28, 15, 32, 45, 19, 27, 49 },
-  { 63, 34, 11, 39, 2, 45, 37, 8, 59, 39, 33, 4, 36, 17, 48, 5, 29, 18, 32, 61, 39, 50, 5, 27, 35, 0, 46, 12, 22, 49, 60, 6, 54, 0, 38, 49, 2, 42, 15, 40, 0, 47, 20, 51, 3, 57, 18, 61, 22, 0, 39, 16, 55, 12, 35, 8, 41, 22, 6, 59, 16, 45, 10, 36, 0, 62, 9, 54, 30, 58, 21, 43, 63, 31, 7, 35, 12, 48, 58, 28, 47, 37, 41, 9, 57, 20, 61, 0, 36, 11, 57, 35, 23, 52, 37, 18, 0, 62, 22, 55, 35, 62, 27, 54, 0, 15, 61, 28, 2, 59, 22, 9, 37, 27, 33, 51, 29, 48, 19, 50, 25, 37, 10, 57, 5, 37, 60, 8 },
-  { 20, 25, 46, 52, 31, 60, 12, 55, 0, 19, 11, 46, 62, 35, 23, 38, 57, 0, 55, 10, 16, 30, 58, 44, 17, 59, 29, 63, 42, 8, 36, 20, 33, 46, 16, 61, 25, 35, 8, 54, 26, 7, 58, 22, 34, 6, 47, 14, 53, 31, 48, 9, 37, 25, 49, 63, 16, 55, 45, 14, 34, 63, 21, 53, 25, 33, 46, 16, 35, 7, 46, 29, 0, 39, 25, 55, 22, 34, 18, 4, 56, 11, 23, 51, 28, 6, 39, 14, 62, 44, 19, 8, 60, 12, 56, 28, 50, 34, 39, 5, 51, 3, 41, 12, 57, 35, 10, 53, 25, 17, 52, 30, 47, 0, 43, 14, 5, 57, 31, 55, 0, 63, 47, 23, 54, 24, 14, 43 },
-  { 0, 57, 16, 6, 26, 19, 35, 28, 49, 42, 54, 26, 21, 1, 59, 27, 9, 47, 26, 44, 50, 22, 13, 40, 8, 37, 10, 34, 17, 56, 25, 58, 13, 27, 44, 9, 20, 58, 31, 17, 60, 36, 10, 41, 53, 25, 36, 39, 4, 24, 58, 17, 60, 4, 22, 38, 10, 32, 0, 50, 31, 7, 28, 47, 12, 57, 5, 26, 52, 23, 14, 40, 57, 17, 47, 5, 53, 1, 44, 31, 19, 60, 46, 2, 35, 48, 30, 54, 22, 5, 51, 39, 25, 31, 4, 43, 14, 9, 45, 16, 24, 44, 19, 29, 40, 23, 44, 7, 38, 42, 4, 63, 12, 54, 23, 59, 22, 42, 8, 15, 40, 21, 8, 34, 3, 41, 30, 50 },
-  { 39, 10, 48, 33, 41, 54, 5, 47, 23, 13, 32, 7, 52, 44, 14, 39, 58, 18, 35, 6, 37, 2, 60, 24, 55, 19, 53, 2, 51, 32, 1, 41, 51, 4, 40, 29, 47, 3, 52, 44, 13, 49, 28, 16, 1, 62, 11, 27, 52, 35, 5, 42, 29, 47, 14, 56, 28, 53, 26, 38, 9, 56, 40, 3, 38, 15, 41, 60, 1, 37, 50, 25, 11, 28, 61, 19, 42, 62, 10, 52, 39, 6, 32, 14, 58, 17, 7, 26, 42, 34, 27, 10, 54, 40, 20, 63, 26, 53, 21, 61, 32, 7, 59, 48, 3, 56, 18, 31, 58, 14, 49, 21, 36, 16, 45, 9, 36, 24, 62, 45, 27, 31, 53, 17, 49, 12, 62, 18 },
-  { 28, 59, 21, 58, 2, 16, 38, 9, 62, 3, 56, 41, 10, 31, 50, 4, 32, 52, 12, 63, 23, 46, 33, 31, 4, 48, 25, 43, 14, 23, 47, 11, 22, 55, 14, 60, 23, 37, 11, 39, 23, 2, 45, 56, 31, 43, 19, 55, 16, 46, 21, 51, 11, 33, 44, 2, 41, 18, 5, 52, 23, 44, 17, 60, 27, 49, 11, 32, 44, 10, 54, 2, 56, 33, 8, 38, 13, 29, 36, 16, 24, 63, 27, 51, 21, 43, 56, 12, 49, 3, 59, 48, 1, 15, 46, 7, 36, 2, 47, 11, 50, 27, 37, 13, 33, 8, 51, 46, 1, 34, 28, 40, 3, 33, 60, 29, 47, 1, 35, 11, 59, 42, 2, 60, 26, 46, 6, 35 },
-  { 4, 43, 9, 29, 36, 63, 24, 44, 20, 50, 30, 17, 60, 22, 16, 43, 25, 3, 42, 19, 51, 15, 8, 54, 42, 15, 61, 5, 39, 57, 18, 61, 31, 48, 34, 2, 50, 19, 57, 5, 63, 33, 19, 38, 13, 27, 48, 7, 32, 61, 2, 26, 58, 6, 24, 50, 13, 61, 42, 20, 62, 2, 35, 20, 51, 4, 62, 18, 23, 58, 20, 31, 43, 15, 51, 45, 26, 50, 4, 55, 45, 3, 35, 9, 38, 1, 32, 61, 20, 45, 17, 33, 24, 57, 29, 51, 22, 58, 38, 30, 15, 1, 54, 21, 63, 43, 26, 12, 24, 56, 8, 60, 50, 19, 5, 52, 13, 54, 17, 50, 4, 16, 36, 12, 32, 56, 22, 54 },
-  { 51, 25, 40, 53, 12, 49, 15, 57, 34, 7, 38, 47, 2, 36, 55, 8, 61, 30, 56, 7, 28, 59, 48, 11, 27, 35, 21, 45, 28, 36, 9, 38, 6, 16, 24, 63, 10, 32, 28, 43, 21, 53, 5, 60, 8, 57, 3, 45, 11, 37, 15, 54, 40, 20, 62, 36, 27, 34, 11, 48, 30, 15, 54, 8, 30, 42, 22, 34, 48, 13, 35, 63, 4, 37, 22, 2, 59, 9, 41, 23, 13, 41, 49, 18, 59, 24, 40, 5, 37, 30, 9, 61, 44, 6, 37, 11, 33, 17, 5, 55, 41, 60, 23, 39, 17, 5, 30, 62, 41, 16, 46, 25, 11, 56, 39, 26, 20, 38, 29, 39, 22, 52, 44, 20, 48, 1, 38, 14 },
-  { 15, 33, 2, 18, 44, 6, 27, 0, 32, 61, 25, 12, 58, 28, 40, 20, 47, 13, 34, 43, 38, 1, 23, 62, 40, 0, 51, 10, 63, 3, 52, 26, 44, 30, 45, 6, 41, 54, 0, 51, 12, 30, 46, 24, 49, 22, 40, 33, 63, 23, 43, 30, 9, 47, 0, 17, 54, 7, 57, 3, 37, 47, 24, 46, 13, 55, 7, 52, 2, 42, 6, 26, 49, 18, 60, 34, 16, 57, 33, 20, 61, 30, 8, 54, 14, 46, 12, 53, 16, 55, 38, 13, 22, 53, 18, 59, 46, 27, 43, 19, 32, 10, 45, 6, 49, 36, 52, 2, 20, 55, 6, 39, 32, 15, 44, 3, 58, 10, 63, 6, 56, 30, 7, 58, 9, 40, 19, 63 },
-  { 10, 47, 61, 23, 55, 31, 52, 42, 17, 45, 4, 51, 27, 6, 15, 53, 0, 49, 26, 10, 56, 18, 36, 6, 20, 58, 32, 30, 13, 49, 19, 56, 0, 59, 12, 53, 27, 17, 38, 25, 48, 9, 15, 36, 14, 30, 59, 17, 0, 50, 8, 58, 18, 56, 31, 45, 21, 41, 29, 19, 60, 6, 32, 59, 0, 36, 29, 39, 19, 59, 46, 12, 55, 30, 10, 47, 24, 3, 28, 48, 0, 55, 44, 27, 33, 4, 63, 29, 49, 0, 26, 50, 34, 2, 42, 14, 0, 62, 9, 56, 3, 52, 28, 34, 58, 9, 20, 48, 37, 32, 22, 53, 0, 62, 27, 49, 34, 46, 21, 33, 41, 14, 25, 37, 53, 29, 31, 45 },
-  { 56, 28, 7, 37, 11, 36, 20, 9, 54, 14, 39, 19, 34, 63, 45, 37, 24, 17, 60, 31, 21, 45, 53, 29, 47, 15, 7, 55, 40, 23, 34, 14, 42, 20, 37, 35, 15, 59, 7, 62, 34, 40, 59, 1, 51, 42, 10, 28, 54, 21, 35, 5, 38, 13, 36, 4, 59, 12, 39, 53, 15, 43, 9, 21, 39, 62, 16, 56, 25, 9, 32, 38, 0, 41, 14, 51, 40, 53, 43, 11, 37, 17, 5, 22, 57, 39, 19, 7, 42, 21, 60, 10, 31, 63, 25, 52, 30, 49, 36, 25, 48, 17, 61, 14, 22, 42, 29, 13, 60, 11, 47, 18, 35, 41, 7, 23, 4, 16, 51, 11, 0, 48, 61, 3, 17, 50, 5, 24 },
-  { 0, 42, 21, 49, 60, 3, 57, 40, 29, 48, 23, 56, 42, 11, 22, 5, 59, 39, 4, 50, 3, 41, 12, 57, 25, 50, 44, 18, 4, 46, 7, 62, 33, 50, 4, 56, 21, 32, 43, 18, 3, 23, 55, 34, 20, 4, 53, 38, 12, 46, 29, 52, 25, 61, 23, 51, 26, 46, 1, 34, 25, 57, 28, 51, 26, 11, 50, 3, 44, 28, 53, 21, 57, 27, 62, 6, 31, 19, 8, 63, 26, 59, 36, 47, 15, 29, 50, 25, 35, 47, 18, 41, 4, 48, 8, 40, 12, 23, 6, 44, 13, 40, 1, 31, 55, 0, 61, 43, 4, 50, 26, 58, 9, 53, 24, 61, 42, 55, 31, 43, 57, 20, 34, 27, 43, 8, 59, 39 },
-  { 18, 51, 30, 13, 26, 16, 46, 22, 2, 59, 8, 30, 1, 48, 33, 51, 29, 9, 46, 16, 62, 14, 33, 2, 38, 9, 27, 60, 37, 26, 53, 17, 28, 10, 24, 46, 2, 49, 8, 57, 29, 45, 6, 26, 62, 44, 18, 25, 61, 3, 42, 14, 49, 10, 43, 6, 17, 32, 63, 10, 49, 4, 40, 14, 45, 33, 22, 37, 12, 61, 5, 17, 43, 7, 23, 37, 15, 58, 49, 13, 39, 21, 10, 52, 1, 62, 9, 56, 12, 2, 58, 28, 36, 16, 56, 28, 56, 35, 20, 63, 24, 37, 51, 8, 45, 25, 16, 33, 27, 38, 2, 44, 13, 30, 17, 36, 12, 26, 5, 18, 28, 47, 13, 60, 23, 45, 13, 33 },
-  { 55, 4, 62, 34, 52, 38, 7, 63, 32, 37, 13, 53, 25, 62, 18, 12, 55, 41, 27, 35, 24, 49, 31, 52, 17, 63, 34, 1, 56, 12, 41, 2, 48, 58, 39, 16, 61, 27, 41, 52, 13, 19, 50, 39, 11, 31, 57, 6, 32, 40, 20, 55, 1, 28, 33, 57, 48, 8, 37, 22, 44, 18, 53, 1, 61, 5, 54, 16, 47, 36, 50, 24, 55, 34, 48, 45, 1, 30, 33, 46, 2, 50, 32, 42, 25, 34, 43, 21, 38, 52, 23, 45, 14, 54, 21, 4, 44, 16, 53, 29, 10, 47, 19, 57, 12, 54, 39, 10, 51, 15, 63, 21, 57, 40, 51, 1, 48, 57, 37, 62, 2, 38, 9, 52, 1, 35, 58, 22 },
-  { 36, 46, 10, 42, 1, 27, 43, 15, 50, 21, 45, 16, 41, 3, 35, 44, 20, 1, 57, 11, 55, 7, 43, 8, 22, 42, 13, 46, 21, 39, 31, 60, 22, 5, 29, 44, 11, 35, 20, 4, 36, 58, 32, 15, 47, 2, 36, 48, 16, 60, 8, 35, 44, 63, 16, 2, 40, 26, 55, 14, 58, 35, 24, 31, 19, 42, 31, 58, 1, 29, 10, 40, 2, 19, 12, 54, 22, 61, 7, 24, 56, 5, 28, 16, 54, 3, 15, 58, 6, 30, 8, 62, 1, 43, 31, 47, 7, 59, 1, 38, 58, 4, 34, 27, 38, 5, 31, 59, 7, 46, 30, 3, 34, 6, 28, 59, 20, 8, 32, 15, 53, 24, 55, 31, 19, 49, 11, 26 },
-  { 2, 24, 16, 58, 19, 55, 5, 35, 10, 61, 4, 28, 57, 24, 58, 7, 31, 47, 22, 38, 19, 28, 61, 36, 54, 5, 59, 29, 6, 52, 15, 11, 43, 36, 8, 54, 52, 1, 62, 25, 47, 9, 1, 60, 28, 53, 24, 14, 46, 27, 51, 22, 12, 24, 38, 53, 20, 11, 51, 3, 29, 7, 48, 63, 8, 49, 9, 21, 52, 14, 63, 32, 46, 60, 35, 4, 41, 16, 52, 35, 18, 42, 59, 7, 36, 61, 45, 27, 33, 51, 19, 39, 34, 11, 61, 18, 33, 41, 28, 15, 54, 22, 42, 3, 49, 21, 47, 18, 36, 23, 55, 19, 48, 24, 45, 10, 33, 44, 50, 40, 7, 35, 15, 41, 63, 6, 40, 54 },
-  { 62, 41, 32, 8, 47, 28, 60, 24, 44, 30, 38, 49, 9, 33, 14, 40, 50, 14, 60, 2, 54, 40, 0, 20, 25, 39, 16, 49, 24, 35, 57, 47, 19, 61, 33, 18, 23, 37, 13, 55, 31, 43, 22, 41, 17, 8, 42, 58, 0, 37, 5, 56, 31, 54, 7, 30, 60, 33, 42, 17, 59, 39, 12, 27, 38, 17, 35, 41, 27, 45, 20, 7, 25, 15, 29, 58, 27, 47, 11, 40, 14, 54, 23, 46, 19, 31, 11, 40, 13, 49, 5, 58, 24, 51, 26, 6, 50, 20, 49, 9, 32, 46, 17, 60, 14, 63, 24, 1, 57, 41, 9, 43, 14, 62, 16, 52, 3, 27, 14, 22, 61, 45, 4, 28, 9, 47, 29, 17 },
-  { 5, 50, 12, 53, 38, 18, 11, 51, 0, 55, 17, 6, 47, 54, 19, 63, 5, 26, 34, 45, 13, 30, 47, 58, 10, 48, 32, 3, 62, 9, 26, 0, 25, 14, 50, 3, 47, 30, 42, 16, 6, 63, 12, 49, 33, 55, 21, 10, 34, 63, 18, 41, 3, 47, 19, 43, 0, 49, 8, 28, 46, 20, 52, 0, 56, 24, 60, 3, 59, 5, 39, 57, 48, 52, 9, 38, 3, 21, 26, 60, 0, 32, 12, 38, 4, 48, 53, 0, 60, 15, 29, 44, 18, 10, 38, 57, 13, 60, 2, 26, 62, 7, 50, 29, 35, 8, 40, 53, 28, 12, 60, 33, 38, 5, 37, 29, 60, 39, 56, 0, 30, 18, 50, 34, 59, 25, 14, 44 },
-  { 20, 31, 60, 22, 3, 49, 33, 25, 40, 13, 34, 59, 22, 36, 0, 28, 37, 56, 8, 18, 51, 16, 4, 45, 27, 12, 53, 42, 18, 44, 51, 31, 55, 40, 28, 58, 7, 60, 10, 51, 27, 37, 24, 56, 5, 26, 44, 29, 50, 23, 45, 11, 34, 15, 59, 27, 13, 23, 62, 37, 4, 57, 15, 32, 42, 6, 47, 11, 30, 43, 23, 13, 0, 36, 18, 44, 63, 51, 37, 29, 49, 20, 57, 27, 62, 9, 24, 35, 23, 53, 37, 3, 42, 55, 0, 36, 23, 39, 31, 43, 17, 37, 24, 11, 52, 43, 19, 32, 5, 50, 26, 0, 56, 21, 54, 11, 19, 6, 47, 25, 59, 42, 12, 54, 21, 3, 38, 57 },
-  { 48, 0, 35, 27, 44, 14, 59, 7, 57, 46, 26, 2, 42, 12, 52, 43, 10, 27, 53, 42, 32, 62, 37, 21, 34, 61, 7, 23, 36, 4, 38, 12, 41, 5, 17, 45, 22, 27, 39, 21, 59, 0, 45, 18, 39, 62, 3, 38, 14, 7, 54, 26, 61, 39, 9, 52, 45, 36, 18, 50, 10, 34, 44, 22, 50, 14, 36, 55, 17, 34, 53, 62, 33, 26, 56, 6, 31, 12, 6, 53, 9, 44, 2, 50, 20, 40, 55, 17, 47, 7, 26, 63, 22, 32, 48, 16, 46, 8, 52, 12, 57, 41, 0, 56, 25, 3, 61, 14, 45, 35, 18, 44, 12, 46, 23, 42, 32, 51, 35, 10, 17, 36, 23, 1, 45, 52, 32, 10 },
-  { 37, 15, 43, 8, 63, 39, 21, 31, 16, 37, 19, 62, 30, 46, 17, 60, 21, 48, 1, 23, 6, 25, 11, 56, 1, 40, 30, 58, 15, 54, 21, 59, 9, 63, 35, 56, 11, 51, 2, 46, 34, 14, 53, 7, 30, 11, 51, 19, 60, 40, 30, 1, 24, 50, 20, 32, 3, 56, 5, 25, 31, 13, 61, 2, 29, 60, 25, 20, 51, 2, 27, 8, 18, 42, 10, 45, 21, 34, 43, 17, 62, 29, 41, 14, 34, 6, 30, 43, 2, 57, 33, 13, 45, 12, 27, 62, 4, 55, 21, 35, 5, 27, 45, 33, 16, 47, 30, 54, 22, 10, 51, 27, 63, 7, 49, 1, 58, 22, 15, 43, 53, 7, 57, 39, 27, 12, 61, 24 },
-  { 56, 51, 26, 56, 19, 2, 41, 54, 5, 52, 9, 48, 6, 23, 39, 4, 32, 15, 63, 35, 59, 49, 43, 15, 52, 19, 50, 9, 46, 33, 1, 29, 48, 20, 32, 1, 38, 33, 19, 54, 9, 32, 24, 48, 58, 35, 16, 48, 4, 52, 13, 57, 33, 5, 45, 59, 15, 29, 41, 55, 47, 39, 23, 53, 9, 40, 4, 57, 10, 44, 48, 40, 50, 14, 61, 24, 55, 1, 59, 22, 33, 8, 51, 25, 58, 46, 11, 59, 20, 41, 17, 51, 6, 56, 35, 25, 42, 30, 15, 58, 48, 18, 61, 9, 58, 39, 13, 2, 37, 59, 40, 2, 31, 16, 34, 41, 8, 30, 62, 3, 29, 48, 33, 5, 63, 16, 41, 7 },
-  { 22, 4, 46, 11, 33, 51, 29, 10, 62, 24, 43, 27, 15, 58, 50, 25, 54, 44, 9, 38, 18, 3, 29, 57, 32, 5, 26, 43, 17, 61, 24, 52, 8, 42, 23, 53, 15, 61, 7, 28, 57, 43, 4, 40, 20, 2, 43, 25, 32, 35, 21, 43, 17, 48, 10, 22, 38, 54, 11, 21, 1, 58, 16, 30, 48, 18, 46, 32, 38, 13, 22, 4, 59, 35, 2, 51, 30, 39, 15, 47, 4, 56, 13, 37, 1, 28, 16, 52, 32, 9, 61, 29, 38, 19, 3, 52, 10, 48, 1, 32, 11, 40, 20, 36, 6, 22, 49, 29, 55, 6, 20, 56, 36, 52, 19, 60, 26, 46, 18, 54, 40, 13, 20, 46, 35, 19, 49, 29 },
-  { 61, 17, 34, 53, 23, 6, 48, 35, 20, 40, 1, 56, 36, 29, 11, 34, 7, 41, 14, 30, 55, 20, 46, 8, 24, 38, 63, 2, 37, 10, 45, 14, 34, 49, 6, 13, 44, 25, 49, 41, 21, 12, 61, 15, 54, 29, 63, 12, 56, 8, 49, 2, 62, 36, 28, 61, 0, 25, 41, 63, 35, 8, 44, 6, 37, 62, 7, 21, 63, 28, 55, 31, 16, 24, 41, 19, 9, 57, 27, 36, 18, 42, 31, 62, 22, 55, 38, 4, 27, 47, 1, 40, 14, 54, 43, 20, 60, 23, 38, 63, 25, 51, 2, 53, 26, 63, 10, 42, 17, 34, 47, 25, 13, 5, 44, 11, 55, 2, 38, 27, 6, 60, 52, 25, 9, 55, 1, 40 },
-  { 8, 30, 58, 3, 42, 61, 17, 38, 13, 59, 32, 10, 54, 3, 51, 20, 61, 26, 57, 2, 46, 33, 12, 60, 41, 13, 48, 29, 55, 20, 39, 27, 57, 18, 62, 29, 55, 2, 31, 16, 37, 50, 26, 36, 6, 46, 9, 41, 27, 57, 23, 39, 26, 6, 51, 12, 31, 46, 7, 16, 27, 52, 19, 56, 26, 12, 33, 53, 1, 41, 8, 57, 46, 7, 54, 32, 47, 5, 49, 11, 60, 23, 5, 48, 10, 43, 19, 63, 35, 24, 49, 21, 59, 5, 31, 37, 14, 44, 7, 42, 6, 30, 46, 13, 44, 32, 19, 50, 4, 58, 8, 30, 62, 38, 28, 53, 21, 36, 13, 50, 21, 33, 15, 2, 44, 31, 14, 47 },
-  { 37, 13, 39, 16, 28, 9, 57, 0, 25, 49, 21, 45, 18, 47, 12, 42, 0, 49, 22, 39, 16, 53, 25, 36, 0, 52, 22, 16, 6, 60, 4, 51, 0, 26, 37, 47, 10, 36, 63, 5, 57, 0, 18, 59, 23, 33, 51, 19, 0, 44, 15, 11, 54, 17, 42, 35, 53, 18, 58, 33, 49, 4, 34, 42, 0, 50, 43, 25, 16, 49, 34, 20, 37, 28, 12, 63, 16, 38, 25, 44, 0, 40, 52, 17, 35, 3, 50, 14, 8, 53, 11, 36, 25, 45, 9, 62, 0, 54, 28, 17, 50, 55, 15, 24, 57, 0, 53, 34, 23, 41, 15, 45, 0, 49, 16, 4, 48, 9, 63, 45, 0, 42, 58, 37, 61, 22, 54, 26 },
-  { 0, 50, 21, 47, 54, 36, 27, 45, 52, 4, 34, 15, 63, 29, 37, 59, 17, 31, 6, 61, 28, 5, 48, 18, 59, 27, 34, 56, 44, 31, 35, 12, 41, 59, 16, 3, 40, 20, 50, 22, 30, 40, 52, 10, 45, 3, 59, 22, 37, 61, 29, 46, 31, 58, 2, 22, 9, 43, 3, 39, 14, 61, 24, 54, 15, 29, 11, 60, 39, 17, 5, 61, 0, 44, 50, 3, 31, 14, 58, 21, 54, 28, 15, 45, 60, 26, 33, 58, 44, 22, 60, 2, 57, 34, 49, 27, 18, 34, 21, 59, 29, 4, 36, 41, 8, 39, 28, 11, 62, 26, 53, 20, 35, 24, 59, 32, 29, 39, 24, 31, 57, 23, 11, 28, 5, 36, 11, 59 },
-  { 44, 32, 63, 5, 20, 12, 41, 7, 30, 61, 42, 8, 39, 5, 33, 8, 24, 53, 45, 11, 37, 58, 7, 44, 10, 50, 3, 40, 8, 22, 53, 19, 46, 9, 33, 52, 24, 58, 8, 44, 13, 47, 8, 34, 38, 30, 14, 47, 7, 34, 4, 55, 9, 19, 40, 49, 56, 26, 60, 21, 30, 45, 10, 19, 40, 58, 23, 36, 3, 52, 45, 23, 54, 13, 22, 42, 53, 45, 7, 33, 10, 36, 57, 6, 29, 12, 41, 0, 30, 15, 41, 30, 17, 7, 16, 53, 40, 56, 2, 39, 12, 61, 10, 52, 31, 60, 16, 45, 1, 37, 7, 61, 40, 10, 43, 17, 58, 7, 54, 14, 4, 51, 39, 49, 18, 56, 42, 20 },
-  { 14, 6, 24, 36, 56, 49, 22, 60, 18, 14, 23, 51, 26, 57, 21, 52, 41, 14, 35, 50, 19, 31, 40, 23, 33, 14, 63, 17, 32, 47, 7, 62, 23, 30, 56, 11, 42, 27, 14, 60, 35, 19, 28, 61, 17, 55, 25, 39, 53, 17, 42, 21, 38, 63, 25, 5, 14, 36, 12, 50, 1, 37, 59, 32, 2, 51, 6, 56, 27, 32, 11, 30, 38, 26, 60, 8, 26, 19, 62, 39, 50, 2, 21, 39, 53, 23, 56, 19, 49, 39, 5, 46, 55, 23, 42, 4, 31, 11, 47, 26, 45, 22, 48, 18, 21, 5, 48, 25, 57, 14, 47, 30, 3, 56, 12, 50, 1, 42, 19, 47, 35, 17, 8, 30, 45, 25, 4, 51 },
-  { 28, 58, 43, 1, 31, 8, 33, 2, 44, 55, 32, 1, 60, 12, 46, 27, 4, 62, 23, 1, 56, 13, 62, 2, 54, 36, 25, 51, 1, 57, 26, 42, 3, 49, 17, 38, 1, 48, 31, 4, 54, 3, 50, 24, 1, 49, 5, 63, 13, 27, 52, 1, 48, 13, 45, 33, 52, 30, 46, 20, 55, 28, 6, 48, 24, 38, 20, 47, 14, 62, 48, 9, 58, 4, 36, 30, 56, 1, 34, 12, 18, 63, 25, 48, 4, 16, 37, 7, 62, 10, 52, 28, 13, 50, 36, 63, 24, 51, 15, 58, 8, 33, 1, 38, 56, 35, 42, 9, 33, 51, 22, 18, 48, 32, 27, 37, 23, 61, 33, 11, 59, 29, 62, 1, 53, 10, 60, 33 },
-  { 12, 39, 17, 52, 26, 46, 53, 38, 25, 11, 48, 36, 16, 43, 2, 35, 55, 17, 39, 29, 43, 9, 28, 45, 20, 5, 46, 12, 42, 28, 13, 52, 36, 6, 60, 22, 54, 17, 62, 39, 25, 42, 15, 55, 44, 20, 31, 10, 35, 57, 24, 32, 29, 6, 59, 18, 7, 62, 3, 41, 10, 44, 16, 54, 13, 62, 31, 9, 41, 1, 21, 43, 18, 47, 15, 40, 11, 49, 28, 55, 46, 30, 8, 43, 32, 61, 28, 47, 25, 34, 21, 61, 32, 1, 20, 9, 46, 6, 35, 19, 41, 54, 27, 63, 14, 3, 51, 20, 62, 2, 38, 55, 8, 21, 63, 6, 46, 9, 26, 51, 3, 24, 43, 34, 16, 41, 18, 48 },
-  { 62, 23, 55, 9, 15, 62, 19, 13, 58, 40, 6, 30, 54, 19, 50, 31, 10, 44, 6, 59, 21, 47, 51, 15, 60, 39, 30, 54, 21, 61, 19, 33, 14, 29, 43, 11, 34, 45, 7, 21, 10, 56, 36, 6, 38, 11, 58, 42, 2, 47, 11, 60, 50, 16, 41, 28, 38, 23, 47, 17, 35, 63, 22, 33, 42, 5, 45, 17, 53, 35, 25, 56, 33, 6, 51, 19, 60, 23, 43, 15, 5, 40, 58, 13, 51, 1, 45, 11, 54, 3, 43, 8, 37, 48, 59, 29, 39, 21, 61, 43, 3, 31, 10, 44, 24, 29, 60, 12, 28, 40, 11, 25, 43, 52, 14, 41, 16, 57, 44, 20, 40, 55, 12, 21, 57, 27, 35, 2 },
-  { 37, 6, 31, 42, 40, 4, 29, 50, 0, 20, 63, 28, 9, 58, 14, 24, 63, 26, 48, 16, 34, 4, 32, 38, 23, 11, 58, 4, 37, 9, 45, 5, 63, 48, 26, 57, 2, 28, 32, 51, 46, 29, 13, 62, 27, 46, 28, 18, 50, 15, 40, 4, 19, 34, 54, 0, 53, 9, 26, 58, 28, 5, 49, 0, 57, 27, 19, 60, 29, 8, 59, 12, 37, 63, 24, 46, 3, 37, 6, 52, 26, 32, 20, 36, 9, 22, 59, 18, 35, 51, 14, 57, 17, 24, 12, 44, 56, 0, 30, 13, 59, 20, 49, 17, 54, 43, 6, 34, 46, 17, 58, 36, 0, 34, 29, 54, 25, 2, 36, 15, 60, 6, 37, 46, 4, 50, 9, 45 },
-  { 19, 59, 48, 3, 24, 60, 44, 22, 34, 51, 15, 45, 41, 5, 33, 47, 0, 37, 12, 55, 25, 54, 8, 57, 0, 47, 18, 34, 49, 15, 55, 24, 40, 20, 8, 35, 53, 13, 41, 18, 0, 59, 22, 33, 4, 52, 8, 60, 24, 36, 31, 56, 45, 26, 10, 43, 15, 56, 36, 4, 51, 14, 39, 30, 12, 55, 36, 2, 39, 49, 4, 44, 17, 0, 32, 13, 53, 35, 59, 17, 62, 0, 55, 24, 52, 38, 31, 6, 42, 19, 29, 40, 4, 54, 33, 5, 16, 27, 52, 37, 23, 55, 7, 37, 0, 39, 23, 49, 4, 53, 31, 15, 59, 10, 50, 4, 60, 34, 48, 7, 31, 49, 27, 14, 62, 22, 53, 29 },
-  { 46, 21, 14, 51, 36, 17, 7, 57, 10, 32, 3, 37, 22, 60, 39, 18, 56, 20, 42, 3, 36, 10, 44, 26, 41, 29, 53, 27, 2, 39, 30, 52, 0, 59, 15, 48, 23, 61, 6, 58, 37, 12, 40, 49, 16, 39, 20, 44, 0, 62, 8, 21, 3, 59, 23, 32, 49, 31, 12, 44, 22, 59, 18, 50, 24, 7, 43, 52, 15, 23, 41, 26, 51, 28, 55, 39, 21, 27, 10, 42, 12, 45, 27, 47, 3, 15, 63, 26, 55, 0, 60, 26, 45, 18, 62, 38, 58, 49, 8, 47, 4, 33, 46, 29, 57, 13, 56, 16, 59, 21, 5, 47, 23, 39, 18, 44, 13, 22, 28, 53, 19, 0, 58, 32, 41, 7, 26, 13 },
-  { 0, 56, 34, 28, 11, 55, 31, 47, 26, 41, 56, 13, 53, 28, 11, 49, 7, 52, 32, 61, 50, 22, 63, 17, 13, 56, 7, 19, 43, 62, 10, 21, 37, 32, 43, 4, 38, 19, 44, 25, 31, 54, 5, 23, 61, 30, 53, 12, 35, 22, 43, 53, 37, 48, 7, 62, 20, 2, 61, 41, 8, 34, 47, 9, 63, 34, 28, 10, 55, 33, 14, 57, 7, 47, 9, 61, 4, 49, 31, 50, 21, 38, 8, 16, 57, 44, 33, 5, 49, 36, 12, 50, 7, 34, 10, 25, 2, 22, 36, 15, 26, 61, 18, 9, 22, 46, 32, 8, 27, 37, 44, 30, 55, 3, 62, 24, 38, 56, 5, 45, 38, 24, 43, 10, 19, 54, 39, 61 },
-  { 41, 30, 8, 63, 43, 23, 38, 3, 62, 19, 8, 49, 25, 1, 58, 30, 23, 40, 9, 28, 18, 40, 6, 38, 49, 22, 35, 59, 8, 27, 50, 5, 56, 17, 11, 50, 30, 9, 55, 2, 51, 19, 34, 47, 9, 41, 6, 26, 48, 57, 14, 28, 17, 12, 39, 13, 37, 46, 25, 19, 54, 27, 1, 37, 16, 45, 20, 60, 1, 48, 20, 38, 31, 22, 42, 15, 19, 44, 1, 61, 6, 34, 56, 40, 29, 10, 20, 46, 13, 22, 41, 23, 59, 42, 30, 51, 45, 13, 63, 53, 42, 12, 51, 38, 62, 2, 26, 41, 50, 1, 61, 10, 19, 42, 31, 8, 49, 32, 12, 63, 9, 52, 16, 56, 36, 2, 31, 16 },
-  { 52, 5, 47, 20, 1, 53, 12, 50, 16, 35, 43, 21, 33, 43, 16, 44, 3, 59, 14, 46, 1, 30, 60, 33, 2, 45, 12, 42, 31, 47, 14, 33, 46, 25, 55, 27, 60, 36, 16, 42, 14, 46, 26, 1, 55, 15, 63, 32, 2, 38, 5, 47, 33, 61, 30, 52, 4, 57, 6, 38, 11, 43, 61, 24, 52, 3, 31, 22, 42, 10, 62, 3, 59, 11, 35, 57, 33, 54, 24, 14, 29, 48, 18, 2, 60, 41, 53, 24, 32, 62, 3, 53, 15, 1, 55, 17, 32, 40, 6, 31, 1, 40, 28, 5, 35, 52, 19, 63, 13, 33, 17, 41, 52, 26, 15, 57, 1, 20, 42, 17, 35, 27, 48, 5, 25, 50, 44, 11 },
-  { 35, 25, 38, 57, 33, 17, 40, 6, 59, 27, 54, 5, 61, 10, 52, 26, 36, 19, 51, 35, 57, 48, 11, 20, 54, 25, 61, 16, 1, 58, 24, 61, 3, 39, 7, 47, 1, 22, 49, 28, 63, 10, 58, 32, 17, 36, 45, 19, 51, 29, 59, 10, 50, 1, 23, 42, 18, 29, 51, 21, 56, 32, 14, 5, 40, 58, 47, 13, 54, 35, 29, 45, 18, 52, 26, 2, 38, 8, 46, 36, 58, 11, 52, 35, 17, 28, 1, 58, 9, 39, 17, 28, 37, 48, 20, 9, 57, 24, 50, 19, 58, 16, 48, 25, 43, 11, 35, 6, 45, 24, 56, 4, 36, 7, 47, 35, 52, 28, 59, 30, 2, 61, 21, 33, 63, 12, 18, 59 },
-  { 3, 49, 15, 10, 27, 61, 25, 45, 30, 0, 14, 47, 31, 38, 17, 62, 7, 55, 27, 4, 15, 24, 42, 52, 10, 34, 5, 51, 36, 18, 41, 11, 35, 21, 62, 13, 33, 57, 8, 35, 5, 40, 21, 43, 52, 3, 24, 56, 11, 16, 33, 25, 41, 20, 55, 8, 60, 35, 15, 48, 2, 57, 30, 49, 18, 25, 6, 39, 17, 57, 7, 25, 43, 5, 49, 16, 62, 22, 55, 4, 25, 43, 23, 7, 50, 11, 37, 48, 14, 51, 33, 57, 7, 27, 39, 46, 4, 29, 11, 43, 34, 56, 7, 60, 20, 54, 30, 57, 22, 49, 9, 33, 54, 14, 63, 23, 6, 43, 10, 40, 50, 13, 44, 8, 38, 33, 46, 23 },
-  { 55, 39, 22, 50, 44, 4, 36, 9, 52, 23, 37, 59, 21, 2, 46, 13, 31, 41, 11, 45, 62, 29, 6, 37, 19, 48, 30, 23, 44, 7, 53, 28, 54, 16, 41, 29, 44, 18, 52, 24, 60, 15, 48, 7, 27, 59, 9, 34, 42, 54, 7, 63, 4, 46, 31, 27, 45, 0, 40, 26, 34, 17, 37, 10, 53, 29, 36, 50, 2, 27, 51, 11, 61, 37, 23, 41, 30, 7, 18, 50, 39, 14, 63, 32, 45, 61, 19, 30, 25, 44, 2, 47, 23, 63, 11, 34, 59, 37, 60, 3, 22, 14, 44, 30, 15, 0, 47, 15, 3, 38, 61, 20, 27, 45, 11, 39, 51, 16, 55, 3, 22, 54, 29, 58, 1, 57, 6, 29 },
-  { 9, 17, 60, 2, 34, 56, 20, 62, 39, 12, 49, 6, 29, 56, 34, 48, 0, 58, 22, 38, 18, 43, 56, 0, 63, 14, 55, 3, 59, 31, 15, 45, 0, 49, 6, 58, 3, 38, 12, 45, 0, 37, 29, 57, 13, 39, 30, 49, 0, 23, 44, 36, 16, 57, 13, 54, 11, 24, 63, 9, 53, 7, 62, 42, 0, 59, 15, 23, 63, 34, 40, 16, 32, 0, 53, 12, 48, 28, 59, 33, 0, 53, 9, 27, 3, 22, 54, 5, 56, 9, 61, 13, 42, 14, 52, 19, 0, 21, 47, 27, 53, 36, 3, 50, 39, 58, 25, 40, 53, 28, 12, 50, 0, 59, 32, 2, 21, 34, 26, 46, 37, 7, 18, 47, 24, 14, 53, 42 },
-  { 61, 32, 13, 54, 29, 7, 46, 13, 28, 57, 18, 41, 53, 15, 9, 39, 24, 49, 33, 3, 53, 9, 26, 32, 40, 28, 46, 39, 25, 9, 56, 21, 63, 37, 26, 22, 51, 27, 17, 56, 31, 53, 4, 43, 22, 46, 12, 18, 60, 40, 20, 26, 50, 21, 39, 5, 49, 33, 16, 44, 22, 46, 20, 32, 24, 45, 8, 43, 12, 46, 4, 48, 56, 20, 29, 58, 3, 40, 10, 42, 31, 21, 47, 41, 56, 38, 15, 42, 36, 27, 20, 33, 55, 3, 26, 44, 31, 54, 12, 35, 9, 63, 28, 10, 21, 32, 9, 60, 17, 8, 43, 29, 40, 16, 36, 48, 60, 7, 57, 14, 62, 31, 42, 15, 36, 40, 20, 26 },
-  { 0, 37, 47, 23, 41, 18, 32, 48, 1, 35, 8, 25, 4, 26, 63, 20, 54, 8, 16, 61, 35, 23, 51, 15, 58, 7, 12, 20, 50, 34, 42, 4, 38, 10, 32, 47, 8, 60, 41, 20, 9, 25, 50, 19, 62, 1, 37, 56, 28, 8, 53, 11, 3, 58, 34, 43, 19, 60, 38, 4, 58, 31, 3, 51, 11, 55, 38, 30, 21, 58, 19, 26, 9, 44, 36, 13, 46, 20, 62, 24, 13, 60, 5, 28, 12, 34, 7, 59, 0, 53, 45, 6, 38, 30, 50, 7, 62, 16, 41, 5, 46, 18, 55, 42, 51, 5, 45, 23, 34, 48, 19, 58, 5, 25, 54, 19, 13, 41, 28, 21, 0, 49, 10, 60, 4, 51, 9, 45 },
-  { 19, 28, 6, 58, 10, 51, 4, 22, 55, 42, 60, 45, 34, 51, 42, 5, 30, 45, 27, 40, 13, 47, 4, 49, 21, 38, 60, 29, 2, 57, 17, 27, 52, 19, 61, 14, 30, 34, 2, 44, 63, 33, 11, 35, 16, 51, 25, 6, 14, 47, 31, 61, 37, 29, 18, 8, 52, 2, 28, 54, 13, 41, 15, 62, 35, 18, 2, 60, 6, 33, 41, 61, 31, 6, 56, 17, 34, 50, 6, 52, 44, 35, 16, 51, 59, 24, 48, 18, 31, 40, 16, 49, 21, 60, 17, 39, 10, 49, 32, 57, 24, 39, 1, 25, 18, 62, 37, 12, 56, 1, 37, 11, 52, 44, 9, 30, 47, 4, 51, 40, 55, 25, 34, 27, 56, 30, 32, 54 },
-  { 63, 40, 49, 15, 43, 26, 63, 38, 16, 20, 30, 12, 57, 14, 19, 60, 36, 12, 59, 2, 57, 17, 42, 31, 1, 44, 16, 35, 47, 11, 32, 48, 13, 43, 1, 39, 51, 12, 57, 23, 6, 40, 53, 3, 55, 31, 39, 60, 35, 44, 5, 15, 45, 1, 62, 41, 26, 14, 47, 22, 36, 27, 50, 9, 26, 47, 52, 28, 54, 16, 1, 13, 51, 39, 23, 63, 1, 30, 15, 26, 2, 57, 19, 37, 1, 44, 21, 50, 13, 63, 8, 24, 56, 1, 35, 25, 58, 20, 2, 28, 14, 51, 33, 59, 13, 30, 4, 49, 31, 24, 63, 26, 33, 3, 58, 38, 62, 24, 32, 8, 17, 45, 5, 48, 18, 3, 43, 11 },
-  { 21, 4, 24, 34, 59, 1, 37, 11, 53, 5, 47, 2, 22, 40, 32, 1, 24, 50, 21, 29, 38, 25, 63, 8, 55, 24, 53, 6, 62, 23, 59, 3, 54, 20, 58, 24, 5, 46, 15, 38, 48, 14, 27, 42, 23, 7, 46, 10, 17, 58, 25, 52, 23, 32, 49, 12, 55, 30, 40, 7, 59, 1, 56, 21, 39, 4, 23, 15, 37, 46, 55, 42, 21, 4, 48, 8, 45, 54, 37, 55, 32, 8, 46, 10, 30, 54, 4, 41, 25, 29, 36, 48, 11, 43, 14, 47, 5, 43, 53, 36, 61, 10, 45, 6, 41, 54, 27, 43, 16, 55, 6, 46, 18, 42, 23, 15, 1, 45, 12, 60, 37, 22, 62, 12, 39, 59, 16, 52 },
-  { 47, 35, 56, 7, 19, 46, 31, 50, 33, 24, 61, 35, 50, 7, 53, 44, 55, 6, 46, 10, 52, 5, 21, 43, 36, 10, 18, 41, 26, 37, 8, 29, 40, 36, 9, 49, 34, 26, 61, 21, 7, 59, 18, 62, 29, 54, 20, 32, 51, 0, 40, 10, 55, 6, 20, 36, 9, 61, 5, 51, 44, 19, 33, 43, 13, 57, 40, 63, 8, 24, 29, 10, 60, 34, 27, 40, 25, 18, 10, 42, 21, 49, 26, 62, 38, 12, 33, 61, 5, 57, 2, 19, 54, 28, 62, 22, 38, 31, 16, 7, 22, 47, 29, 17, 35, 8, 20, 51, 2, 40, 22, 50, 13, 61, 28, 53, 35, 20, 56, 30, 2, 53, 14, 41, 23, 34, 8, 31 },
-  { 12, 2, 42, 29, 52, 13, 21, 8, 55, 14, 41, 17, 28, 58, 23, 11, 17, 36, 31, 62, 17, 34, 50, 14, 28, 61, 33, 52, 2, 51, 17, 45, 7, 25, 62, 30, 18, 55, 0, 42, 30, 35, 45, 1, 12, 48, 3, 63, 21, 36, 30, 48, 19, 59, 43, 27, 46, 17, 34, 25, 12, 29, 53, 6, 48, 31, 11, 34, 49, 3, 36, 50, 19, 47, 14, 61, 11, 36, 58, 4, 60, 14, 39, 22, 6, 52, 15, 35, 17, 46, 31, 42, 9, 34, 3, 52, 12, 60, 26, 56, 40, 2, 53, 23, 57, 38, 62, 14, 36, 59, 10, 31, 39, 6, 49, 9, 41, 26, 5, 48, 43, 27, 33, 58, 1, 50, 25, 57 },
-  { 61, 37, 15, 61, 3, 39, 58, 43, 26, 0, 44, 10, 47, 3, 37, 63, 28, 43, 13, 39, 3, 57, 30, 59, 0, 48, 5, 43, 13, 22, 60, 33, 55, 15, 42, 4, 52, 10, 45, 13, 54, 4, 24, 49, 37, 26, 41, 14, 42, 9, 61, 13, 38, 23, 3, 53, 0, 58, 21, 42, 63, 10, 17, 61, 25, 0, 58, 28, 17, 44, 57, 12, 27, 0, 55, 5, 52, 28, 23, 47, 29, 0, 43, 17, 58, 28, 47, 23, 55, 10, 58, 23, 51, 40, 18, 33, 45, 0, 49, 8, 32, 61, 19, 48, 0, 26, 7, 47, 29, 18, 44, 0, 56, 34, 20, 59, 15, 51, 37, 18, 10, 52, 7, 20, 46, 9, 38, 17 },
-  { 6, 27, 48, 23, 45, 29, 5, 18, 38, 62, 27, 56, 20, 32, 15, 9, 48, 0, 54, 22, 45, 20, 7, 41, 23, 39, 19, 27, 58, 31, 44, 0, 12, 50, 23, 56, 20, 39, 32, 59, 16, 52, 33, 9, 57, 22, 6, 58, 28, 50, 24, 2, 56, 35, 16, 45, 32, 38, 15, 54, 2, 38, 46, 22, 35, 45, 20, 5, 52, 25, 7, 35, 59, 32, 22, 43, 38, 3, 51, 16, 34, 53, 32, 50, 3, 40, 8, 43, 0, 39, 27, 4, 14, 61, 8, 55, 15, 41, 20, 44, 27, 13, 39, 11, 46, 42, 54, 33, 4, 52, 23, 61, 14, 25, 43, 2, 33, 11, 63, 29, 61, 17, 40, 55, 22, 62, 28, 44 },
-  { 20, 54, 8, 56, 35, 10, 63, 31, 52, 12, 48, 6, 59, 41, 52, 33, 19, 58, 25, 49, 11, 37, 47, 12, 54, 15, 56, 35, 7, 47, 16, 53, 28, 34, 5, 37, 28, 8, 48, 3, 28, 38, 18, 61, 16, 43, 53, 32, 4, 17, 47, 27, 44, 8, 63, 10, 25, 49, 6, 37, 24, 52, 32, 3, 50, 12, 41, 56, 38, 14, 62, 20, 40, 16, 53, 31, 18, 63, 41, 9, 59, 7, 13, 25, 57, 20, 63, 26, 53, 18, 48, 62, 30, 46, 21, 25, 58, 29, 36, 4, 55, 34, 6, 60, 31, 16, 21, 12, 58, 38, 9, 29, 47, 7, 52, 30, 57, 44, 22, 0, 35, 45, 3, 31, 14, 36, 0, 51 },
-  { 42, 14, 33, 24, 16, 49, 40, 2, 22, 33, 16, 36, 25, 1, 21, 61, 38, 8, 33, 4, 62, 26, 29, 60, 6, 46, 30, 11, 63, 4, 36, 40, 19, 57, 46, 11, 41, 63, 22, 25, 58, 10, 46, 2, 34, 27, 11, 38, 56, 34, 12, 53, 18, 33, 41, 51, 13, 28, 60, 20, 47, 14, 29, 59, 16, 62, 8, 22, 32, 47, 9, 49, 2, 44, 7, 12, 45, 6, 20, 27, 45, 24, 62, 42, 36, 11, 33, 15, 37, 7, 32, 10, 37, 1, 35, 50, 6, 11, 63, 24, 52, 15, 50, 24, 3, 37, 56, 27, 34, 22, 49, 16, 36, 62, 17, 39, 4, 15, 54, 24, 50, 8, 58, 26, 49, 54, 11, 30 },
-  { 4, 59, 41, 1, 53, 12, 25, 45, 59, 7, 51, 39, 54, 14, 46, 4, 27, 53, 16, 44, 18, 51, 1, 32, 25, 2, 50, 40, 20, 54, 24, 9, 62, 2, 27, 60, 1, 17, 36, 50, 6, 40, 30, 55, 41, 19, 49, 1, 21, 60, 40, 5, 62, 1, 22, 30, 57, 4, 43, 31, 1, 55, 40, 7, 27, 37, 30, 54, 1, 19, 42, 30, 56, 26, 62, 49, 24, 57, 37, 56, 2, 39, 16, 5, 30, 55, 3, 49, 60, 23, 56, 44, 17, 52, 13, 42, 28, 48, 18, 45, 9, 37, 21, 41, 58, 10, 48, 1, 63, 5, 41, 57, 2, 24, 12, 48, 27, 42, 32, 46, 13, 38, 19, 34, 5, 41, 25, 60 },
-  { 39, 28, 21, 46, 32, 57, 36, 9, 19, 42, 4, 29, 11, 43, 30, 49, 13, 42, 35, 56, 9, 39, 15, 52, 36, 61, 18, 26, 45, 14, 31, 48, 21, 43, 14, 33, 49, 54, 14, 44, 21, 62, 13, 23, 8, 62, 15, 51, 44, 7, 30, 37, 20, 42, 56, 7, 39, 18, 50, 11, 61, 9, 19, 43, 57, 2, 48, 11, 39, 60, 28, 4, 37, 17, 35, 1, 33, 11, 31, 14, 48, 19, 35, 51, 46, 21, 44, 29, 12, 41, 2, 22, 58, 26, 54, 4, 59, 38, 2, 33, 57, 1, 63, 13, 28, 51, 15, 40, 18, 45, 8, 30, 43, 37, 54, 19, 8, 59, 21, 6, 60, 29, 55, 10, 63, 15, 47, 17 },
-  { 3, 50, 10, 62, 18, 5, 27, 49, 60, 23, 55, 18, 62, 24, 56, 10, 59, 28, 2, 23, 34, 59, 43, 20, 10, 42, 8, 49, 1, 37, 57, 6, 51, 29, 53, 7, 23, 31, 5, 32, 51, 0, 35, 54, 45, 31, 5, 26, 36, 24, 55, 15, 48, 29, 14, 48, 26, 60, 21, 41, 36, 26, 50, 33, 14, 44, 17, 24, 52, 15, 46, 23, 54, 6, 47, 21, 60, 50, 4, 53, 29, 61, 8, 23, 1, 60, 19, 6, 53, 16, 47, 34, 6, 39, 16, 31, 12, 20, 53, 22, 30, 43, 25, 46, 35, 6, 44, 32, 53, 26, 55, 19, 11, 59, 5, 33, 51, 1, 35, 53, 25, 3, 42, 23, 44, 32, 7, 53 },
-  { 22, 44, 37, 6, 26, 51, 38, 0, 34, 13, 31, 46, 3, 37, 6, 19, 40, 21, 47, 63, 12, 5, 29, 55, 22, 58, 34, 28, 60, 22, 11, 41, 17, 38, 9, 44, 59, 39, 56, 19, 11, 47, 25, 15, 3, 39, 57, 17, 61, 11, 46, 3, 58, 9, 54, 35, 2, 34, 8, 45, 15, 56, 5, 23, 53, 33, 63, 35, 4, 59, 10, 51, 13, 61, 29, 41, 15, 25, 43, 19, 40, 10, 54, 33, 41, 12, 38, 51, 31, 26, 61, 9, 30, 45, 24, 62, 49, 40, 10, 61, 14, 49, 5, 17, 54, 20, 60, 23, 3, 13, 35, 50, 32, 23, 46, 27, 38, 63, 16, 12, 39, 48, 18, 51, 1, 27, 56, 35 },
-  { 63, 15, 30, 55, 43, 14, 57, 17, 53, 44, 7, 48, 26, 50, 32, 60, 0, 53, 14, 31, 50, 24, 46, 0, 38, 13, 4, 52, 16, 45, 30, 59, 0, 25, 55, 35, 16, 10, 26, 42, 58, 29, 60, 38, 50, 22, 28, 47, 0, 50, 28, 19, 33, 39, 11, 44, 16, 52, 24, 59, 3, 38, 27, 51, 0, 21, 7, 42, 26, 34, 21, 40, 33, 18, 39, 3, 54, 38, 8, 59, 0, 44, 27, 15, 58, 28, 57, 9, 43, 0, 36, 50, 20, 59, 8, 34, 0, 27, 47, 7, 36, 19, 56, 32, 0, 38, 11, 29, 62, 47, 6, 61, 0, 41, 14, 56, 10, 23, 45, 31, 57, 8, 36, 13, 58, 38, 11, 19 },
-  { 0, 34, 12, 47, 21, 2, 40, 30, 11, 25, 61, 20, 40, 15, 35, 22, 45, 36, 7, 41, 17, 57, 9, 48, 32, 62, 44, 24, 35, 3, 54, 13, 33, 63, 19, 4, 48, 22, 62, 2, 37, 8, 33, 6, 20, 52, 9, 32, 43, 13, 39, 63, 25, 4, 49, 23, 62, 32, 9, 30, 48, 18, 63, 12, 46, 29, 58, 13, 48, 8, 57, 31, 0, 51, 9, 58, 12, 22, 47, 29, 35, 22, 49, 5, 46, 4, 34, 20, 63, 24, 56, 11, 41, 3, 51, 19, 56, 35, 17, 58, 28, 42, 9, 45, 59, 26, 51, 42, 17, 36, 25, 15, 53, 21, 44, 3, 30, 55, 5, 50, 21, 28, 61, 32, 6, 49, 28, 46 },
-  { 58, 42, 60, 4, 31, 59, 22, 63, 35, 38, 9, 54, 1, 57, 8, 51, 16, 58, 27, 53, 3, 38, 30, 15, 27, 6, 19, 56, 10, 50, 21, 36, 47, 5, 43, 28, 51, 32, 13, 46, 18, 54, 16, 43, 63, 12, 36, 59, 22, 34, 5, 52, 17, 59, 27, 41, 0, 19, 55, 37, 13, 43, 6, 34, 41, 10, 36, 55, 19, 44, 3, 16, 58, 27, 49, 25, 32, 62, 17, 55, 13, 63, 18, 52, 25, 37, 17, 48, 13, 32, 5, 46, 28, 37, 14, 43, 25, 5, 51, 39, 3, 52, 33, 22, 8, 40, 12, 4, 57, 9, 46, 39, 28, 58, 13, 62, 17, 42, 19, 36, 0, 47, 16, 43, 24, 21, 54, 13 },
-  { 25, 9, 23, 50, 36, 8, 45, 14, 3, 51, 16, 28, 44, 12, 42, 29, 4, 26, 10, 47, 22, 61, 18, 54, 51, 39, 46, 13, 41, 26, 58, 7, 18, 39, 12, 57, 15, 1, 52, 27, 41, 23, 48, 1, 27, 45, 18, 2, 57, 26, 55, 8, 43, 31, 6, 58, 14, 51, 40, 5, 61, 31, 24, 54, 17, 60, 22, 1, 39, 30, 53, 45, 36, 13, 43, 5, 45, 2, 37, 6, 34, 42, 2, 39, 10, 62, 7, 54, 40, 18, 60, 15, 52, 21, 63, 8, 55, 46, 15, 30, 23, 13, 62, 16, 50, 24, 58, 31, 48, 21, 34, 2, 49, 7, 31, 37, 26, 48, 9, 61, 40, 11, 52, 2, 60, 40, 4, 37 },
-  { 52, 28, 39, 16, 54, 19, 29, 55, 42, 20, 58, 33, 24, 63, 18, 55, 39, 62, 43, 34, 12, 40, 6, 35, 2, 25, 8, 62, 34, 1, 31, 42, 61, 27, 53, 24, 40, 61, 34, 8, 59, 4, 30, 56, 40, 6, 53, 42, 10, 48, 16, 37, 12, 46, 21, 36, 47, 11, 28, 45, 22, 10, 57, 2, 49, 31, 14, 44, 61, 11, 25, 6, 23, 63, 18, 36, 28, 56, 20, 51, 11, 48, 27, 56, 32, 22, 45, 30, 2, 42, 27, 39, 1, 44, 23, 31, 38, 22, 11, 61, 43, 54, 4, 47, 35, 2, 44, 16, 28, 54, 12, 62, 18, 43, 10, 52, 1, 58, 33, 15, 29, 56, 20, 34, 9, 30, 48, 17 },
-  { 46, 2, 56, 11, 41, 1, 49, 6, 27, 47, 2, 48, 5, 32, 37, 3, 13, 19, 32, 1, 55, 28, 60, 17, 43, 59, 32, 20, 49, 16, 55, 23, 14, 46, 2, 36, 6, 30, 20, 49, 12, 47, 35, 14, 21, 60, 29, 14, 35, 24, 46, 1, 56, 29, 53, 8, 33, 23, 56, 1, 35, 46, 20, 39, 26, 4, 53, 28, 17, 38, 60, 34, 48, 9, 55, 15, 46, 7, 41, 31, 60, 24, 16, 36, 1, 59, 19, 52, 35, 6, 55, 11, 59, 33, 7, 57, 4, 29, 48, 1, 19, 26, 37, 30, 18, 63, 37, 6, 59, 1, 40, 24, 56, 33, 46, 22, 35, 7, 24, 53, 39, 5, 26, 45, 55, 18, 62, 7 },
-  { 20, 60, 29, 34, 20, 62, 33, 52, 10, 36, 13, 60, 41, 21, 50, 27, 56, 49, 8, 51, 21, 45, 11, 48, 8, 23, 53, 3, 29, 44, 5, 52, 9, 32, 50, 17, 43, 56, 3, 38, 24, 10, 62, 25, 51, 9, 33, 49, 61, 7, 30, 62, 22, 19, 2, 42, 63, 5, 49, 18, 60, 15, 52, 7, 43, 56, 23, 50, 5, 50, 2, 20, 41, 30, 1, 52, 22, 61, 14, 26, 3, 43, 53, 7, 47, 28, 11, 14, 23, 58, 33, 25, 47, 13, 50, 17, 40, 54, 34, 60, 41, 6, 59, 14, 50, 7, 25, 55, 20, 42, 51, 8, 27, 4, 16, 60, 28, 50, 44, 3, 22, 49, 63, 12, 33, 1, 43, 31 },
-  { 36, 5, 46, 8, 44, 24, 13, 39, 25, 57, 31, 18, 8, 52, 10, 45, 6, 30, 36, 24, 63, 4, 33, 26, 57, 40, 15, 56, 37, 12, 40, 25, 37, 58, 11, 63, 21, 45, 16, 60, 31, 53, 18, 33, 3, 45, 23, 0, 20, 54, 40, 15, 50, 38, 60, 16, 25, 42, 29, 38, 7, 41, 25, 62, 18, 33, 8, 35, 42, 16, 32, 56, 12, 39, 59, 19, 34, 9, 49, 38, 57, 12, 21, 50, 14, 40, 61, 44, 50, 9, 49, 19, 3, 29, 35, 62, 12, 24, 7, 18, 52, 32, 10, 46, 21, 41, 32, 11, 36, 29, 14, 34, 60, 38, 54, 11, 41, 14, 19, 57, 32, 16, 7, 41, 51, 25, 14, 57 },
-  { 53, 18, 26, 50, 15, 58, 4, 63, 17, 43, 7, 40, 61, 35, 15, 41, 23, 60, 16, 38, 14, 42, 19, 50, 0, 31, 10, 46, 27, 63, 18, 60, 0, 20, 29, 39, 8, 26, 37, 5, 42, 0, 44, 39, 57, 17, 58, 41, 28, 37, 4, 32, 9, 44, 12, 31, 54, 10, 59, 14, 27, 53, 12, 36, 0, 47, 13, 63, 21, 58, 10, 24, 50, 27, 4, 26, 44, 53, 31, 0, 18, 42, 29, 33, 57, 4, 32, 26, 0, 38, 16, 61, 41, 53, 20, 0, 42, 44, 49, 27, 10, 56, 39, 0, 57, 15, 53, 49, 3, 61, 22, 47, 17, 5, 49, 26, 2, 63, 39, 10, 47, 27, 37, 23, 4, 59, 38, 10 },
-  { 23, 39, 61, 3, 37, 28, 48, 31, 0, 34, 51, 23, 2, 26, 58, 0, 53, 11, 46, 1, 57, 29, 52, 14, 37, 61, 21, 35, 2, 49, 7, 34, 47, 55, 4, 33, 54, 13, 58, 52, 19, 50, 22, 7, 13, 29, 36, 11, 51, 17, 60, 25, 55, 4, 34, 51, 0, 35, 20, 48, 32, 3, 51, 30, 59, 28, 40, 3, 46, 29, 54, 43, 7, 62, 47, 11, 39, 4, 23, 46, 55, 8, 63, 5, 25, 37, 18, 46, 21, 56, 31, 5, 36, 8, 45, 58, 26, 15, 2, 36, 47, 21, 29, 44, 25, 34, 3, 27, 43, 10, 52, 0, 45, 30, 24, 36, 43, 18, 34, 59, 0, 52, 61, 15, 44, 19, 30, 49 },
-  { 0, 27, 12, 43, 54, 9, 22, 53, 21, 46, 15, 55, 29, 47, 20, 33, 39, 28, 59, 35, 9, 44, 5, 24, 47, 7, 52, 17, 56, 22, 30, 42, 14, 26, 45, 18, 49, 1, 24, 34, 11, 27, 55, 32, 61, 47, 2, 56, 6, 44, 13, 47, 36, 27, 58, 22, 16, 47, 40, 4, 57, 38, 21, 45, 16, 9, 56, 26, 11, 38, 0, 22, 36, 17, 33, 57, 16, 30, 62, 15, 35, 40, 20, 45, 59, 10, 54, 8, 63, 13, 52, 27, 22, 57, 28, 12, 32, 51, 55, 22, 63, 4, 16, 54, 12, 62, 45, 19, 58, 13, 32, 40, 20, 56, 7, 57, 9, 54, 6, 29, 42, 21, 8, 55, 35, 47, 6, 41 },
-  { 56, 33, 58, 32, 19, 35, 42, 6, 59, 11, 38, 5, 49, 12, 62, 7, 52, 17, 5, 25, 54, 20, 61, 31, 54, 27, 41, 11, 44, 5, 59, 12, 36, 51, 10, 61, 28, 41, 48, 9, 43, 63, 5, 40, 20, 8, 49, 26, 34, 21, 58, 1, 18, 45, 7, 39, 61, 26, 8, 50, 23, 10, 63, 5, 55, 37, 19, 49, 52, 15, 59, 47, 13, 54, 1, 25, 42, 58, 10, 48, 3, 27, 50, 1, 17, 48, 34, 41, 16, 40, 2, 45, 10, 39, 17, 61, 5, 38, 19, 9, 41, 31, 60, 38, 5, 23, 36, 8, 30, 55, 24, 63, 12, 48, 14, 51, 31, 20, 45, 25, 12, 50, 32, 2, 28, 11, 62, 14 },
-  { 44, 16, 7, 48, 1, 62, 16, 50, 27, 33, 61, 25, 17, 44, 31, 14, 22, 43, 32, 48, 18, 40, 8, 36, 3, 16, 33, 62, 23, 38, 25, 53, 2, 21, 41, 6, 22, 15, 59, 29, 16, 37, 26, 15, 52, 42, 23, 15, 54, 39, 10, 30, 53, 11, 49, 24, 2, 43, 55, 17, 34, 44, 15, 31, 24, 44, 2, 32, 7, 35, 25, 5, 40, 45, 29, 51, 6, 21, 37, 52, 24, 60, 13, 31, 53, 23, 2, 28, 49, 24, 31, 60, 20, 51, 1, 34, 48, 14, 59, 33, 50, 1, 18, 33, 48, 60, 17, 51, 39, 6, 38, 2, 35, 29, 40, 23, 1, 62, 15, 53, 37, 17, 46, 57, 40, 51, 24, 22 },
-  { 5, 37, 52, 24, 45, 13, 40, 3, 45, 9, 19, 42, 56, 4, 37, 46, 56, 2, 63, 11, 51, 1, 49, 13, 59, 45, 39, 1, 48, 15, 58, 9, 46, 31, 54, 35, 57, 38, 3, 46, 56, 4, 47, 57, 1, 30, 38, 63, 3, 46, 28, 63, 41, 14, 33, 62, 19, 32, 13, 28, 61, 1, 53, 42, 11, 60, 22, 62, 27, 42, 61, 31, 19, 8, 61, 12, 32, 55, 2, 18, 33, 12, 43, 36, 9, 62, 30, 55, 6, 58, 35, 7, 43, 29, 54, 23, 43, 30, 3, 25, 11, 45, 52, 28, 7, 14, 42, 1, 22, 50, 16, 53, 19, 59, 4, 46, 33, 41, 4, 35, 58, 5, 26, 13, 20, 2, 34, 54 },
-  { 30, 63, 21, 10, 26, 55, 29, 59, 23, 39, 53, 1, 36, 24, 59, 27, 10, 34, 23, 38, 30, 60, 22, 42, 28, 19, 9, 57, 30, 19, 43, 33, 13, 63, 3, 19, 11, 50, 31, 20, 14, 34, 10, 35, 17, 59, 7, 31, 19, 25, 50, 5, 20, 57, 29, 6, 52, 41, 4, 46, 20, 37, 26, 17, 49, 6, 39, 18, 53, 14, 3, 49, 57, 23, 34, 48, 14, 41, 28, 38, 56, 6, 58, 25, 39, 19, 43, 15, 37, 11, 47, 18, 53, 4, 37, 9, 62, 21, 53, 40, 57, 24, 13, 40, 56, 26, 47, 31, 59, 25, 45, 27, 10, 43, 21, 61, 13, 27, 48, 9, 23, 43, 31, 62, 38, 59, 9, 47 },
-  { 25, 4, 40, 60, 34, 6, 18, 36, 8, 57, 12, 30, 49, 14, 6, 54, 41, 16, 50, 6, 43, 15, 34, 4, 53, 24, 50, 35, 4, 51, 7, 55, 28, 24, 39, 44, 60, 7, 25, 62, 42, 53, 24, 61, 28, 45, 52, 12, 48, 37, 9, 35, 43, 3, 37, 48, 12, 58, 30, 52, 9, 59, 6, 57, 33, 29, 48, 4, 37, 45, 20, 34, 10, 39, 0, 60, 22, 45, 8, 63, 21, 42, 14, 49, 3, 56, 11, 46, 21, 61, 0, 42, 25, 13, 63, 17, 36, 8, 46, 16, 6, 35, 63, 0, 21, 37, 4, 57, 9, 34, 5, 61, 48, 32, 8, 37, 54, 17, 56, 30, 60, 0, 50, 16, 7, 29, 42, 17 },
-  { 32, 50, 15, 48, 2, 43, 52, 25, 47, 16, 32, 63, 21, 52, 40, 19, 0, 61, 29, 58, 20, 56, 26, 46, 12, 55, 6, 22, 62, 32, 17, 40, 0, 49, 34, 8, 27, 32, 48, 0, 21, 39, 5, 44, 12, 6, 22, 40, 0, 57, 16, 60, 23, 17, 54, 22, 36, 15, 24, 39, 19, 34, 47, 23, 0, 54, 13, 51, 24, 9, 55, 16, 52, 27, 44, 20, 4, 54, 26, 49, 0, 30, 46, 16, 29, 51, 34, 4, 52, 28, 33, 15, 57, 39, 26, 49, 0, 56, 27, 31, 48, 20, 43, 29, 53, 11, 46, 19, 41, 13, 55, 18, 0, 57, 26, 51, 2, 44, 6, 38, 14, 40, 22, 45, 36, 53, 3, 57 },
-  { 44, 12, 37, 28, 22, 57, 11, 38, 0, 51, 9, 41, 4, 29, 11, 47, 33, 45, 12, 26, 3, 36, 9, 63, 31, 16, 38, 44, 14, 47, 25, 61, 20, 58, 15, 47, 17, 57, 13, 36, 9, 51, 18, 29, 50, 36, 54, 20, 61, 27, 32, 13, 53, 44, 9, 27, 0, 63, 45, 2, 56, 10, 14, 43, 41, 28, 58, 11, 35, 60, 30, 41, 6, 63, 11, 51, 37, 32, 15, 10, 35, 53, 5, 61, 22, 7, 26, 59, 23, 9, 44, 48, 21, 3, 51, 32, 24, 41, 12, 61, 2, 55, 9, 15, 35, 58, 28, 15, 62, 30, 37, 23, 42, 29, 11, 17, 35, 24, 63, 20, 52, 28, 8, 55, 11, 23, 47, 19 },
-  { 0, 56, 8, 53, 14, 31, 61, 20, 55, 28, 62, 18, 35, 60, 25, 57, 7, 23, 39, 54, 47, 17, 43, 0, 40, 59, 29, 2, 56, 10, 37, 5, 43, 11, 29, 52, 1, 23, 54, 41, 59, 30, 55, 1, 62, 15, 33, 4, 43, 10, 47, 39, 1, 31, 40, 60, 49, 33, 7, 55, 26, 50, 31, 61, 8, 18, 21, 32, 44, 1, 25, 47, 18, 36, 30, 23, 59, 7, 40, 59, 27, 19, 38, 32, 44, 54, 40, 17, 38, 60, 27, 6, 35, 55, 10, 14, 44, 5, 50, 17, 38, 26, 42, 50, 18, 3, 44, 52, 2, 49, 7, 52, 15, 46, 62, 39, 55, 10, 31, 48, 3, 58, 33, 18, 61, 34, 13, 59 },
-  { 39, 27, 63, 20, 35, 41, 4, 45, 26, 5, 38, 13, 44, 2, 50, 17, 37, 52, 2, 13, 28, 58, 24, 51, 21, 8, 34, 48, 27, 42, 18, 51, 31, 56, 5, 36, 38, 44, 4, 17, 26, 11, 38, 23, 42, 8, 56, 39, 24, 51, 5, 56, 21, 59, 14, 6, 18, 42, 22, 35, 16, 37, 3, 25, 39, 46, 63, 5, 50, 17, 58, 8, 55, 3, 50, 12, 43, 17, 47, 2, 51, 9, 62, 12, 1, 35, 13, 50, 1, 37, 12, 51, 19, 29, 46, 59, 22, 58, 33, 45, 22, 60, 10, 32, 61, 39, 8, 33, 25, 36, 20, 60, 38, 4, 21, 5, 28, 45, 12, 18, 42, 11, 49, 1, 27, 40, 6, 30 },
-  { 24, 16, 42, 1, 50, 10, 48, 17, 33, 43, 24, 48, 21, 55, 31, 42, 10, 21, 63, 35, 49, 6, 33, 13, 41, 53, 10, 20, 60, 6, 53, 26, 12, 41, 22, 60, 14, 28, 63, 33, 49, 3, 45, 16, 48, 26, 14, 46, 18, 30, 35, 26, 8, 50, 29, 51, 25, 57, 12, 47, 53, 9, 62, 20, 54, 2, 36, 15, 40, 28, 33, 13, 38, 24, 46, 1, 29, 56, 33, 20, 44, 24, 41, 26, 57, 20, 63, 8, 30, 55, 5, 41, 62, 8, 34, 2, 37, 10, 19, 6, 37, 1, 53, 23, 5, 27, 58, 22, 43, 12, 50, 26, 9, 34, 54, 32, 49, 1, 59, 37, 22, 46, 25, 36, 51, 15, 54, 46 },
-  { 52, 7, 45, 33, 26, 58, 14, 60, 7, 54, 3, 58, 8, 34, 14, 5, 59, 30, 18, 44, 8, 22, 48, 62, 3, 26, 55, 38, 23, 16, 39, 1, 62, 24, 49, 9, 53, 19, 46, 7, 19, 60, 31, 58, 2, 34, 53, 7, 59, 2, 62, 42, 46, 19, 36, 11, 44, 4, 38, 28, 1, 43, 32, 51, 12, 29, 56, 22, 52, 2, 62, 49, 22, 60, 14, 35, 63, 5, 25, 57, 14, 53, 4, 46, 18, 31, 42, 22, 47, 20, 58, 31, 16, 43, 23, 54, 30, 42, 52, 57, 29, 49, 30, 13, 45, 48, 16, 55, 6, 63, 1, 44, 14, 58, 19, 47, 15, 24, 51, 34, 6, 55, 5, 63, 20, 41, 21, 9 },
-  { 30, 62, 18, 55, 5, 23, 39, 29, 49, 30, 15, 36, 28, 46, 60, 25, 39, 46, 4, 32, 61, 40, 15, 30, 36, 45, 14, 2, 49, 33, 57, 45, 18, 32, 3, 45, 30, 2, 35, 52, 40, 27, 13, 21, 38, 63, 20, 28, 37, 23, 16, 10, 13, 55, 2, 62, 21, 32, 60, 17, 58, 23, 5, 40, 16, 48, 7, 45, 10, 26, 43, 19, 6, 31, 52, 21, 39, 16, 48, 9, 37, 28, 36, 55, 7, 48, 3, 59, 15, 45, 25, 1, 53, 13, 47, 7, 62, 15, 4, 25, 12, 41, 18, 60, 38, 11, 34, 19, 39, 31, 29, 56, 23, 42, 3, 27, 60, 41, 8, 16, 61, 29, 43, 9, 32, 2, 60, 34 },
-  { 3, 38, 13, 37, 52, 44, 2, 19, 12, 42, 63, 19, 40, 1, 20, 50, 12, 55, 15, 56, 27, 1, 54, 11, 57, 18, 32, 63, 44, 4, 29, 13, 37, 61, 35, 16, 42, 57, 12, 22, 6, 55, 43, 10, 50, 5, 44, 11, 48, 52, 34, 58, 28, 41, 38, 30, 7, 52, 11, 49, 30, 14, 45, 27, 59, 34, 21, 38, 32, 58, 11, 36, 56, 42, 9, 41, 3, 54, 31, 42, 0, 60, 16, 11, 39, 24, 52, 33, 6, 36, 10, 40, 32, 60, 26, 20, 39, 28, 47, 34, 63, 8, 54, 3, 24, 56, 0, 51, 13, 47, 16, 40, 7, 35, 52, 11, 36, 4, 57, 30, 39, 13, 18, 50, 58, 28, 12, 48 },
-  { 57, 24, 49, 21, 10, 31, 61, 36, 56, 0, 22, 53, 11, 56, 32, 7, 36, 27, 41, 9, 46, 19, 34, 42, 25, 7, 50, 9, 28, 21, 54, 8, 50, 7, 27, 59, 10, 25, 48, 62, 37, 0, 33, 58, 25, 18, 32, 61, 0, 15, 45, 5, 50, 3, 23, 55, 47, 17, 40, 6, 60, 34, 53, 8, 41, 0, 61, 13, 54, 4, 46, 28, 0, 17, 48, 27, 58, 13, 23, 61, 33, 21, 50, 30, 62, 8, 14, 29, 56, 27, 61, 49, 17, 2, 44, 11, 51, 0, 59, 17, 40, 20, 32, 47, 36, 21, 42, 28, 60, 4, 54, 10, 59, 17, 30, 62, 21, 43, 26, 48, 0, 56, 36, 25, 8, 44, 39, 17 },
-  { 10, 42, 4, 59, 27, 47, 8, 23, 51, 32, 45, 6, 37, 26, 48, 43, 62, 0, 21, 53, 38, 12, 51, 5, 60, 47, 24, 37, 59, 15, 35, 47, 22, 55, 0, 50, 21, 40, 6, 29, 15, 52, 24, 8, 41, 55, 13, 29, 40, 56, 24, 31, 19, 33, 61, 15, 0, 35, 24, 42, 21, 2, 19, 57, 24, 15, 30, 50, 20, 25, 40, 16, 57, 34, 61, 8, 29, 45, 6, 49, 11, 47, 2, 44, 19, 57, 38, 50, 12, 42, 21, 4, 35, 52, 28, 56, 23, 36, 13, 45, 4, 52, 27, 14, 6, 62, 9, 45, 21, 37, 25, 46, 33, 49, 0, 44, 7, 53, 13, 19, 53, 31, 3, 47, 15, 56, 22, 51 },
-  { 35, 28, 53, 32, 1, 16, 54, 40, 9, 17, 25, 58, 14, 59, 3, 22, 16, 51, 31, 5, 23, 58, 28, 17, 35, 20, 0, 42, 11, 52, 3, 31, 41, 17, 43, 13, 32, 54, 18, 60, 32, 45, 17, 49, 2, 36, 51, 22, 7, 36, 9, 63, 48, 12, 46, 26, 43, 28, 63, 13, 48, 37, 51, 33, 5, 47, 55, 9, 42, 63, 7, 51, 24, 12, 37, 19, 55, 34, 18, 38, 15, 28, 54, 34, 5, 43, 22, 0, 48, 14, 54, 24, 58, 9, 38, 5, 32, 55, 21, 30, 49, 9, 59, 43, 30, 51, 35, 26, 7, 53, 2, 22, 14, 27, 57, 18, 38, 24, 33, 45, 10, 41, 20, 60, 37, 5, 32, 0 },
-  { 63, 19, 15, 40, 62, 35, 14, 28, 46, 61, 4, 49, 35, 10, 29, 54, 33, 8, 45, 62, 37, 1, 43, 55, 10, 52, 61, 30, 19, 40, 25, 62, 11, 38, 27, 58, 36, 3, 46, 8, 39, 4, 62, 28, 47, 20, 4, 54, 47, 27, 43, 1, 21, 38, 8, 58, 10, 54, 4, 56, 9, 26, 12, 39, 60, 27, 18, 37, 1, 31, 35, 5, 45, 50, 2, 43, 26, 1, 59, 23, 56, 40, 7, 26, 58, 17, 32, 63, 25, 39, 7, 31, 45, 19, 63, 15, 48, 8, 37, 61, 16, 34, 1, 56, 18, 3, 15, 58, 49, 32, 63, 41, 55, 5, 40, 22, 50, 6, 59, 2, 63, 23, 52, 11, 26, 61, 44, 23 },
-  { 11, 56, 46, 6, 22, 43, 58, 3, 34, 21, 38, 30, 18, 44, 52, 13, 41, 57, 17, 28, 14, 49, 25, 7, 33, 39, 26, 6, 56, 48, 1, 20, 56, 5, 46, 9, 19, 51, 30, 25, 56, 21, 35, 14, 57, 42, 16, 33, 10, 57, 17, 59, 41, 25, 53, 37, 20, 40, 30, 18, 31, 62, 44, 22, 3, 44, 11, 48, 23, 53, 18, 60, 29, 22, 62, 15, 53, 47, 10, 41, 3, 19, 52, 36, 13, 46, 10, 35, 3, 61, 41, 16, 1, 50, 26, 42, 18, 46, 2, 25, 54, 20, 39, 23, 47, 31, 41, 12, 38, 17, 8, 19, 31, 48, 12, 61, 9, 54, 29, 35, 15, 38, 6, 43, 34, 14, 7, 47 },
-  { 39, 2, 33, 26, 53, 8, 18, 50, 41, 12, 53, 1, 63, 24, 19, 39, 2, 24, 47, 10, 60, 38, 19, 63, 48, 4, 15, 45, 32, 14, 60, 36, 29, 53, 23, 63, 34, 12, 61, 1, 43, 11, 53, 30, 1, 26, 60, 45, 23, 39, 3, 29, 12, 50, 4, 16, 51, 3, 45, 36, 50, 1, 16, 54, 35, 14, 57, 30, 58, 9, 46, 14, 41, 10, 32, 38, 4, 30, 21, 51, 32, 63, 25, 1, 60, 27, 53, 18, 51, 22, 28, 55, 34, 12, 40, 3, 60, 29, 57, 41, 6, 44, 11, 53, 8, 61, 24, 57, 1, 28, 44, 59, 36, 3, 34, 25, 41, 31, 16, 44, 22, 47, 28, 58, 1, 49, 54, 29 },
-  { 58, 25, 50, 13, 38, 30, 60, 24, 6, 57, 27, 42, 9, 45, 6, 61, 30, 50, 4, 34, 29, 3, 46, 13, 22, 42, 58, 28, 9, 39, 23, 44, 7, 15, 44, 2, 40, 15, 47, 41, 23, 37, 7, 59, 38, 11, 34, 6, 62, 14, 52, 35, 55, 19, 32, 61, 33, 24, 57, 6, 22, 59, 29, 7, 49, 25, 40, 3, 17, 39, 27, 52, 0, 55, 16, 57, 24, 61, 36, 6, 29, 12, 48, 39, 20, 44, 6, 40, 33, 5, 48, 10, 57, 36, 22, 51, 33, 9, 24, 12, 62, 29, 50, 35, 14, 43, 5, 33, 47, 52, 13, 23, 10, 51, 56, 16, 46, 1, 49, 4, 61, 9, 52, 18, 31, 21, 36, 17 },
-  { 19, 42, 9, 48, 2, 44, 11, 37, 48, 20, 33, 16, 55, 35, 49, 15, 37, 20, 59, 16, 53, 22, 56, 31, 50, 11, 34, 54, 16, 51, 4, 49, 33, 53, 21, 28, 56, 24, 31, 9, 52, 16, 48, 24, 44, 13, 51, 20, 31, 49, 18, 6, 34, 2, 44, 14, 47, 8, 15, 43, 13, 41, 33, 52, 20, 61, 7, 51, 34, 62, 4, 20, 36, 33, 43, 8, 46, 13, 53, 17, 45, 42, 9, 31, 52, 11, 30, 56, 13, 59, 17, 44, 27, 6, 62, 11, 43, 17, 49, 38, 26, 2, 16, 27, 58, 21, 54, 18, 26, 5, 35, 61, 43, 27, 7, 39, 14, 58, 37, 55, 20, 33, 13, 40, 62, 10, 55, 5 },
-  { 51, 14, 61, 29, 59, 20, 55, 31, 0, 49, 11, 60, 3, 26, 22, 56, 0, 40, 12, 43, 41, 8, 36, 0, 17, 57, 24, 2, 46, 26, 61, 18, 0, 38, 12, 59, 6, 49, 3, 57, 19, 63, 5, 33, 18, 54, 28, 56, 0, 43, 26, 46, 63, 27, 56, 22, 27, 54, 38, 28, 63, 24, 10, 45, 0, 31, 42, 21, 12, 25, 44, 49, 59, 6, 26, 50, 3, 34, 27, 59, 0, 35, 62, 16, 4, 58, 47, 0, 43, 24, 37, 2, 54, 20, 46, 31, 0, 56, 34, 5, 55, 45, 60, 37, 0, 40, 10, 38, 63, 46, 15, 20, 0, 53, 21, 62, 30, 11, 24, 27, 40, 0, 57, 26, 3, 45, 27, 35 },
-};
-
-#else
-#define DM_WIDTH 8
-#define DM_WIDTH_SHIFT 3
-#define DM_HEIGHT 8
-static const guchar DM[8][8] =
-{
-  { 0,  32, 8,  40, 2,  34, 10, 42 },
-  { 48, 16, 56, 24, 50, 18, 58, 26 },
-  { 12, 44, 4,  36, 14, 46, 6,  38 },
-  { 60, 28, 52, 20, 62, 30, 54, 22 },
-  { 3,  35, 11, 43, 1,  33, 9,  41 },
-  { 51, 19, 59, 27, 49, 17, 57, 25 },
-  { 15, 47, 7,  39, 13, 45, 5,  37 },
-  { 63, 31, 55, 23, 61, 29, 53, 21 }
-};
-#endif
-
-static guint32 *DM_565 = NULL;
-
-static void
-gdk_rgb_preprocess_dm_565 (void)
-{
-  int i;
-  guint32 dith;
-
-  if (DM_565 == NULL)
-    {
-      DM_565 = g_new (guint32, DM_WIDTH * DM_HEIGHT);
-      for (i = 0; i < DM_WIDTH * DM_HEIGHT; i++)
-	{
-	  dith = DM[0][i] >> 3;
-	  DM_565[i] = (dith << 20) | dith | (((7 - dith) >> 1) << 10);
-#ifdef VERBOSE
-	  g_print ("%i %x %x\n", i, dith, DM_565[i]);
-#endif
-	}
-    }
-}
-
-static void
-gdk_rgb_convert_8_d666 (GdkImage *image,
-			gint x0, gint y0, gint width, gint height,
-			guchar *buf, int rowstride,
-			gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  gint bpl;
-  guchar *obuf, *obptr;
-  guchar *bptr, *bp2;
-  gint r, g, b;
-  const guchar *dmp;
-  gint dith;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0;
-  for (y = 0; y < height; y++)
-    {
-      dmp = DM[(y_align + y) & (DM_HEIGHT - 1)];
-      bp2 = bptr;
-      obptr = obuf;
-      for (x = 0; x < width; x++)
-	{
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  dith = (dmp[(x_align + x) & (DM_WIDTH - 1)] << 2) | 7;
-	  r = ((r * 5) + dith) >> 8;
-	  g = ((g * 5) + (262 - dith)) >> 8;
-	  b = ((b * 5) + dith) >> 8;
-	  obptr[0] = colorcube_d[(r << 6) | (g << 3) | b];
-	  obptr++;
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-static void
-gdk_rgb_convert_8_d (GdkImage *image,
-		     gint x0, gint y0, gint width, gint height,
-		     guchar *buf, int rowstride,
-		     gint x_align, gint y_align,
-		     GdkRgbCmap *cmap)
-{
-  int x, y;
-  gint bpl;
-  guchar *obuf, *obptr;
-  guchar *bptr, *bp2;
-  gint r, g, b;
-  const guchar *dmp;
-  gint dith;
-  gint rs, gs, bs;
-
-  bptr = buf;
-  bpl = image->bpl;
-  rs = image_info->nred_shades - 1;
-  gs = image_info->ngreen_shades - 1;
-  bs = image_info->nblue_shades - 1;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0;
-  for (y = 0; y < height; y++)
-    {
-      dmp = DM[(y_align + y) & (DM_HEIGHT - 1)];
-      bp2 = bptr;
-      obptr = obuf;
-      for (x = 0; x < width; x++)
-	{
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  dith = (dmp[(x_align + x) & (DM_WIDTH - 1)] << 2) | 7;
-	  r = ((r * rs) + dith) >> 8;
-	  g = ((g * gs) + (262 - dith)) >> 8;
-	  b = ((b * bs) + dith) >> 8;
-	  obptr[0] = colorcube_d[(r << 6) | (g << 3) | b];
-	  obptr++;
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-static void
-gdk_rgb_convert_8_indexed (GdkImage *image,
-			   gint x0, gint y0, gint width, gint height,
-			   guchar *buf, int rowstride,
-			   gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  gint bpl;
-  guchar *obuf, *obptr;
-  guchar *bptr, *bp2;
-  guchar c;
-  guchar *lut;
-
-  lut = cmap->lut;
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      obptr = obuf;
-      for (x = 0; x < width; x++)
-	{
-	  c = *bp2++;
-	  obptr[0] = lut[c];
-	  obptr++;
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-static void
-gdk_rgb_convert_gray8 (GdkImage *image,
-		       gint x0, gint y0, gint width, gint height,
-		       guchar *buf, int rowstride,
-		       gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  gint bpl;
-  guchar *obuf, *obptr;
-  guchar *bptr, *bp2;
-  gint r, g, b;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      obptr = obuf;
-      for (x = 0; x < width; x++)
-	{
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  obptr[0] = (g + ((b + r) >> 1)) >> 1;
-	  obptr++;
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-static void
-gdk_rgb_convert_gray8_gray (GdkImage *image,
-			    gint x0, gint y0, gint width, gint height,
-			    guchar *buf, int rowstride,
-			    gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int y;
-  gint bpl;
-  guchar *obuf;
-  guchar *bptr;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0;
-  for (y = 0; y < height; y++)
-    {
-      memcpy (obuf, bptr, width);
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define HAIRY_CONVERT_565
-#endif
-
-#ifdef HAIRY_CONVERT_565
-/* Render a 24-bit RGB image in buf into the GdkImage, without dithering.
-   This assumes native byte ordering - what should really be done is to
-   check whether static_image->byte_order is consistent with the _ENDIAN
-   config flag, and if not, use a different function.
-
-   This one is even faster than the one below - its inner loop loads 3
-   words (i.e. 4 24-bit pixels), does a lot of shifting and masking,
-   then writes 2 words. */
-static void
-gdk_rgb_convert_565 (GdkImage *image,
-		     gint x0, gint y0, gint width, gint height,
-		     guchar *buf, int rowstride,
-		     gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf, *obptr;
-  gint bpl;
-  guchar *bptr, *bp2;
-  guchar r, g, b;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 2;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      obptr = obuf;
-      if (((unsigned long)obuf | (unsigned long) bp2) & 3)
-	{
-	  for (x = 0; x < width; x++)
-	    {
-	      r = *bp2++;
-	      g = *bp2++;
-	      b = *bp2++;
-	      ((guint16 *)obptr)[0] = ((r & 0xf8) << 8) |
-		((g & 0xfc) << 3) |
-		(b >> 3);
-	      obptr += 2;
-	    }
-	}
-      else
-	{
-	  for (x = 0; x < width - 3; x += 4)
-	    {
-	      guint32 r1b0g0r0;
-	      guint32 g2r2b1g1;
-	      guint32 b3g3r3b2;
-
-	      r1b0g0r0 = ((guint32 *)bp2)[0];
-	      g2r2b1g1 = ((guint32 *)bp2)[1];
-	      b3g3r3b2 = ((guint32 *)bp2)[2];
-	      ((guint32 *)obptr)[0] =
-		((r1b0g0r0 & 0xf8) << 8) |
-		((r1b0g0r0 & 0xfc00) >> 5) |
-		((r1b0g0r0 & 0xf80000) >> 19) |
-		(r1b0g0r0 & 0xf8000000) |
-		((g2r2b1g1 & 0xfc) << 19) |
-		((g2r2b1g1 & 0xf800) << 5);
-	      ((guint32 *)obptr)[1] =
-		((g2r2b1g1 & 0xf80000) >> 8) |
-		((g2r2b1g1 & 0xfc000000) >> 21) |
-		((b3g3r3b2 & 0xf8) >> 3) |
-		((b3g3r3b2 & 0xf800) << 16) |
-		((b3g3r3b2 & 0xfc0000) << 3) |
-		((b3g3r3b2 & 0xf8000000) >> 11);
-	      bp2 += 12;
-	      obptr += 8;
-	    }
-	  for (; x < width; x++)
-	    {
-	      r = *bp2++;
-	      g = *bp2++;
-	      b = *bp2++;
-	      ((guint16 *)obptr)[0] = ((r & 0xf8) << 8) |
-		((g & 0xfc) << 3) |
-		(b >> 3);
-	      obptr += 2;
-	    }
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-#else
-/* Render a 24-bit RGB image in buf into the GdkImage, without dithering.
-   This assumes native byte ordering - what should really be done is to
-   check whether static_image->byte_order is consistent with the _ENDIAN
-   config flag, and if not, use a different function.
-
-   This routine is faster than the one included with Gtk 1.0 for a number
-   of reasons:
-
-   1. Shifting instead of lookup tables (less memory traffic).
-
-   2. Much less register pressure, especially because shifts are
-   in the code.
-
-   3. A memcpy is avoided (i.e. the transfer function).
-
-   4. On big-endian architectures, byte swapping is avoided.
-
-   That said, it wouldn't be hard to make it even faster - just make an
-   inner loop that reads 3 words (i.e. 4 24-bit pixels), does a lot of
-   shifting and masking, then writes 2 words.
-*/
-static void
-gdk_rgb_convert_565 (GdkImage *image,
-		     gint x0, gint y0, gint width, gint height,
-		     guchar *buf, int rowstride,
-		     gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf;
-  gint bpl;
-  guchar *bptr, *bp2;
-  guchar r, g, b;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 2;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      for (x = 0; x < width; x++)
-	{
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  ((unsigned short *)obuf)[x] = ((r & 0xf8) << 8) |
-	    ((g & 0xfc) << 3) |
-	    (b >> 3);
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-#endif
-
-#ifdef HAIRY_CONVERT_565
-static void
-gdk_rgb_convert_565_gray (GdkImage *image,
-			  gint x0, gint y0, gint width, gint height,
-			  guchar *buf, int rowstride,
-			  gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf, *obptr;
-  gint bpl;
-  guchar *bptr, *bp2;
-  guchar g;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 2;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      obptr = obuf;
-      if (((unsigned long)obuf | (unsigned long) bp2) & 3)
-	{
-	  for (x = 0; x < width; x++)
-	    {
-	      g = *bp2++;
-	      ((guint16 *)obptr)[0] = ((g & 0xf8) << 8) |
-		((g & 0xfc) << 3) |
-		(g >> 3);
-	      obptr += 2;
-	    }
-	}
-      else
-	{
-	  for (x = 0; x < width - 3; x += 4)
-	    {
-	      guint32 g3g2g1g0;
-
-	      g3g2g1g0 = ((guint32 *)bp2)[0];
-	      ((guint32 *)obptr)[0] =
-		((g3g2g1g0 & 0xf8) << 8) |
-		((g3g2g1g0 & 0xfc) << 3) |
-		((g3g2g1g0 & 0xf8) >> 3) |
-		(g3g2g1g0 & 0xf800) << 16 |
-		((g3g2g1g0 & 0xfc00) << 11) |
-		((g3g2g1g0 & 0xf800) << 5);
-	      ((guint32 *)obptr)[1] =
-		((g3g2g1g0 & 0xf80000) >> 8) |
-		((g3g2g1g0 & 0xfc0000) >> 13) |
-		((g3g2g1g0 & 0xf80000) >> 19) |
-		(g3g2g1g0 & 0xf8000000) |
-		((g3g2g1g0 & 0xfc000000) >> 5) |
-		((g3g2g1g0 & 0xf8000000) >> 11);
-	      bp2 += 4;
-	      obptr += 8;
-	    }
-	  for (; x < width; x++)
-	    {
-	      g = *bp2++;
-	      ((guint16 *)obptr)[0] = ((g & 0xf8) << 8) |
-		((g & 0xfc) << 3) |
-		(g >> 3);
-	      obptr += 2;
-	    }
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-#else
-static void
-gdk_rgb_convert_565_gray (GdkImage *image,
-			  gint x0, gint y0, gint width, gint height,
-			  guchar *buf, int rowstride,
-			  gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf;
-  gint bpl;
-  guchar *bptr, *bp2;
-  guchar g;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 2;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      for (x = 0; x < width; x++)
-	{
-	  g = *bp2++;
-	  ((guint16 *)obuf)[x] = ((g & 0xf8) << 8) |
-	    ((g & 0xfc) << 3) |
-	    (g >> 3);
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-#endif
-
-static void
-gdk_rgb_convert_565_br (GdkImage *image,
-			gint x0, gint y0, gint width, gint height,
-			guchar *buf, int rowstride,
-			gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf;
-  gint bpl;
-  guchar *bptr, *bp2;
-  guchar r, g, b;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 2;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      for (x = 0; x < width; x++)
-	{
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  /* final word is:
-	     g4 g3 g2 b7 b6 b5 b4 b3  r7 r6 r5 r4 r3 g7 g6 g5
-	   */
-	  ((unsigned short *)obuf)[x] = (r & 0xf8) |
-	    ((g & 0xe0) >> 5) |
-	    ((g & 0x1c) << 11) |
-	    ((b & 0xf8) << 5);
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-/* Thanks to Ray Lehtiniemi for a patch that resulted in a ~25% speedup
-   in this mode. */
-#ifdef HAIRY_CONVERT_565
-static void
-gdk_rgb_convert_565_d (GdkImage *image,
-		     gint x0, gint y0, gint width, gint height,
-		     guchar *buf, int rowstride,
-		     gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  /* Now this is what I'd call some highly tuned code! */
-  int x, y;
-  guchar *obuf, *obptr;
-  gint bpl;
-  guchar *bptr, *bp2;
-
-  width += x_align;
-  height += y_align;
-  
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 2;
-  for (y = y_align; y < height; y++)
-    {
-      guint32 *dmp = DM_565 + ((y & (DM_HEIGHT - 1)) << DM_WIDTH_SHIFT);
-      bp2 = bptr;
-      obptr = obuf;
-      if (((unsigned long)obuf | (unsigned long) bp2) & 3)
-	{
-	  for (x = x_align; x < width; x++)
-	    {
-	      gint32 rgb = *bp2++ << 20;
-	      rgb += *bp2++ << 10;
-	      rgb += *bp2++;
-	      rgb += dmp[x & (DM_WIDTH - 1)];
-	      rgb += 0x10040100
-		- ((rgb & 0x1e0001e0) >> 5)
-		- ((rgb & 0x00070000) >> 6);
-
-	      ((unsigned short *)obptr)[0] =
-		((rgb & 0x0f800000) >> 12) |
-		((rgb & 0x0003f000) >> 7) |
-		((rgb & 0x000000f8) >> 3);
-	      obptr += 2;
-	    }
-	}
-      else
-	{
-	  for (x = x_align; x < width - 3; x += 4)
-	    {
-	      guint32 r1b0g0r0;
-	      guint32 g2r2b1g1;
-	      guint32 b3g3r3b2;
-	      guint32 rgb02, rgb13;
-
-	      r1b0g0r0 = ((guint32 *)bp2)[0];
-	      g2r2b1g1 = ((guint32 *)bp2)[1];
-	      b3g3r3b2 = ((guint32 *)bp2)[2];
-	      rgb02 =
-		((r1b0g0r0 & 0xff) << 20) +
-		((r1b0g0r0 & 0xff00) << 2) +
-		((r1b0g0r0 & 0xff0000) >> 16) +
-		dmp[x & (DM_WIDTH - 1)];
-	      rgb02 += 0x10040100
-		- ((rgb02 & 0x1e0001e0) >> 5)
-		- ((rgb02 & 0x00070000) >> 6);
-	      rgb13 =
-		((r1b0g0r0 & 0xff000000) >> 4) +
-		((g2r2b1g1 & 0xff) << 10) +
-		((g2r2b1g1 & 0xff00) >> 8) +
-		dmp[(x + 1) & (DM_WIDTH - 1)];
-	      rgb13 += 0x10040100
-		- ((rgb13 & 0x1e0001e0) >> 5)
-		- ((rgb13 & 0x00070000) >> 6);
-	      ((guint32 *)obptr)[0] =
-		((rgb02 & 0x0f800000) >> 12) |
-		((rgb02 & 0x0003f000) >> 7) |
-		((rgb02 & 0x000000f8) >> 3) |
-		((rgb13 & 0x0f800000) << 4) |
-		((rgb13 & 0x0003f000) << 9) |
-		((rgb13 & 0x000000f8) << 13);
-	      rgb02 =
-		((g2r2b1g1 & 0xff0000) << 4) +
-		((g2r2b1g1 & 0xff000000) >> 14) +
-		(b3g3r3b2 & 0xff) +
-		dmp[(x + 2) & (DM_WIDTH - 1)];
-	      rgb02 += 0x10040100
-		- ((rgb02 & 0x1e0001e0) >> 5)
-		- ((rgb02 & 0x00070000) >> 6);
-	      rgb13 =
-		((b3g3r3b2 & 0xff00) << 12) +
-		((b3g3r3b2 & 0xff0000) >> 6) +
-		((b3g3r3b2 & 0xff000000) >> 24) +
-		dmp[(x + 3) & (DM_WIDTH - 1)];
-	      rgb13 += 0x10040100
-		- ((rgb13 & 0x1e0001e0) >> 5)
-		- ((rgb13 & 0x00070000) >> 6);
-	      ((guint32 *)obptr)[1] =
-		((rgb02 & 0x0f800000) >> 12) |
-		((rgb02 & 0x0003f000) >> 7) |
-		((rgb02 & 0x000000f8) >> 3) |
-		((rgb13 & 0x0f800000) << 4) |
-		((rgb13 & 0x0003f000) << 9) |
-		((rgb13 & 0x000000f8) << 13);
-	      bp2 += 12;
-	      obptr += 8;
-	    }
-	  for (; x < width; x++)
-	    {
-	      gint32 rgb = *bp2++ << 20;
-	      rgb += *bp2++ << 10;
-	      rgb += *bp2++;
-	      rgb += dmp[x & (DM_WIDTH - 1)];
-	      rgb += 0x10040100
-		- ((rgb & 0x1e0001e0) >> 5)
-		- ((rgb & 0x00070000) >> 6);
-
-	      ((unsigned short *)obptr)[0] =
-		((rgb & 0x0f800000) >> 12) |
-		((rgb & 0x0003f000) >> 7) |
-		((rgb & 0x000000f8) >> 3);
-	      obptr += 2;
-	    }
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-#else
-static void
-gdk_rgb_convert_565_d (GdkImage *image,
-                       gint x0, gint y0, gint width, gint height,
-                       guchar *buf, int rowstride,
-                       gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf;
-  gint bpl;
-  guchar *bptr;
-
-  width += x_align;
-  height += y_align;
-  
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + (x0 - x_align) * 2;
-
-  for (y = y_align; y < height; y++)
-    {
-      guint32 *dmp = DM_565 + ((y & (DM_HEIGHT - 1)) << DM_WIDTH_SHIFT);
-      guchar *bp2 = bptr;
-
-      for (x = x_align; x < width; x++)
-        {
-          gint32 rgb = *bp2++ << 20;
-          rgb += *bp2++ << 10;
-          rgb += *bp2++;
-	  rgb += dmp[x & (DM_WIDTH - 1)];
-          rgb += 0x10040100
-            - ((rgb & 0x1e0001e0) >> 5)
-            - ((rgb & 0x00070000) >> 6);
-
-          ((unsigned short *)obuf)[x] =
-            ((rgb & 0x0f800000) >> 12) |
-            ((rgb & 0x0003f000) >> 7) |
-            ((rgb & 0x000000f8) >> 3);
-        }
-
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-#endif
-
-static void
-gdk_rgb_convert_555 (GdkImage *image,
-		     gint x0, gint y0, gint width, gint height,
-		     guchar *buf, int rowstride,
-		     gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf;
-  gint bpl;
-  guchar *bptr, *bp2;
-  guchar r, g, b;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 2;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      for (x = 0; x < width; x++)
-	{
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  ((unsigned short *)obuf)[x] = ((r & 0xf8) << 7) |
-	    ((g & 0xf8) << 2) |
-	    (b >> 3);
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-static void
-gdk_rgb_convert_555_br (GdkImage *image,
-			gint x0, gint y0, gint width, gint height,
-			guchar *buf, int rowstride,
-			gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf;
-  gint bpl;
-  guchar *bptr, *bp2;
-  guchar r, g, b;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 2;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      for (x = 0; x < width; x++)
-	{
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  /* final word is:
-	     g5 g4 g3 b7 b6 b5 b4 b3  0 r7 r6 r5 r4 r3 g7 g6
-	   */
-	  ((unsigned short *)obuf)[x] = ((r & 0xf8) >> 1) |
-	    ((g & 0xc0) >> 6) |
-	    ((g & 0x18) << 10) |
-	    ((b & 0xf8) << 5);
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-static void
-gdk_rgb_convert_888_msb (GdkImage *image,
-			 gint x0, gint y0, gint width, gint height,
-			 guchar *buf, int rowstride,
-			 gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int y;
-  guchar *obuf;
-  gint bpl;
-  guchar *bptr;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 3;
-  for (y = 0; y < height; y++)
-    {
-      memcpy (obuf, bptr, width + width + width);
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-/* todo: optimize this */
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define HAIRY_CONVERT_888
-#endif
-
-#ifdef HAIRY_CONVERT_888
-static void
-gdk_rgb_convert_888_lsb (GdkImage *image,
-			 gint x0, gint y0, gint width, gint height,
-			 guchar *buf, int rowstride,
-			 gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf, *obptr;
-  gint bpl;
-  guchar *bptr, *bp2;
-  int r, g, b;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 3;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      obptr = obuf;
-      if (((unsigned long)obuf | (unsigned long) bp2) & 3)
-	{
-	  for (x = 0; x < width; x++)
-	    {
-	      r = bp2[0];
-	      g = bp2[1];
-	      b = bp2[2];
-	      *obptr++ = b;
-	      *obptr++ = g;
-	      *obptr++ = r;
-	      bp2 += 3;
-	    }
-	}
-      else
-	{
-	  for (x = 0; x < width - 3; x += 4)
-	    {
-	      guint32 r1b0g0r0;
-	      guint32 g2r2b1g1;
-	      guint32 b3g3r3b2;
-
-	      r1b0g0r0 = ((guint32 *)bp2)[0];
-	      g2r2b1g1 = ((guint32 *)bp2)[1];
-	      b3g3r3b2 = ((guint32 *)bp2)[2];
-	      ((guint32 *)obptr)[0] =
-		(r1b0g0r0 & 0xff00) |
-		((r1b0g0r0 & 0xff0000) >> 16) |
-		(((g2r2b1g1 & 0xff00) | (r1b0g0r0 & 0xff)) << 16);
-	      ((guint32 *)obptr)[1] =
-		(g2r2b1g1 & 0xff0000ff) |
-		((r1b0g0r0 & 0xff000000) >> 16) |
-		((b3g3r3b2 & 0xff) << 16);
-	      ((guint32 *)obptr)[2] =
-		(((g2r2b1g1 & 0xff0000) | (b3g3r3b2 & 0xff000000)) >> 16) |
-		((b3g3r3b2 & 0xff00) << 16) |
-		((b3g3r3b2 & 0xff0000));
-	      bp2 += 12;
-	      obptr += 12;
-	    }
-	  for (; x < width; x++)
-	    {
-	      r = bp2[0];
-	      g = bp2[1];
-	      b = bp2[2];
-	      *obptr++ = b;
-	      *obptr++ = g;
-	      *obptr++ = r;
-	      bp2 += 3;
-	    }
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-#else
-static void
-gdk_rgb_convert_888_lsb (GdkImage *image,
-			 gint x0, gint y0, gint width, gint height,
-			 guchar *buf, int rowstride,
-			 gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf;
-  gint bpl;
-  guchar *bptr, *bp2;
-  int r, g, b;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 3;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      for (x = 0; x < width; x++)
-	{
-	  r = bp2[0];
-	  g = bp2[1];
-	  b = bp2[2];
-	  obuf[x * 3] = b;
-	  obuf[x * 3 + 1] = g;
-	  obuf[x * 3 + 2] = r;
-	  bp2 += 3;
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-#endif
-
-/* convert 24-bit packed to 32-bit unpacked */
-/* todo: optimize this */
-static void
-gdk_rgb_convert_0888 (GdkImage *image,
-		      gint x0, gint y0, gint width, gint height,
-		      guchar *buf, int rowstride,
-		      gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf;
-  gint bpl;
-  guchar *bptr, *bp2;
-  int r, g, b;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 4;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      for (x = 0; x < width; x++)
-	{
-	  r = bp2[0];
-	  g = bp2[1];
-	  b = bp2[2];
-	  ((guint32 *)obuf)[x] = (r << 16) | (g << 8) | b;
-	  bp2 += 3;
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-static void
-gdk_rgb_convert_0888_br (GdkImage *image,
-			 gint x0, gint y0, gint width, gint height,
-			 guchar *buf, int rowstride,
-			 gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf;
-  gint bpl;
-  guchar *bptr, *bp2;
-  int r, g, b;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 4;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      for (x = 0; x < width; x++)
-	{
-	  r = bp2[0];
-	  g = bp2[1];
-	  b = bp2[2];
-	  ((guint32 *)obuf)[x] = (b << 24) | (g << 16) | (r << 8);
-	  bp2 += 3;
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-static void
-gdk_rgb_convert_8880_br (GdkImage *image,
-			 gint x0, gint y0, gint width, gint height,
-			 guchar *buf, int rowstride,
-			 gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf;
-  gint bpl;
-  guchar *bptr, *bp2;
-  int r, g, b;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * 4;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      for (x = 0; x < width; x++)
-	{
-	  r = bp2[0];
-	  g = bp2[1];
-	  b = bp2[2];
-	  ((guint32 *)obuf)[x] = (b << 16) | (g << 8) | r;
-	  bp2 += 3;
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-/* Generic truecolor/directcolor conversion function. Slow, but these
-   are oddball modes. */
-static void
-gdk_rgb_convert_truecolor_lsb (GdkImage *image,
-			       gint x0, gint y0, gint width, gint height,
-			       guchar *buf, int rowstride,
-			       gint x_align, gint y_align,
-			       GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf, *obptr;
-  gint bpl;
-  guchar *bptr, *bp2;
-  gint r, g, b;
-  gint r_right, r_left;
-  gint g_right, g_left;
-  gint b_right, b_left;
-  gint bpp;
-  guint32 pixel;
-  gint i;
-
-  r_right = 8 - image_info->visual->red_prec;
-  r_left = image_info->visual->red_shift;
-  g_right = 8 - image_info->visual->green_prec;
-  g_left = image_info->visual->green_shift;
-  b_right = 8 - image_info->visual->blue_prec;
-  b_left = image_info->visual->blue_shift;
-  bpp = image_info->bpp;
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * bpp;
-  for (y = 0; y < height; y++)
-    {
-      obptr = obuf;
-      bp2 = bptr;
-      for (x = 0; x < width; x++)
-	{
-	  r = bp2[0];
-	  g = bp2[1];
-	  b = bp2[2];
-	  pixel = ((r >> r_right) << r_left) |
-	    ((g >> g_right) << g_left) |
-	    ((b >> b_right) << b_left);
-	  for (i = 0; i < bpp; i++)
-	    {
-	      *obptr++ = pixel & 0xff;
-	      pixel >>= 8;
-	    }
-	  bp2 += 3;
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-static void
-gdk_rgb_convert_truecolor_lsb_d (GdkImage *image,
-				 gint x0, gint y0, gint width, gint height,
-				 guchar *buf, int rowstride,
-				 gint x_align, gint y_align,
-				 GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf, *obptr;
-  gint bpl;
-  guchar *bptr, *bp2;
-  gint r, g, b;
-  gint r_right, r_left, r_prec;
-  gint g_right, g_left, g_prec;
-  gint b_right, b_left, b_prec;
-  gint bpp;
-  guint32 pixel;
-  gint i;
-  gint dith;
-  gint r1, g1, b1;
-  const guchar *dmp;
-
-  r_right = 8 - image_info->visual->red_prec;
-  r_left = image_info->visual->red_shift;
-  r_prec = image_info->visual->red_prec;
-  g_right = 8 - image_info->visual->green_prec;
-  g_left = image_info->visual->green_shift;
-  g_prec = image_info->visual->green_prec;
-  b_right = 8 - image_info->visual->blue_prec;
-  b_left = image_info->visual->blue_shift;
-  b_prec = image_info->visual->blue_prec;
-  bpp = image_info->bpp;
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * bpp;
-  for (y = 0; y < height; y++)
-    {
-      dmp = DM[(y_align + y) & (DM_HEIGHT - 1)];
-      obptr = obuf;
-      bp2 = bptr;
-      for (x = 0; x < width; x++)
-	{
-	  r = bp2[0];
-	  g = bp2[1];
-	  b = bp2[2];
-	  dith = dmp[(x_align + x) & (DM_WIDTH - 1)] << 2;
-	  r1 = r + (dith >> r_prec);
-	  g1 = g + ((252 - dith) >> g_prec);
-	  b1 = b + (dith >> b_prec);
-	  pixel = (((r1 - (r1 >> r_prec)) >> r_right) << r_left) |
-	    (((g1 - (g1 >> g_prec)) >> g_right) << g_left) |
-	    (((b1 - (b1 >> b_prec)) >> b_right) << b_left);
-	  for (i = 0; i < bpp; i++)
-	    {
-	      *obptr++ = pixel & 0xff;
-	      pixel >>= 8;
-	    }
-	  bp2 += 3;
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-static void
-gdk_rgb_convert_truecolor_msb (GdkImage *image,
-			       gint x0, gint y0, gint width, gint height,
-			       guchar *buf, int rowstride,
-			       gint x_align, gint y_align,
-			       GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf, *obptr;
-  gint bpl;
-  guchar *bptr, *bp2;
-  gint r, g, b;
-  gint r_right, r_left;
-  gint g_right, g_left;
-  gint b_right, b_left;
-  gint bpp;
-  guint32 pixel;
-  gint shift, shift_init;
-
-  r_right = 8 - image_info->visual->red_prec;
-  r_left = image_info->visual->red_shift;
-  g_right = 8 - image_info->visual->green_prec;
-  g_left = image_info->visual->green_shift;
-  b_right = 8 - image_info->visual->blue_prec;
-  b_left = image_info->visual->blue_shift;
-  bpp = image_info->bpp;
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * bpp;
-  shift_init = (bpp - 1) << 3;
-  for (y = 0; y < height; y++)
-    {
-      obptr = obuf;
-      bp2 = bptr;
-      for (x = 0; x < width; x++)
-	{
-	  r = bp2[0];
-	  g = bp2[1];
-	  b = bp2[2];
-	  pixel = ((r >> r_right) << r_left) |
-	    ((g >> g_right) << g_left) |
-	    ((b >> b_right) << b_left);
-	  for (shift = shift_init; shift >= 0; shift -= 8)
-	    {
-	      *obptr++ = (pixel >> shift) & 0xff;
-	    }
-	  bp2 += 3;
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-static void
-gdk_rgb_convert_truecolor_msb_d (GdkImage *image,
-				 gint x0, gint y0, gint width, gint height,
-				 guchar *buf, int rowstride,
-				 gint x_align, gint y_align,
-				 GdkRgbCmap *cmap)
-{
-  int x, y;
-  guchar *obuf, *obptr;
-  gint bpl;
-  guchar *bptr, *bp2;
-  gint r, g, b;
-  gint r_right, r_left, r_prec;
-  gint g_right, g_left, g_prec;
-  gint b_right, b_left, b_prec;
-  gint bpp;
-  guint32 pixel;
-  gint shift, shift_init;
-  gint dith;
-  gint r1, g1, b1;
-  const guchar *dmp;
-
-  r_right = 8 - image_info->visual->red_prec;
-  r_left = image_info->visual->red_shift;
-  r_prec = image_info->visual->red_prec;
-  g_right = 8 - image_info->visual->green_prec;
-  g_left = image_info->visual->green_shift;
-  g_prec = image_info->visual->green_prec;
-  b_right = 8 - image_info->visual->blue_prec;
-  b_left = image_info->visual->blue_shift;
-  b_prec = image_info->visual->blue_prec;
-  bpp = image_info->bpp;
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0 * bpp;
-  shift_init = (bpp - 1) << 3;
-  for (y = 0; y < height; y++)
-    {
-      dmp = DM[(y_align + y) & (DM_HEIGHT - 1)];
-      obptr = obuf;
-      bp2 = bptr;
-      for (x = 0; x < width; x++)
-	{
-	  r = bp2[0];
-	  g = bp2[1];
-	  b = bp2[2];
-	  dith = dmp[(x_align + x) & (DM_WIDTH - 1)] << 2;
-	  r1 = r + (dith >> r_prec);
-	  g1 = g + ((252 - dith) >> g_prec);
-	  b1 = b + (dith >> b_prec);
-	  pixel = (((r1 - (r1 >> r_prec)) >> r_right) << r_left) |
-	    (((g1 - (g1 >> g_prec)) >> g_right) << g_left) |
-	    (((b1 - (b1 >> b_prec)) >> b_right) << b_left);
-	  for (shift = shift_init; shift >= 0; shift -= 8)
-	    {
-	      *obptr++ = (pixel >> shift) & 0xff;
-	    }
-	  bp2 += 3;
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-/* This actually works for depths from 3 to 7 */
-static void
-gdk_rgb_convert_4 (GdkImage *image,
-		   gint x0, gint y0, gint width, gint height,
-		   guchar *buf, int rowstride,
-		   gint x_align, gint y_align,
-		   GdkRgbCmap *cmap)
-{
-  int x, y;
-  gint bpl;
-  guchar *obuf, *obptr;
-  guchar *bptr, *bp2;
-  gint r, g, b;
-  const guchar *dmp;
-  gint dith;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0;
-  for (y = 0; y < height; y++)
-    {
-      dmp = DM[(y_align + y) & (DM_HEIGHT - 1)];
-      bp2 = bptr;
-      obptr = obuf;
-      for (x = 0; x < width; x += 1)
-	{
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  dith = (dmp[(x_align + x) & (DM_WIDTH - 1)] << 2) | 3;
-	  obptr[0] = colorcube_d[(((r + dith) & 0x100) >> 2) |
-				(((g + 258 - dith) & 0x100) >> 5) |
-				(((b + dith) & 0x100) >> 8)];
-	  obptr++;
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-/* This actually works for depths from 3 to 7 */
-static void
-gdk_rgb_convert_gray4 (GdkImage *image,
-		       gint x0, gint y0, gint width, gint height,
-		       guchar *buf, int rowstride,
-		       gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  gint bpl;
-  guchar *obuf, *obptr;
-  guchar *bptr, *bp2;
-  gint r, g, b;
-  gint shift;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0;
-  shift = 9 - image_info->visual->depth;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      obptr = obuf;
-      for (x = 0; x < width; x++)
-	{
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  obptr[0] = (g + ((b + r) >> 1)) >> shift;
-	  obptr++;
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-static void
-gdk_rgb_convert_gray4_pack (GdkImage *image,
-			    gint x0, gint y0, gint width, gint height,
-			    guchar *buf, int rowstride,
-			    gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  gint bpl;
-  guchar *obuf, *obptr;
-  guchar *bptr, *bp2;
-  gint r, g, b;
-  gint shift;
-  guchar pix0, pix1;
-  /* todo: this is hardcoded to big-endian. Make endian-agile. */
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + (x0 >> 1);
-  shift = 9 - image_info->visual->depth;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      obptr = obuf;
-      for (x = 0; x < width; x += 2)
-	{
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  pix0 = (g + ((b + r) >> 1)) >> shift;
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  pix1 = (g + ((b + r) >> 1)) >> shift;
-	  obptr[0] = (pix0 << 4) | pix1;
-	  obptr++;
-	}
-      if (width & 1)
-	{
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  pix0 = (g + ((b + r) >> 1)) >> shift;
-	  obptr[0] = (pix0 << 4);
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-/* This actually works for depths from 3 to 7 */
-static void
-gdk_rgb_convert_gray4_d (GdkImage *image,
-		       gint x0, gint y0, gint width, gint height,
-		       guchar *buf, int rowstride,
-		       gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  gint bpl;
-  guchar *obuf, *obptr;
-  guchar *bptr, *bp2;
-  gint r, g, b;
-  const guchar *dmp;
-  gint prec, right;
-  gint gray;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + x0;
-  prec = image_info->visual->depth;
-  right = 8 - prec;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      obptr = obuf;
-      dmp = DM[(y_align + y) & (DM_HEIGHT - 1)];
-      for (x = 0; x < width; x++)
-	{
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  gray = (g + ((b + r) >> 1)) >> 1;
-	  gray += (dmp[(x_align + x) & (DM_WIDTH - 1)] << 2) >> prec;
-	  obptr[0] = (gray - (gray >> prec)) >> right;
-	  obptr++;
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-static void
-gdk_rgb_convert_gray4_d_pack (GdkImage *image,
-			      gint x0, gint y0, gint width, gint height,
-			      guchar *buf, int rowstride,
-			      gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  int x, y;
-  gint bpl;
-  guchar *obuf, *obptr;
-  guchar *bptr, *bp2;
-  gint r, g, b;
-  const guchar *dmp;
-  gint prec, right;
-  gint gray;
-  guchar pix0, pix1;
-  /* todo: this is hardcoded to big-endian. Make endian-agile. */
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + (x0 >> 1);
-  prec = image_info->visual->depth;
-  right = 8 - prec;
-  for (y = 0; y < height; y++)
-    {
-      bp2 = bptr;
-      obptr = obuf;
-      dmp = DM[(y_align + y) & (DM_HEIGHT - 1)];
-      for (x = 0; x < width; x += 2)
-	{
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  gray = (g + ((b + r) >> 1)) >> 1;
-	  gray += (dmp[(x_align + x) & (DM_WIDTH - 1)] << 2) >> prec;
-	  pix0 = (gray - (gray >> prec)) >> right;
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  gray = (g + ((b + r) >> 1)) >> 1;
-	  gray += (dmp[(x_align + x + 1) & (DM_WIDTH - 1)] << 2) >> prec;
-	  pix1 = (gray - (gray >> prec)) >> right;
-	  obptr[0] = (pix0 << 4) | pix1;
-	  obptr++;
-	}
-      if (width & 1)
-	{
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  gray = (g + ((b + r) >> 1)) >> 1;
-	  gray += (dmp[(x_align + x + 1) & (DM_WIDTH - 1)] << 2) >> prec;
-	  pix0 = (gray - (gray >> prec)) >> right;
-	  obptr[0] = (pix0 << 4);
-	}
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-static void
-gdk_rgb_convert_1 (GdkImage *image,
-		   gint x0, gint y0, gint width, gint height,
-		   guchar *buf, int rowstride,
-		   gint x_align, gint y_align,
-		   GdkRgbCmap *cmap)
-{
-  int x, y;
-  gint bpl;
-  guchar *obuf, *obptr;
-  guchar *bptr, *bp2;
-  gint r, g, b;
-  const guchar *dmp;
-  gint dith;
-  guchar byte;
-
-  bptr = buf;
-  bpl = image->bpl;
-  obuf = ((guchar *)image->mem) + y0 * bpl + (x0 >> 3);
-  byte = 0; /* unnecessary, but it keeps gcc from complaining */
-  for (y = 0; y < height; y++)
-    {
-      dmp = DM[(y_align + y) & (DM_HEIGHT - 1)];
-      bp2 = bptr;
-      obptr = obuf;
-      for (x = 0; x < width; x++)
-	{
-	  r = *bp2++;
-	  g = *bp2++;
-	  b = *bp2++;
-	  dith = (dmp[(x_align + x) & (DM_WIDTH - 1)] << 4) | 4;
-	  byte += byte + (r + g + g + b + dith > 1020);
-	  if ((x & 7) == 7)
-	    {
-	      obptr[0] = byte;
-	      obptr++;
-	    }
-	}
-      if (x & 7)
-	obptr[0] = byte << (8 - (x & 7));
-      bptr += rowstride;
-      obuf += bpl;
-    }
-}
-
-/* Returns a pointer to the stage buffer. */
-static guchar *
-gdk_rgb_ensure_stage (void)
-{
-  if (image_info->stage_buf == NULL)
-    image_info->stage_buf = g_malloc (IMAGE_HEIGHT * STAGE_ROWSTRIDE);
-  return image_info->stage_buf;
-}
-
-/* This is slow. Speed me up, please. */
-static void
-gdk_rgb_32_to_stage (guchar *buf, gint rowstride, gint width, gint height)
-{
-  gint x, y;
-  guchar *pi_start, *po_start;
-  guchar *pi, *po;
-
-  pi_start = buf;
-  po_start = gdk_rgb_ensure_stage ();
-  for (y = 0; y < height; y++)
-    {
-      pi = pi_start;
-      po = po_start;
-      for (x = 0; x < width; x++)
-	{
-	  *po++ = *pi++;
-	  *po++ = *pi++;
-	  *po++ = *pi++;
-	  pi++;
-	}
-      pi_start += rowstride;
-      po_start += STAGE_ROWSTRIDE;
-    }
-}
-
-/* Generic 32bit RGB conversion function - convert to 24bit packed, then
-   go from there. */
-static void
-gdk_rgb_convert_32_generic (GdkImage *image,
-			    gint x0, gint y0, gint width, gint height,
-			    guchar *buf, gint rowstride,
-			    gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  gdk_rgb_32_to_stage (buf, rowstride, width, height);
-
-  (*image_info->conv) (image, x0, y0, width, height,
-		       image_info->stage_buf, STAGE_ROWSTRIDE,
-		       x_align, y_align, cmap);
-}
-
-/* Generic 32bit RGB conversion function - convert to 24bit packed, then
-   go from there. */
-static void
-gdk_rgb_convert_32_generic_d (GdkImage *image,
-			      gint x0, gint y0, gint width, gint height,
-			      guchar *buf, gint rowstride,
-			      gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  gdk_rgb_32_to_stage (buf, rowstride, width, height);
-
-  (*image_info->conv_d) (image, x0, y0, width, height,
-			 image_info->stage_buf, STAGE_ROWSTRIDE,
-			 x_align, y_align, cmap);
-}
-
-/* This is slow. Speed me up, please. */
-static void
-gdk_rgb_gray_to_stage (guchar *buf, gint rowstride, gint width, gint height)
-{
-  gint x, y;
-  guchar *pi_start, *po_start;
-  guchar *pi, *po;
-  guchar gray;
-
-  pi_start = buf;
-  po_start = gdk_rgb_ensure_stage ();
-  for (y = 0; y < height; y++)
-    {
-      pi = pi_start;
-      po = po_start;
-      for (x = 0; x < width; x++)
-	{
-	  gray = *pi++;
-	  *po++ = gray;
-	  *po++ = gray;
-	  *po++ = gray;
-	}
-      pi_start += rowstride;
-      po_start += STAGE_ROWSTRIDE;
-    }
-}
-
-/* Generic gray conversion function - convert to 24bit packed, then go
-   from there. */
-static void
-gdk_rgb_convert_gray_generic (GdkImage *image,
-			      gint x0, gint y0, gint width, gint height,
-			      guchar *buf, gint rowstride,
-			      gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  gdk_rgb_gray_to_stage (buf, rowstride, width, height);
-
-  (*image_info->conv) (image, x0, y0, width, height,
-		       image_info->stage_buf, STAGE_ROWSTRIDE,
-		       x_align, y_align, cmap);
-}
-
-static void
-gdk_rgb_convert_gray_generic_d (GdkImage *image,
-				gint x0, gint y0, gint width, gint height,
-				guchar *buf, gint rowstride,
-				gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  gdk_rgb_gray_to_stage (buf, rowstride, width, height);
-
-  (*image_info->conv_d) (image, x0, y0, width, height,
-			 image_info->stage_buf, STAGE_ROWSTRIDE,
-			 x_align, y_align, cmap);
-}
-
-/* Render grayscale using indexed method. */
-static void
-gdk_rgb_convert_gray_cmap (GdkImage *image,
-			   gint x0, gint y0, gint width, gint height,
-			   guchar *buf, gint rowstride,
-			   gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  (*image_info->conv_indexed) (image, x0, y0, width, height,
-			       buf, rowstride,
-			       x_align, y_align, image_info->gray_cmap);
-}
-
-#if 0
-static void
-gdk_rgb_convert_gray_cmap_d (GdkImage *image,
-				gint x0, gint y0, gint width, gint height,
-				guchar *buf, gint rowstride,
-				gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  (*image_info->conv_indexed_d) (image, x0, y0, width, height,
-				 buf, rowstride,
-				 x_align, y_align, image_info->gray_cmap);
-}
-#endif
-
-/* This is slow. Speed me up, please. */
-static void
-gdk_rgb_indexed_to_stage (guchar *buf, gint rowstride, gint width, gint height,
-			  GdkRgbCmap *cmap)
-{
-  gint x, y;
-  guchar *pi_start, *po_start;
-  guchar *pi, *po;
-  gint rgb;
-
-  pi_start = buf;
-  po_start = gdk_rgb_ensure_stage ();
-  for (y = 0; y < height; y++)
-    {
-      pi = pi_start;
-      po = po_start;
-      for (x = 0; x < width; x++)
-	{
-	  rgb = cmap->colors[*pi++];
-	  *po++ = rgb >> 16;
-	  *po++ = (rgb >> 8) & 0xff;
-	  *po++ = rgb & 0xff;
-	}
-      pi_start += rowstride;
-      po_start += STAGE_ROWSTRIDE;
-    }
-}
-
-/* Generic gray conversion function - convert to 24bit packed, then go
-   from there. */
-static void
-gdk_rgb_convert_indexed_generic (GdkImage *image,
-				 gint x0, gint y0, gint width, gint height,
-				 guchar *buf, gint rowstride,
-				 gint x_align, gint y_align, GdkRgbCmap *cmap)
-{
-  gdk_rgb_indexed_to_stage (buf, rowstride, width, height, cmap);
-
-  (*image_info->conv) (image, x0, y0, width, height,
-		       image_info->stage_buf, STAGE_ROWSTRIDE,
-		       x_align, y_align, cmap);
-}
-
-static void
-gdk_rgb_convert_indexed_generic_d (GdkImage *image,
-				   gint x0, gint y0, gint width, gint height,
-				   guchar *buf, gint rowstride,
-				   gint x_align, gint y_align,
-				   GdkRgbCmap *cmap)
-{
-  gdk_rgb_indexed_to_stage (buf, rowstride, width, height, cmap);
-
-  (*image_info->conv_d) (image, x0, y0, width, height,
-			 image_info->stage_buf, STAGE_ROWSTRIDE,
-			 x_align, y_align, cmap);
-}
-
-/* Select a conversion function based on the visual and a
-   representative image. */
-static void
-gdk_rgb_select_conv (GdkImage *image)
-{
-  GdkByteOrder byte_order;
-  gint depth, bpp, byterev;
-  GdkVisualType vtype;
-  guint32 red_mask, green_mask, blue_mask;
-  GdkRgbConvFunc conv, conv_d;
-  GdkRgbConvFunc conv_32, conv_32_d;
-  GdkRgbConvFunc conv_gray, conv_gray_d;
-  GdkRgbConvFunc conv_indexed, conv_indexed_d;
-  gboolean mask_rgb, mask_bgr;
-
-  depth = image_info->visual->depth;
-#if GDK_WINDOWING == GDK_WINDOWING_X11
-  bpp = ((GdkImagePrivate *)image)->ximage->bits_per_pixel;
-#elif GDK_WINDOWING == GDK_WINDOWING_WIN32
-  bpp = ((GdkVisualPrivate *) gdk_visual_get_system())->xvisual->bitspixel;
-#endif
-  byte_order = image->byte_order;
-  if (gdk_rgb_verbose)
-    g_print ("Chose visual 0x%x, image bpp=%d, depth = %d %s first\n",
-	     (gint)(((GdkVisualPrivate *)image_info->visual)->xvisual->visualid),
-	     bpp, depth, byte_order == GDK_LSB_FIRST ? "lsb" : "msb");
-
-#if G_BYTE_ORDER == G_BIG_ENDIAN
-  byterev = (byte_order == GDK_LSB_FIRST);
-#else
-  byterev = (byte_order == GDK_MSB_FIRST);
-#endif
-
-  vtype = image_info->visual->type;
-  if (vtype == GDK_VISUAL_DIRECT_COLOR)
-    vtype = GDK_VISUAL_TRUE_COLOR;
-
-  red_mask = image_info->visual->red_mask;
-  green_mask = image_info->visual->green_mask;
-  blue_mask = image_info->visual->blue_mask;
-
-  mask_rgb = red_mask == 0xff0000 && green_mask == 0xff00 && blue_mask == 0xff;
-  mask_bgr = red_mask == 0xff && green_mask == 0xff00 && blue_mask == 0xff0000;
-
-  conv = NULL;
-  conv_d = NULL;
-
-  conv_32 = gdk_rgb_convert_32_generic;
-  conv_32_d = gdk_rgb_convert_32_generic_d;
-
-  conv_gray = gdk_rgb_convert_gray_generic;
-  conv_gray_d = gdk_rgb_convert_gray_generic_d;
-
-  conv_indexed = gdk_rgb_convert_indexed_generic;
-  conv_indexed_d = gdk_rgb_convert_indexed_generic_d;
-
-  image_info->dith_default = FALSE;
-
-  if (image_info->bitmap)
-    conv = gdk_rgb_convert_1;
-  else if (bpp == 16 && depth == 16 && !byterev &&
-      red_mask == 0xf800 && green_mask == 0x7e0 && blue_mask == 0x1f)
-    {
-      conv = gdk_rgb_convert_565;
-      conv_d = gdk_rgb_convert_565_d;
-      conv_gray = gdk_rgb_convert_565_gray;
-      gdk_rgb_preprocess_dm_565 ();
-    }
-  else if (bpp == 16 && depth == 16 &&
-	   vtype == GDK_VISUAL_TRUE_COLOR && byterev &&
-      red_mask == 0xf800 && green_mask == 0x7e0 && blue_mask == 0x1f)
-    conv = gdk_rgb_convert_565_br;
-
-  else if (bpp == 16 && depth == 15 &&
-	   vtype == GDK_VISUAL_TRUE_COLOR && !byterev &&
-      red_mask == 0x7c00 && green_mask == 0x3e0 && blue_mask == 0x1f)
-    conv = gdk_rgb_convert_555;
-
-  else if (bpp == 16 && depth == 15 &&
-	   vtype == GDK_VISUAL_TRUE_COLOR && byterev &&
-      red_mask == 0x7c00 && green_mask == 0x3e0 && blue_mask == 0x1f)
-    conv = gdk_rgb_convert_555_br;
-
-  /* I'm not 100% sure about the 24bpp tests - but testing will show*/
-  else if (bpp == 24 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
-	   ((mask_rgb && byte_order == GDK_LSB_FIRST) ||
-	    (mask_bgr && byte_order == GDK_MSB_FIRST)))
-    conv = gdk_rgb_convert_888_lsb;
-  else if (bpp == 24 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
-	   ((mask_rgb && byte_order == GDK_MSB_FIRST) ||
-	    (mask_bgr && byte_order == GDK_LSB_FIRST)))
-    conv = gdk_rgb_convert_888_msb;
-#if G_BYTE_ORDER == G_BIG_ENDIAN
-  else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
-	   (mask_rgb && byte_order == GDK_LSB_FIRST))
-    conv = gdk_rgb_convert_0888_br;
-  else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
-	   (mask_rgb && byte_order == GDK_MSB_FIRST))
-    conv = gdk_rgb_convert_0888;
-  else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
-	   (mask_bgr && byte_order == GDK_MSB_FIRST))
-    conv = gdk_rgb_convert_8880_br;
-#else
-  else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
-	   (mask_rgb && byte_order == GDK_MSB_FIRST))
-    conv = gdk_rgb_convert_0888_br;
-  else if (bpp == 32 && (depth == 24 || depth == 32) && vtype == GDK_VISUAL_TRUE_COLOR &&
-	   (mask_rgb && byte_order == GDK_LSB_FIRST))
-    conv = gdk_rgb_convert_0888;
-  else if (bpp == 32 && depth == 24 && vtype == GDK_VISUAL_TRUE_COLOR &&
-	   (mask_bgr && byte_order == GDK_LSB_FIRST))
-    conv = gdk_rgb_convert_8880_br;
-#endif
-
-  else if (vtype == GDK_VISUAL_TRUE_COLOR && byte_order == GDK_LSB_FIRST)
-    {
-      conv = gdk_rgb_convert_truecolor_lsb;
-      conv_d = gdk_rgb_convert_truecolor_lsb_d;
-    }
-  else if (vtype == GDK_VISUAL_TRUE_COLOR && byte_order == GDK_MSB_FIRST)
-    {
-      conv = gdk_rgb_convert_truecolor_msb;
-      conv_d = gdk_rgb_convert_truecolor_msb_d;
-    }
-  else if (bpp == 8 && depth == 8 && (vtype == GDK_VISUAL_PSEUDO_COLOR
-#ifdef ENABLE_GRAYSCALE
-				      || vtype == GDK_VISUAL_GRAYSCALE
-#endif
-				      ))
-    {
-      image_info->dith_default = TRUE;
-      conv = gdk_rgb_convert_8;
-      if (vtype != GDK_VISUAL_GRAYSCALE)
-	{
-	  if (image_info->nred_shades == 6 &&
-	      image_info->ngreen_shades == 6 &&
-	      image_info->nblue_shades == 6)
-	    conv_d = gdk_rgb_convert_8_d666;
-	  else
-	    conv_d = gdk_rgb_convert_8_d;
-	}
-      conv_indexed = gdk_rgb_convert_8_indexed;
-      conv_gray = gdk_rgb_convert_gray_cmap;
-    }
-  else if (bpp == 8 && depth == 8 && (vtype == GDK_VISUAL_STATIC_GRAY
-#ifdef not_ENABLE_GRAYSCALE
-				      || vtype == GDK_VISUAL_GRAYSCALE
-#endif
-				      ))
-    {
-      conv = gdk_rgb_convert_gray8;
-      conv_gray = gdk_rgb_convert_gray8_gray;
-    }
-  else if (bpp == 8 && depth < 8 && depth >= 2 &&
-	   (vtype == GDK_VISUAL_STATIC_GRAY
-	    || vtype == GDK_VISUAL_GRAYSCALE))
-    {
-      conv = gdk_rgb_convert_gray4;
-      conv_d = gdk_rgb_convert_gray4_d;
-    }
-  else if (bpp == 8 && depth < 8 && depth >= 3)
-    {
-      conv = gdk_rgb_convert_4;
-    }
-  else if (bpp == 4 && depth <= 4 && depth >= 2 &&
-	   (vtype == GDK_VISUAL_STATIC_GRAY
-	    || vtype == GDK_VISUAL_GRAYSCALE))
-    {
-      conv = gdk_rgb_convert_gray4_pack;
-      conv_d = gdk_rgb_convert_gray4_d_pack;
-    }
-
-  if (conv_d == NULL)
-    conv_d = conv;
-
-  image_info->conv = conv;
-  image_info->conv_d = conv_d;
-
-  image_info->conv_32 = conv_32;
-  image_info->conv_32_d = conv_32_d;
-
-  image_info->conv_gray = conv_gray;
-  image_info->conv_gray_d = conv_gray_d;
-
-  image_info->conv_indexed = conv_indexed;
-  image_info->conv_indexed_d = conv_indexed_d;
-}
-
-static gint horiz_idx;
-static gint horiz_y = IMAGE_HEIGHT;
-static gint vert_idx;
-static gint vert_x = IMAGE_WIDTH;
-static gint tile_idx;
-static gint tile_x = IMAGE_WIDTH;
-static gint tile_y1 = IMAGE_HEIGHT;
-static gint tile_y2 = IMAGE_HEIGHT;
-
-#ifdef VERBOSE
-static gint sincelast;
-#endif
-
-/* Defining NO_FLUSH can cause inconsistent screen updates, but is useful
-   for performance evaluation. */
-
-#undef NO_FLUSH
-
-static gint
-gdk_rgb_alloc_scratch_image (void)
-{
-  if (static_image_idx == N_IMAGES)
-    {
-#ifndef NO_FLUSH
-      gdk_flush ();
-#endif
-#ifdef VERBOSE
-      g_print ("flush, %d puts since last flush\n", sincelast);
-      sincelast = 0;
-#endif
-      static_image_idx = 0;
-      horiz_y = IMAGE_HEIGHT;
-      vert_x = IMAGE_WIDTH;
-      tile_x = IMAGE_WIDTH;
-      tile_y1 = tile_y2 = IMAGE_HEIGHT;
-    }
-  return static_image_idx++;
-}
-
-static GdkImage *
-gdk_rgb_alloc_scratch (gint width, gint height, gint *x0, gint *y0)
-{
-  GdkImage *image;
-  gint idx;
-
-  if (width >= (IMAGE_WIDTH >> 1))
-    {
-      if (height >= (IMAGE_HEIGHT >> 1))
-	{
-	  idx = gdk_rgb_alloc_scratch_image ();
-	  *x0 = 0;
-	  *y0 = 0;
-	}
-      else
-	{
-	  if (height + horiz_y > IMAGE_HEIGHT)
-	    {
-	      horiz_idx = gdk_rgb_alloc_scratch_image ();
-	      horiz_y = 0;
-	    }
-	  idx = horiz_idx;
-	  *x0 = 0;
-	  *y0 = horiz_y;
-	  horiz_y += height;
-	}
-    }
-  else
-    {
-      if (height >= (IMAGE_HEIGHT >> 1))
-	{
-	  if (width + vert_x > IMAGE_WIDTH)
-	    {
-	      vert_idx = gdk_rgb_alloc_scratch_image ();
-	      vert_x = 0;
-	    }
-	  idx = vert_idx;
-	  *x0 = vert_x;
-	  *y0 = 0;
-	  /* using 3 and -4 would be slightly more efficient on 32-bit machines
-	     with > 1bpp displays */
-	  vert_x += (width + 7) & -8;
-	}
-      else
-	{
-	  if (width + tile_x > IMAGE_WIDTH)
-	    {
-	      tile_y1 = tile_y2;
-	      tile_x = 0;
-	    }
-	  if (height + tile_y1 > IMAGE_HEIGHT)
-	    {
-	      tile_idx = gdk_rgb_alloc_scratch_image ();
-	      tile_x = 0;
-	      tile_y1 = 0;
-	      tile_y2 = 0;
-	    }
-	  if (height + tile_y1 > tile_y2)
-	    tile_y2 = height + tile_y1;
-	  idx = tile_idx;
-	  *x0 = tile_x;
-	  *y0 = tile_y1;
-	  tile_x += (width + 7) & -8;
-	}
-    }
-  image = static_image[idx];
-#ifdef VERBOSE
-  g_print ("index %d, x %d, y %d (%d x %d)\n", idx, *x0, *y0, width, height);
-  sincelast++;
-#endif
-  return image;
-}
-
-static void
-gdk_draw_rgb_image_core (GdkDrawable *drawable,
-			 GdkGC *gc,
-			 gint x,
-			 gint y,
-			 gint width,
-			 gint height,
-			 guchar *buf,
-			 gint pixstride,
-			 gint rowstride,
-			 GdkRgbConvFunc conv,
-			 GdkRgbCmap *cmap,
-			 gint xdith,
-			 gint ydith)
-{
-  gint y0, x0;
-  gint xs0, ys0;
-  GdkImage *image;
-  gint width1, height1;
-  guchar *buf_ptr;
-
-  if (image_info->bitmap)
-    {
-      if (image_info->own_gc == NULL)
-	{
-	  GdkColor color;
-
-	  image_info->own_gc = gdk_gc_new (drawable);
-	  gdk_color_white (image_info->cmap, &color);
-	  gdk_gc_set_foreground (image_info->own_gc, &color);
-	  gdk_color_black (image_info->cmap, &color);
-	  gdk_gc_set_background (image_info->own_gc, &color);
-	}
-      gc = image_info->own_gc;
-    }
-  for (y0 = 0; y0 < height; y0 += IMAGE_HEIGHT)
-    {
-      height1 = MIN (height - y0, IMAGE_HEIGHT);
-      for (x0 = 0; x0 < width; x0 += IMAGE_WIDTH)
-	{
-	  width1 = MIN (width - x0, IMAGE_WIDTH);
-	  buf_ptr = buf + y0 * rowstride + x0 * pixstride;
-
-	  image = gdk_rgb_alloc_scratch (width1, height1, &xs0, &ys0);
-
-	  conv (image, xs0, ys0, width1, height1, buf_ptr, rowstride,
-		x + x0 + xdith, y + y0 + ydith, cmap);
-
-#ifndef DONT_ACTUALLY_DRAW
-	  gdk_draw_image (drawable, gc,
-			  image, xs0, ys0, x + x0, y + y0, width1, height1);
-#endif
-	}
-    }
-}
-
-
-void
-gdk_draw_rgb_image (GdkDrawable *drawable,
-		    GdkGC *gc,
-		    gint x,
-		    gint y,
-		    gint width,
-		    gint height,
-		    GdkRgbDither dith,
-		    guchar *rgb_buf,
-		    gint rowstride)
-{
-  if (dith == GDK_RGB_DITHER_NONE || (dith == GDK_RGB_DITHER_NORMAL &&
-				      !image_info->dith_default))
-    gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
-			     rgb_buf, 3, rowstride, image_info->conv, NULL,
-			     0, 0);
-  else
-    gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
-			     rgb_buf, 3, rowstride, image_info->conv_d, NULL,
-			     0, 0);
-}
-
-void
-gdk_draw_rgb_image_dithalign (GdkDrawable *drawable,
-			      GdkGC *gc,
-			      gint x,
-			      gint y,
-			      gint width,
-			      gint height,
-			      GdkRgbDither dith,
-			      guchar *rgb_buf,
-			      gint rowstride,
-			      gint xdith,
-			      gint ydith)
-{
-  if (dith == GDK_RGB_DITHER_NONE || (dith == GDK_RGB_DITHER_NORMAL &&
-				      !image_info->dith_default))
-    gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
-			     rgb_buf, 3, rowstride, image_info->conv, NULL,
-			     xdith, ydith);
-  else
-    gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
-			     rgb_buf, 3, rowstride, image_info->conv_d, NULL,
-			     xdith, ydith);
-}
-
-void
-gdk_draw_rgb_32_image (GdkDrawable *drawable,
-		       GdkGC *gc,
-		       gint x,
-		       gint y,
-		       gint width,
-		       gint height,
-		       GdkRgbDither dith,
-		       guchar *buf,
-		       gint rowstride)
-{
-  if (dith == GDK_RGB_DITHER_NONE || (dith == GDK_RGB_DITHER_NORMAL &&
-				      !image_info->dith_default))
-    gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
-			     buf, 4, rowstride,
-			     image_info->conv_32, NULL, 0, 0);
-  else
-    gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
-			     buf, 4, rowstride,
-			     image_info->conv_32_d, NULL, 0, 0);
-}
-
-static void
-gdk_rgb_make_gray_cmap (GdkRgbInfo *info)
-{
-  guint32 rgb[256];
-  gint i;
-
-  for (i = 0; i < 256; i++)
-    rgb[i] = (i << 16)  | (i << 8) | i;
-  info->gray_cmap = gdk_rgb_cmap_new (rgb, 256);
-}
-
-void
-gdk_draw_gray_image (GdkDrawable *drawable,
-		     GdkGC *gc,
-		     gint x,
-		     gint y,
-		     gint width,
-		     gint height,
-		     GdkRgbDither dith,
-		     guchar *buf,
-		     gint rowstride)
-{
-  if (image_info->bpp == 1 &&
-      image_info->gray_cmap == NULL &&
-      (image_info->visual->type == GDK_VISUAL_PSEUDO_COLOR ||
-       image_info->visual->type == GDK_VISUAL_GRAYSCALE))
-    gdk_rgb_make_gray_cmap (image_info);
-  
-  if (dith == GDK_RGB_DITHER_NONE || (dith == GDK_RGB_DITHER_NORMAL &&
-				      !image_info->dith_default))
-    gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
-			     buf, 1, rowstride,
-			     image_info->conv_gray, NULL, 0, 0);
-  else
-    gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
-			     buf, 1, rowstride,
-			     image_info->conv_gray_d, NULL, 0, 0);
-}
-
-GdkRgbCmap *
-gdk_rgb_cmap_new (guint32 *colors, gint n_colors)
-{
-  GdkRgbCmap *cmap;
-  int i, j;
-  guint32 rgb;
-
-  g_return_val_if_fail (n_colors >= 0, NULL);
-  g_return_val_if_fail (n_colors <= 256, NULL);
-  cmap = g_new (GdkRgbCmap, 1);
-  memcpy (cmap->colors, colors, n_colors * sizeof(guint32));
-  if (image_info->bpp == 1 &&
-      (image_info->visual->type == GDK_VISUAL_PSEUDO_COLOR ||
-       image_info->visual->type == GDK_VISUAL_GRAYSCALE))
-    for (i = 0; i < n_colors; i++)
-      {
-	rgb = colors[i];
-	j = ((rgb & 0xf00000) >> 12) |
-		   ((rgb & 0xf000) >> 8) |
-		   ((rgb & 0xf0) >> 4);
-#ifdef VERBOSE
-	g_print ("%d %x %x %d\n", i, j, colorcube[j]);
-#endif
-	cmap->lut[i] = colorcube[j];
-      }
-  return cmap;
-}
-
-void
-gdk_rgb_cmap_free (GdkRgbCmap *cmap)
-{
-  g_free (cmap);
-}
-
-void
-gdk_draw_indexed_image (GdkDrawable *drawable,
-			GdkGC *gc,
-			gint x,
-			gint y,
-			gint width,
-			gint height,
-			GdkRgbDither dith,
-			guchar *buf,
-			gint rowstride,
-			GdkRgbCmap *cmap)
-{
-  if (dith == GDK_RGB_DITHER_NONE || (dith == GDK_RGB_DITHER_NORMAL &&
-				      !image_info->dith_default))
-    gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
-			     buf, 1, rowstride,
-			     image_info->conv_indexed, cmap, 0, 0);
-  else
-    gdk_draw_rgb_image_core (drawable, gc, x, y, width, height,
-			     buf, 1, rowstride,
-			     image_info->conv_indexed_d, cmap, 0, 0);
-}
-
-gboolean
-gdk_rgb_ditherable (void)
-{
-  return (image_info->conv != image_info->conv_d);
-}
-
-GdkColormap *
-gdk_rgb_get_cmap (void)
-{
-  gdk_rgb_init ();
-  return image_info->cmap;
-}
-
-GdkVisual *
-gdk_rgb_get_visual (void)
-{
-  gdk_rgb_init ();
-  return image_info->visual;
-}
diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c
index 2c91ba2bb..94b66fa5b 100644
--- a/gdk/win32/gdkselection-win32.c
+++ b/gdk/win32/gdkselection-win32.c
@@ -28,9 +28,8 @@
 
 #include <string.h>
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkx.h"
-#include "gdkprivate.h"
 
 /* We emulate the GDK_SELECTION window properties by storing
  * it's data in a per-window hashtable.
diff --git a/gdk/win32/gdkselection.c b/gdk/win32/gdkselection.c
index 2c91ba2bb..94b66fa5b 100644
--- a/gdk/win32/gdkselection.c
+++ b/gdk/win32/gdkselection.c
@@ -28,9 +28,8 @@
 
 #include <string.h>
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkx.h"
-#include "gdkprivate.h"
 
 /* We emulate the GDK_SELECTION window properties by storing
  * it's data in a per-window hashtable.
diff --git a/gdk/win32/gdktypes.h b/gdk/win32/gdktypes.h
deleted file mode 100644
index 21957eecf..000000000
--- a/gdk/win32/gdktypes.h
+++ /dev/null
@@ -1,1301 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_TYPES_H__
-#define __GDK_TYPES_H__
-
-
-/* GDK uses "glib". (And so does GTK).
- */
-#include <glib.h>
-
-#ifdef NATIVE_WIN32
-#ifdef GDK_COMPILATION
-#define GDKVAR __declspec(dllexport)
-#else
-#define GDKVAR extern __declspec(dllimport)
-#endif
-#else
-#define GDKVAR extern
-#endif
-
-/* The system specific file gdkconfig.h contains such configuration
- * settings that are needed not only when compiling GDK (or GTK)
- * itself, but also occasionally when compiling programs that use GDK
- * (or GTK). One such setting is what windowing API backend is in use.
- */
-#include <gdkconfig.h>
-
-/* Windowing API alternatives. Note that these macros indicate just
- * what windowing system is in use, not what operating system. It is
- * possible to built GDK for X11 in a Win32 environment, for instance.
- *
- * gdkconfig.h defines GDK_WINDOWING as one of the following. In
- * addition to the original X11 only the Win32 implementation exists
- * yet.
- */
-#define GDK_WINDOWING_X11 1	/* X11 */
-#define GDK_WINDOWING_WIN32 2	/* Win32 GDI */
-#define GDK_WINDOWING_BEOS 3	/* BeOS */
-#define GDK_WINDOWING_MACOS 4	/* MacOS */
-#define GDK_WINDOWING_GGI 5	/* Linux GGI */
-
-/* some common magic values */
-#define GDK_NONE	     0L
-#define GDK_CURRENT_TIME     0L
-#define GDK_PARENT_RELATIVE  1L
-
-/* special deviceid for core pointer events */
-#define GDK_CORE_POINTER 0xfedc
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-/* Type definitions for the basic structures.
- */
-
-typedef gulong			      GdkAtom;
-typedef struct _GdkColor	      GdkColor;
-typedef struct _GdkColormap	      GdkColormap;
-typedef struct _GdkVisual	      GdkVisual;
-typedef struct _GdkWindowAttr	      GdkWindowAttr;
-typedef struct _GdkWindow	      GdkWindow;
-typedef struct _GdkWindow	      GdkPixmap;
-typedef struct _GdkWindow	      GdkBitmap;
-typedef struct _GdkWindow	      GdkDrawable;
-typedef struct _GdkGeometry           GdkGeometry;
-typedef struct _GdkImage	      GdkImage;
-typedef struct _GdkGCValues	      GdkGCValues;
-typedef struct _GdkGC		      GdkGC;
-typedef struct _GdkPoint	      GdkPoint;
-typedef struct _GdkRectangle	      GdkRectangle;
-typedef struct _GdkSegment	      GdkSegment;
-typedef struct _GdkFont		      GdkFont;
-typedef struct _GdkCursor	      GdkCursor;
-typedef struct _GdkColorContextDither GdkColorContextDither;
-typedef struct _GdkColorContext	      GdkColorContext;
-typedef struct _GdkDragContext        GdkDragContext;
-
-typedef struct _GdkEventAny	    GdkEventAny;
-typedef struct _GdkEventExpose	    GdkEventExpose;
-typedef struct _GdkEventNoExpose    GdkEventNoExpose;
-typedef struct _GdkEventVisibility  GdkEventVisibility;
-typedef struct _GdkEventMotion	    GdkEventMotion;
-typedef struct _GdkEventButton	    GdkEventButton;
-typedef struct _GdkEventKey	    GdkEventKey;
-typedef struct _GdkEventFocus	    GdkEventFocus;
-typedef struct _GdkEventCrossing    GdkEventCrossing;
-typedef struct _GdkEventConfigure   GdkEventConfigure;
-typedef struct _GdkEventProperty    GdkEventProperty;
-typedef struct _GdkEventSelection   GdkEventSelection;
-typedef struct _GdkEventProximity   GdkEventProximity;
-typedef struct _GdkEventClient	    GdkEventClient;
-
-typedef struct _GdkEventDND         GdkEventDND;
-
-typedef union  _GdkEvent	    GdkEvent;
-
-typedef struct _GdkDeviceKey	    GdkDeviceKey;
-typedef struct _GdkDeviceInfo	    GdkDeviceInfo;
-typedef struct _GdkTimeCoord	    GdkTimeCoord;
-typedef struct _GdkRegion	    GdkRegion;
-typedef void (*GdkEventFunc) (GdkEvent *event,
-			      gpointer	data);
-
-typedef struct _GdkIC               GdkIC;
-typedef struct _GdkICAttr	    GdkICAttr;
-
-typedef guint32			    GdkWChar;
- 
-
-/* Types of windows.
- *   Root: There is only 1 root window and it is initialized
- *	   at startup. Creating a window of type GDK_WINDOW_ROOT
- *	   is an error.
- *   Toplevel: Windows which interact with the window manager.
- *   Child: Windows which are children of some other type of window.
- *	    (Any other type of window). Most windows are child windows.
- *   Dialog: A special kind of toplevel window which interacts with
- *	     the window manager slightly differently than a regular
- *	     toplevel window. Dialog windows should be used for any
- *	     transient window.
- *   Pixmap: Pixmaps are really just another kind of window which
- *	     doesn't actually appear on the screen. It can't have
- *	     children, either and is really just a convenience so
- *	     that the drawing functions can work on both windows
- *	     and pixmaps transparently. (ie. You shouldn't pass a
- *	     pixmap to any procedure which accepts a window with the
- *	     exception of the drawing functions).
- *   Foreign: A window that actually belongs to another application
- */
-typedef enum
-{
-  GDK_WINDOW_ROOT,
-  GDK_WINDOW_TOPLEVEL,
-  GDK_WINDOW_CHILD,
-  GDK_WINDOW_DIALOG,
-  GDK_WINDOW_TEMP,
-  GDK_WINDOW_PIXMAP,
-  GDK_WINDOW_FOREIGN
-} GdkWindowType;
-
-/* Classes of windows.
- *   InputOutput: Almost every window should be of this type. Such windows
- *		  receive events and are also displayed on screen.
- *   InputOnly: Used only in special circumstances when events need to be
- *		stolen from another window or windows. Input only windows
- *		have no visible output, so they are handy for placing over
- *		top of a group of windows in order to grab the events (or
- *		filter the events) from those windows.
- */
-typedef enum
-{
-  GDK_INPUT_OUTPUT,
-  GDK_INPUT_ONLY
-} GdkWindowClass;
-
-/* Types of images.
- *   Normal: Normal X image type. These are slow as they involve passing
- *	     the entire image through the X connection each time a draw
- *	     request is required.
- *   Shared: Shared memory X image type. These are fast as the X server
- *	     and the program actually use the same piece of memory. They
- *	     should be used with care though as there is the possibility
- *	     for both the X server and the program to be reading/writing
- *	     the image simultaneously and producing undesired results.
- *   Shared Pixmap: Also a shared memory image, which also has a
- *	     pixmap using the same memory.
- */
-typedef enum
-{
-  GDK_IMAGE_NORMAL,
-  GDK_IMAGE_SHARED,
-  GDK_IMAGE_FASTEST,
-  GDK_IMAGE_SHARED_PIXMAP
-} GdkImageType;
-
-/* Types of visuals.
- *   StaticGray:
- *   Grayscale:
- *   StaticColor:
- *   PseudoColor:
- *   TrueColor:
- *   DirectColor:
- */
-typedef enum
-{
-  GDK_VISUAL_STATIC_GRAY,
-  GDK_VISUAL_GRAYSCALE,
-  GDK_VISUAL_STATIC_COLOR,
-  GDK_VISUAL_PSEUDO_COLOR,
-  GDK_VISUAL_TRUE_COLOR,
-  GDK_VISUAL_DIRECT_COLOR
-} GdkVisualType;
-
-/* Types of font.
- *   GDK_FONT_FONT: the font is an XFontStruct.
- *   GDK_FONT_FONTSET: the font is an XFontSet used for I18N.
- */
-typedef enum
-{
-  GDK_FONT_FONT,
-  GDK_FONT_FONTSET
-} GdkFontType;
-
-/* Window attribute mask values.
- *   GDK_WA_TITLE: The "title" field is valid.
- *   GDK_WA_X: The "x" field is valid.
- *   GDK_WA_Y: The "y" field is valid.
- *   GDK_WA_CURSOR: The "cursor" field is valid.
- *   GDK_WA_COLORMAP: The "colormap" field is valid.
- *   GDK_WA_VISUAL: The "visual" field is valid.
- */
-typedef enum
-{
-  GDK_WA_TITLE	  = 1 << 1,
-  GDK_WA_X	  = 1 << 2,
-  GDK_WA_Y	  = 1 << 3,
-  GDK_WA_CURSOR	  = 1 << 4,
-  GDK_WA_COLORMAP = 1 << 5,
-  GDK_WA_VISUAL	  = 1 << 6,
-  GDK_WA_WMCLASS  = 1 << 7,
-  GDK_WA_NOREDIR  = 1 << 8
-} GdkWindowAttributesType;
-
-/* Size restriction enumeration.
- */
-typedef enum
-{
-  GDK_HINT_POS	      = 1 << 0,
-  GDK_HINT_MIN_SIZE   = 1 << 1,
-  GDK_HINT_MAX_SIZE   = 1 << 2,
-  GDK_HINT_BASE_SIZE  = 1 << 3,
-  GDK_HINT_ASPECT     = 1 << 4,
-  GDK_HINT_RESIZE_INC = 1 << 5
-} GdkWindowHints;
-
-/* GC function types.
- *   Copy: Overwrites destination pixels with the source pixels.
- *   Invert: Inverts the destination pixels.
- *   Xor: Xor's the destination pixels with the source pixels.
- *   Clear: set pixels to 0
- *   And: source AND destination
- *   And Reverse: source AND (NOT destination)
- *   And Invert: (NOT source) AND destination
- *   Noop: destination
- *   Or: source OR destination
- *   Nor: (NOT source) AND (NOT destination)
- *   Equiv: (NOT source) XOR destination
- *   Xor Reverse: source OR (NOT destination)
- *   Copy Inverted: NOT source
- *   Xor Inverted: (NOT source) OR destination
- *   Nand: (NOT source) OR (NOT destination)
- *   Set: set pixels to 1
- */
-typedef enum
-{
-  GDK_COPY,
-  GDK_INVERT,
-  GDK_XOR,
-  GDK_CLEAR,
-  GDK_AND,
-  GDK_AND_REVERSE,
-  GDK_AND_INVERT,
-  GDK_NOOP,
-  GDK_OR,
-  GDK_EQUIV,
-  GDK_OR_REVERSE,
-  GDK_COPY_INVERT,
-  GDK_OR_INVERT,
-  GDK_NAND,
-  GDK_SET
-} GdkFunction;
-
-/* GC fill types.
- *  Solid:
- *  Tiled:
- *  Stippled:
- *  OpaqueStippled:
- */
-typedef enum
-{
-  GDK_SOLID,
-  GDK_TILED,
-  GDK_STIPPLED,
-  GDK_OPAQUE_STIPPLED
-} GdkFill;
-
-/* GC fill rule for polygons
- *  EvenOddRule
- *  WindingRule
- */
-typedef enum
-{
-  GDK_EVEN_ODD_RULE,
-  GDK_WINDING_RULE
-} GdkFillRule;
-
-/* GC line styles
- *  Solid:
- *  OnOffDash:
- *  DoubleDash:
- */
-typedef enum
-{
-  GDK_LINE_SOLID,
-  GDK_LINE_ON_OFF_DASH,
-  GDK_LINE_DOUBLE_DASH
-} GdkLineStyle;
-
-/* GC cap styles
- *  CapNotLast:
- *  CapButt:
- *  CapRound:
- *  CapProjecting:
- */
-typedef enum
-{
-  GDK_CAP_NOT_LAST,
-  GDK_CAP_BUTT,
-  GDK_CAP_ROUND,
-  GDK_CAP_PROJECTING
-} GdkCapStyle;
-
-/* GC join styles
- *  JoinMiter:
- *  JoinRound:
- *  JoinBevel:
- */
-typedef enum
-{
-  GDK_JOIN_MITER,
-  GDK_JOIN_ROUND,
-  GDK_JOIN_BEVEL
-} GdkJoinStyle;
-
-/* Cursor types.
- */
-typedef enum
-{
-#include <gdk/gdkcursors.h>
-  GDK_LAST_CURSOR,
-  GDK_CURSOR_IS_PIXMAP = -1
-} GdkCursorType;
-
-typedef enum {
-  GDK_FILTER_CONTINUE,	  /* Event not handled, continue processesing */
-  GDK_FILTER_TRANSLATE,	  /* Translated event stored */
-  GDK_FILTER_REMOVE	  /* Terminate processing, removing event */
-} GdkFilterReturn;
-
-typedef enum {
-  GDK_VISIBILITY_UNOBSCURED,
-  GDK_VISIBILITY_PARTIAL,
-  GDK_VISIBILITY_FULLY_OBSCURED
-} GdkVisibilityState;
-
-/* Event types.
- *   Nothing: No event occurred.
- *   Delete: A window delete event was sent by the window manager.
- *	     The specified window should be deleted.
- *   Destroy: A window has been destroyed.
- *   Expose: Part of a window has been uncovered.
- *   NoExpose: Same as expose, but no expose event was generated.
- *   VisibilityNotify: A window has become fully/partially/not obscured.
- *   MotionNotify: The mouse has moved.
- *   ButtonPress: A mouse button was pressed.
- *   ButtonRelease: A mouse button was release.
- *   KeyPress: A key was pressed.
- *   KeyRelease: A key was released.
- *   EnterNotify: A window was entered.
- *   LeaveNotify: A window was exited.
- *   FocusChange: The focus window has changed. (The focus window gets
- *		  keyboard events).
- *   Resize: A window has been resized.
- *   Map: A window has been mapped. (It is now visible on the screen).
- *   Unmap: A window has been unmapped. (It is no longer visible on
- *	    the screen).
- */
-typedef enum
-{
-  GDK_NOTHING		= -1,
-  GDK_DELETE		= 0,
-  GDK_DESTROY		= 1,
-  GDK_EXPOSE		= 2,
-  GDK_MOTION_NOTIFY	= 3,
-  GDK_BUTTON_PRESS	= 4,
-  GDK_2BUTTON_PRESS	= 5,
-  GDK_3BUTTON_PRESS	= 6,
-  GDK_BUTTON_RELEASE	= 7,
-  GDK_KEY_PRESS		= 8,
-  GDK_KEY_RELEASE	= 9,
-  GDK_ENTER_NOTIFY	= 10,
-  GDK_LEAVE_NOTIFY	= 11,
-  GDK_FOCUS_CHANGE	= 12,
-  GDK_CONFIGURE		= 13,
-  GDK_MAP		= 14,
-  GDK_UNMAP		= 15,
-  GDK_PROPERTY_NOTIFY	= 16,
-  GDK_SELECTION_CLEAR	= 17,
-  GDK_SELECTION_REQUEST = 18,
-  GDK_SELECTION_NOTIFY	= 19,
-  GDK_PROXIMITY_IN	= 20,
-  GDK_PROXIMITY_OUT	= 21,
-  GDK_DRAG_ENTER        = 22,
-  GDK_DRAG_LEAVE        = 23,
-  GDK_DRAG_MOTION       = 24,
-  GDK_DRAG_STATUS       = 25,
-  GDK_DROP_START        = 26,
-  GDK_DROP_FINISHED     = 27,
-  GDK_CLIENT_EVENT	= 28,
-  GDK_VISIBILITY_NOTIFY = 29,
-  GDK_NO_EXPOSE		= 30
-} GdkEventType;
-
-/* Event masks. (Used to select what types of events a window
- *  will receive).
- */
-typedef enum
-{
-  GDK_EXPOSURE_MASK		= 1 << 1,
-  GDK_POINTER_MOTION_MASK	= 1 << 2,
-  GDK_POINTER_MOTION_HINT_MASK	= 1 << 3,
-  GDK_BUTTON_MOTION_MASK	= 1 << 4,
-  GDK_BUTTON1_MOTION_MASK	= 1 << 5,
-  GDK_BUTTON2_MOTION_MASK	= 1 << 6,
-  GDK_BUTTON3_MOTION_MASK	= 1 << 7,
-  GDK_BUTTON_PRESS_MASK		= 1 << 8,
-  GDK_BUTTON_RELEASE_MASK	= 1 << 9,
-  GDK_KEY_PRESS_MASK		= 1 << 10,
-  GDK_KEY_RELEASE_MASK		= 1 << 11,
-  GDK_ENTER_NOTIFY_MASK		= 1 << 12,
-  GDK_LEAVE_NOTIFY_MASK		= 1 << 13,
-  GDK_FOCUS_CHANGE_MASK		= 1 << 14,
-  GDK_STRUCTURE_MASK		= 1 << 15,
-  GDK_PROPERTY_CHANGE_MASK	= 1 << 16,
-  GDK_VISIBILITY_NOTIFY_MASK	= 1 << 17,
-  GDK_PROXIMITY_IN_MASK		= 1 << 18,
-  GDK_PROXIMITY_OUT_MASK	= 1 << 19,
-  GDK_SUBSTRUCTURE_MASK		= 1 << 20,
-  GDK_ALL_EVENTS_MASK		= 0x0FFFFF
-} GdkEventMask;
-
-/* Types of enter/leave notifications.
- *   Ancestor:
- *   Virtual:
- *   Inferior:
- *   Nonlinear:
- *   NonlinearVirtual:
- *   Unknown: An unknown type of enter/leave event occurred.
- */
-typedef enum
-{
-  GDK_NOTIFY_ANCESTOR		= 0,
-  GDK_NOTIFY_VIRTUAL		= 1,
-  GDK_NOTIFY_INFERIOR		= 2,
-  GDK_NOTIFY_NONLINEAR		= 3,
-  GDK_NOTIFY_NONLINEAR_VIRTUAL	= 4,
-  GDK_NOTIFY_UNKNOWN		= 5
-} GdkNotifyType;
-
-/* Enter/leave event modes.
- *   NotifyNormal
- *   NotifyGrab
- *   NotifyUngrab
- */
-typedef enum
-{
-  GDK_CROSSING_NORMAL,
-  GDK_CROSSING_GRAB,
-  GDK_CROSSING_UNGRAB
-} GdkCrossingMode;
-
-/* Types of modifiers.
- */
-typedef enum
-{
-  GDK_SHIFT_MASK    = 1 << 0,
-  GDK_LOCK_MASK	    = 1 << 1,
-  GDK_CONTROL_MASK  = 1 << 2,
-  GDK_MOD1_MASK	    = 1 << 3,
-  GDK_MOD2_MASK	    = 1 << 4,
-  GDK_MOD3_MASK	    = 1 << 5,
-  GDK_MOD4_MASK	    = 1 << 6,
-  GDK_MOD5_MASK	    = 1 << 7,
-  GDK_BUTTON1_MASK  = 1 << 8,
-  GDK_BUTTON2_MASK  = 1 << 9,
-  GDK_BUTTON3_MASK  = 1 << 10,
-  GDK_BUTTON4_MASK  = 1 << 11,
-  GDK_BUTTON5_MASK  = 1 << 12,
-  GDK_RELEASE_MASK  = 1 << 13,
-  GDK_MODIFIER_MASK = 0x3fff
-} GdkModifierType;
-
-typedef enum
-{
-  GDK_CLIP_BY_CHILDREN	= 0,
-  GDK_INCLUDE_INFERIORS = 1
-} GdkSubwindowMode;
-
-typedef enum
-{
-  GDK_INPUT_READ       = 1 << 0,
-  GDK_INPUT_WRITE      = 1 << 1,
-  GDK_INPUT_EXCEPTION  = 1 << 2
-} GdkInputCondition;
-
-typedef enum
-{
-  GDK_OK	  = 0,
-  GDK_ERROR	  = -1,
-  GDK_ERROR_PARAM = -2,
-  GDK_ERROR_FILE  = -3,
-  GDK_ERROR_MEM	  = -4
-} GdkStatus;
-
-typedef enum
-{
-  GDK_LSB_FIRST,
-  GDK_MSB_FIRST
-} GdkByteOrder;
-
-typedef enum
-{
-  GDK_GC_FOREGROUND    = 1 << 0,
-  GDK_GC_BACKGROUND    = 1 << 1,
-  GDK_GC_FONT	       = 1 << 2,
-  GDK_GC_FUNCTION      = 1 << 3,
-  GDK_GC_FILL	       = 1 << 4,
-  GDK_GC_TILE	       = 1 << 5,
-  GDK_GC_STIPPLE       = 1 << 6,
-  GDK_GC_CLIP_MASK     = 1 << 7,
-  GDK_GC_SUBWINDOW     = 1 << 8,
-  GDK_GC_TS_X_ORIGIN   = 1 << 9,
-  GDK_GC_TS_Y_ORIGIN   = 1 << 10,
-  GDK_GC_CLIP_X_ORIGIN = 1 << 11,
-  GDK_GC_CLIP_Y_ORIGIN = 1 << 12,
-  GDK_GC_EXPOSURES     = 1 << 13,
-  GDK_GC_LINE_WIDTH    = 1 << 14,
-  GDK_GC_LINE_STYLE    = 1 << 15,
-  GDK_GC_CAP_STYLE     = 1 << 16,
-  GDK_GC_JOIN_STYLE    = 1 << 17
-} GdkGCValuesMask;
-
-typedef enum
-{
-  GDK_SELECTION_PRIMARY = 1,
-  GDK_SELECTION_SECONDARY = 2
-} GdkSelection;
-
-typedef enum
-{
-  GDK_PROPERTY_NEW_VALUE,
-  GDK_PROPERTY_DELETE
-} GdkPropertyState;
-
-typedef enum
-{
-  GDK_PROP_MODE_REPLACE,
-  GDK_PROP_MODE_PREPEND,
-  GDK_PROP_MODE_APPEND
-} GdkPropMode;
-
-/* Enums for XInput support */
-
-typedef enum
-{
-  GDK_SOURCE_MOUSE,
-  GDK_SOURCE_PEN,
-  GDK_SOURCE_ERASER,
-  GDK_SOURCE_CURSOR
-} GdkInputSource;
-
-typedef enum
-{
-  GDK_MODE_DISABLED,
-  GDK_MODE_SCREEN,
-  GDK_MODE_WINDOW
-} GdkInputMode;
-
-typedef enum
-{
-  GDK_AXIS_IGNORE,
-  GDK_AXIS_X,
-  GDK_AXIS_Y,
-  GDK_AXIS_PRESSURE,
-  GDK_AXIS_XTILT,
-  GDK_AXIS_YTILT,
-  GDK_AXIS_LAST
-} GdkAxisUse;
-
-/* The next two types define enums for predefined atoms relating
-   to selections. In general, one will need to use gdk_intern_atom */
-
-typedef enum
-{
-  GDK_TARGET_BITMAP = 5,
-  GDK_TARGET_COLORMAP = 7,
-  GDK_TARGET_DRAWABLE = 17,
-  GDK_TARGET_PIXMAP = 20,
-  GDK_TARGET_STRING = 31
-} GdkTarget;
-
-typedef enum
-{
-  GDK_SELECTION_TYPE_ATOM = 4,
-  GDK_SELECTION_TYPE_BITMAP = 5,
-  GDK_SELECTION_TYPE_COLORMAP = 7,
-  GDK_SELECTION_TYPE_DRAWABLE = 17,
-  GDK_SELECTION_TYPE_INTEGER = 19,
-  GDK_SELECTION_TYPE_PIXMAP = 20,
-  GDK_SELECTION_TYPE_WINDOW = 33,
-  GDK_SELECTION_TYPE_STRING = 31
-} GdkSelectionType;
-
-typedef enum
-{
-  GDK_EXTENSION_EVENTS_NONE,
-  GDK_EXTENSION_EVENTS_ALL,
-  GDK_EXTENSION_EVENTS_CURSOR
-} GdkExtensionMode;
-
-typedef enum			/*< flags >*/
-{
-  GDK_IM_PREEDIT_AREA	   = 0x0001, 
-  GDK_IM_PREEDIT_CALLBACKS = 0x0002, 
-  GDK_IM_PREEDIT_POSITION  = 0x0004,
-  GDK_IM_PREEDIT_NOTHING   = 0x0008,
-  GDK_IM_PREEDIT_NONE	   = 0x0010,
-  GDK_IM_PREEDIT_MASK      = 0x001f,
-
-  GDK_IM_STATUS_AREA	   = 0x0100, 
-  GDK_IM_STATUS_CALLBACKS  = 0x0200,
-  GDK_IM_STATUS_NOTHING	   = 0x0400,
-  GDK_IM_STATUS_NONE	   = 0x0800,
-  GDK_IM_STATUS_MASK	   = 0x0f00 
-} GdkIMStyle;
-
-typedef enum
-{
-  GDK_IC_STYLE			= 1 << 0,
-  GDK_IC_CLIENT_WINDOW		= 1 << 1,
-  GDK_IC_FOCUS_WINDOW		= 1 << 2,
-  GDK_IC_FILTER_EVENTS		= 1 << 3,
-  GDK_IC_SPOT_LOCATION		= 1 << 4,
-  GDK_IC_LINE_SPACING		= 1 << 5,
-  GDK_IC_CURSOR			= 1 << 6,
-
-  GDK_IC_PREEDIT_FONTSET	= 1 << 10,
-  GDK_IC_PREEDIT_AREA		= 1 << 11,
-  GDK_IC_PREEDIT_AREA_NEEDED	= 1 << 12,
-  GDK_IC_PREEDIT_FOREGROUND	= 1 << 13,
-  GDK_IC_PREEDIT_BACKGROUND	= 1 << 14,
-  GDK_IC_PREEDIT_PIXMAP		= 1 << 15,
-  GDK_IC_PREEDIT_COLORMAP	= 1 << 16,
-
-  GDK_IC_STATUS_FONTSET		= 1 << 21,
-  GDK_IC_STATUS_AREA		= 1 << 22,
-  GDK_IC_STATUS_AREA_NEEDED	= 1 << 23,
-  GDK_IC_STATUS_FOREGROUND	= 1 << 24,
-  GDK_IC_STATUS_BACKGROUND	= 1 << 25,
-  GDK_IC_STATUS_PIXMAP		= 1 << 26,
-  GDK_IC_STATUS_COLORMAP	= 1 << 27,
-
-  GDK_IC_ALL_REQ		= GDK_IC_STYLE |
-    				  GDK_IC_CLIENT_WINDOW,
-
-  GDK_IC_PREEDIT_AREA_REQ	= GDK_IC_PREEDIT_AREA | 
-				  GDK_IC_PREEDIT_FONTSET,
-  GDK_IC_PREEDIT_POSITION_REQ	= GDK_IC_PREEDIT_AREA | GDK_IC_SPOT_LOCATION |
-				  GDK_IC_PREEDIT_FONTSET,
-
-  GDK_IC_STATUS_AREA_REQ	= GDK_IC_STATUS_AREA | 
-				  GDK_IC_STATUS_FONTSET
-} GdkICAttributesType;
-
-/* The next two enumeration values current match the
- * Motif constants. If this is changed, the implementation
- * of gdk_window_set_decorations/gdk_window_set_functions
- * will need to change as well.
- */
-typedef enum
-{
-  GDK_DECOR_ALL		= 1 << 0,
-  GDK_DECOR_BORDER	= 1 << 1,
-  GDK_DECOR_RESIZEH	= 1 << 2,
-  GDK_DECOR_TITLE	= 1 << 3,
-  GDK_DECOR_MENU	= 1 << 4,
-  GDK_DECOR_MINIMIZE	= 1 << 5,
-  GDK_DECOR_MAXIMIZE	= 1 << 6
-} GdkWMDecoration;
-
-typedef enum
-{
-  GDK_FUNC_ALL		= 1 << 0,
-  GDK_FUNC_RESIZE	= 1 << 1,
-  GDK_FUNC_MOVE		= 1 << 2,
-  GDK_FUNC_MINIMIZE	= 1 << 3,
-  GDK_FUNC_MAXIMIZE	= 1 << 4,
-  GDK_FUNC_CLOSE	= 1 << 5
-} GdkWMFunction;
-
-typedef void (*GdkInputFunction) (gpointer	    data,
-				  gint		    source,
-				  GdkInputCondition condition);
-
-typedef void (*GdkDestroyNotify) (gpointer data);
-
-/* Color Context modes.
- *
- * GDK_CC_MODE_UNDEFINED - unknown
- * GDK_CC_MODE_BW	 - default B/W
- * GDK_CC_MODE_STD_CMAP	 - has a standard colormap
- * GDK_CC_MODE_TRUE	 - is a TrueColor/DirectColor visual
- * GDK_CC_MODE_MY_GRAY	 - my grayramp
- * GDK_CC_MODE_PALETTE	 - has a pre-allocated palette
- */ 
-
-typedef enum
-{
-  GDK_CC_MODE_UNDEFINED,
-  GDK_CC_MODE_BW,
-  GDK_CC_MODE_STD_CMAP,
-  GDK_CC_MODE_TRUE,
-  GDK_CC_MODE_MY_GRAY,
-  GDK_CC_MODE_PALETTE
-} GdkColorContextMode;
-
-/* Types of overlapping between a rectangle and a region
- * GDK_OVERLAP_RECTANGLE_IN: rectangle is in region
- * GDK_OVERLAP_RECTANGLE_OUT: rectangle in not in region
- * GDK_OVERLAP_RECTANGLE_PART: rectangle in partially in region
- */
-
-typedef enum
-{
-  GDK_OVERLAP_RECTANGLE_IN,
-  GDK_OVERLAP_RECTANGLE_OUT,
-  GDK_OVERLAP_RECTANGLE_PART
-} GdkOverlapType;
-
-typedef enum {
-  GDK_ACTION_DEFAULT = 1 << 0,
-  GDK_ACTION_COPY    = 1 << 1,
-  GDK_ACTION_MOVE    = 1 << 2,
-  GDK_ACTION_LINK    = 1 << 3,
-  GDK_ACTION_PRIVATE = 1 << 4,
-  GDK_ACTION_ASK     = 1 << 5
-} GdkDragAction;
-
-typedef enum {
-  GDK_DRAG_PROTO_MOTIF,
-  GDK_DRAG_PROTO_XDND,
-  GDK_DRAG_PROTO_ROOTWIN,	/* A root window with nobody claiming drags */
-  GDK_DRAG_PROTO_WIN32_DROPFILES, /* The simple WM_DROPFILES dnd */
-  GDK_DRAG_PROTO_OLE2,		/* The complex OLE2 dnd */
-  GDK_DRAG_PROTO_NONE		/* Not a valid drag window */
-} GdkDragProtocol;
-
-/* The color type.
- *   A color consists of red, green and blue values in the
- *    range 0-65535 and a pixel value. The pixel value is highly
- *    dependent on the depth and colormap which this color will
- *    be used to draw into. Therefore, sharing colors between
- *    colormaps is a bad idea.
- */
-struct _GdkColor
-{
-  gulong  pixel;
-  gushort red;
-  gushort green;
-  gushort blue;
-};
-
-/* The colormap type.
- *   Colormaps consist of 256 colors.
- */
-struct _GdkColormap
-{
-  gint      size;
-  GdkColor *colors;
-};
-
-/* The visual type.
- *   "type" is the type of visual this is (PseudoColor, TrueColor, etc).
- *   "depth" is the bit depth of this visual.
- *   "colormap_size" is the size of a colormap for this visual.
- *   "bits_per_rgb" is the number of significant bits per red, green and blue.
- *  The red, green and blue masks, shifts and precisions refer
- *   to value needed to calculate pixel values in TrueColor and DirectColor
- *   visuals. The "mask" is the significant bits within the pixel. The
- *   "shift" is the number of bits left we must shift a primary for it
- *   to be in position (according to the "mask"). "prec" refers to how
- *   much precision the pixel value contains for a particular primary.
- */
-struct _GdkVisual
-{
-  GdkVisualType type;
-  gint depth;
-  GdkByteOrder byte_order;
-  gint colormap_size;
-  gint bits_per_rgb;
-
-  guint32 red_mask;
-  gint red_shift;
-  gint red_prec;
-
-  guint32 green_mask;
-  gint green_shift;
-  gint green_prec;
-
-  guint32 blue_mask;
-  gint blue_shift;
-  gint blue_prec;
-};
-
-struct _GdkWindowAttr
-{
-  gchar *title;
-  gint event_mask;
-  gint16 x, y;
-  gint16 width;
-  gint16 height;
-  GdkWindowClass wclass;
-  GdkVisual *visual;
-  GdkColormap *colormap;
-  GdkWindowType window_type;
-  GdkCursor *cursor;
-  gchar *wmclass_name;
-  gchar *wmclass_class;
-  gboolean override_redirect;
-};
-
-struct _GdkWindow
-{
-  gpointer user_data;
-};
-
-struct _GdkGeometry {
-  gint min_width;
-  gint min_height;
-  gint max_width;
-  gint max_height;
-  gint base_width;
-  gint base_height;
-  gint width_inc;
-  gint height_inc;
-  gdouble min_aspect;
-  gdouble max_aspect;
-  /* GdkGravity gravity; */
-};
-
-struct _GdkImage
-{
-  GdkImageType	type;
-  GdkVisual    *visual;	    /* visual used to create the image */
-  GdkByteOrder	byte_order;
-  guint16	width;
-  guint16	height;
-  guint16	depth;
-  guint16	bpp;	    /* bytes per pixel */
-  guint16	bpl;	    /* bytes per line */
-  gpointer	mem;
-};
-
-struct _GdkGCValues
-{
-  GdkColor	    foreground;
-  GdkColor	    background;
-  GdkFont	   *font;
-  GdkFunction	    function;
-  GdkFill	    fill;
-  GdkPixmap	   *tile;
-  GdkPixmap	   *stipple;
-  GdkPixmap	   *clip_mask;
-  GdkSubwindowMode  subwindow_mode;
-  gint		    ts_x_origin;
-  gint		    ts_y_origin;
-  gint		    clip_x_origin;
-  gint		    clip_y_origin;
-  gint		    graphics_exposures;
-  gint		    line_width;
-  GdkLineStyle	    line_style;
-  GdkCapStyle	    cap_style;
-  GdkJoinStyle	    join_style;
-};
-
-struct _GdkGC
-{
-  gint dummy_var;
-};
-
-struct _GdkPoint
-{
-  gint16 x;
-  gint16 y;
-};
-
-struct _GdkRectangle
-{
-  gint16 x;
-  gint16 y;
-  guint16 width;
-  guint16 height;
-};
-
-struct _GdkSegment
-{
-  gint16 x1;
-  gint16 y1;
-  gint16 x2;
-  gint16 y2;
-};
-
-struct _GdkFont
-{
-  GdkFontType type;
-  gint ascent;
-  gint descent;
-};
-
-struct _GdkCursor
-{
-  GdkCursorType type;
-};
-
-
-struct _GdkColorContextDither
-{
-  gint fast_rgb[32][32][32]; /* quick look-up table for faster rendering */
-  gint fast_err[32][32][32]; /* internal RGB error information */
-  gint fast_erg[32][32][32];
-  gint fast_erb[32][32][32];
-};
-
-struct _GdkColorContext
-{
-  GdkVisual *visual;
-  GdkColormap *colormap;
-
-  gint num_colors;		/* available no. of colors in colormap */
-  gint max_colors;		/* maximum no. of colors */
-  gint num_allocated;		/* no. of allocated colors */
-
-  GdkColorContextMode mode;
-  gint need_to_free_colormap;
-  GdkAtom std_cmap_atom;
-
-  gulong *clut;			/* color look-up table */
-  GdkColor *cmap;		/* colormap */
-
-  GHashTable *color_hash;	/* hash table of allocated colors */
-  GdkColor *palette;		/* preallocated palette */
-  gint num_palette;		/* size of palette */
-
-  GdkColorContextDither *fast_dither;	/* fast dither matrix */
-
-  struct
-  {
-    gint red;
-    gint green;
-    gint blue;
-  } shifts;
-
-  struct
-  {
-    gulong red;
-    gulong green;
-    gulong blue;
-  } masks;
-
-  struct
-  {
-    gint red;
-    gint green;
-    gint blue;
-  } bits;
-
-  gulong max_entry;
-
-  gulong black_pixel;
-  gulong white_pixel;
-};
-
-/* Types for XInput support */
-
-struct _GdkDeviceKey
-{
-  guint keyval;
-  GdkModifierType modifiers;
-};
-
-struct _GdkDeviceInfo
-{
-  guint32 deviceid;
-  gchar *name;
-  GdkInputSource source;
-  GdkInputMode mode;
-  gint has_cursor;	/* TRUE if the X pointer follows device motion */
-  gint num_axes;
-  GdkAxisUse *axes;    /* Specifies use for each axis */
-  gint num_keys;
-  GdkDeviceKey *keys;
-};
-
-struct _GdkTimeCoord
-{
-  guint32 time;
-  gdouble x;
-  gdouble y;
-  gdouble pressure;
-  gdouble xtilt;
-  gdouble ytilt;
-};
-
-/* Structure that holds information about a drag in progress.
- * this is used on both source and destination sides.
- */
-struct _GdkDragContext {
-  GdkDragProtocol protocol;
-  
-  gboolean is_source;
-  
-  GdkWindow *source_window;
-  GdkWindow *dest_window;
-
-  GList *targets;
-  GdkDragAction actions;
-  GdkDragAction suggested_action;
-  GdkDragAction action; 
-
-  guint32 start_time;
-};
-
-/* Event filtering */
-
-typedef void GdkXEvent;	  /* Can be cast to XEvent */
-
-typedef GdkFilterReturn (*GdkFilterFunc) (GdkXEvent *xevent,
-					  GdkEvent *event,
-					  gpointer  data);
-
-struct _GdkEventAny
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-};
-
-struct _GdkEventExpose
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkRectangle area;
-  gint count; /* If non-zero, how many more events follow. */
-};
-
-struct _GdkEventNoExpose
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  /* XXX: does anyone need the X major_code or minor_code fields? */
-};
-
-struct _GdkEventVisibility
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkVisibilityState state;
-};
-
-struct _GdkEventMotion
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  guint32 time;
-  gdouble x;
-  gdouble y;
-  gdouble pressure;
-  gdouble xtilt;
-  gdouble ytilt;
-  guint state;
-  gint16 is_hint;
-  GdkInputSource source;
-  guint32 deviceid;
-  gdouble x_root, y_root;
-};
-
-struct _GdkEventButton
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  guint32 time;
-  gdouble x;
-  gdouble y;
-  gdouble pressure;
-  gdouble xtilt;
-  gdouble ytilt;
-  guint state;
-  guint button;
-  GdkInputSource source;
-  guint32 deviceid;
-  gdouble x_root, y_root;
-};
-
-struct _GdkEventKey
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  guint32 time;
-  guint state;
-  guint keyval;
-  gint length;
-  gchar *string;
-};
-
-struct _GdkEventCrossing
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkWindow *subwindow;
-  guint32 time;
-  gdouble x;
-  gdouble y;
-  gdouble x_root;
-  gdouble y_root;
-  GdkCrossingMode mode;
-  GdkNotifyType detail;
-  gboolean focus;
-  guint state;
-};
-
-struct _GdkEventFocus
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  gint16 in;
-};
-
-struct _GdkEventConfigure
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  gint16 x, y;
-  gint16 width;
-  gint16 height;
-};
-
-struct _GdkEventProperty
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkAtom atom;
-  guint32 time;
-  guint state;
-};
-
-struct _GdkEventSelection
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkAtom selection;
-  GdkAtom target;
-  GdkAtom property;
-  guint32 requestor;
-  guint32 time;
-};
-
-/* This event type will be used pretty rarely. It only is important
-   for XInput aware programs that are drawing their own cursor */
-
-struct _GdkEventProximity
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  guint32 time;
-  GdkInputSource source;
-  guint32 deviceid;
-};
-
-struct _GdkEventClient
-{
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkAtom message_type;
-  gushort data_format;
-  union {
-    char b[20];
-    short s[10];
-    long l[5];
-  } data;
-};
-
-/* Event types for DND */
-
-struct _GdkEventDND {
-  GdkEventType type;
-  GdkWindow *window;
-  gint8 send_event;
-  GdkDragContext *context;
-
-  guint32 time;
-  gshort x_root, y_root;
-};
-
-union _GdkEvent
-{
-  GdkEventType		    type;
-  GdkEventAny		    any;
-  GdkEventExpose	    expose;
-  GdkEventNoExpose	    no_expose;
-  GdkEventVisibility	    visibility;
-  GdkEventMotion	    motion;
-  GdkEventButton	    button;
-  GdkEventKey		    key;
-  GdkEventCrossing	    crossing;
-  GdkEventFocus		    focus_change;
-  GdkEventConfigure	    configure;
-  GdkEventProperty	    property;
-  GdkEventSelection	    selection;
-  GdkEventProximity	    proximity;
-  GdkEventClient	    client;
-  GdkEventDND               dnd;
-};
-
-struct _GdkRegion
-{
-  gpointer user_data;
-};
-
-struct _GdkICAttr
-{
-  GdkIMStyle style;
-  GdkWindow *client_window;
-  GdkWindow *focus_window;
-  GdkEventMask filter_events;
-  GdkPoint spot_location;
-  gint line_spacing;
-  GdkCursor *cursor;
-
-  GdkFont *preedit_fontset;
-  GdkRectangle preedit_area;
-  GdkRectangle preedit_area_needed; 
-  GdkColor preedit_foreground;
-  GdkColor preedit_background;
-  GdkPixmap *preedit_pixmap;
-  GdkColormap *preedit_colormap;
-
-  GdkFont *status_fontset;
-  GdkRectangle status_area;
-  GdkRectangle status_area_needed; 
-  GdkColor status_foreground;
-  GdkColor status_background;
-  GdkPixmap *status_pixmap;
-  GdkColormap *status_colormap;
-};
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GDK_TYPES_H__ */
diff --git a/gdk/win32/gdkvisual-win32.c b/gdk/win32/gdkvisual-win32.c
index e207fde7b..70f513c4e 100644
--- a/gdk/win32/gdkvisual-win32.c
+++ b/gdk/win32/gdkvisual-win32.c
@@ -26,8 +26,7 @@
 
 #include "config.h"
 
-#include "gdk.h"
-#include "gdkprivate.h"
+#include <gdk/gdk.h>
 #include "gdkx.h"
 
 static void  gdk_visual_add            (GdkVisual *visual);
diff --git a/gdk/win32/gdkvisual.c b/gdk/win32/gdkvisual.c
index e207fde7b..70f513c4e 100644
--- a/gdk/win32/gdkvisual.c
+++ b/gdk/win32/gdkvisual.c
@@ -26,8 +26,7 @@
 
 #include "config.h"
 
-#include "gdk.h"
-#include "gdkprivate.h"
+#include <gdk/gdk.h>
 #include "gdkx.h"
 
 static void  gdk_visual_add            (GdkVisual *visual);
diff --git a/gdk/win32/gdkwin32.h b/gdk/win32/gdkwin32.h
index 508619114..34724393f 100644
--- a/gdk/win32/gdkwin32.h
+++ b/gdk/win32/gdkwin32.h
@@ -28,7 +28,7 @@
 #define __GDK_X_H__
 
 #include <gdk/gdk.h>
-#include <gdk/gdkprivate.h>
+#include <gdkprivate.h>
 
 #include <time.h>
 #include <locale.h>
diff --git a/gdk/win32/gdkwin32id.c b/gdk/win32/gdkwin32id.c
index f6d7bf0f4..de2bfa9d3 100644
--- a/gdk/win32/gdkwin32id.c
+++ b/gdk/win32/gdkwin32id.c
@@ -26,9 +26,9 @@
 
 #include "config.h"
 
-#include "gdk.h"
-#include "gdkprivate.h"
 #include <stdio.h>
+#include <gdk/gdk.h>
+#include "gdkprivate.h"
 
 static guint gdk_xid_hash    (XID *xid);
 static gint  gdk_xid_compare (XID *a,
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index d7728d69e..d41750ae4 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -27,11 +27,11 @@
 
 #include "config.h"
 
-#include "gdk.h"
-#include "gdkprivate.h"
-#include "gdkinput.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include <gdk/gdk.h>
+#include "gdkprivate.h"
+#include "gdkinput.h"
 
 /* The Win API function AdjustWindowRect may return negative values
  * resulting in obscured title bars. This helper function is coreccting it.
diff --git a/gdk/win32/gdkwindow.c b/gdk/win32/gdkwindow.c
index d7728d69e..d41750ae4 100644
--- a/gdk/win32/gdkwindow.c
+++ b/gdk/win32/gdkwindow.c
@@ -27,11 +27,11 @@
 
 #include "config.h"
 
-#include "gdk.h"
-#include "gdkprivate.h"
-#include "gdkinput.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include <gdk/gdk.h>
+#include "gdkprivate.h"
+#include "gdkinput.h"
 
 /* The Win API function AdjustWindowRect may return negative values
  * resulting in obscured title bars. This helper function is coreccting it.
diff --git a/gdk/win32/gdkx.h b/gdk/win32/gdkx.h
index 508619114..34724393f 100644
--- a/gdk/win32/gdkx.h
+++ b/gdk/win32/gdkx.h
@@ -28,7 +28,7 @@
 #define __GDK_X_H__
 
 #include <gdk/gdk.h>
-#include <gdk/gdkprivate.h>
+#include <gdkprivate.h>
 
 #include <time.h>
 #include <locale.h>
diff --git a/gdk/win32/gdkxid.c b/gdk/win32/gdkxid.c
index f6d7bf0f4..de2bfa9d3 100644
--- a/gdk/win32/gdkxid.c
+++ b/gdk/win32/gdkxid.c
@@ -26,9 +26,9 @@
 
 #include "config.h"
 
-#include "gdk.h"
-#include "gdkprivate.h"
 #include <stdio.h>
+#include <gdk/gdk.h>
+#include "gdkprivate.h"
 
 static guint gdk_xid_hash    (XID *xid);
 static gint  gdk_xid_compare (XID *a,
diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc
index e6591d38c..0594778ec 100644
--- a/gdk/win32/makefile.msc
+++ b/gdk/win32/makefile.msc
@@ -75,6 +75,13 @@ gdk-$(GTK_VER).dll : $(gdk_OBJECTS) gdk.def gdk.res
 .c.obj :
 	$(CC) $(CFLAGS) -GD -c -DGDK_COMPILATION -DG_LOG_DOMAIN=\"Gdk\" $<
 
+gdkrgb.c : ..\gdkrgb.c
+	copy ..\gdkrgb.c .
+
+gdkrectangle.c : ..\gdkrectangle.c
+	copy ..\gdkrectangle.c .
+
+
 testgdk.exe : testgdk.obj gdk-$(GTK_VER).dll
 	$(CC) $(CFLAGS) testgdk.obj gdk-$(GTK_VER).lib $(GLIB)\glib-$(GLIB_VER).lib $(LDFLAGS)