--- ./programs/xkbcomp/keycodes/evdev.evdev-xkb	Thu Aug 25 22:20:41 2005
+++ ./programs/xkbcomp/keycodes/evdev	Thu Aug 25 22:20:41 2005
@@ -0,0 +1,355 @@
+// translation from evdev scancodes to something resembling xfree86 keycodes.
+
+default xkb_keycodes "evdev" {
+    minimum = 8;
+    maximum = 511;
+
+    <TLDE> =  41;
+    <AE01> =   2;
+    <AE02> =   3;
+    <AE03> =   4;
+    <AE04> =   5;
+    <AE05> =   6;
+    <AE06> =   7;
+    <AE07> =   8;
+    <AE08> =   9;
+    <AE09> =  10;
+    <AE10> =  11;
+    <AE11> =  12;
+    <AE12> =  13;
+    <BKSP> =  14;
+
+    <TAB>  =  15;
+    <AD01> =  16;
+    <AD02> =  17;
+    <AD03> =  18;
+    <AD04> =  19;
+    <AD05> =  20;
+    <AD06> =  21;
+    <AD07> =  22;
+    <AD08> =  23;
+    <AD09> =  24;
+    <AD10> =  25;
+    <AD11> =  26;
+    <AD12> =  27;
+    <BKSL> =  43;
+    <RTRN> =  28;
+
+    <CAPS> =  58;
+    <AC01> =  30;
+    <AC02> =  31;
+    <AC03> =  32;
+    <AC04> =  33;
+    <AC05> =  34;
+    <AC06> =  35;
+    <AC07> =  36;
+    <AC08> =  37;
+    <AC09> =  38;
+    <AC10> =  39;
+    <AC11> =  40;
+
+    <LFSH> =  42;
+    <AB01> =  44;
+    <AB02> =  45;
+    <AB03> =  46;
+    <AB04> =  47;
+    <AB05> =  48;
+    <AB06> =  49;
+    <AB07> =  50;
+    <AB08> =  51;
+    <AB09> =  52;
+    <AB10> =  53;
+    <RTSH> =  54;
+
+    <LALT> =  56;
+    <LCTL> =  29;
+    <SPCE> =  57;
+    <RCTL> =  97;
+    <RALT> = 100;
+    // Microsoft keyboard extra keys
+    // <LWIN> = 115; 125 leftmeta?
+    // <RWIN> = 116; 126 rightmeta?
+    <MENU> = 139;  // guess, maybe 127 compose?
+
+    <ESC>  =   1;
+    <FK01> =  59;
+    <FK02> =  60;
+    <FK03> =  61;
+    <FK04> =  62;
+    <FK05> =  63;
+    <FK06> =  64;
+    <FK07> =  65;
+    <FK08> =  66;
+    <FK09> =  67;
+    <FK10> =  68;
+    <FK11> =  87;
+    <FK12> =  88;
+
+    <PRSC> = 121;
+    <SYRQ> =  99;
+    <SCLK> =  70;
+    <PAUS> = 119;
+    <BRK>  = 411;
+
+    <INS>  = 110;
+    <HOME> = 102;
+    <PGUP> = 104;
+    <DELE> = 111;
+    <END>  = 103;
+    <PGDN> = 109;
+
+    <UP>   = 103;
+    <LEFT> = 105;
+    <DOWN> = 108;
+    <RGHT> = 106;
+
+    <NMLK> =  69;
+    <KPDV> =  98;
+    <KPMU> =  55;
+    <KPSU> =  74;
+
+    <KP7>  =  71;
+    <KP8>  =  72;
+    <KP9>  =  73;
+    <KPAD> =  78;
+
+    <KP4>  =  75;
+    <KP5>  =  76;
+    <KP6>  =  77;
+
+    <KP1>  =  79;
+    <KP2>  =  80;
+    <KP3>  =  81;
+    <KPEN> =  96;
+
+    <KP0>  =  82;
+    <KPDL> =  83;
+    // <KPEQ> = 126;
+
+    <FK13> = 183;
+    <FK14> = 184;
+    <FK15> = 185;
+    <FK16> = 186;
+    <FK17> = 187;
+    // <KPDC> = 123;
+
+    // Keys that are generated on Japanese keyboards
+
+    // alias <HZTG> = <TLDE>;	// Hankaku_Zenkaku toggle
+    <HZTG> =  85;               // Hankaku/Zenkakau toggle 
+    <HKTG> =  93;		// Hiragana/Katakana toggle
+    // <AB11> = 211;		// backslash/underscore
+    <XFER> =  92;		// Henkan
+    <NFER> =  94;		// Muhenkan
+    <AE13> = 124;		// Yen
+
+    // Keys that are generated on Korean keyboards
+
+    // alias <HNGL> = <FK16>;     // Hangul Latin toggle
+    // alias <HJCV> = <FK17>;     // Hangul to Hanja conversion
+    <HNGL> = 122;
+    <HJCV> = 123;
+
+    // Extended keys that may be generated on "Internet" keyboards.
+    // These are not standardised, hence the meaningless names.
+    // The entries commented out are never generated because the raw codes
+    // in those positions are already used for well-defined keys.
+
+    // evdev does standardize names for these though.  comment them 
+    // all out for now.
+
+    // alias <I01> = <XFER>;
+    // <I02> =   130;
+    // alias <I03> = <NFER>;
+    // <I04> =   132;
+    // alias <I05> = <AE13>;
+    // <I06> =   134;
+    // <I07> =   135;
+    // <I08> =   136;
+    // <I09> =   137;
+    // <I0A> =   138;
+    // <I0B> =   139;
+    // <I0C> =   140;
+    // <I0D> =   141;
+    // <I0E> =   142;
+    // <I0F> =   143;
+    // <I10> =   144;
+    // <I11> =   145;
+    // <I12> =   146;
+    // <I13> =   147;
+    // <I14> =   148;
+    // <I15> =   149;
+    // <I16> =   150;
+    // <I17> =   151;
+    // <I18> =   152;
+    // <I19> =   153;
+    // <I1A> =   154;
+    // <I1B> =   155;
+    // <I1C> =   156;	<META>
+    // <I1D> =   157;	<K59>
+    // <I1E> =   158;
+    // <I1F> =   159;
+    // <I20> =   160;
+    // <I21> =   161;
+    // <I22> =   162;
+    // <I23> =   163;
+    // <I24> =   164;
+    // <I25> =   165;
+    // <I26> =   166;
+    // <I27> =   167;
+    // <I28> =   168;
+    // <I29> =   169;
+    // <I2A> =   170;	<K5A>
+    // <I2B> =   171;
+    // <I2C> =   172;
+    // <I2D> =   173;
+    // <I2E> =   174;
+    // <I2F> =   175;
+    // <I30> =   176;
+    // <I31> =   177;
+    // <I32> =   178;
+    // <I33> =   179;
+    // <I34> =   180;
+    // <I35> =   181;	<K5B>
+    // <I36> =   182;	<K5D>
+    // <I37> =   183;	<K5E>
+    // <I38> =   184;	<K5F>
+    // <I39> =   185;
+    // <I3A> =   186;
+    // <I3B> =   187;
+    // <I3C> =   188;
+    // <I3D> =   189;	<K62>
+    // <I3E> =   190;	<K63>
+    // <I3F> =   191;	<K64>
+    // <I40> =   192;	<K65>
+    // <I41> =   193;	<K66>
+    // <I42> =   194;
+    // <I43> =   195;
+    // <I44> =   196;
+    // <I45> =   197;
+    // <I46> =   198;	<K67>
+    // <I47> =   199;	<K68>
+    // <I48> =   200;	<K69>
+    // <I49> =   201;	<K6A>
+    // <I4A> =   202;
+    // <I4B> =   203;	<K6B>
+    // <I4C> =   204;	<K6C>
+    // <I4D> =   205;	<K6D>
+    // <I4E> =   206;	<K6E>
+    // <I4F> =   207;	<K6F>
+    // <I50> =   208;	<K70>
+    // <I51> =   209;	<K71>
+    // <I52> =   210;	<K72>
+    // <I53> =   211;	<K73>
+    // <I54> =   212;
+    // <I55> =   213;
+    // <I56> =   214;
+    // <I57> =   215;
+    // <I58> =   216;
+    // <I59> =   217;
+    // <I5A> =   218;
+    // <I5B> =   219;	<K74>
+    // <I5C> =   220;	<K75>
+    // <I5D> =   221;	<K76>
+    // <I5E> =   222;
+    // <I5F> =   223;
+    // <I60> =   224;
+    // <I61> =   225;
+    // <I62> =   226;
+    // <I63> =   227;
+    // <I64> =   228;
+    // <I65> =   229;
+    // <I66> =   230;
+    // <I67> =   231;
+    // <I68> =   232;
+    // <I69> =   233;
+    // <I6A> =   234;
+    // <I6B> =   235;
+    // <I6C> =   236;
+    // <I6D> =   237;
+    // <I6E> =   238;
+    // <I6F> =   239;
+    // <I70> =   240;
+    // <I71> =   241;
+    // <I72> =   242;
+    // <I73> =   243;
+    // <I74> =   244;
+    // <I75> =   245;
+    // <I76> =   246;
+    // <I77> =   247;
+    // <I78> =   248;
+    // <I79> =   249;
+    // <I7A> =   250;
+    // <I7B> =   251;
+    // <I7C> =   252;
+    // <I7D> =   253;
+    // <I7E> =   254;
+    // <I7F> =   255;
+
+    // Codes generated for scancodes 0x59-0x5f, 0x62-0x76
+    // <K59> =   157;		// <I1D>
+    // <K5A> =   170;		// <I2A>
+    // <K5B> =   181;		// <I35>
+    // alias <K5C> = <KPEQ>;
+    // <K5D> =   182;		// <I36>
+    // <K5E> =   183;		// <I37>
+    // <K5F> =   184;		// <I38>
+    // <K62> =   189;		// <I3D>
+    // <K63> =   190;		// <I3E>
+    // <K64> =   191;		// <I3F>
+    // <K65> =   192;		// <I40>
+    // <K66> =   193;		// <I41>
+    // <K67> =   198;		// <I46>
+    // <K68> =   199;		// <I47>
+    // <K69> =   200;		// <I48>
+    // <K6A> =   201;		// <I49>
+    // <K6B> =   203;		// <I4B>
+    // <K6C> =   204;		// <I4C>
+    // <K6D> =   205;		// <I4D>
+    // <K6E> =   206;		// <I4E>
+    // <K6F> =   207;		// <I4F>
+    // alias <K70> = <HKTG>;	// <I50>
+    // <K71> =   209;		// <I51>
+    // <K72> =   210;		// <I52>
+    // alias <K73> = <AB11>;	// <I53>
+    // <K74> =   219;		// <I5B>
+    // <K75> =   220;		// <I5C>
+    // <K76> =   221;		// <I5D>
+   
+    // Solaris compatibility
+
+    // alias <LMTA> = <LWIN>;
+    // alias <RMTA> = <RWIN>;
+    // alias <COMP> = <MENU>;
+    // alias <POWR> = <I0C>;
+    // alias <MUTE> = <I0D>;
+    // alias <VOL-> = <I0E>;
+    // alias <VOL+> = <I0F>;
+    // alias <HELP> = <I10>;
+    // alias <STOP> = <I11>;
+    // alias <AGAI> = <I12>;
+    // alias <PROP> = <I13>;
+    // alias <UNDO> = <I14>;
+    // alias <FRNT> = <I15>;
+    // alias <COPY> = <I16>;
+    // alias <OPEN> = <I17>;
+    // alias <PAST> = <I18>;
+    // alias <FIND> = <I19>;
+    // alias <CUT>  = <I1A>;
+
+    // Other codes never generated.  The XFree86 ddx never generates
+    // these codes.
+    // Thus we can use them as fake keys
+    // <MDSW> =    93; // <U5D>
+    // <LVL3> =   124; // <U7C>
+    // <ALT>  =   125; // <U7D>
+    // <META> =   156; // <I1C>
+    // <SUPR> =   127; // <U7F>
+    // <HYPR> =   128; // <U80>
+
+    indicator 1 = "Caps Lock";
+    indicator 2 = "Num Lock";
+    indicator 3 = "Scroll Lock";
+
+    alias <ALGR> = <RALT>;
+};
--- ./programs/xkbcomp/keycodes/Imakefile.evdev-xkb	Fri Apr 23 15:54:51 2004
+++ ./programs/xkbcomp/keycodes/Imakefile	Thu Aug 25 22:20:41 2005
@@ -8,7 +8,7 @@
 #define IHaveSubdirs
 
     DATAFILES = README amiga ataritt fujitsu hp ibm macintosh sony sun \
-		xfree86 xfree98 powerpcps2 aliases
+		xfree86 xfree98 powerpcps2 aliases evdev
       SUBDIRS = digital sgi
 
 all::
--- ./programs/xkbcomp/keymap/evdev.evdev-xkb	Thu Aug 25 22:20:41 2005
+++ ./programs/xkbcomp/keymap/evdev	Thu Aug 25 22:20:41 2005
@@ -0,0 +1,362 @@
+// $XFree86: xc/programs/xkbcomp/keymap/evdev,v 3.30 2003/04/03 16:34:49 dawes Exp $
+
+
+default xkb_keymap "us" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "us(pc105)"		};
+    xkb_geometry	{ include "pc"			};
+};
+
+// "ar" addition by Arabeyes Team, <support@arabeyes.org>
+xkb_keymap "ar" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+ar"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+xkb_keymap "be"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+be"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "bg"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+bg"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
+xkb_keymap "br"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "us(pc101)+br"	};
+    xkb_geometry 	{ include "pc(abnt2)"		};
+};
+// cz and sk keymaps by Kamil Toman (ktoman@email.cz) 
+// are designed to replace old czechoslovakian and czsk keyboards
+// and their prog variants. Those are now obsolete and should not be used anymore.
+xkb_keymap "cz" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+cz"	};
+    xkb_geometry	{ include "pc"			};
+};
+xkb_keymap "cz_qwerty" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+cz_qwerty"	};
+    xkb_geometry	{ include "pc"			};
+};
+xkb_keymap "de"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+de"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "de_CH"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+de_CH"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "dk"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+dk"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "dvorak" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+dvorak"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+xkb_keymap "en_US" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc105)"	};
+    xkb_geometry 	{ include "pc"			};
+};
+xkb_keymap "es"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+es"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "fr"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+fr"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "fr-latin9" {
+    xkb_keycodes        { include "evdev"             };
+    xkb_types           { include "default"             };
+    xkb_compatibility   { include "default"             };
+    xkb_symbols         { include "en_US(pc105)+fr-latin9" };
+    xkb_geometry        { include "pc"           	};
+};
+xkb_keymap "fr_CA"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+ca"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "fr_CH"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+fr_CH"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "gb"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+gb"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "hr"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+hr"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "it"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+it"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "jp106" {
+    xkb_keycodes	{ include "evdev(jp106)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "jp(jp106)"		};
+    xkb_geometry	{ include "pc(jp106)"		};
+};
+xkb_keymap "lt"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+lt"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "lt_std"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+lt_std"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "lv"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+lv"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "mk" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+mk"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+xkb_keymap "mt" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+mt"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+xkb_keymap "mt_us" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+mt_us"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+xkb_keymap "no"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+no"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "pl"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+pl"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "pt"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+pt"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+// ro: additions by Cristian Gafton, <gafton@redhat.com>
+xkb_keymap "ro" {
+    xkb_keycodes	{ include "evdev"			};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols		{ include "en_US(pc101)+ro(pc101)"	};
+    xkb_geometry	{ include "pc(pc101)"			};
+};
+xkb_keymap "ro_microsoft" {
+    xkb_keycodes	{ include "evdev"			};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols		{ include "en_US(pc105)+ro(pc105)"	};
+    xkb_geometry	{ include "pc(pc105)"			};
+};
+xkb_keymap "ru"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+ru"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "se_FI"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+fi"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "se_SE"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+se"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "sl" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+si"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+xkb_keymap "sl_SI" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+si"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+// cz and sk keymaps by Kamil Toman (ktoman@email.cz) 
+// are designed to replace old czechoslovakian and czsk keyboards
+// and their prog variants. Those are now obsolete and should not be used anymore.
+xkb_keymap "sk" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+sk"	};
+    xkb_geometry	{ include "pc"			};
+};
+xkb_keymap "sk_qwerty" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+sk_qwerty"	};
+    xkb_geometry	{ include "pc"			};
+};
+// Additions by Emil Soleyman-Zomalan, <emil@nishra.com>
+xkb_keymap "syr" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default" 		};
+    xkb_symbols		{ include "en_US(pc105)+syr"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};    
+xkb_keymap "th"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+th"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "th_tis"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+th_tis"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "th_pat"	{
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+th_pat"	};
+    xkb_geometry 	{ include "pc(pc102)"		};
+};
+xkb_keymap "tr" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+tr"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+xkb_keymap "uk" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+uk)"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+xkb_keymap "us_flexpro" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "us(pc105)"		};
+    xkb_geometry	{ include "keytronic(FlexPro)"	};
+};
+// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
+// us_intl means standard us keyboard plus dead_keys symbols
+// these keyboards are very popular in Brazil
+xkb_keymap "us_intl" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "us(pc101)+us_intl"	};
+    xkb_geometry	{ include "pc"			};
+};
+xkb_keymap "us_microsoft" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "us(pc105)"		};
+    xkb_geometry	{ include "microsoft"		};
+};
+
+xkb_keymap "uz" {
+    xkb_keycodes	{ include "evdev"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+uz"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+
--- ./programs/xkbcomp/keymap/Imakefile.evdev-xkb	Fri Apr 23 15:54:52 2004
+++ ./programs/xkbcomp/keymap/Imakefile	Thu Aug 25 22:20:41 2005
@@ -7,7 +7,7 @@
 
 #define IHaveSubdirs
 
-     DATAFILES = README amiga ataritt macintosh sony xfree86 xfree98
+     DATAFILES = README amiga ataritt macintosh sony xfree86 xfree98 evdev
        SUBDIRS = digital sgi sun
 
 all::
--- ./programs/xkbcomp/rules/xorg.evdev-xkb	Tue Oct 12 15:13:44 2004
+++ ./programs/xkbcomp/rules/xorg	Thu Aug 25 22:20:41 2005
@@ -26,6 +26,7 @@
   pc98		=	xfree98(pc98)
   abnt2		=	xfree86(abnt2)
   jp106		=	xfree86(jp106)
+  evdev         =       evdev
   *		=	xfree86
 
 ! $azerty = be fr fr-latin9
--- ./programs/Xserver/hw/xfree86/input/evdev/evdev.c.evdev-xkb	Thu Aug 25 22:09:21 2005
+++ ./programs/Xserver/hw/xfree86/input/evdev/evdev.c	Thu Aug 25 22:24:26 2005
@@ -47,6 +47,12 @@
 #include <exevents.h>
 #include <mipointer.h>
 
+#ifdef XKB
+#include <X11/extensions/XKB.h>
+#include <X11/extensions/XKBstr.h>
+#include <X11/extensions/XKBsrv.h>
+#endif
+
 #include <xf86Module.h>
 
 /* 2.4 compatibility */
@@ -83,6 +89,78 @@
     int kernel24;
 } EvdevRec, *EvdevPtr;
 
+typedef struct {
+    int     noXkb;
+
+    /* XKB stuff has to be per-device rather than per-driver */
+#ifdef XKB
+    char                    *xkb_rules;
+    char                    *xkb_model;
+    char                    *xkb_layout;
+    char                    *xkb_variant;
+    char                    *xkb_options;
+    XkbComponentNamesRec    xkbnames;
+#endif
+} EvdevRec, *EvdevPtr;
+
+typedef enum {
+    OPTION_XKB_DISABLE,
+    OPTION_XKB_KEYMAP,
+    OPTION_XKB_KEYCODES,
+    OPTION_XKB_TYPES,
+    OPTION_XKB_COMPAT,
+    OPTION_XKB_SYMBOLS,
+    OPTION_XKB_GEOMETRY,
+    OPTION_XKB_RULES,
+    OPTION_XKB_MODEL,
+    OPTION_XKB_LAYOUT,
+    OPTION_XKB_VARIANT,
+    OPTION_XKB_OPTIONS
+} EvdevOpts;
+
+#ifdef XFree86LOADER
+static const OptionInfoRec EvdevOptions[] = {
+    { OPTION_XKB_DISABLE,   "XkbDisable",   OPTV_BOOLEAN, {0}, FALSE },
+    { OPTION_XKB_KEYMAP,    "XkbKeymap",    OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_KEYCODES,  "XkbKeycodes",  OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_TYPES,     "XkbTypes",     OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_COMPAT,    "XkbCompat",    OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_SYMBOLS,   "XkbSymbols",   OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_GEOMETRY,  "XkbGeometry",  OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_RULES,     "XkbRules",     OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_MODEL,     "XkbModel",     OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_LAYOUT,    "XkbLayout",    OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_VARIANT,   "XkbVariant",   OPTV_STRING,  {0}, FALSE },
+    { OPTION_XKB_OPTIONS,   "XkbOptions",   OPTV_STRING,  {0}, FALSE },
+    { -1,                   NULL,           OPTV_NONE,    {0}, FALSE }
+};
+#endif
+
+static const char *evdevDefaults[] = {
+    "XkbRules",     "xfree86",
+    "XkbModel",     "evdev",
+    "XkbLayout",    "us",
+    NULL
+};
+
+static void
+SetXkbOption(InputInfoPtr pInfo, char *name, char **option)
+{
+    char *s;
+
+    if ((s = xf86SetStrOption(pInfo->options, name, NULL))) {
+        if (!s[0]) {
+            xfree(s);
+            *option = NULL;
+        } else {
+            *option = s;
+            xf86Msg(X_CONFIG, "%s: %s: \"%s\"\n", pInfo->name, name, s);
+        }
+    }
+}
+
+#define GET_EVDEVPTR(x) (x->public.devicePrivate->private)
+
 static int wheel_up_button = 4;
 static int wheel_down_button = 5;
 static int wheel_left_button = 6;
@@ -368,6 +446,7 @@
     CARD8 modMap[MAP_LENGTH];
     KeySym sym;
     int i, j;
+    EvdevPtr pEvdev;
 
     static struct { KeySym keysym; CARD8 mask; } modifiers[] = {
         { XK_Shift_L,		ShiftMask },
@@ -389,6 +468,7 @@
      */
 
     pInfo = device->public.devicePrivate;
+    pEvdev = pInfo->private;
 
      /* Compute the modifier map */
     memset(modMap, 0, sizeof modMap);
@@ -406,14 +486,41 @@
     keySyms.minKeyCode = MIN_KEYCODE;
     keySyms.maxKeyCode = MIN_KEYCODE + ArrayLength(map) / GLYPHS_PER_KEY - 1;
 
-    if (!InitKeyClassDeviceStruct(device, &keySyms, modMap))
-        return !Success;
-
-    if (!InitFocusClassDeviceStruct(device))
-        return !Success;
-
-    if (!InitKbdFeedbackClassDeviceStruct(device, EvdevKbdBell, EvdevKbdCtrl))
-        return !Success;
+#ifdef XKB
+    if (pEvdev->noXkb)
+#endif
+    {
+        xf86Msg(X_CONFIG, "XKB: disabled\n");
+        if (!InitKeyboardDeviceStruct((DevicePtr)device, &keySyms, modMap,
+                                      EvdevKbdBell, EvdevKbdCtrl))
+            return !Success;
+    }
+#ifdef XKB
+    else
+    {
+        SetXkbOption(pInfo, "XkbRules", &pEvdev->xkb_rules);
+        SetXkbOption(pInfo, "XkbModel", &pEvdev->xkb_model);
+        SetXkbOption(pInfo, "XkbLayout", &pEvdev->xkb_layout);
+        SetXkbOption(pInfo, "XkbVariant", &pEvdev->xkb_variant);
+        SetXkbOption(pInfo, "XkbOptions", &pEvdev->xkb_options);
+        SetXkbOption(pInfo, "XkbKeycodes", &pEvdev->xkbnames.keycodes);
+        SetXkbOption(pInfo, "XkbTypes", &pEvdev->xkbnames.types);
+        SetXkbOption(pInfo, "XkbCompat", &pEvdev->xkbnames.compat);
+        SetXkbOption(pInfo, "XkbSymbols", &pEvdev->xkbnames.symbols);
+        SetXkbOption(pInfo, "XkbGeometry", &pEvdev->xkbnames.geometry);
+
+        if (pEvdev->xkbnames.keymap)
+            pEvdev->xkb_rules = NULL;
+
+        XkbSetRulesDflts(pEvdev->xkb_rules, pEvdev->xkb_model,
+                         pEvdev->xkb_layout, pEvdev->xkb_variant,
+                         pEvdev->xkb_options);
+        if (!XkbInitKeyboardDeviceStruct(device, &pEvdev->xkbnames,
+                                         &keySyms, modMap, EvdevKbdBell,
+                                         EvdevKbdCtrl))
+            return !Success;
+    }
+#endif
 
     pInfo->flags |= XI86_KEYBOARD_CAPABLE;
 
@@ -658,7 +765,12 @@
         return pInfo;
     pInfo->private = pEvdev;
 
-    xf86CollectInputOptions(pInfo, NULL, NULL);
+    if (!(pEvdev = xcalloc(sizeof(EvdevRec), 1)))
+        return pInfo;
+
+    pInfo->private = pEvdev;
+
+    xf86CollectInputOptions(pInfo, evdevDefaults, NULL);
     xf86ProcessCommonOptions(pInfo, pInfo->options); 
 
     device = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
@@ -679,6 +791,9 @@
         xfree(pEvdev);
         return pInfo;
     }
+
+    pEvdev->noXkb = noXkbExtension;
+    /* parse the XKB options during kbd setup */
 
     if (EvdevProbe(pInfo))
         xfree(pEvdev);