Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 456 insertions, 0 deletions

diff --git a/xorg-server/xkbdata.src/geometry/hp b/xorg-server/xkbdata.src/geometry/hp
new file mode 100644
index 000000000..c93cb0cd1
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/hp
@@ -0,0 +1,456 @@
+// $Xorg: hp,v 1.4 2001/02/09 02:05:50 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//Permission to use, copy, modify, distribute, and sell this software and its
+//documentation for any purpose is hereby granted without fee, provided that
+//the above copyright notice appear in all copies and that both that
+//copyright notice and this permission notice appear in supporting
+//documentation.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/geometry/hp,v 1.8 2003/08/09 14:30:46 pascal Exp $
+
+default xkb_geometry "pc101" {
+
+    description= "HP PC101";
+    width= 470;
+    height= 210;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [132,18] }, { [2,1], [130,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 18 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 91;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 20 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, { <RCTL>, 20 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 91;
+	left= 310;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 91;
+	left= 375;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "default" geometry
+
+xkb_geometry "hil" {
+
+    description= "HP hil";
+    width= 455;
+    height= 170;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "TABK" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "BKSL" { { [ 24,18] }, { [2,1], [ 22,17] } };
+    shape "RTRN" { { [ 38,18] }, { [2,1], [ 36,17] } };
+    shape "LFSH" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "RTSH" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [151,18] }, { [2,1], [150,17] } };
+    shape "KP0"  { { [ 38,18] }, { [2,1], [ 36,17] } };
+    shape "KPTB" { { [ 18,38] }, { [2,1], [ 16,37] } };
+    shape "TLDE" { { [ 24,18] }, { [2,1], [ 22,17] } };
+    shape "FKT1" { { [ 17,14] }, { [2,1], [ 15,13] } };
+    shape "FKT2" { { [ 23,14] }, { [2,1], [ 21,13] } };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 14;
+	row {
+	    top= 1;
+	    keys {  { <BRK>, "FKT1" }, { <STOP>, "FKT1" } ,
+		    { <FK01>, "FKT2", 10 }, { <FK02>, "FKT2" },
+		    { <FK03>, "FKT2" }, { <FK04>, "FKT2" }, 
+		    { <MENU>, "FKT1" }, { <SYST>, "FKT1" },
+		    { <FK05>, "FKT2" }, { <FK06>, "FKT2" }, 
+		    { <FK07>, "FKT2" }, { <FK08>, "FKT2" }, 
+		    { <CLRL>, "FKT1", 10 }, { <CLR>, "FKT1" },
+		    { <FK09>, "FKT1", 19 }, { <FK10>, "FKT1" },
+		    { <FK11>, "FKT1" }, { <FK12>, "FKT1" }
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys { { <TLDE>, "TLDE" }, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP" }, <INSL>, <DELL>
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" },
+		   <INSC>, <DELC>
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <CAPS>, <LCTL>,
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN" },
+		   <HOME>, <PGUP>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys {  <ESC>, { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH" }, <SELE>,
+		    <UP>, <PGDN>
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <PRSC>, { <LALT>, 30 },
+		   { <SPCE>, "SPCE" },
+		   <RALT>, { <LEFT>, 30 }, <DOWN>, <RGHT>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Keypad" {
+	top= 52;
+	left= 360;
+	row {
+	    top= 1;
+	    keys { <KPMU>, <KPDV>, <KPAD>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPEN> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPSP> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPTB>, "KPTB" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+}; // End of "default" geometry
+
+
+// Created by Alexander Pohoyda <alexander.pohoyda@gmx.net>
+// Geometry specification for HP Omnibook keyboards.
+// Compatible Models: 6100, 6000.
+
+xkb_geometry "omnibook" {
+    width = 282;
+    height = 128;
+    baseColor = "grey80";
+    labelColor = "white";
+
+    shape "FN0"  { cornerRadius = 1, { [15.5, 12] }, { [1, 0], [14.5, 11] } };
+    shape "NORM" { cornerRadius = 1, { [18, 16] }, { [2, 0], [16, 14] } };
+    shape "BKSP" { cornerRadius = 1, { [31, 16] }, { [2, 0], [29, 14] } };
+    shape "TABK" { cornerRadius = 1, { [27, 16] }, { [2, 0], [25, 14] } };
+    shape "CAPS" { cornerRadius = 1, { [32, 16] }, { [2, 0], [30, 14] } };
+    shape "RTSH" { cornerRadius = 1, { [45, 16] }, { [2, 0], [43, 14] } };
+    shape "MODK" { cornerRadius = 1, { [28, 16] }, { [2, 0], [26, 14] } };
+    shape "SPCE" { cornerRadius = 1, { [90, 16] }, { [2, 0], [88, 14] } };
+    shape "ARRS" { cornerRadius = 1, { [17, 12] }, { [2, 0], [15, 11] } };
+    
+    shape "LED"  { cornerRadius = 1, { [2, 4] } };
+
+    shape "KEYS" { cornerRadius = 1,
+                   { [0, 13],
+                     [197, 13], [197, 0],
+                     [280, 0], [280, 125],
+                     [224, 125], [224, 112],
+                     [0, 112] }
+    };
+
+    solid "KeyPanel" {
+	shape = "KEYS";
+	left = 1;
+	top = 1;
+	color = "black";
+    };
+
+    shape "NULL1" { cornerRadius = 1, { [54, 16] } };
+
+    solid "NullPanel1" {
+	shape = "NULL1";
+	left = 226;
+	top = 96;
+	color = "grey80";
+    };
+
+    shape "NULL2" { cornerRadius = 1, { [19, 14] } };
+
+    solid "NullPanel2" {
+	shape = "NULL2";
+	left = 243;
+	top = 97;
+	color = "black";
+    };
+
+    indicator.onColor = "green";
+    indicator.offColor = "grey10";
+    indicator.top = 4;
+    indicator.shape = "LED";
+    indicator "Caps Lock"    { left = 45; };
+    indicator "Num Lock"     { left = 60; };
+    indicator "Scroll Lock"  { left = 75; };
+    indicator "HDDActivity" { onColor = "red"; left = 90; };
+
+    key.color = "grey60";
+
+    section "Function" {
+        key.gap = 0.99;
+        left = 1;
+        top = 1;
+	key.shape = "FN0";
+	row {
+	    left = 197;
+	    top = 1;
+	    keys {  <PRSC>, <PAUS>, <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top = 14;
+	    keys {  <ESC>,
+                    <FK01>, <FK02>, <FK03>, <FK04>,
+		    <FK05>, <FK06>, <FK07>, <FK08>,
+		    <FK09>, <FK10>, <FK11>, <FK12>,
+                    <SCLK>, <DELE>, <END>, <PGDN>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Control" {
+        left = 1;
+	top = 34;
+        key.gap = 1;
+	row {
+	    top = 62;
+	    key.shape = "NORM";
+	    keys { <LCTL>, <FN>, <LWIN>, <LALT>,
+		   { <SPCE>, "SPCE" }, <RALT>, <MENU>, <RCTL>
+	    };
+	};
+    }; // End of "Control" section
+
+    section "Navigation" {
+	key.shape = "ARRS";
+	left = 225;
+	top = 97;
+        key.gap = 1.4;
+	row {
+	    left= 18;
+	    top = 1;
+	    keys { <UP> };
+	};
+	row {
+	    top = 16;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Navigation" section
+
+    shape "STIK" { cornerRadius = 4, { [7, 7] } };
+
+    solid "STIK" {
+	priority = 255;
+	color = "red";
+	shape = "STIK";
+	top = 73;
+	left = 126;
+    };
+};
+
+// 86 keys
+xkb_geometry "omnibook_intl" {
+    include "hp(omnibook)"
+    description = "HP Omnibook 6000/6100, Intl";
+
+    shape "RTRN" { cornerRadius = 1,
+                   { [22, 0], [22, 33], [5, 33], [5, 16], [0, 16], [0, 0] },
+                   { [20, 0], [20, 31], [7, 31], [7, 14], [2, 14], [2, 0] } };
+    shape "LFSH" { cornerRadius = 1, { [23, 16] }, { [2, 0], [21, 14] } };
+
+    section "Alpha" {
+	key.gap = 1;
+	key.color = "grey60";
+	key.shape = "NORM";
+        left = 1;
+	top = 27;
+	row {
+	    top = 1;
+	    keys { <AE00>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top = 18;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top = 35;
+	    keys { { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top = 52;
+	    keys { { <LFSH>, "LFSH" }, <LSGT>,
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		   { <RTSH>, "RTSH" }
+	    };
+	};
+    }; // End of "Alpha" section
+};