aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/xkeyboard-config')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.extras.xml.in2
-rw-r--r--xorg-server/xkeyboard-config/rules/base.o_s.part1
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in32
-rw-r--r--xorg-server/xkeyboard-config/symbols/altwin4
-rw-r--r--xorg-server/xkeyboard-config/symbols/epo24
-rw-r--r--xorg-server/xkeyboard-config/symbols/us21
6 files changed, 42 insertions, 42 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index 4b3c6234e..56c2295d0 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -257,7 +257,7 @@
<variant>
<configItem>
<name>crd</name>
- <_description>Couer D'alene Salish</_description>
+ <_description>Coeur d'Alene Salish</_description>
<languageList><iso639Id>crd</iso639Id></languageList>
</configItem>
</variant>
diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part
index 46c07b01d..35b6ef3b6 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_s.part
@@ -130,6 +130,7 @@
shift:breaks_caps = +shift(breaks_caps)
esperanto:qwerty = +epo(qwerty)
esperanto:dvorak = +epo(dvorak)
+ esperanto:colemak = +epo(colemak)
terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp)
keypad:pointerkeys = +keypad(pointerkeys)
apple:alupckeys = +macintosh_vndr/apple(alupckeys)
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 51c4ca59e..874b52eb6 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -5659,7 +5659,7 @@
<!-- The key combination used to switch between groups -->
<configItem>
<name>grp</name>
- <_description>Key(s) to change layout</_description>
+ <_description>Switching to another layout</_description>
</configItem>
<option>
<configItem>
@@ -6060,7 +6060,7 @@
<!-- Select a keypad type -->
<configItem>
<name>keypad</name>
- <_description>Numeric keypad layout selection</_description>
+ <_description>Layout of numeric keypad</_description>
</configItem>
<option>
<configItem>
@@ -6077,7 +6077,7 @@
<option>
<configItem>
<name>keypad:future</name>
- <_description>Unicode additions (arrows and math operators). Math operators on default level</_description>
+ <_description>Unicode additions (arrows and math operators; math operators on default level)</_description>
</configItem>
</option>
<option>
@@ -6095,7 +6095,7 @@
<option>
<configItem>
<name>keypad:future_wang</name>
- <_description>Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level</_description>
+ <_description>Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)</_description>
</configItem>
</option>
<option>
@@ -6182,25 +6182,25 @@
<option>
<configItem>
<name>caps:internal</name>
- <_description>Caps Lock uses internal capitalization. Shift "pauses" Caps Lock</_description>
+ <_description>Caps Lock uses internal capitalization; Shift "pauses" Caps Lock</_description>
</configItem>
</option>
<option>
<configItem>
<name>caps:internal_nocancel</name>
- <_description>Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock</_description>
+ <_description>Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock</_description>
</configItem>
</option>
<option>
<configItem>
<name>caps:shift</name>
- <_description>Caps Lock acts as Shift with locking. Shift "pauses" Caps Lock</_description>
+ <_description>Caps Lock acts as Shift with locking; Shift "pauses" Caps Lock</_description>
</configItem>
</option>
<option>
<configItem>
<name>caps:shift_nocancel</name>
- <_description>Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock</_description>
+ <_description>Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock</_description>
</configItem>
</option>
<option>
@@ -6260,7 +6260,7 @@
<option>
<configItem>
<name>caps:ctrl_modifier</name>
- <_description>Make Caps Lock an additional Control but keep the Caps_Lock keysym</_description>
+ <_description>Make Caps Lock an additional Ctrl</_description>
</configItem>
</option>
</group>
@@ -6291,13 +6291,13 @@
<option>
<configItem>
<name>altwin:ctrl_win</name>
- <_description>Control is mapped to Win keys (and the usual Ctrl keys)</_description>
+ <_description>Ctrl is mapped to Win keys (and the usual Ctrl keys)</_description>
</configItem>
</option>
<option>
<configItem>
<name>altwin:ctrl_alt_win</name>
- <_description>Control is mapped to Alt keys, Alt is mapped to Win keys</_description>
+ <_description>Ctrl is mapped to Alt keys, Alt is mapped to Win keys</_description>
</configItem>
</option>
<option>
@@ -6335,7 +6335,7 @@
<!-- Tweaking the position of the "Compose" key: mapping to existing PC keys -->
<configItem>
<name>Compose key</name>
- <_description>Compose key position</_description>
+ <_description>Position of Compose key</_description>
</configItem>
<option>
<configItem>
@@ -6779,6 +6779,12 @@
<_description>To the corresponding key in a Dvorak layout</_description>
</configItem>
</option>
+ <option>
+ <configItem>
+ <name>esperanto:colemak</name>
+ <_description>To the corresponding key in a Colemak layout</_description>
+ </configItem>
+ </option>
</group>
<group allowMultipleSelection="true">
<configItem>
@@ -6800,7 +6806,7 @@
<option>
<configItem>
<name>terminate:ctrl_alt_bksp</name>
- <_description>Control + Alt + Backspace</_description>
+ <_description>Ctrl + Alt + Backspace</_description>
</configItem>
</option>
</group>
diff --git a/xorg-server/xkeyboard-config/symbols/altwin b/xorg-server/xkeyboard-config/symbols/altwin
index d22013d0c..c65727db4 100644
--- a/xorg-server/xkeyboard-config/symbols/altwin
+++ b/xorg-server/xkeyboard-config/symbols/altwin
@@ -15,7 +15,7 @@ xkb_symbols "alt_win" {
modifier_map Mod1 { <LWIN>, <RWIN> };
};
-// Control is mapped to the Win-keys (and the usual Ctrl keys).
+// Ctrl is mapped to the Win-keys (and the usual Ctrl keys).
partial modifier_keys
xkb_symbols "ctrl_win" {
key <LWIN> { [ Control_L ] };
@@ -23,7 +23,7 @@ xkb_symbols "ctrl_win" {
modifier_map Control { <LWIN>, <RWIN> };
};
-// Ctrl is mapped to the Alt-keys, Alt is mapped to the Win-keys, Win is mapped to the Ctrl-keys.
+// Ctrl is mapped to the Alt-keys, Alt is mapped to the Win-keys, Win is mapped to the Ctrl-keys.
partial modifier_keys
xkb_symbols "ctrl_alt_win" {
key <LALT> { [ Control_L, Control_L ] };
diff --git a/xorg-server/xkeyboard-config/symbols/epo b/xorg-server/xkeyboard-config/symbols/epo
index 840501119..ae738359f 100644
--- a/xorg-server/xkeyboard-config/symbols/epo
+++ b/xorg-server/xkeyboard-config/symbols/epo
@@ -112,10 +112,10 @@ xkb_symbols "legacy" {
include "level3(ralt_switch)"
};
-// Add Esperanto supersignos to the corresponding key in a Qwerty keyboard.
-// This is a generic "component" that is not used to the other layouts in this
-// file but it is meant to be applied to any layout. If you have any questions
-// ask J. Pablo Fernández <pupeno@pupeno.com>.
+// Add the Esperanto supersigned letters to their related keys on a Qwerty keyboard.
+// This is a generic "component" that is not used by the other layouts in this file,
+// but is meant to be applied to any Qwerty layout. If you have any questions, ask
+// J. Pablo Fernández <pupeno@pupeno.com>.
partial
xkb_symbols "qwerty" {
key <AB03> { [ NoSymbol, NoSymbol, ccircumflex, Ccircumflex ] };
@@ -126,8 +126,8 @@ xkb_symbols "qwerty" {
key <AD07> { [ NoSymbol, NoSymbol, ubreve, Ubreve ] };
};
-// Add Esperanto supersignos to the corresponding key in a Dvorak keyboard.
-// Same comment as the Qwerty one above applies.
+// Add the Esperanto supersigned letters to their related keys in a
+// Dvorak layout. Similar comment as above applies.
partial
xkb_symbols "dvorak" {
key <AD08> { [ NoSymbol, NoSymbol, ccircumflex, Ccircumflex ] };
@@ -137,3 +137,15 @@ xkb_symbols "dvorak" {
key <AC10> { [ NoSymbol, NoSymbol, scircumflex, Scircumflex ] };
key <AC04> { [ NoSymbol, NoSymbol, ubreve, Ubreve ] };
};
+
+// Add the Esperanto supersigned letters to their related keys in a
+// Colemak layout. Similar comment as above applies.
+partial
+xkb_symbols "colemak" {
+ key <AB03> { [ NoSymbol, NoSymbol, ccircumflex, Ccircumflex ] };
+ key <AD05> { [ NoSymbol, NoSymbol, gcircumflex, Gcircumflex ] };
+ key <AC06> { [ NoSymbol, NoSymbol, hcircumflex, Hcircumflex ] };
+ key <AD06> { [ NoSymbol, NoSymbol, jcircumflex, Jcircumflex ] };
+ key <AC03> { [ NoSymbol, NoSymbol, scircumflex, Scircumflex ] };
+ key <AD08> { [ NoSymbol, NoSymbol, ubreve, Ubreve ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us
index 5ad2ae072..31977e417 100644
--- a/xorg-server/xkeyboard-config/symbols/us
+++ b/xorg-server/xkeyboard-config/symbols/us
@@ -4,7 +4,6 @@ xkb_symbols "basic" {
name[Group1]= "English (US)";
- // Alphanumeric section
key <TLDE> { [ grave, asciitilde ] };
key <AE01> { [ 1, exclam ] };
key <AE02> { [ 2, at ] };
@@ -56,7 +55,6 @@ xkb_symbols "basic" {
key <AB10> { [ slash, question ] };
key <BKSL> { [ backslash, bar ] };
- // End alphanumeric section
};
partial alphanumeric_keys
@@ -79,7 +77,6 @@ xkb_symbols "intl" {
include "us(basic)"
- // Alphanumeric section
key <TLDE> { [dead_grave, dead_tilde, grave, asciitilde ] };
key <AE01> { [ 1, exclam, exclamdown, onesuperior ] };
key <AE02> { [ 2, at, twosuperior, dead_doubleacute ] };
@@ -196,8 +193,6 @@ xkb_symbols "dvorak" {
name[Group1]= "English (Dvorak)";
- // Alphanumeric section
-
key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] };
key <AE01> { [ 1, exclam ] };
@@ -490,8 +485,6 @@ xkb_symbols "dvorak-classic" {
name[Group1]= "English (classic Dvorak)";
- // Alphanumeric section
-
key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] };
key <AE01> { [ bracketleft, braceleft ] };
@@ -738,7 +731,6 @@ xkb_symbols "colemak" {
include "us"
name[Group1]= "English (Colemak)";
- // Alphanumeric section
key <TLDE> { [ grave, asciitilde, dead_tilde, asciitilde ] };
key <AE01> { [ 1, exclam, exclamdown, onesuperior ] };
key <AE02> { [ 2, at, masculine, twosuperior ] };
@@ -1122,7 +1114,6 @@ xkb_symbols "chr" {
name[Group1]= "Cherokee";
key.type[group1]="ALPHABETIC";
- // Alphanumeric section
key <TLDE> { [ grave, U13CA ] };
key <AE01> { [ 1, U13B1 ] };
key <AE02> { [ 2, U13C7 ] };
@@ -1173,8 +1164,6 @@ xkb_symbols "chr" {
key <AB08> { [ comma, U13E2 ] };
key <AB09> { [ period, U13B4 ] };
key <AB10> { [ U13C2, U13C9 ] };
-
- // End alphanumeric section
};
// Serbian charecters added as third level symbols to US keyboard layout.
@@ -1258,7 +1247,6 @@ xkb_symbols "workman" {
include "us(basic)"
- // Alphanumeric section
key <AD01> { [ q, Q ] };
key <AD02> { [ d, D ] };
key <AD03> { [ r, R ] };
@@ -1288,7 +1276,6 @@ xkb_symbols "workman" {
key <AB05> { [ v, V ] };
key <AB06> { [ k, K ] };
key <AB07> { [ l, L ] };
- // End alphanumeric section
key <CAPS> { [ BackSpace, Escape, BackSpace, BackSpace ] };
@@ -1302,7 +1289,6 @@ xkb_symbols "workman-intl" {
include "us(intl)"
- // Alphanumeric section
key <AD01> { [ q, Q, adiaeresis, Adiaeresis ] };
key <AD02> { [ d, D, eth, ETH ] };
key <AD03> { [ r, R, registered, registered ] };
@@ -1332,7 +1318,6 @@ xkb_symbols "workman-intl" {
key <AB05> { [ v, V, v, V ] };
key <AB06> { [ k, K, oe, OE ] };
key <AB07> { [ l, L, oslash, Ooblique ] };
- // End alphanumeric section
key <CAPS> { [ BackSpace, Escape, BackSpace, BackSpace ] };
@@ -1496,7 +1481,6 @@ xkb_symbols "ats" {
key <AC01> { [ a, A, aacute, Aacute ] };
-
//Small letter Open use compose to key get acute accent
key <AB03> { [ c, C, U0254, U0186 ] };
key <AB08> { [ comma, less, U0313 ] };
@@ -1511,9 +1495,8 @@ xkb_symbols "crd" {
include "us"
- name[Group1]= "Couer D'alene Salish";
+ name[Group1]= "Coeur d'Alene Salish";
- // Alphanumeric section
key <AD02> { [ w, W, U02B7, U02B7 ] };
key <AE07> { [ 7, ampersand, U0294 ] };
key <AD01> { [ q, Q, U221A ] };
@@ -1530,8 +1513,6 @@ xkb_symbols "crd" {
include "level3(ralt_switch)"
include "compose(rctrl)"
-
- // End alphanumeric section
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 01:02:40 +0000