From 7dfaa4f8cd411b93c33acee6eea04e704ca78fe4 Mon Sep 17 00:00:00 2001 From: "Sergey V. Udaltsov" Date: Thu, 19 Nov 2009 21:40:19 +0000 Subject: [PATCH] using one file for all hp geometries, http://bugs.freedesktop.org/show_bug.cgi?id=25178 --- geometry/hp | 106 +++++++++++++++++++++++++++++++++++++++++++ geometry/hpmini | 127 ---------------------------------------------------- rules/base.m_g.part | 2 +- rules/base.xml.in | 2 +- 4 files changed, 108 insertions(+), 129 deletions(-) delete mode 100644 geometry/hpmini diff --git a/geometry/hp b/geometry/hp index c93cb0c..79242a0 100644 --- a/geometry/hp +++ b/geometry/hp @@ -454,3 +454,109 @@ xkb_geometry "omnibook_intl" { }; }; // End of "Alpha" section }; + +xkb_geometry "mini110" { + + description= "HP Mini 110"; + width= 262; + height= 106; + + shape.cornerRadius = 0; + shape "FN0" { { [ 14, 10 ] } , { [ 14, 10 ] } }; + shape "NORM" { { [ 16.7, 16 ] } , { [ 16.7, 16 ] } }; + shape "TLDE" { { [ 12, 16 ] } , { [ 12, 16 ] } }; + shape "ONE" { { [ 14, 16 ] } , { [ 14, 16 ] } }; + shape "BKSP" { { [ 31.3, 16 ] } , { [ 31.3, 16 ] } }; + shape "BKSL" { { [ 23.9, 16 ] } , { [ 23.9, 16 ] } }; + shape "CAPS" { { [ 22, 16 ] } , { [ 22, 16 ] } }; + shape "RTRN" { { [ 36.3, 16 ] } , { [ 36.3, 16 ] } }; + shape "LFSH" { { [ 31, 16 ] } , { [ 31, 16 ] } }; + shape "RTSH" { { [ 45, 16 ] } , { [ 45, 16 ] } }; + shape "CTLS" { { [ 16.5, 19 ] } , { [ 16.5, 19 ] } }; + shape "SPCE" { { [ 78.4, 19 ] } , { [ 78.4, 19 ] } }; + shape "ARRW" { { [ 16.7, 9 ] } , { [ 16.7, 9 ] } }; + + key.gap=1; + + section "Function" { + top=4; + left=3; + key.shape="FN0"; + row { + keys { + , , , , , , + , , , , , , + , , , , + }; + }; + }; + + section "Alphanum" { + top=15; + left=3; + key.shape="NORM"; + row { + top= 0; + keys { { , "TLDE" } , { , "ONE" }, , , , + , , , , , + , , , + { , "BKSP" } + }; + }; + row { + top= 17; + keys { , , , , , , + , , , , , + , , { , "BKSL" } + }; + }; + row { + top= 34; + keys { { , "CAPS" } , + , , , , , + , , , , , + , { , "RTRN" } + }; + }; + row { + top= 51; + keys { { , "LFSH" }, + , , , , , + , , , , , + { , "RTSH" } + }; + }; + + }; + + section "Control" { + top=83; + left=3; + key.shape="CTLS"; + row { + keys { + , , , , { , "SPCE" }, , , + }; + }; + }; + + section "Arrows" { + top=83; + left=204.9; + key.shape="ARRW"; + row { + left= 17.7; + keys { + + }; + }; + row { + top = 10; + keys { + , , + }; + }; + }; + +}; + diff --git a/geometry/hpmini b/geometry/hpmini deleted file mode 100644 index e51f532..0000000 --- a/geometry/hpmini +++ /dev/null @@ -1,127 +0,0 @@ -// XKB geometry for the HP Mini 110 keyboard. -// -// Copyright (c) 2009, Octavio Alvarez -// -//Permission is hereby granted, free of charge, to any person obtaining a copy -//of this software and associated documentation files (the "Software"), to deal -//in the Software without restriction, including without limitation the rights -//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -//copies of the Software, and to permit persons to whom the Software is -//furnished to do so, subject to the following conditions: -// -//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 -//AUTHORS OR COPYRIGHT HOLDERS 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. - -default xkb_geometry "110" { - - description= "HP Mini 110"; - width= 262; - height= 106; - - shape.cornerRadius = 0; - shape "FN0" { { [ 14, 10 ] } , { [ 14, 10 ] } }; - shape "NORM" { { [ 16.7, 16 ] } , { [ 16.7, 16 ] } }; - shape "TLDE" { { [ 12, 16 ] } , { [ 12, 16 ] } }; - shape "ONE" { { [ 14, 16 ] } , { [ 14, 16 ] } }; - shape "BKSP" { { [ 31.3, 16 ] } , { [ 31.3, 16 ] } }; - shape "BKSL" { { [ 23.9, 16 ] } , { [ 23.9, 16 ] } }; - shape "CAPS" { { [ 22, 16 ] } , { [ 22, 16 ] } }; - shape "RTRN" { { [ 36.3, 16 ] } , { [ 36.3, 16 ] } }; - shape "LFSH" { { [ 31, 16 ] } , { [ 31, 16 ] } }; - shape "RTSH" { { [ 45, 16 ] } , { [ 45, 16 ] } }; - shape "CTLS" { { [ 16.5, 19 ] } , { [ 16.5, 19 ] } }; - shape "SPCE" { { [ 78.4, 19 ] } , { [ 78.4, 19 ] } }; - shape "ARRW" { { [ 16.7, 9 ] } , { [ 16.7, 9 ] } }; - - key.gap=1; - - section "Function" { - top=4; - left=3; - key.shape="FN0"; - row { - keys { - , , , , , , - , , , , , , - , , , , - }; - }; - }; - - section "Alphanum" { - top=15; - left=3; - key.shape="NORM"; - row { - top= 0; - keys { { , "TLDE" } , { , "ONE" }, , , , - , , , , , - , , , - { , "BKSP" } - }; - }; - row { - top= 17; - keys { , , , , , , - , , , , , - , , { , "BKSL" } - }; - }; - row { - top= 34; - keys { { , "CAPS" } , - , , , , , - , , , , , - , { , "RTRN" } - }; - }; - row { - top= 51; - keys { { , "LFSH" }, - , , , , , - , , , , , - { , "RTSH" } - }; - }; - - }; - - section "Control" { - top=83; - left=3; - key.shape="CTLS"; - row { - keys { - , , , , { , "SPCE" }, , , - }; - }; - }; - - section "Arrows" { - top=83; - left=204.9; - key.shape="ARRW"; - row { - left= 17.7; - keys { - - }; - }; - row { - top = 10; - keys { - , , - }; - }; - }; - -}; - diff --git a/rules/base.m_g.part b/rules/base.m_g.part index 340ca86..badbf82 100644 --- a/rules/base.m_g.part +++ b/rules/base.m_g.part @@ -5,6 +5,7 @@ latitude = dell(latitude) flexpro = keytronic(FlexPro) hp6000 = hp(omnibook) + hpmini110 = hp(mini110) omnikey101 = northgate(omnikey101) $pcmodels = pc(%m) $pcgeometries = pc(%m) @@ -19,5 +20,4 @@ $macs = macintosh(macintosh) hhk = hhk(basic) kinesis = kinesis(model100) - hpmini110 = hpmini(110) * = pc(pc104) diff --git a/rules/base.xml.in b/rules/base.xml.in index d60e976..d79ba8e 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -555,7 +555,7 @@ hpmini110 - <_description>HP Mini 110 Notebook + <_description>Hewlett-Packard Mini 110 Notebook Hewlett-Packard -- 2.7.4