rpms/xkeyboard-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix some keyboard descriptions, add some

Browse Source
This commit is contained in:
Matthias Clasen 2006-08-25 03:28:51 +00:00
parent 09c9255c99
commit 9cdcdb4f64
4 changed files with 485 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

419
xkeyboard-config-0.8-dell.patch Normal file
View File

@ -0,0 +1,419 @@
--- xkeyboard-config-0.8/rules/base.dellm65 2006-02-27 18:14:28.000000000 -0500
+++ xkeyboard-config-0.8/rules/base 2006-08-24 20:09:46.000000000 -0400
@@ -104,6 +104,7 @@
microsoftprousb = microsoft(natural)
microsoftprose = microsoft(natural)
dell101 = dell(dell101)
+ dellm65 = dell(dellm65)
flexpro = keytronic(FlexPro)
hp6000 = hp(omnibook)
omnikey101 = northgate(omnikey101)
@@ -201,6 +202,7 @@
$mac $macvendorlayouts nodeadkeys = macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
! model layout = symbols
+ dellm65 * = pc(pc104)+%l+inet(%m)
$pcmodels ar = pc(%m)+ara
* ar = pc(pc105)+ara
$pcmodels ben = pc(%m)+in(ben)
--- xkeyboard-config-0.8/rules/base.xml.in.dellm65 2006-08-24 20:28:41.000000000 -0400
+++ xkeyboard-config-0.8/rules/base.xml.in 2006-08-24 20:29:08.000000000 -0400
@@ -34,6 +34,12 @@
</model>
<model>
<configItem>
+ <name>dellm65</name>
+ <_description>Dell Precision M65</_description>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>everex</name>
<_description>Everex STEPnote</_description>
</configItem>
--- xkeyboard-config-0.8/geometry/dell.dellm65 2006-08-24 20:03:12.000000000 -0400
+++ xkeyboard-config-0.8/geometry/dell 2006-08-24 20:03:20.000000000 -0400
@@ -181,3 +181,362 @@
alias <AA00> = <LCTL>;
}; // End of "default" geometry
+
+
+xkb_geometry "dell65" {
+};
+
+xkb_geometry "dell65x" {
+
+ description= "Dell 101";
+ width= 470;
+ height= 210;
+ color="grey10";
+
+ shape.cornerRadius= 1;
+ shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+ shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+ shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+ shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+ shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
+ shape "CAPS" { { [ 33,18] }, { [ 28,18] }, { [2,1], [ 26,16] } };
+ shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
+ shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
+ shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+ shape "SPCE" { { [133,18] }, { [2,1], [131,16] } };
+ shape "KP0" { { [ 37,18] }, { [2,1], [ 35,16] } };
+ shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+ shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+ shape "LED" { cornerRadius= 0, { [ 5, 1 ] } };
+ solid "LedPanel" {
+ shape= "LEDS";
+ top= 52;
+ left= 377;
+ color= "grey10";
+ };
+
+ shape "BACKGROUND" { cornerRadius=5, { [ 470, 210 ] } };
+ solid "Background" {
+ shape= "BACKGROUND";
+ top= 0;
+ left= 0;
+ color= "grey10";
+ };
+
+ indicator.onColor= "green";
+ indicator.offColor= "green30";
+ indicator.top= 67;
+ indicator.shape= "LED";
+ indicator "Num Lock" { left= 382; };
+ indicator "Caps Lock" { left= 407; };
+ indicator "Scroll Lock" { left= 433; };
+ text.top= 55;
+ text.color= "black";
+ text "NumLockLabel" { left= 378; text="Num\nLock"; };
+ text "CapsLockLabel" { left= 403; text="Caps\nLock"; };
+ text "ScrollLockLabel" { left= 428; text="Scroll\nLock"; };
+
+ section.left= 19;
+ row.left= 1;
+ key.shape= "NORM";
+ key.gap= 1;
+ section "Function" {
+ top= 52;
+ row {
+ top= 1;
+ keys { { <ESC>, color="grey20" },
+ { <FK01>, 20 }, <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>, 21 },
+ { <SPCE>, "SPCE", color="white" },
+ <RALT>, { <RCTL>, 21 }
+ };
+ };
+ }; // End of "Alpha" section
+
+ section "Editing" {
+ top= 91;
+ left= 312;
+ 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= 376;
+ 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>;
+
+};
+
+
+//
+// Dell Precision M65
+//
+
+xkb_geometry "dellm65" {
+
+ description= "Dell Precision M65";
+ width= 308;
+ height= 152;
+ baseColor = "grey20";
+ labelColor = "white";
+
+ shape "BACKGROUND" { cornerRadius = 3, { [ 308, 152 ] } };
+ shape "BACKGROUND2" { cornerRadius = 2, { [ 7, 22 ],
+ [ 171, 22 ],
+ [ 171, 10 ],
+ [ 301, 10 ],
+ [ 301, 148 ],
+ [ 244, 148 ],
+ [ 244, 132 ],
+ [ 7, 132] } };
+ solid "Background" {
+ shape = "BACKGROUND";
+ top = 0;
+ left = 0;
+ color = "grey20";
+ };
+ solid "Background2" {
+ shape = "BACKGROUND2";
+ top = 0;
+ left = 0;
+ color = "black";
+ };
+
+ shape "LEDS" { cornerRadius = 4, { [ 26, 8 ] } };
+ shape "LED" { cornerRadius = 0, { [ 4, 4 ] } };
+ solid "LedPanel" {
+ shape = "LEDS";
+ top = 8;
+ left = 69;
+ color = "grey20";
+ };
+
+ indicator.onColor= "green";
+ indicator.offColor= "gray20";
+ indicator.top= 10;
+ indicator.shape= "LED";
+ indicator "Num Lock" { left= 72; };
+ indicator "Caps Lock" { left= 80; };
+ indicator "Scroll Lock" { left= 88; };
+
+ shape "MEDIA" { cornerRadius = 5, { [ 2, 2], [ 12, 12 ] } };
+ shape "POWER" { cornerRadius = 7, { [ 14, 14 ] } };
+
+ section "Media" {
+ top = 5;
+ left = 102;
+ width = 60;
+ height = 14;
+ key.color="grey30";
+ key.shape = "MEDIA";
+ row {
+ top = 0;
+ keys {
+ <I2E>, <I30>, <I20>, { <I04>, shape = "POWER", gap = 3 }
+ };
+ };
+ };
+
+
+ shape "FKEY" { cornerRadius = 1, { [ 18, 12 ] }, { [ 1, 1 ], [ 17, 10 ] } };
+
+ section "Function" {
+ top = 12;
+ left = 8;
+ width = 290;
+ height = 24;
+ key.color = "grey80";
+ key.shape = "FKEY";
+ key.gap = 0;
+ row {
+ top = 0;
+ keys { { <MENU>, 165 }, <PRSC>, <NMLK>, <PAUS>,
+ { <INS>, 1 }, <HOME>, <PGUP> };
+ };
+ row {
+ top = 12;
+ keys { <ESC>, { <FK01>, 1 }, <FK02>, <FK03>, <FK04>,
+ { <FK05>, 1 }, <FK06>, <FK07>, <FK08>,
+ { <FK09>, 1 }, <FK10>, <FK11>, <FK12>,
+ { <DELE>, 1 }, <END>, <PGDN> };
+ };
+ };
+
+ shape "AKEY" { cornerRadius = 1, { [ 19, 19 ] }, { [ 2, 1 ], [ 17, 15 ] } };
+ shape "BKSP" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
+ shape "TABK" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+ shape "BKSL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+ shape "CAPS" { cornerRadius = 1, { [ 34, 19 ] }, { [ 2, 1 ], [ 32, 15 ] } };
+ shape "RTRN" { cornerRadius = 1, { [ 47, 19 ] }, { [ 2, 1 ], [ 45, 15 ] } };
+ shape "LFSH" { cornerRadius = 1, { [ 44, 19 ] }, { [ 2, 1 ], [ 42, 15 ] } };
+ shape "RTSH" { cornerRadius = 1, { [ 56, 19 ] }, { [ 2, 1 ], [ 54, 15 ] } };
+ shape "LCTL" { cornerRadius = 1, { [ 31, 19 ] }, { [ 2, 1 ], [ 29, 15 ] } };
+ shape "LALT" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
+ shape "RCTL" { cornerRadius = 1, { [ 25, 19 ] }, { [ 2, 1 ], [ 23, 15 ] } };
+ shape "SPCE" { cornerRadius = 1, { [ 96, 19 ] }, { [ 2, 1 ], [ 94, 15 ] } };
+
+
+ section "Alpha" {
+ top = 36;
+ left = 8;
+ width = 290;
+ height = 21;
+ key.color = "grey80";
+ key.shape = "AKEY";
+ key.gap = 0;
+ row {
+ top = 1;
+ keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+ <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+ <AE10>, <AE11>, <AE12>, { <BKSP>, 1, "BKSP" } };
+ };
+ row {
+ top = 20;
+ keys { { <TAB>, "TABK" },
+ { <AD01>, 1 }, <AD02>, <AD03>, <AD04>, <AD05>,
+ <AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
+ <AD11>, <AD12>, { <BKSL>, 1, "BKSL" } };
+ };
+ row {
+ top = 39;
+ keys { { <CAPS>, "CAPS" },
+ { <AC01>, 1 }, <AC02>, <AC03>, <AC04>, <AC05>,
+ <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+ <AC11>, { <RTRN>, 1, "RTRN" } };
+ };
+ row {
+ top = 58;
+ keys { { <LFSH>, "LFSH" },
+ { <AB01>, 1 }, <AB02>, <AB03>, <AB04>, <AB05>,
+ <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+ { <RTSH>, 1, "RTSH" } };
+ };
+ row {
+ top = 77;
+ keys { { <LCTL>, "LCTL" }, { <LWIN>, 20 }, { <LALT>, "LALT" },
+ { <SPCE>, "SPCE" }, <RALT>, { <RCTL>, "RCTL" } };
+ };
+ };
+
+ shape "SKEY" { cornerRadius = 1, { [ 18, 17 ] }, { [ 2, 1 ], [ 16, 13 ] } };
+ section "Arrows" {
+ top = 113;
+ left = 243;
+ width = 54;
+ height = 36;
+
+ key.color = "grey80";
+ key.shape = "SKEY";
+ row {
+ top = 0;
+ left = 20;
+
+ keys { <UP> };
+ };
+
+ row {
+ top = 17;
+ left = 2;
+
+ keys { <LEFT>, <DOWN>, <RGHT> };
+ };
+ };
+
+ shape "STIK" { cornerRadius = 4, { [ 7, 7 ] } };
+
+ solid "STIK" {
+ priority = 255;
+ color = "blue";
+ shape = "STIK";
+ top = 90;
+ left = 135;
+ };
+};
+
+
--- xkeyboard-config-0.8/symbols/inet.dellm65 2006-08-24 20:05:41.000000000 -0400
+++ xkeyboard-config-0.8/symbols/inet 2006-08-24 20:05:55.000000000 -0400
@@ -2028,3 +2028,18 @@
key <K67> { [ XF86MyComputer ] };
key <XFER> { [ XF86AudioMedia ] };
};
+
+//
+// Dell Precision M65
+//
+partial alphanumeric_keys
+xkb_symbols "dellm65" {
+
+ key <I2E> { [ XF86AudioLowerVolume ] };
+ key <I30> { [ XF86AudioRaiseVolume ] };
+ key <I20> { [ XF86AudioMute ] };
+ key <I04> { [ XF86PowerOff ] };
+
+ key <LWIN> { [ Super_L ] };
+};
+

25
xkeyboard-config-0.8-kinesis.patch Normal file
View File

@ -0,0 +1,25 @@
--- xkeyboard-config-0.8/rules/base.kinesis 2006-08-24 21:39:56.000000000 -0400
+++ xkeyboard-config-0.8/rules/base 2006-08-24 21:40:45.000000000 -0400
@@ -115,6 +115,7 @@
pc98 = nec(pc98)
abnt2 = pc(abnt2)
$mac = macintosh(macintosh)
+ kinesis = kinesis(model100)
* = pc(pc104)
! model layout variant = symbols
--- xkeyboard-config-0.8/rules/base.xml.in.kinesis 2006-08-24 21:40:52.000000000 -0400
+++ xkeyboard-config-0.8/rules/base.xml.in 2006-08-24 21:42:13.000000000 -0400
@@ -704,6 +704,12 @@
<_description>Laptop/notebook eMachines m68xx</_description>
</configItem>
</model>
+ <model>
+ <configItem>
+ <name>kinesis</name>
+ <description>Kinesis Classic Keyboard</description>
+ </configItem>
+ </model>
</modelList>
<layoutList>
<layout>

27
xkeyboard-config-0.8-thinkpad.patch Normal file
View File

@ -0,0 +1,27 @@
--- xkeyboard-config-0.8/rules/base.thinkpad 2006-08-24 19:42:40.000000000 -0400
+++ xkeyboard-config-0.8/rules/base 2006-08-24 19:42:54.000000000 -0400
@@ -107,7 +107,8 @@
flexpro = keytronic(FlexPro)
hp6000 = hp(omnibook)
omnikey101 = northgate(omnikey101)
- thinkpad = ibm_vndr/thinkpad(common)
+ thinkpad = ibm_vndr/thinkpad(us)
+ thinkpadintl = ibm_vndr/thinkpad(intl)
$pcmodels = pc(%m)
jp106 = pc(jp106)
everex = everex(STEPnote)
--- xkeyboard-config-0.8/rules/base.xml.in.thinkpad 2006-08-24 19:43:03.000000000 -0400
+++ xkeyboard-config-0.8/rules/base.xml.in 2006-08-24 19:43:25.000000000 -0400
@@ -400,6 +400,12 @@
</model>
<model>
<configItem>
+ <name>thinkpadintl</name>
+ <_description>IBM ThinkPad 560Z/600/600E/A22E, Intl</_description>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>logiaccess</name>
<_description>Logitech Access Keyboard</_description>
</configItem>

15
xkeyboard-config.spec
View File

@ -4,7 +4,7 @@
Summary: xkeyboard-config alternative xkb data files
Name: xkeyboard-config
Version: 0.8
Release: 3
Release: 4
License: MIT
Group: User Interface/X
URL: http://www.x.org
@ -13,6 +13,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
Patch0: xkeyboard-config-0.8-composify-ralt.patch
Patch1: xkeyboard-config-0.8-thinkpad.patch
Patch2: xkeyboard-config-0.8-kinesis.patch
Patch3: xkeyboard-config-0.8-dell.patch
BuildArch: noarch
BuildRequires: pkgconfig
@ -41,6 +45,10 @@ xkeyboard-config alternative xkb data files
%setup -q
%patch0 -p1 -b .composify-ralt
%patch1 -p1 -b .thinkpad
%patch2 -p1 -b .kinesis
%patch3 -p1 -b .dell
%build
%configure \
--enable-compat-rules \
@ -76,6 +84,11 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/X11/xkb/rules/xorg.xml
%changelog
* Thu Aug 22 2006 Matthias Clasen <mclasen@redhat.com> 0.8-4
- Fix geometry description for Thinkpads
- Add a Kinesis model
- Add Dell Precision M65 geometry and model
* Tue Aug 22 2006 Adam Jackson <ajackson@redhat.com> 0.8-3
- Add Compose semantics to right Alt when that's ISO_Level3_Shift (#193922)