Directly include the contents of gdkcursors.h in the GdkCursorType enum.

        * gdk/gdkcursor.h: Directly include the contents
        of gdkcursors.h in the GdkCursorType enum.

        * gdk/gdkcursors.h: Deleted.

        * gdk/gdkkeysyms.h: Remove XFree86-specific keysyms, add
        header boilerplate.

        * gdk/Makefile.am: Remove the X-derived-headers rule.

        * gdk/tmpl/cursors.sgml: Document GdkCursor and standard cursors.

4 files changed, 110 insertions, 236 deletions

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index cea103a9c..29293fc16 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -190,19 +190,6 @@ MAINTAINERCLEANFILES =
 EXTRA_HEADERS =
 
 #
-# rules to generate built sources
-#
-# we only need to remake these headers once a new X version is released
-X-derived-headers:
-	sed -e 's/^#define[ 	]*XC\([^ 	]*\)[ 	]*\([^ 	]*\)[ 	]*.*$$/GDK\1 = \2,/' \
-	    -e 'tb' -e 'd' -e ':b' \
-	    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
-	    < @x_includes@/X11/cursorfont.h > gdkcursors.h ; \
-	sed -e 's/^#define[ 	]*XK\([^ 	]*\)[ 	]*\([^ 	]*\)[ 	]*.*$$/#define GDK\1 \2/' \
-	    -e 'tb' -e 'd' -e ':b' -e 's/ 0X/ 0x/' \
-	    < @x_includes@/X11/keysymdef.h > gdkkeysyms.h
-
-#
 # Rule to install gdkconfig.h header file
 #
 configexecincludedir = $(libdir)/gtk-2.0/include
diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index be2778c3f..24e9c7f7d 100644
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -13,9 +13,85 @@ extern "C" {
  */
 typedef enum
 {
-#include <gdk/gdkcursors.h>
+  GDK_X_CURSOR 		  = 0,
+  GDK_ARROW 		  = 2,
+  GDK_BASED_ARROW_DOWN    = 4,
+  GDK_BASED_ARROW_UP 	  = 6,
+  GDK_BOAT 		  = 8,
+  GDK_BOGOSITY 		  = 10,
+  GDK_BOTTOM_LEFT_CORNER  = 12,
+  GDK_BOTTOM_RIGHT_CORNER = 14,
+  GDK_BOTTOM_SIDE 	  = 16,
+  GDK_BOTTOM_TEE 	  = 18,
+  GDK_BOX_SPIRAL 	  = 20,
+  GDK_CENTER_PTR 	  = 22,
+  GDK_CIRCLE 		  = 24,
+  GDK_CLOCK	 	  = 26,
+  GDK_COFFEE_MUG 	  = 28,
+  GDK_CROSS 		  = 30,
+  GDK_CROSS_REVERSE 	  = 32,
+  GDK_CROSSHAIR 	  = 34,
+  GDK_DIAMOND_CROSS 	  = 36,
+  GDK_DOT 		  = 38,
+  GDK_DOTBOX 		  = 40,
+  GDK_DOUBLE_ARROW 	  = 42,
+  GDK_DRAFT_LARGE 	  = 44,
+  GDK_DRAFT_SMALL 	  = 46,
+  GDK_DRAPED_BOX 	  = 48,
+  GDK_EXCHANGE 		  = 50,
+  GDK_FLEUR 		  = 52,
+  GDK_GOBBLER 		  = 54,
+  GDK_GUMBY 		  = 56,
+  GDK_HAND1 		  = 58,
+  GDK_HAND2 		  = 60,
+  GDK_HEART 		  = 62,
+  GDK_ICON 		  = 64,
+  GDK_IRON_CROSS 	  = 66,
+  GDK_LEFT_PTR 		  = 68,
+  GDK_LEFT_SIDE 	  = 70,
+  GDK_LEFT_TEE 		  = 72,
+  GDK_LEFTBUTTON 	  = 74,
+  GDK_LL_ANGLE 		  = 76,
+  GDK_LR_ANGLE 	 	  = 78,
+  GDK_MAN 		  = 80,
+  GDK_MIDDLEBUTTON 	  = 82,
+  GDK_MOUSE 		  = 84,
+  GDK_PENCIL 		  = 86,
+  GDK_PIRATE 		  = 88,
+  GDK_PLUS 		  = 90,
+  GDK_QUESTION_ARROW 	  = 92,
+  GDK_RIGHT_PTR 	  = 94,
+  GDK_RIGHT_SIDE 	  = 96,
+  GDK_RIGHT_TEE 	  = 98,
+  GDK_RIGHTBUTTON 	  = 100,
+  GDK_RTL_LOGO 		  = 102,
+  GDK_SAILBOAT 		  = 104,
+  GDK_SB_DOWN_ARROW 	  = 106,
+  GDK_SB_H_DOUBLE_ARROW   = 108,
+  GDK_SB_LEFT_ARROW 	  = 110,
+  GDK_SB_RIGHT_ARROW 	  = 112,
+  GDK_SB_UP_ARROW 	  = 114,
+  GDK_SB_V_DOUBLE_ARROW   = 116,
+  GDK_SHUTTLE 		  = 118,
+  GDK_SIZING 		  = 120,
+  GDK_SPIDER		  = 122,
+  GDK_SPRAYCAN 		  = 124,
+  GDK_STAR 		  = 126,
+  GDK_TARGET 		  = 128,
+  GDK_TCROSS 		  = 130,
+  GDK_TOP_LEFT_ARROW 	  = 132,
+  GDK_TOP_LEFT_CORNER 	  = 134,
+  GDK_TOP_RIGHT_CORNER 	  = 136,
+  GDK_TOP_SIDE 		  = 138,
+  GDK_TOP_TEE 		  = 140,
+  GDK_TREK 		  = 142,
+  GDK_UL_ANGLE 		  = 144,
+  GDK_UMBRELLA 		  = 146,
+  GDK_UR_ANGLE 		  = 148,
+  GDK_WATCH 		  = 150,
+  GDK_XTERM 		  = 152,
   GDK_LAST_CURSOR,
-  GDK_CURSOR_IS_PIXMAP = -1
+  GDK_CURSOR_IS_PIXMAP 	= -1
 } GdkCursorType;
 
 struct _GdkCursor
diff --git a/gdk/gdkcursors.h b/gdk/gdkcursors.h
deleted file mode 100644
index 1d2ae0131..000000000
--- a/gdk/gdkcursors.h
+++ /dev/null
@@ -1,78 +0,0 @@
-GDK_NUM_GLYPHS = 154,
-GDK_X_CURSOR = 0,
-GDK_ARROW = 2,
-GDK_BASED_ARROW_DOWN = 4,
-GDK_BASED_ARROW_UP = 6,
-GDK_BOAT = 8,
-GDK_BOGOSITY = 10,
-GDK_BOTTOM_LEFT_CORNER = 12,
-GDK_BOTTOM_RIGHT_CORNER = 14,
-GDK_BOTTOM_SIDE = 16,
-GDK_BOTTOM_TEE = 18,
-GDK_BOX_SPIRAL = 20,
-GDK_CENTER_PTR = 22,
-GDK_CIRCLE = 24,
-GDK_CLOCK = 26,
-GDK_COFFEE_MUG = 28,
-GDK_CROSS = 30,
-GDK_CROSS_REVERSE = 32,
-GDK_CROSSHAIR = 34,
-GDK_DIAMOND_CROSS = 36,
-GDK_DOT = 38,
-GDK_DOTBOX = 40,
-GDK_DOUBLE_ARROW = 42,
-GDK_DRAFT_LARGE = 44,
-GDK_DRAFT_SMALL = 46,
-GDK_DRAPED_BOX = 48,
-GDK_EXCHANGE = 50,
-GDK_FLEUR = 52,
-GDK_GOBBLER = 54,
-GDK_GUMBY = 56,
-GDK_HAND1 = 58,
-GDK_HAND2 = 60,
-GDK_HEART = 62,
-GDK_ICON = 64,
-GDK_IRON_CROSS = 66,
-GDK_LEFT_PTR = 68,
-GDK_LEFT_SIDE = 70,
-GDK_LEFT_TEE = 72,
-GDK_LEFTBUTTON = 74,
-GDK_LL_ANGLE = 76,
-GDK_LR_ANGLE = 78,
-GDK_MAN = 80,
-GDK_MIDDLEBUTTON = 82,
-GDK_MOUSE = 84,
-GDK_PENCIL = 86,
-GDK_PIRATE = 88,
-GDK_PLUS = 90,
-GDK_QUESTION_ARROW = 92,
-GDK_RIGHT_PTR = 94,
-GDK_RIGHT_SIDE = 96,
-GDK_RIGHT_TEE = 98,
-GDK_RIGHTBUTTON = 100,
-GDK_RTL_LOGO = 102,
-GDK_SAILBOAT = 104,
-GDK_SB_DOWN_ARROW = 106,
-GDK_SB_H_DOUBLE_ARROW = 108,
-GDK_SB_LEFT_ARROW = 110,
-GDK_SB_RIGHT_ARROW = 112,
-GDK_SB_UP_ARROW = 114,
-GDK_SB_V_DOUBLE_ARROW = 116,
-GDK_SHUTTLE = 118,
-GDK_SIZING = 120,
-GDK_SPIDER = 122,
-GDK_SPRAYCAN = 124,
-GDK_STAR = 126,
-GDK_TARGET = 128,
-GDK_TCROSS = 130,
-GDK_TOP_LEFT_ARROW = 132,
-GDK_TOP_LEFT_CORNER = 134,
-GDK_TOP_RIGHT_CORNER = 136,
-GDK_TOP_SIDE = 138,
-GDK_TOP_TEE = 140,
-GDK_TREK = 142,
-GDK_UL_ANGLE = 144,
-GDK_UMBRELLA = 146,
-GDK_UR_ANGLE = 148,
-GDK_WATCH = 150,
-GDK_XTERM = 152,
diff --git a/gdk/gdkkeysyms.h b/gdk/gdkkeysyms.h
index 25bb5c574..6d6ddffa4 100644
--- a/gdk/gdkkeysyms.h
+++ b/gdk/gdkkeysyms.h
@@ -1,3 +1,33 @@
+/* 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 Lesser 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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-2001.  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_KEYSYMS_H__
+#define __GDK_KEYSYMS_H__
+
+
 #define GDK_VoidSymbol 0xFFFFFF
 #define GDK_BackSpace 0xFF08
 #define GDK_Tab 0xFF09
@@ -751,7 +781,6 @@
 #define GDK_Serbian_nje 0x6aa
 #define GDK_Serbian_tshe 0x6ab
 #define GDK_Macedonia_kje 0x6ac
-#define GDK_Ukrainian_ghe_with_upturn 0x6ad
 #define GDK_Byelorussian_shortu 0x6ae
 #define GDK_Cyrillic_dzhe 0x6af
 #define GDK_Serbian_dze 0x6af
@@ -774,7 +803,6 @@
 #define GDK_Serbian_NJE 0x6ba
 #define GDK_Serbian_TSHE 0x6bb
 #define GDK_Macedonia_KJE 0x6bc
-#define GDK_Ukrainian_GHE_WITH_UPTURN 0x6bd
 #define GDK_Byelorussian_SHORTU 0x6be
 #define GDK_Cyrillic_DZHE 0x6bf
 #define GDK_Serbian_DZE 0x6bf
@@ -1322,147 +1350,6 @@
 #define GDK_Hangul_J_KkogjiDalrinIeung 0xef9
 #define GDK_Hangul_J_YeorinHieuh 0xefa
 #define GDK_Korean_Won 0xeff
-#define GDK_Armenian_eternity 0x14a1
-#define GDK_Armenian_section_sign 0x14a2
-#define GDK_Armenian_full_stop 0x14a3
-#define GDK_Armenian_verjaket 0x14a3
-#define GDK_Armenian_parenright 0x14a4
-#define GDK_Armenian_parenleft 0x14a5
-#define GDK_Armenian_guillemotright 0x14a6
-#define GDK_Armenian_guillemotleft 0x14a7
-#define GDK_Armenian_em_dash 0x14a8
-#define GDK_Armenian_dot 0x14a9
-#define GDK_Armenian_mijaket 0x14a9
-#define GDK_Armenian_separation_mark 0x14aa
-#define GDK_Armenian_but 0x14aa
-#define GDK_Armenian_comma 0x14ab
-#define GDK_Armenian_en_dash 0x14ac
-#define GDK_Armenian_hyphen 0x14ad
-#define GDK_Armenian_yentamna 0x14ad
-#define GDK_Armenian_ellipsis 0x14ae
-#define GDK_Armenian_exclam 0x14af
-#define GDK_Armenian_amanak 0x14af
-#define GDK_Armenian_accent 0x14b0
-#define GDK_Armenian_shesht 0x14b0
-#define GDK_Armenian_question 0x14b1
-#define GDK_Armenian_paruyk 0x14b1
-#define GDK_Armenian_AYB 0x14b2
-#define GDK_Armenian_ayb 0x14b3
-#define GDK_Armenian_BEN 0x14b4
-#define GDK_Armenian_ben 0x14b5
-#define GDK_Armenian_GIM 0x14b6
-#define GDK_Armenian_gim 0x14b7
-#define GDK_Armenian_DA 0x14b8
-#define GDK_Armenian_da 0x14b9
-#define GDK_Armenian_YECH 0x14ba
-#define GDK_Armenian_yech 0x14bb
-#define GDK_Armenian_ZA 0x14bc
-#define GDK_Armenian_za 0x14bd
-#define GDK_Armenian_E 0x14be
-#define GDK_Armenian_e 0x14bf
-#define GDK_Armenian_AT 0x14c0
-#define GDK_Armenian_at 0x14c1
-#define GDK_Armenian_TO 0x14c2
-#define GDK_Armenian_to 0x14c3
-#define GDK_Armenian_ZHE 0x14c4
-#define GDK_Armenian_zhe 0x14c5
-#define GDK_Armenian_INI 0x14c6
-#define GDK_Armenian_ini 0x14c7
-#define GDK_Armenian_LYUN 0x14c8
-#define GDK_Armenian_lyun 0x14c9
-#define GDK_Armenian_KHE 0x14ca
-#define GDK_Armenian_khe 0x14cb
-#define GDK_Armenian_TSA 0x14cc
-#define GDK_Armenian_tsa 0x14cd
-#define GDK_Armenian_KEN 0x14ce
-#define GDK_Armenian_ken 0x14cf
-#define GDK_Armenian_HO 0x14d0
-#define GDK_Armenian_ho 0x14d1
-#define GDK_Armenian_DZA 0x14d2
-#define GDK_Armenian_dza 0x14d3
-#define GDK_Armenian_GHAT 0x14d4
-#define GDK_Armenian_ghat 0x14d5
-#define GDK_Armenian_TCHE 0x14d6
-#define GDK_Armenian_tche 0x14d7
-#define GDK_Armenian_MEN 0x14d8
-#define GDK_Armenian_men 0x14d9
-#define GDK_Armenian_HI 0x14da
-#define GDK_Armenian_hi 0x14db
-#define GDK_Armenian_NU 0x14dc
-#define GDK_Armenian_nu 0x14dd
-#define GDK_Armenian_SHA 0x14de
-#define GDK_Armenian_sha 0x14df
-#define GDK_Armenian_VO 0x14e0
-#define GDK_Armenian_vo 0x14e1
-#define GDK_Armenian_CHA 0x14e2
-#define GDK_Armenian_cha 0x14e3
-#define GDK_Armenian_PE 0x14e4
-#define GDK_Armenian_pe 0x14e5
-#define GDK_Armenian_JE 0x14e6
-#define GDK_Armenian_je 0x14e7
-#define GDK_Armenian_RA 0x14e8
-#define GDK_Armenian_ra 0x14e9
-#define GDK_Armenian_SE 0x14ea
-#define GDK_Armenian_se 0x14eb
-#define GDK_Armenian_VEV 0x14ec
-#define GDK_Armenian_vev 0x14ed
-#define GDK_Armenian_TYUN 0x14ee
-#define GDK_Armenian_tyun 0x14ef
-#define GDK_Armenian_RE 0x14f0
-#define GDK_Armenian_re 0x14f1
-#define GDK_Armenian_TSO 0x14f2
-#define GDK_Armenian_tso 0x14f3
-#define GDK_Armenian_VYUN 0x14f4
-#define GDK_Armenian_vyun 0x14f5
-#define GDK_Armenian_PYUR 0x14f6
-#define GDK_Armenian_pyur 0x14f7
-#define GDK_Armenian_KE 0x14f8
-#define GDK_Armenian_ke 0x14f9
-#define GDK_Armenian_O 0x14fa
-#define GDK_Armenian_o 0x14fb
-#define GDK_Armenian_FE 0x14fc
-#define GDK_Armenian_fe 0x14fd
-#define GDK_Armenian_apostrophe 0x14fe
-#define GDK_Armenian_ligature_ew 0x14ff
-#define GDK_Georgian_an 0x15d0
-#define GDK_Georgian_ban 0x15d1
-#define GDK_Georgian_gan 0x15d2
-#define GDK_Georgian_don 0x15d3
-#define GDK_Georgian_en 0x15d4
-#define GDK_Georgian_vin 0x15d5
-#define GDK_Georgian_zen 0x15d6
-#define GDK_Georgian_tan 0x15d7
-#define GDK_Georgian_in 0x15d8
-#define GDK_Georgian_kan 0x15d9
-#define GDK_Georgian_las 0x15da
-#define GDK_Georgian_man 0x15db
-#define GDK_Georgian_nar 0x15dc
-#define GDK_Georgian_on 0x15dd
-#define GDK_Georgian_par 0x15de
-#define GDK_Georgian_zhar 0x15df
-#define GDK_Georgian_rae 0x15e0
-#define GDK_Georgian_san 0x15e1
-#define GDK_Georgian_tar 0x15e2
-#define GDK_Georgian_un 0x15e3
-#define GDK_Georgian_phar 0x15e4
-#define GDK_Georgian_khar 0x15e5
-#define GDK_Georgian_ghan 0x15e6
-#define GDK_Georgian_qar 0x15e7
-#define GDK_Georgian_shin 0x15e8
-#define GDK_Georgian_chin 0x15e9
-#define GDK_Georgian_can 0x15ea
-#define GDK_Georgian_jil 0x15eb
-#define GDK_Georgian_cil 0x15ec
-#define GDK_Georgian_char 0x15ed
-#define GDK_Georgian_xan 0x15ee
-#define GDK_Georgian_jhan 0x15ef
-#define GDK_Georgian_hae 0x15f0
-#define GDK_Georgian_he 0x15f1
-#define GDK_Georgian_hie 0x15f2
-#define GDK_Georgian_we 0x15f3
-#define GDK_Georgian_har 0x15f4
-#define GDK_Georgian_hoe 0x15f5
-#define GDK_Georgian_fi 0x15f6
 #define GDK_EcuSign 0x20a0
 #define GDK_ColonSign 0x20a1
 #define GDK_CruzeiroSign 0x20a2
@@ -1476,3 +1363,5 @@
 #define GDK_NewSheqelSign 0x20aa
 #define GDK_DongSign 0x20ab
 #define GDK_EuroSign 0x20ac
+
+#endif /* __GDK_KEYSYMS_H__ */