summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rules/0042-o_s.part2
-rw-r--r--rules/base.xml2
-rw-r--r--rules/compat/variantsMapping.lst1
-rw-r--r--rules/xfree982
-rw-r--r--symbols/ctrl8
5 files changed, 8 insertions, 7 deletions
diff --git a/rules/0042-o_s.part b/rules/0042-o_s.part
index fd526fa..a69cf6d 100644
--- a/rules/0042-o_s.part
+++ b/rules/0042-o_s.part
@@ -80,7 +80,7 @@
ctrl:nocaps = +ctrl(nocaps)
ctrl:lctrl_meta = +ctrl(lctrl_meta)
ctrl:swapcaps = +ctrl(swapcaps)
- ctrl:swapcaps_hyper = +ctrl(swapcaps_hyper)
+ ctrl:hyper_capscontrol = +ctrl(hyper_capscontrol)
ctrl:swapcaps_and_switch_layout = +ctrl(swapcaps_and_switch_layout)
ctrl:ac_ctrl = +ctrl(ac_ctrl)
ctrl:aa_ctrl = +ctrl(aa_ctrl)
diff --git a/rules/base.xml b/rules/base.xml
index 303388e..19ccb09 100644
--- a/rules/base.xml
+++ b/rules/base.xml
@@ -7253,7 +7253,7 @@
</option>
<option>
<configItem>
- <name>ctrl:swapcaps_hyper</name>
+ <name>ctrl:hyper_capscontrol</name>
<description>Caps Lock as Ctrl, Ctrl as Hyper</description>
</configItem>
</option>
diff --git a/rules/compat/variantsMapping.lst b/rules/compat/variantsMapping.lst
index 4afdb40..7c10067 100644
--- a/rules/compat/variantsMapping.lst
+++ b/rules/compat/variantsMapping.lst
@@ -1,5 +1,6 @@
ben basic in ben
ben probhat in ben_probhat
+ctrl swapcaps_hyper ctrl hyper_capscontrol
dev basic in deva
dzdwi basic bt basic
fi basic fi classic
diff --git a/rules/xfree98 b/rules/xfree98
index 8e9f3b3..0621377 100644
--- a/rules/xfree98
+++ b/rules/xfree98
@@ -23,7 +23,7 @@
ctrl:nocaps = +ctrl(nocaps)
ctrl:lctrl_meta = +ctrl(lctrl_meta)
ctrl:swapcaps = +ctrl(swapcaps)
- ctrl:swapcaps_hyper = +ctrl(swapcaps_hyper)
+ ctrl:hyper_capscontrol = +ctrl(hyper_capscontrol)
ctrl:swapcaps_and_switch_layout = +ctrl(swapcaps_and_switch_layout)
ctrl:ac_ctrl = +ctrl(ac_ctrl)
ctrl:aa_ctrl = +ctrl(aa_ctrl)
diff --git a/symbols/ctrl b/symbols/ctrl
index a9e97f5..75aca17 100644
--- a/symbols/ctrl
+++ b/symbols/ctrl
@@ -20,14 +20,14 @@ xkb_symbols "swapcaps" {
modifier_map Lock { <LCTL> };
};
-// Swap the functions of the CapsLock key and the left Ctrl key,
-// but make the Ctrl key a 'Hyper' modifier
+// Make the left Ctrl key a left Hyper,
+// and the CapsLock key a left Control.
partial modifier_keys
-xkb_symbols "swapcaps_hyper" {
+xkb_symbols "hyper_capscontrol" {
replace key <CAPS> { [ Control_L ] };
replace key <LCTL> { [ Hyper_L ] };
modifier_map Control { <CAPS> };
- modifier_map Mod3 { <LCTL> };
+ modifier_map Mod4 { <LCTL> };
};
// Set CapsLock to left Ctrl and left Ctrl to switch layout.