summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey V. Udaltsov <svu@gnome.org>2011-08-06 21:47:53 +0100
committerSergey V. Udaltsov <svu@gnome.org>2011-08-06 21:47:53 +0100
commit6b47b2e5e95b5f53bd58e0e78bf324a260d789fa (patch)
tree97e7f696ceb0baedadb06cab3623a4d41c0176f0
parentf0c4c16bf0fdb38494875dba117e38b363e99614 (diff)
Small reorganization in ctrl:* option names
There was no convention for the option names. Now, where it is possible, the convention is <keycode>_<keysym> (when <keycode> is mapped to <keysym>)
-rw-r--r--rules/base.o_s.part10
-rw-r--r--rules/base.xml.in16
-rw-r--r--symbols/ctrl10
3 files changed, 18 insertions, 18 deletions
diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index 8191a3f5..6cf9f140 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -64,11 +64,11 @@
ctrl:nocaps = +ctrl(nocaps)
ctrl:lctrl_meta = +ctrl(lctrl_meta)
ctrl:swapcaps = +ctrl(swapcaps)
- ctrl:ctrl_ac = +ctrl(ctrl_ac)
- ctrl:ctrl_aa = +ctrl(ctrl_aa)
- ctrl:ctrl_ra = +ctrl(ctrl_ra)
- ctrl:ctrl_menu = +ctrl(ctrl_menu)
- ctrl:ctrl_ralt = +ctrl(ctrl_ralt)
+ ctrl:ac_ctrl = +ctrl(ac_ctrl)
+ ctrl:aa_ctrl = +ctrl(aa_ctrl)
+ ctrl:rctrl_ralt = +ctrl(rctrl_ralt)
+ ctrl:menu_rctrl = +ctrl(menu_rctrl)
+ ctrl:ralt_rctrl = +ctrl(ralt_rctrl)
compose:ralt = +compose(ralt)
compose:lwin = +compose(lwin)
compose:rwin = +compose(rwin)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 91996367..062fe1d7 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -5602,13 +5602,13 @@
<option>
<configItem>
<name>ctrl:nocaps</name>
- <_description>Make Caps Lock an additional Ctrl</_description>
+ <_description>Caps Lock as Ctrl</_description>
</configItem>
</option>
<option>
<configItem>
<name>ctrl:lctrl_meta</name>
- <_description>Meta on Left Ctrl</_description>
+ <_description>Left Ctrl as Meta</_description>
</configItem>
</option>
<option>
@@ -5619,32 +5619,32 @@
</option>
<option>
<configItem>
- <name>ctrl:ctrl_ac</name>
+ <name>ctrl:ac_ctrl</name>
<_description>At left of 'A'</_description>
</configItem>
</option>
<option>
<configItem>
- <name>ctrl:ctrl_aa</name>
+ <name>ctrl:aa_ctrl</name>
<_description>At bottom left</_description>
</configItem>
</option>
<option>
<configItem>
- <name>ctrl:ctrl_ra</name>
+ <name>ctrl:rctrl_ralt</name>
<_description>Right Ctrl as Right Alt</_description>
</configItem>
</option>
<option>
<configItem>
- <name>ctrl:ctrl_menu</name>
- <_description>Right Ctrl is mapped to Menu</_description>
+ <name>ctrl:menu_rctrl</name>
+ <_description>Menu as Right Ctrl</_description>
</configItem>
</option>
<option>
<configItem>
<name>ctrl:ctrl_ralt</name>
- <_description>Right Alt functions as Ctrl</_description>
+ <_description>Right Alt as Right Ctrl</_description>
</configItem>
</option>
</group>
diff --git a/symbols/ctrl b/symbols/ctrl
index 55a148fa..09d76b55 100644
--- a/symbols/ctrl
+++ b/symbols/ctrl
@@ -21,7 +21,7 @@ xkb_symbols "swapcaps" {
// to the bottom row. Only works if the geometry or keycodes
// file has defined appropriate aliases for the keys in question.
partial modifier_keys
-xkb_symbols "ctrl_ac" {
+xkb_symbols "ac_ctrl" {
replace key <AC00> { [ Control_L ] };
replace key <AA00> { [ Caps_Lock ] };
};
@@ -30,27 +30,27 @@ xkb_symbols "ctrl_ac" {
// to the middle row. Only works if the geometry or keycodes
// file has defined appropriate aliases for the keys in question.
partial modifier_keys
-xkb_symbols "ctrl_aa" {
+xkb_symbols "aa_ctrl" {
replace key <AA00> { [ Control_L ] };
replace key <AC00> { [ Caps_Lock ] };
};
// Right Ctrl works as Right Alt
partial modifier_keys
-xkb_symbols "ctrl_ra" {
+xkb_symbols "rctrl_ralt" {
key <RCTL> { symbols[Group1]= [ Alt_R ] };
};
// Menu works as Right Ctrl
partial modifier_keys
-xkb_symbols "ctrl_menu" {
+xkb_symbols "menu_rctrl" {
replace key <MENU> { [ Control_R, Control_R ] };
modifier_map Control { Control_L, <MENU> };
};
// right alt functions as another ctrl key
partial modifier_keys
-xkb_symbols "ctrl_ralt" {
+xkb_symbols "ralt_rctrl" {
replace key <RALT> { type[Group1] = "TWO_LEVEL",
symbols[Group1] = [ Control_R, Control_R ] };
modifier_map Control { <RALT> };