aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/symbols
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/xkeyboard-config/symbols')
-rw-r--r--xorg-server/xkeyboard-config/symbols/cd.in4
-rw-r--r--xorg-server/xkeyboard-config/symbols/es47
-rw-r--r--xorg-server/xkeyboard-config/symbols/inet2
-rw-r--r--xorg-server/xkeyboard-config/symbols/olpc8
-rw-r--r--xorg-server/xkeyboard-config/symbols/ru19
-rw-r--r--xorg-server/xkeyboard-config/symbols/us61
6 files changed, 132 insertions, 9 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/cd.in b/xorg-server/xkeyboard-config/symbols/cd.in
index 5e51535cc..a4f2fa2d2 100644
--- a/xorg-server/xkeyboard-config/symbols/cd.in
+++ b/xorg-server/xkeyboard-config/symbols/cd.in
@@ -52,10 +52,10 @@ xkb_symbols "basic" {
key <AB01> { [ w, W ] };
key <AB02> { [ x, X ] };
- key <AB03> { [ c, C, ccedilla, Ccedilla ] };
+ key <AB03> { [ c, C ] };
key <AB04> { [ v, V ] };
key <AB05> { [ b, B ] };
- key <AB06> { [ n, N, 0x01000014B, 0x0100014A ] };
+ key <AB06> { [ n, N, 0x0100014B, 0x0100014A ] };
key <AB07> { [ comma, question, 0x01000327 ] };
key <AB08> { [ semicolon, period ] };
key <AB09> { [ colon, slash ] };
diff --git a/xorg-server/xkeyboard-config/symbols/es b/xorg-server/xkeyboard-config/symbols/es
index cf66f9b35..5adf1a2bb 100644
--- a/xorg-server/xkeyboard-config/symbols/es
+++ b/xorg-server/xkeyboard-config/symbols/es
@@ -158,10 +158,12 @@ xkb_symbols "mac" {
partial alphanumeric_keys
xkb_symbols "olpc" {
+ // http://wiki.laptop.org/go/OLPC_Spanish_Keyboard
+
include "us(basic)"
name[Group1]="Spanish";
- key <TLDE> { [ masculine, ordfeminine ] };
+ key <AE00> { [ masculine, ordfeminine ] };
key <AE01> { [ 1, exclam, bar ] };
key <AE02> { [ 2, quotedbl, at ] };
key <AE03> { [ 3, dead_grave, numbersign, grave ] };
@@ -180,7 +182,7 @@ xkb_symbols "olpc" {
key <AC10> { [ ntilde, Ntilde ] };
key <AC11> { [ plus, asterisk, dead_tilde ] };
- key <BKSL> { [ bracketright, braceright, section ] };
+ key <AC12> { [ bracketright, braceright, section ] };
key <AB08> { [ comma, semicolon ] };
key <AB09> { [ period, colon ] };
@@ -192,6 +194,47 @@ xkb_symbols "olpc" {
};
partial alphanumeric_keys
+xkb_symbols "olpcm" {
+
+ // Mechanical (non-membrane) OLPC Spanish keyboard layout.
+ // See: http://wiki.laptop.org/go/OLPC_Spanish_Non-membrane_Keyboard
+
+ include "us(basic)"
+ name[Group1]="Spain";
+
+ key <AE00> { [ questiondown, exclamdown, backslash ] };
+ key <AE01> { [ 1, exclam, bar ] };
+ key <AE02> { [ 2, quotedbl, at ] };
+ key <AE03> { [ 3, dead_grave, numbersign, grave ] };
+ key <AE04> { [ 4, dollar, asciitilde, dead_tilde ] };
+ key <AE05> { [ 5, percent, asciicircum, dead_circumflex ] };
+ key <AE06> { [ 6, ampersand, notsign ] };
+ key <AE07> { [ 7, slash, backslash ] }; // no '\' label on olpcm, leave for compatibility
+ key <AE08> { [ 8, parenleft, masculine ] };
+ key <AE09> { [ 9, parenright, ordfeminine ] };
+ key <AE10> { [ 0, equal ] };
+ key <AE11> { [ apostrophe, question ] };
+
+ key <AD03> { [ e, E, EuroSign ] };
+ key <AD11> { [ dead_acute, dead_diaeresis, dead_abovering, acute ] };
+ key <AD12> { [ plus, asterisk ] };
+
+ key <AC10> { [ ntilde, Ntilde ] };
+ // no AC11 or AC12 on olpcm
+
+ key <AB08> { [ comma, semicolon ] };
+ key <AB09> { [ period, colon ] };
+ key <AB10> { [ minus, underscore ] };
+
+ key <AA02> { [ less, greater ] };
+ key <AA06> { [ bracketleft, braceleft, ccedilla, Ccedilla ] };
+ key <AA07> { [ bracketright, braceright ] };
+
+
+ include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
xkb_symbols "deadtilde" {
include "es(basic)"
diff --git a/xorg-server/xkeyboard-config/symbols/inet b/xorg-server/xkeyboard-config/symbols/inet
index 4c172faa2..839439a96 100644
--- a/xorg-server/xkeyboard-config/symbols/inet
+++ b/xorg-server/xkeyboard-config/symbols/inet
@@ -120,6 +120,8 @@ xkb_symbols "evdev" {
key <FK22> { [ XF86TouchpadOn ] };
key <FK23> { [ XF86TouchpadOff ] };
+ key <FK20> { [ XF86AudioMicMute ] };
+
// key <I120> { [ ] }; // KEY_MACRO
key <I126> { [ plusminus ] };
key <I128> { [ XF86LaunchA ] };
diff --git a/xorg-server/xkeyboard-config/symbols/olpc b/xorg-server/xkeyboard-config/symbols/olpc
index e9e950b1e..250e2c5d6 100644
--- a/xorg-server/xkeyboard-config/symbols/olpc
+++ b/xorg-server/xkeyboard-config/symbols/olpc
@@ -13,9 +13,9 @@ xkb_symbols "olpc" {
modifier_map Mod4 { KP_Prior }; // KP_Prior is the "O" game key
modifier_map Mod5 { KP_Next }; // KP_Next is the "X" game key
- key <I220> { [ XF86Search ] }; // search key
- key <I221> { [ XF86Meeting ] }; // fn+search key
+ key <I220> { [ XF86Search ] }; // search key (unpopulated on olpcm, harmless)
+ key <I221> { [ XF86Meeting ] }; // fn+search key (unpopulated on olpcm, harmless)
key <I236> { [ XF86Start ] }; // gear key (fn+space)
- key <I147> { [ XF86TaskPane ] }; // frame key (the top-right key)
- key <I224> { [ XF86Messenger ] }; // overlay key (next to frame key)
+ key <I147> { [ XF86TaskPane ] }; // frame key (the top-right key) (unpopulated on olpcm, harmless)
+ key <I224> { [ XF86Messenger ] }; // overlay key (next to frame key) (unpopulated on olpcm, harmless)
};
diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru
index 457c9efaa..a761c30d0 100644
--- a/xorg-server/xkeyboard-config/symbols/ru
+++ b/xorg-server/xkeyboard-config/symbols/ru
@@ -656,3 +656,22 @@ partial alphanumeric_keys
xkb_symbols "sun_type6" {
include "sun_vndr/ru(sun_type6)"
};
+
+// Apple layout
+partial alphanumeric_keys
+xkb_symbols "mac" {
+include "ru(common)"
+
+ name[Group1]= "Russian (Macintosh)";
+
+ key <LSGT> { [ less, greater ] };
+ key <AE02> { [ 2, quotedbl ] };
+ key <AE03> { [ 3, numerosign ] };
+ key <AE04> { [ 4, percent ] };
+ key <AE05> { [ 5, colon ] };
+ key <AE06> { [ 6, comma ] };
+ key <AE07> { [ 7, period ] };
+ key <AE08> { [ 8, semicolon ] };
+ key <TLDE> { [ bracketright, bracketleft ] };
+ key <BKSL> { [ Cyrillic_io, Cyrillic_IO ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us
index 11c971cf1..b34bedc0f 100644
--- a/xorg-server/xkeyboard-config/symbols/us
+++ b/xorg-server/xkeyboard-config/symbols/us
@@ -605,6 +605,8 @@ xkb_symbols "dvp" {
// lower row, left side
key <AB01> { [ apostrophe, quotedbl, dead_acute ] };
+
+ include "level3(ralt_switch)"
};
// phonetic layout for Russian letters on an US keyboard
@@ -1033,7 +1035,7 @@ xkb_symbols "olpc" {
key <AC07> { [ j, J, EuroSign, EuroSign ] };
key <AC10> { [ semicolon, colon, masculine, ordfeminine ] };
key <AC11> { [ apostrophe, quotedbl, currency, currency ] };
- key <BKSL> { [ backslash, bar, section, section ] };
+ key <AC12> { [ backslash, bar, section, section ] };
key <AB03> { [ c, C, ccedilla, Ccedilla ] };
key <AB06> { [ n, N, ntilde, Ntilde ] };
@@ -1054,6 +1056,63 @@ xkb_symbols "olpc2" {
include "group(olpc)"
};
+xkb_symbols "olpcm" {
+
+ include "us(basic)"
+ name[Group1]= "USA";
+
+ // Mechanical (non-membrane) OLPC int'l US English keyboard layout.
+ // See: http://wiki.laptop.org/go/OLPC_English_Non-membrane_Keyboard
+
+ key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] };
+ key <AE01> { [ 1, exclam, exclamdown, exclamdown ] };
+ key <AE02> { [ 2, at, notsign, notsign ] };
+ key <AE03> { [ 3, numbersign, 0x1000300, 0x1000300 ] }; // combining grave
+ key <AE04> { [ 4, dollar, 0x1000301, 0x1000301 ] }; // combining acute
+ key <AE05> { [ 5, percent, 0x1000306, 0x1000306 ] }; // combining breve above
+ key <AE06> { [ 6,asciicircum, 0x100030A, 0x100030A ] }; // combining ring above
+ key <AE07> { [ 7, ampersand, 0x1000302, 0x1000302 ] }; // combining circumflex above
+ key <AE08> { [ 8, asterisk, 0x100030C, 0x100030C ] }; // combining caron above
+ key <AE09> { [ 9, parenleft, 0x1000307, 0x1000307 ] }; // combining dot above
+ key <AE10> { [ 0, parenright, 0x1000308, 0x1000308 ] }; // combining diaeresis above
+ key <AE11> { [ minus, underscore, 0x1000304, 0x1000304 ] }; // combining macron above
+
+ key <AD01> { [ q, Q, Greek_omega, Greek_OMEGA ] };
+ key <AD02> { [ w, W, oslash, Oslash ] };
+ key <AD03> { [ e, E, oe, OE ] };
+ key <AD04> { [ r, R, 0x1000327, 0x1000327 ] }; // combining cedilla
+ key <AD05> { [ t, T, 0x100032E, 0x100032E ] }; // combining breve below
+ key <AD06> { [ y, Y, 0x1000325, 0x1000325 ] }; // combining ring below
+ key <AD07> { [ u, U, 0x100032D, 0x100032D ] }; // combining circumflex below
+ key <AD08> { [ i, I, 0x100032C, 0x100032C ] }; // combining caron below
+ key <AD09> { [ o, O, 0x1000323, 0x1000323 ] }; // combining dot below
+ key <AD10> { [ p, P, 0x1000324, 0x1000324 ] }; // combining diaeresis below
+ key <AD11> { [ bracketleft, braceleft, 0x1000331, 0x1000331 ] }; // combining macron below
+ key <AD12> { [bracketright, braceright, 0x1000330, 0x1000330 ] }; // combining tilde below
+
+ key <AC01> { [ a, A, ae, AE ] };
+ key <AC02> { [ s, S, ssharp, 0x1001E9C ] }; // uppercase S sharp
+ key <AC03> { [ d, D, eth, ETH ] };
+ key <AC04> { [ f, F, thorn, THORN ] };
+ key <AC06> { [ h, H, sterling, sterling ] };
+ key <AC07> { [ j, J, EuroSign, EuroSign ] };
+ key <AC10> { [ semicolon, colon, masculine, ordfeminine ] };
+ // no AC11 or AC12 on olpcm
+
+ key <AB03> { [ c, C, ccedilla, Ccedilla ] };
+ key <AB06> { [ n, N, ntilde, Ntilde ] };
+ key <AB07> { [ m, M, mu, mu ] };
+ key <AB08> { [ comma, less, guillemotleft, guillemotleft ] };
+ key <AB09> { [ period, greater, guillemotright, guillemotright ] };
+ key <AB10> { [ slash, question, questiondown, questiondown ] };
+
+ key <AA02> { [ backslash, bar, section, section ] };
+ key <AA06> { [ equal, plus, 0x1000303, 0x1000303 ] };
+ key <AA07> { [ apostrophe, quotedbl, currency, currency ] };
+
+ include "level3(ralt_switch)"
+};
+
// Based on Cherokee Nation Official Layout
// http://www.cherokee.org/extras/downloads/font/Keyboard.htm
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 01:02:02 +0000