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

Remove old patches

Browse Source
This commit is contained in:
Matthias Clasen 2007-10-06 20:10:03 +00:00
parent 2442e804d7
commit 26697f7990
9 changed files with 7 additions and 1631 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

426
dellm65.patch
View File

@ -1,426 +0,0 @@
diff -up xkeyboard-config-1.0/symbols/inet.dellm65 xkeyboard-config-1.0/symbols/inet
--- xkeyboard-config-1.0/symbols/inet.dellm65 2007-04-23 18:09:07.000000000 -0400
+++ xkeyboard-config-1.0/symbols/inet 2007-09-05 18:30:51.000000000 -0400
@@ -2451,3 +2451,18 @@ xkb_symbols "logitech_g15" {
key <XFER> { [ XF86Launch8 ] };
};
+
+//
+// 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 ] };
+};
+
diff -up xkeyboard-config-1.0/geometry/dell.dellm65 xkeyboard-config-1.0/geometry/dell
--- xkeyboard-config-1.0/geometry/dell.dellm65 2007-05-31 17:17:44.000000000 -0400
+++ xkeyboard-config-1.0/geometry/dell 2007-09-05 18:30:51.000000000 -0400
@@ -181,3 +181,362 @@ default xkb_geometry "dell101" {
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;
+ };
+};
+
+
diff -up xkeyboard-config-1.0/rules/base.m_g.part.dellm65 xkeyboard-config-1.0/rules/base.m_g.part
--- xkeyboard-config-1.0/rules/base.m_g.part.dellm65 2007-09-05 18:32:22.000000000 -0400
+++ xkeyboard-config-1.0/rules/base.m_g.part 2007-09-05 18:32:41.000000000 -0400
@@ -1,5 +1,6 @@
$msmodels = microsoft(natural)
dell101 = dell(dell101)
+ dellm65 = dell(dellm65)
flexpro = keytronic(FlexPro)
hp6000 = hp(omnibook)
omnikey101 = northgate(omnikey101)
diff -up xkeyboard-config-1.0/rules/base.lists.part.dellm65 xkeyboard-config-1.0/rules/base.lists.part
--- xkeyboard-config-1.0/rules/base.lists.part.dellm65 2007-09-05 18:31:07.000000000 -0400
+++ xkeyboard-config-1.0/rules/base.lists.part 2007-09-05 18:31:20.000000000 -0400
@@ -33,7 +33,7 @@
chicony chicony9885 \
compaqeak8 compaqik7 compaqik13 compaqik18 \
cymotionlinux \
- dell inspiron precision_m dellusbmm dtk2000 dell8125 dell8135 \
+ dellm65 dell inspiron precision_m dellusbmm dtk2000 dell8125 dell8135 \
emachines ennyah_dkb1008 evdev \
genius geniuscomfy geniuscomfy2 geniuskb19e \
gyration honeywell_euroboard \
diff -up xkeyboard-config-1.0/rules/base.xml.in.dellm65 xkeyboard-config-1.0/rules/base.xml.in
--- xkeyboard-config-1.0/rules/base.xml.in.dellm65 2007-07-11 18:57:28.000000000 -0400
+++ xkeyboard-config-1.0/rules/base.xml.in 2007-09-05 18:30:51.000000000 -0400
@@ -46,6 +46,12 @@
</model>
<model>
<configItem>
+ <name>dellm65</name>
+ <_description>Dell Precision M65</_description>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>everex</name>
<_description>Everex STEPnote</_description>
<vendor>Everex</vendor>

9
kinesis.patch
View File

@ -1,9 +0,0 @@
diff -up xkeyboard-config-1.0/rules/base.m_g.part.kinesis xkeyboard-config-1.0/rules/base.m_g.part
--- xkeyboard-config-1.0/rules/base.m_g.part.kinesis 2007-09-05 15:18:32.000000000 -0400
+++ xkeyboard-config-1.0/rules/base.m_g.part 2007-09-05 15:19:01.000000000 -0400
@@ -11,4 +11,5 @@
$macbooks = macintosh(%m)
$macs = macintosh(macintosh)
hhk = hhk(basic)
+ kinesis = kinesis(model100)
* = pc(pc104)

23
xkeyboard-config-0.8-composify-ralt.patch
View File

@ -1,23 +0,0 @@
--- xkeyboard-config-0.8/symbols/level3.bak 2006-08-15 11:16:23.000000000 +0200
+++ xkeyboard-config-0.8/symbols/level3 2006-08-15 11:45:34.000000000 +0200
@@ -10,11 +10,15 @@
// third engraved symbol
default partial modifier_keys
xkb_symbols "ralt_switch" {
- key <RALT> {
- type[Group1]="ONE_LEVEL",
- symbols[Group1] = [ ISO_Level3_Shift ]
- };
- modifier_map Mod5 { ISO_Level3_Shift };
+ // key <RALT> {
+ // type[Group1]="ONE_LEVEL",
+ // symbols[Group1] = [ ISO_Level3_Shift ]
+ // };
+ // modifier_map Mod5 { ISO_Level3_Shift };
+ key <RALT> { type[Group1]="TWO_LEVEL",
+ [ ISO_Level3_Shift, Multi_key ] };
+ modifier_map Mod5 { <RALT> };
+
};
// special case or right Alt switch - for use with grp:alts_toggle

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

@ -1,419 +0,0 @@
--- 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
View File

@ -1,25 +0,0 @@
--- 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>

277
xkeyboard-config-0.8-korean.patch
View File

@ -1,277 +0,0 @@
--- xkeyboard-config-0.8/rules/base.xml.in.korean 2006-09-01 01:10:09.000000000 -0400
+++ xkeyboard-config-0.8/rules/base.xml.in 2006-09-01 01:14:33.000000000 -0400
@@ -734,6 +734,12 @@
<description>Kinesis Classic Keyboard</description>
</configItem>
</model>
+ <model>
+ <configItem>
+ <name>kr106</name>
+ <_description>Korean 106-key</_description>
+ </configItem>
+ </model>
</modelList>
<layoutList>
<layout>
@@ -2419,6 +2425,22 @@
</layout>
<layout>
<configItem>
+ <name>kr</name>
+ <_shortDescription>Kor</_shortDescription>
+ <_description>Korea, Republic of</_description>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>kr104</name>
+ <_description>101/104 key Compatible</_description>
+ </configItem>
+ </variant>
+ </variantList>
+ </layout>
+
+ <layout>
+ <configItem>
<name>nec_vndr/jp</name>
<_shortDescription>Jpn</_shortDescription>
<_description>PC-98xx Series</_description>
--- xkeyboard-config-0.8/rules/base.m_g.part.korean 2006-09-01 01:09:48.000000000 -0400
+++ xkeyboard-config-0.8/rules/base.m_g.part 2006-09-01 01:09:55.000000000 -0400
@@ -9,6 +9,7 @@
thinkpad = ibm_vndr/thinkpad(common)
$pcmodels = pc(%m)
jp106 = pc(jp106)
+ kr106 = pc(kr106)
everex = everex(STEPnote)
winbook = winbook(XP5)
pc98 = nec(pc98)
--- xkeyboard-config-0.8/rules/base.lists.part.korean 2006-09-01 01:09:13.000000000 -0400
+++ xkeyboard-config-0.8/rules/base.lists.part 2006-09-01 01:09:23.000000000 -0400
@@ -2,7 +2,7 @@
// If you want non-latin layouts implicitly include the en_US layout
// uncomment lines below
//! $nonlatin = am ara ben bd bg bt by cs deva ge gh gr guj guru il \
-// in ir iku jp kan kh la lao lk mk mm mn mv mal ori pk \
+// in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \
// ru scc sy syr tel th tj tam ua uz
! $pcmodels = pc101 pc102 pc104 pc105
--- xkeyboard-config-0.8/geometry/pc.korean 2006-09-01 01:08:37.000000000 -0400
+++ xkeyboard-config-0.8/geometry/pc 2006-09-01 01:08:43.000000000 -0400
@@ -1157,3 +1157,164 @@
alias <AC00> = <CAPS>;
alias <AA00> = <LCTL>;
}; // End of "pc86" geometry
+
+xkb_geometry "kr106" {
+
+ description= "Korean 106";
+ width= 470;
+ height= 210;
+
+ 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] }, { [2,1], [ 31,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 "SMOD" { { [ 23,18] }, { [2,1], [ 21,16] } };
+ shape "SPCE" { { [ 75,18] }, { [2,1], [ 73,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";
+ };
+
+ 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= "SMOD";
+ key.color= "grey20";
+ keys { { <LCTL>, "MODK" }, <LWIN>, <LALT>,
+ { <K71>, "NORM", color="white" },
+ { <SPCE>, "SPCE", color="white" },
+ { <K72>, "NORM", color="white" },
+ <RALT>, <RWIN>, <MENU>, <RCTL>
+ };
+ };
+ }; // 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>;
+
+}; // End of "kr106" geometry
--- xkeyboard-config-0.8/symbols/Makefile.in.korean 2006-09-01 01:16:57.000000000 -0400
+++ xkeyboard-config-0.8/symbols/Makefile.in 2006-09-01 01:17:05.000000000 -0400
@@ -175,7 +175,7 @@
gr hr hu \
ie il in \
ir is it \
-jp kg kh kz la \
+jp kg kh kr kz la \
latam latin lk \
lt lv mao \
mk mm mn \
--- xkeyboard-config-0.8/symbols/kr.korean 2006-09-01 01:15:01.000000000 -0400
+++ xkeyboard-config-0.8/symbols/kr 2006-09-01 01:15:49.000000000 -0400
@@ -0,0 +1,26 @@
+default alphanumeric_keys
+xkb_symbols "kr106" {
+ name[Group1]= "Korea, Republic of";
+ include "us"
+ include "kr(koreankeys)"
+};
+
+alphanumeric_keys
+xkb_symbols "kr104" {
+ name[Group1]= "Korea, Republic of - 101/104 key Compatible";
+ include "us"
+ include "kr(koreankeys)"
+ include "kr(koreankeys_raltctl)"
+};
+
+partial hidden function_keys
+xkb_symbols "koreankeys" {
+ key <K72> { [ Hangul ] };
+ key <K71> { [ Hangul_Hanja ] };
+};
+
+partial hidden function_keys
+xkb_symbols "koreankeys_raltctl" {
+ key <RALT> { [ Hangul ] };
+ key <RCTL> { [ Hangul_Hanja ] };
+};
--- xkeyboard-config-0.8/symbols/Makefile.am.korean 2006-09-01 01:16:38.000000000 -0400
+++ xkeyboard-config-0.8/symbols/Makefile.am 2006-09-01 01:16:44.000000000 -0400
@@ -13,7 +13,7 @@
gr hr hu \
ie il in \
ir is it \
-jp kg kh kz la \
+jp kg kh kr kz la \
latam latin lk \
lt lv mao \
mk mm mn \

424
xkeyboard-config-0.8-macbook.patch
View File

@ -1,424 +0,0 @@
--- /dev/null 2006-08-28 15:22:40.902752500 +0200
+++ xkeyboard-config-0.8/geometry/macbook 2006-09-01 12:39:19.000000000 +0200
@@ -0,0 +1,237 @@
+xkb_geometry "macbook79" {
+
+ description= "MacBook/MacBook Pro (Intl)";
+ width= 273;
+ height= 110;
+
+ shape.cornerRadius= 0;
+ shape "ESC" { { [ 21,9] }, cornerRadius=1, { [0,1], [ 19,8] } };
+ shape "FUNC" { { [ 18,9] }, cornerRadius=1, { [2,1], [ 16,8] } };
+ shape "EJCT" { { [ 20,9] }, cornerRadius=1, { [2,1], [ 20,8] } };
+ shape "DEGR" { { [ 16,18] }, cornerRadius=1, { [0,2], [ 14,16] } };
+ shape "NORM" { { [ 18,18] }, cornerRadius=1, { [2,2], [ 16,16] } };
+ shape "BKSP" { { [ 25,18] }, cornerRadius=1, { [2,2], [ 25,16] } };
+ shape "TABK" { { [ 24,18] }, cornerRadius=1, { [0,2], [ 22,16] } };
+ shape "RTRN" { { [ 0,0], [17,0], [17,37], [5,37], [5, 18], [0,18], [0,0] },
+ cornerRadius=1,
+ { [ 2,2], [15,2], [15,35], [7,35], [7, 16], [2,16] }
+ };
+ shape "CAPS" { { [ 29,18] }, cornerRadius=1, { [0,2], [ 27,16] } };
+ shape "LFSH" { { [ 21,18] }, cornerRadius=1, { [0,2], [ 19,16] } };
+ shape "RTSH" { { [ 39,18] }, cornerRadius=1, { [2,2], [ 39,16] } };
+ shape "APPL" { { [ 23,18] }, cornerRadius=1, { [2,2], [ 21,16] } };
+ shape "SPCE" { { [ 94,18] }, cornerRadius=1, { [2,2], [ 92,16] } };
+ shape "ARRO" { { [ 17,9] }, cornerRadius=1, { [2,1], [ 15,8] } };
+
+ shape "LED" { cornerRadius= 1, { [ 2, 2 ] } };
+
+ indicator.onColor= "green";
+ indicator.offColor= "gray";
+ indicator.shape= "LED";
+ indicator "Num Lock" { top=4; left= 119; };
+ indicator "Caps Lock" { top=53; left= 4; };
+
+ section.left=0;
+ row.left= 1;
+ key.shape= "FUNC";
+ key.gap= 1;
+ section "Function" {
+ top= 0;
+ row {
+ top= 1;
+ keys { {<ESC>, "ESC" },
+ <FK01>, <FK02>, <FK03>, <FK04>,
+ <FK05>, <FK06>, <FK07>, <FK08>,
+ <FK09>, <FK10>, <FK11>, <FK12>,
+ {<K6C>, "EJCT" }
+ };
+ };
+ }; // End of "Function" section
+
+ key.shape= "NORM";
+ section "Alpha" {
+ top= 10;
+ row {
+ top= 1;
+ keys { {<TLDE>, "DEGR"},
+ <AE01>, <AE02>, <AE03>, <AE04>,
+ <AE05>, <AE06>, <AE07>, <AE08>,
+ <AE09>, <AE10>, <AE11>, <AE12>,
+ { <BKSP>, "BKSP" }
+ };
+ };
+ row {
+ top= 20;
+ keys { { <TAB>, "TABK"},
+ <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+ <AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
+ <AD11>, <AD12>, { <RTRN>, "RTRN" }
+ };
+ };
+ row {
+ top= 39;
+ keys { { <CAPS>, "CAPS" },
+ <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+ <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+ <AC11>, <BKSL>
+ };
+ };
+ row {
+ top= 58;
+ keys { { <LFSH>, "LFSH"},
+ <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
+ <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+ { <RTSH>, "RTSH" }
+ };
+ };
+ row {
+ top= 77;
+ keys { {<FN>, "DEGR"},
+ <LCTL>, <LALT>,
+ {<LWIN>, "APPL"},
+ {<SPCE>, "SPCE" },
+ {<RALT>, "APPL"},
+ <KPEN>
+ };
+ };
+
+ }; // End of "Alpha" section
+
+ key.shape= "ARRO";
+ section "Editing" {
+ top = 86;
+ left = 217;
+ row {
+ top= 1;
+ left= 19;
+ keys { <UP> };
+ };
+ row {
+ top= 10;
+ keys { <LEFT>, <DOWN>, <RGHT> };
+ };
+ }; // End of "Editing" section
+
+ alias <AC00> = <CAPS>;
+ alias <AA00> = <LCTL>;
+
+}; // End of "default" geometry
+
+default xkb_geometry "macbook78" {
+
+ description= "MacBook/MacBook Pro (US)";
+ width= 273;
+ height= 110;
+
+ shape.cornerRadius= 0;
+ shape "ESC" { { [ 21,9] }, cornerRadius=1, { [0,1], [ 19,8] } };
+ shape "FUNC" { { [ 18,9] }, cornerRadius=1, { [2,1], [ 16,8] } };
+ shape "EJCT" { { [ 20,9] }, cornerRadius=1, { [2,1], [ 20,8] } };
+ shape "DEGR" { { [ 16,18] }, cornerRadius=1, { [0,2], [ 14,16] } };
+ shape "NORM" { { [ 18,18] }, cornerRadius=1, { [2,2], [ 16,16] } };
+ shape "BKSP" { { [ 25,18] }, cornerRadius=1, { [2,2], [ 25,16] } };
+ shape "TABK" { { [ 24,18] }, cornerRadius=1, { [0,2], [ 22,16] } };
+ shape "BKSL" { { [ 17,18] }, cornerRadius=1, { [2,2], [17,16] } };
+ shape "RTRN" { { [ 31,18] }, cornerRadius=1, { [2,2], [31,16] } };
+ shape "CAPS" { { [ 29,18] }, cornerRadius=1, { [0,2], [ 27,16] } };
+ shape "LFSH" { { [ 40,18] }, cornerRadius=1, { [0,2], [ 38,16] } };
+ shape "RTSH" { { [ 39,18] }, cornerRadius=1, { [2,2], [ 39,16] } };
+ shape "APPL" { { [ 23,18] }, cornerRadius=1, { [2,2], [ 21,16] } };
+ shape "SPCE" { { [ 94,18] }, cornerRadius=1, { [2,2], [ 92,16] } };
+ shape "ARRO" { { [ 17,9] }, cornerRadius=1, { [2,1], [ 15,8] } };
+
+ shape "LED" { cornerRadius= 1, { [ 2, 2 ] } };
+
+ indicator.onColor= "green";
+ indicator.offColor= "gray";
+ indicator.shape= "LED";
+ indicator "Num Lock" { top=4; left= 119; };
+ indicator "Caps Lock" { top=53; left= 4; };
+
+ section.left=0;
+ row.left= 1;
+ key.shape= "FUNC";
+ key.gap= 1;
+ section "Function" {
+ top= 0;
+ row {
+ top= 1;
+ keys { {<ESC>, "ESC" },
+ <FK01>, <FK02>, <FK03>, <FK04>,
+ <FK05>, <FK06>, <FK07>, <FK08>,
+ <FK09>, <FK10>, <FK11>, <FK12>,
+ {<K6C>, "EJCT" }
+ };
+ };
+ }; // End of "Function" section
+
+ key.shape= "NORM";
+ section "Alpha" {
+ top= 10;
+ row {
+ top= 1;
+ keys { {<TLDE>, "DEGR"},
+ <AE01>, <AE02>, <AE03>, <AE04>,
+ <AE05>, <AE06>, <AE07>, <AE08>,
+ <AE09>, <AE10>, <AE11>, <AE12>,
+ { <BKSP>, "BKSP" }
+ };
+ };
+ row {
+ top= 20;
+ keys { { <TAB>, "TABK"},
+ <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+ <AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
+ <AD11>, <AD12>,
+ { <BKSL>, "BKSL" }
+ };
+ };
+ row {
+ top= 39;
+ keys { { <CAPS>, "CAPS" },
+ <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+ <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+ <AC11>,
+ { <RTRN>, "RTRN" }
+ };
+ };
+ row {
+ top= 58;
+ keys { { <LFSH>, "LFSH"},
+ <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
+ <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+ { <RTSH>, "RTSH" }
+ };
+ };
+ row {
+ top= 77;
+ keys { {<FN>, "DEGR"},
+ <LCTL>, <LALT>,
+ {<LMTA>, "APPL"},
+ {<SPCE>, "SPCE" },
+ {<RMTA>, "APPL"},
+ <KPEN>
+ };
+ };
+
+ }; // End of "Alpha" section
+
+ key.shape= "ARRO";
+ section "Editing" {
+ top = 86;
+ left = 217;
+ row {
+ top= 1;
+ left= 19;
+ keys { <UP> };
+ };
+ row {
+ top= 10;
+ keys { <LEFT>, <DOWN>, <RGHT> };
+ };
+ }; // End of "Editing" section
+
+ alias <AC00> = <CAPS>;
+ alias <AA00> = <LCTL>;
+
+};
--- xkeyboard-config-0.8/geometry/Makefile.am.macbook 2005-09-21 23:29:24.000000000 +0200
+++ xkeyboard-config-0.8/geometry/Makefile.am 2006-09-01 12:39:19.000000000 +0200
@@ -6,7 +6,7 @@
amiga ataritt chicony \
dell everex fujitsu \
hp keytronic kinesis \
-macintosh microsoft nec \
+macbook macintosh microsoft nec \
northgate pc sony \
sun winbook README
--- xkeyboard-config-0.8/symbols/altwin.macbook 2005-10-01 14:20:31.000000000 +0200
+++ xkeyboard-config-0.8/symbols/altwin 2006-09-01 12:39:19.000000000 +0200
@@ -58,3 +58,14 @@
modifier_map Mod1 { Alt_L, Alt_R, Meta_L, Meta_R };
modifier_map Mod4 { Super_L, Super_R };
};
+
+// Make windows key emit alt, alt becomes meta.
+// Useful on apple keyboards where the apple key is beside space
+partial modifier_keys
+xkb_symbols "alt_win" {
+ key <LWIN> { [ Alt_L ] };
+ key <RWIN> { [ Alt_R ] };
+ key <LALT> { [ Meta_L ] };
+ modifier_map Mod1 { Alt_L, Alt_R };
+ modifier_map Mod4 { Meta_L, Meta_R };
+};
--- xkeyboard-config-0.8/symbols/macintosh_vndr/apple.macbook 2005-09-21 23:29:25.000000000 +0200
+++ xkeyboard-config-0.8/symbols/macintosh_vndr/apple 2006-09-01 12:43:02.000000000 +0200
@@ -3,6 +3,14 @@
//
// $XFree86: xc/programs/xkbcomp/symbols/apple,v 1.2 2003/10/24 20:38:20 tsi Exp $
+// MacBook/MacBook Pro
+xkb_symbols "macbook" {
+ key <K6C> { [ XF86Eject ] };
+ replace key <KPEN> { [ ISO_Level3_Shift ] };
+ modifier_map Mod2 { ISO_Level3_Shift };
+};
+
+
partial default modifier_keys
xkb_symbols "extended" {
--- xkeyboard-config-0.8/keycodes/xfree86.macbook 2005-09-21 23:29:24.000000000 +0200
+++ xkeyboard-config-0.8/keycodes/xfree86 2006-09-01 12:41:12.000000000 +0200
@@ -412,4 +412,11 @@
<KPPT> = 134;
};
+xkb_keycodes "macbook" {
+ include "xfree86(basic)"
+ <BKSL> = 51;
+// Macbook keyboards switch TLDE and LSGT keycodes
+ <TLDE> = 94;
+ <LSGT> = 49;
+};
--- xkeyboard-config-0.8/rules/base.ml_s.part.macbook 2006-01-15 00:47:48.000000000 +0100
+++ xkeyboard-config-0.8/rules/base.ml_s.part 2006-09-01 12:39:19.000000000 +0200
@@ -13,6 +13,8 @@
old_macintosh $macvendorlayouts = macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
old_macintosh $nonlatin = macintosh_vndr/us(extended)+%l%(v):2
old_macintosh * = macintosh_vndr/us(extended)+%l%(v)
+ macbook78 * = pc(pc104)+%l%(v)+macintosh_vndr/apple(macbook)
+ macbook79 * = pc(pc105)+%l%(v)+macintosh_vndr/apple(macbook)
$mac en_US = pc(pc105)+macintosh_vndr/us(extended)
$mac $macvendorlayouts = pc(pc105)+macintosh_vndr/%l%(v)
$pcmodels intl = us(%mcompose)
--- xkeyboard-config-0.8/rules/base.m_g.part.macbook 2005-09-21 23:29:25.000000000 +0200
+++ xkeyboard-config-0.8/rules/base.m_g.part 2006-09-01 12:39:19.000000000 +0200
@@ -13,5 +13,6 @@
winbook = winbook(XP5)
pc98 = nec(pc98)
abnt2 = pc(abnt2)
+ $macbooks = macbook(%m)
$mac = macintosh(macintosh)
* = pc(pc104)
--- xkeyboard-config-0.8/rules/base.o_s.part.macbook 2005-09-23 00:21:08.000000000 +0200
+++ xkeyboard-config-0.8/rules/base.o_s.part 2006-09-01 12:39:19.000000000 +0200
@@ -43,6 +43,7 @@
altwin:super_win = +altwin(super_win)
altwin:hyper_win = +altwin(hyper_win)
altwin:alt_super_win = +altwin(alt_super_win)
+ altwin:alt_win = +altwin(alt_win)
compose:ralt = +compose(ralt)
compose:rwin = +compose(rwin)
compose:menu = +compose(menu)
--- xkeyboard-config-0.8/rules/base.m_k.part.macbook 2006-02-22 00:52:07.000000000 +0100
+++ xkeyboard-config-0.8/rules/base.m_k.part 2006-09-01 12:39:19.000000000 +0200
@@ -8,4 +8,5 @@
abnt2 = xfree86(abnt2)
jp106 = xfree86(jp106)
evdev = evdev
+ $macbooks = xfree86(macbook)
* = xfree86
--- xkeyboard-config-0.8/rules/base.lists.part.macbook 2006-01-14 23:22:13.000000000 +0100
+++ xkeyboard-config-0.8/rules/base.lists.part 2006-09-01 12:39:19.000000000 +0200
@@ -6,6 +6,7 @@
// ru scc sy syr tel th tj tam ua uz
! $pcmodels = pc101 pc102 pc104 pc105
+! $macbooks = macbook78 macbook79
! $maclaptop = ibook powerbook
! $mac = macintosh macintosh_old ibook powerbook
--- xkeyboard-config-0.8/rules/base.macbook 2006-09-01 12:39:19.000000000 +0200
+++ xkeyboard-config-0.8/rules/base 2006-09-01 12:39:19.000000000 +0200
@@ -15,6 +15,7 @@
// ru scc sy syr tel th tj tam ua uz
! $pcmodels = pc101 pc102 pc104 pc105
+! $macbooks = macbook78 macbook79
! $maclaptop = ibook powerbook
! $mac = macintosh macintosh_old ibook powerbook
@@ -86,6 +87,7 @@
abnt2 = xfree86(abnt2)
jp106 = xfree86(jp106)
evdev = evdev
+ $macbooks = xfree86(macbook)
* = xfree86
! layout[1] = keycodes
@@ -116,6 +118,7 @@
winbook = winbook(XP5)
pc98 = nec(pc98)
abnt2 = pc(abnt2)
+ $macbooks = macbook(%m)
$mac = macintosh(macintosh)
kinesis = kinesis(model100)
* = pc(pc104)
@@ -352,6 +355,8 @@
old_macintosh $macvendorlayouts = macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
old_macintosh $nonlatin = macintosh_vndr/us(extended)+%l%(v):2
old_macintosh * = macintosh_vndr/us(extended)+%l%(v)
+ macbook78 * = pc(pc104)+%l%(v)+macintosh_vndr/apple(macbook)
+ macbook79 * = pc(pc105)+%l%(v)+macintosh_vndr/apple(macbook)
$mac en_US = pc(pc105)+macintosh_vndr/us(extended)
$mac $macvendorlayouts = pc(pc105)+macintosh_vndr/%l%(v)
$pcmodels intl = us(%mcompose)
@@ -997,6 +1002,7 @@
altwin:super_win = +altwin(super_win)
altwin:hyper_win = +altwin(hyper_win)
altwin:alt_super_win = +altwin(alt_super_win)
+ altwin:alt_win = +altwin(alt_win)
compose:ralt = +compose(ralt)
compose:rwin = +compose(rwin)
compose:menu = +compose(menu)
--- xkeyboard-config-0.8/rules/base.xml.in.macbook 2006-09-01 12:39:19.000000000 +0200
+++ xkeyboard-config-0.8/rules/base.xml.in 2006-09-01 12:39:19.000000000 +0200
@@ -676,6 +676,18 @@
</model>
<model>
<configItem>
+ <name>macbook78</name>
+ <description>MacBook/MacBook Pro (US)</description>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
+ <name>macbook79</name>
+ <description>MacBook/MacBook Pro (Intl)</description>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>macintosh</name>
<_description>Macintosh</_description>
</configItem>
@@ -2840,6 +2852,12 @@
<_description>Alt is mapped to the right Win-key and Super to Menu.</_description>
</configItem>
</option>
+ <option>
+ <configItem>
+ <name>altwin:alt_win</name>
+ <description>Alt is mapped to the Win-keys. Alt becomes Meta.</description>
+ </configItem>
+ </option>
</group>
<group allowMultipleSelection="true">
<!-- Tweaking the position of the "Compose" key: mapping to existing PC keys -->

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

@ -1,27 +0,0 @@
--- 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>

8
xkeyboard-config.spec
View File

@ -4,13 +4,15 @@
Summary: xkeyboard-config alternative xkb data files
Name: xkeyboard-config
Version: 1.1
Release: 2%{?dist}
Release: 3%{?dist}
License: MIT
Group: User Interface/X
URL: http://www.x.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
# https://bugs.freedesktop.org/show_bug.cgi?id=12719
Patch0: dellm65.patch
BuildArch: noarch
@ -40,6 +42,7 @@ xkeyboard-config alternative xkb data files
%prep
%setup -q
%patch0 -p1 -b .dellm65
%build
%configure \
@ -76,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/X11/xkb/rules/xorg.xml
%changelog
* Sat Oct 6 2007 Matthias Clasen <mclasen@redhat.com> - 1.1-3
- Somehow the Dell M65 model lost its vendor
* Wed Sep 26 2007 Matthias Clasen <mclasen@redhat.com> - 1.1-2
- Pick up the respun 1.1 release