aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.o_s.part1
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in6
-rw-r--r--xorg-server/xkeyboard-config/rules/xfree9859
-rw-r--r--xorg-server/xkeyboard-config/symbols/ctrl5
-rw-r--r--xorg-server/xkeyboard-config/symbols/eurosign52
-rw-r--r--xorg-server/xkeyboard-config/symbols/shift174
6 files changed, 156 insertions, 141 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part
index 2b400e634..0d46fa00c 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_s.part
@@ -60,6 +60,7 @@
caps:hyper = +capslock(hyper)
caps:none = +capslock(none)
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)
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 27cf6e6ff..d9faa2d87 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -4994,6 +4994,12 @@
</option>
<option>
<configItem>
+ <name>ctrl:lctrl_meta</name>
+ <_description>Meta on Left Ctrl</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
<name>ctrl:swapcaps</name>
<_description>Swap Ctrl and Caps Lock</_description>
</configItem>
diff --git a/xorg-server/xkeyboard-config/rules/xfree98 b/xorg-server/xkeyboard-config/rules/xfree98
index ca7a18bf7..4e16c6dc9 100644
--- a/xorg-server/xkeyboard-config/rules/xfree98
+++ b/xorg-server/xkeyboard-config/rules/xfree98
@@ -1,29 +1,30 @@
-//
-// Rules for resolving XKB components for use with XFree86
-// Copyright 1996 by Joseph Moss
-//
-// $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.5 1996/12/17 21:03:59 dawes Exp $
-//
-
-! model = keycodes geometry
- pc98 = xfree98(pc98) nec(pc98)
- jp106 = xfree98(jp106) pc(jp106)
-
-! model layout = symbols
- pc98 nec_vndr/jp = nec_vndr/jp(pc98)
- jp106 jp = jp
-
-! model layout = compat types
- * * = complete complete
-
-! option = symbols
- grp:switch = +group(switch)
- grp:toggle = +group(toggle)
- grp:shift_toggle = +group(shifts_toggle)
- grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
- grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
- ctrl:nocaps = +ctrl(nocaps)
- ctrl:swapcaps = +ctrl(swapcaps)
- ctrl:ctrl_ac = +ctrl(ctrl_ac)
- ctrl:ctrl_aa = +ctrl(ctrl_aa)
-
+//
+// Rules for resolving XKB components for use with XFree86
+// Copyright 1996 by Joseph Moss
+//
+// $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.5 1996/12/17 21:03:59 dawes Exp $
+//
+
+! model = keycodes geometry
+ pc98 = xfree98(pc98) nec(pc98)
+ jp106 = xfree98(jp106) pc(jp106)
+
+! model layout = symbols
+ pc98 nec_vndr/jp = nec_vndr/jp(pc98)
+ jp106 jp = jp
+
+! model layout = compat types
+ * * = complete complete
+
+! option = symbols
+ grp:switch = +group(switch)
+ grp:toggle = +group(toggle)
+ grp:shift_toggle = +group(shifts_toggle)
+ grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
+ grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
+ 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)
+
diff --git a/xorg-server/xkeyboard-config/symbols/ctrl b/xorg-server/xkeyboard-config/symbols/ctrl
index 80930bc12..e11306fa4 100644
--- a/xorg-server/xkeyboard-config/symbols/ctrl
+++ b/xorg-server/xkeyboard-config/symbols/ctrl
@@ -9,6 +9,11 @@ xkb_symbols "nocaps" {
modifier_map Control { <CAPS>, <LCTL> };
};
+// replace left control with Meta
+xkb_symbols "lctrl_meta" {
+ replace key <LCTL> { [ Meta_L ] };
+};
+
// swap the caps lock key with the left control key
partial modifier_keys
xkb_symbols "swapcaps" {
diff --git a/xorg-server/xkeyboard-config/symbols/eurosign b/xorg-server/xkeyboard-config/symbols/eurosign
index 9458cea33..61a4057b0 100644
--- a/xorg-server/xkeyboard-config/symbols/eurosign
+++ b/xorg-server/xkeyboard-config/symbols/eurosign
@@ -1,26 +1,26 @@
-// $XKeyboardConfig$
-
-// Most keyboards have the EuroSign engraved on the E key
-partial
-xkb_symbols "e" {
- key <AD03> { [ NoSymbol, NoSymbol, EuroSign ] };
-};
-
-// Many Apple keyboards have the EuroSign engraved on the 2 key
-partial
-xkb_symbols "2" {
- key <AE02> { [ NoSymbol, NoSymbol, EuroSign ] };
-};
-
-// Some keyboards have the EuroSign engraved on the 4 key
-partial
-xkb_symbols "4" {
- key <AE04> { [ NoSymbol, NoSymbol, EuroSign ] };
-};
-
-// Many keyboards have the EuroSign engraved on the 5 key
-partial
-xkb_symbols "5" {
- key <AE05> { [ NoSymbol, NoSymbol, EuroSign ] };
-};
-
+// $XKeyboardConfig$
+
+// Most keyboards have the EuroSign engraved on the E key
+partial
+xkb_symbols "e" {
+ key <AD03> { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] };
+};
+
+// Many Apple keyboards have the EuroSign engraved on the 2 key
+partial
+xkb_symbols "2" {
+ key <AE02> { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] };
+};
+
+// Some keyboards have the EuroSign engraved on the 4 key
+partial
+xkb_symbols "4" {
+ key <AE04> { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] };
+};
+
+// Many keyboards have the EuroSign engraved on the 5 key
+partial
+xkb_symbols "5" {
+ key <AE05> { [ NoSymbol, NoSymbol, EuroSign, NoSymbol ] };
+};
+
diff --git a/xorg-server/xkeyboard-config/symbols/shift b/xorg-server/xkeyboard-config/symbols/shift
index 78951c1ec..e850128a2 100644
--- a/xorg-server/xkeyboard-config/symbols/shift
+++ b/xorg-server/xkeyboard-config/symbols/shift
@@ -1,86 +1,88 @@
-// $XKeyboardConfig$
-
-partial modifier_keys
-xkb_symbols "breaks_caps" {
- key <LFSH> {
- type = "ALPHABETIC",
- actions [Group1] = [
- SetMods(modifiers=Shift),
- SetMods(modifiers=Shift+Lock,clearLocks)
- ]
- };
- key <RTSH> {
- type = "ALPHABETIC",
- actions [Group1] = [
- SetMods(modifiers=Shift),
- SetMods(modifiers=Shift+Lock,clearLocks)
- ]
- };
-};
-
-// When pressed together with another Shift key, set/release Lock.
-partial modifier_keys
-xkb_symbols "lshift_both_capslock" {
- key <LFSH> {
- type[Group1]="TWO_LEVEL",
- symbols[Group1] = [ Shift_L, Caps_Lock ]
- };
-};
-// When pressed together with another Shift key, set or unset Lock.
-partial modifier_keys
-xkb_symbols "rshift_both_capslock" {
- key <RTSH> {
- type[Group1]="TWO_LEVEL",
- symbols[Group1] = [ Shift_R, Caps_Lock ]
- };
-};
-partial modifier_keys
-xkb_symbols "both_capslock" {
- include "shift(lshift_both_capslock)"
- include "shift(rshift_both_capslock)"
-};
-
-// Release Lock when pressed alone and set Lock when pressed with another Shift key.
-partial modifier_keys
-xkb_symbols "lshift_both_capslock_cancel" {
- key <LFSH> {
- type[Group1]="ALPHABETIC",
- symbols[Group1] = [ Shift_L, Caps_Lock ]
- };
-};
-// Release Lock when pressed alone and set Lock when pressed with another Shift key.
-partial modifier_keys
-xkb_symbols "rshift_both_capslock_cancel" {
- key <RTSH> {
- type[Group1]="ALPHABETIC",
- symbols[Group1] = [ Shift_R, Caps_Lock ]
- };
-};
-partial modifier_keys
-xkb_symbols "both_capslock_cancel" {
- include "shift(lshift_both_capslock_cancel)"
- include "shift(rshift_both_capslock_cancel)"
-};
-
-
-// When pressed together with another Shift key, lock/unlock Shift.
-partial modifier_keys
-xkb_symbols "lshift_both_shiftlock" {
- key <LFSH> {
- type[Group1]="TWO_LEVEL",
- symbols[Group1] = [ Shift_L, Shift_Lock ]
- };
-};
-// When pressed together with another Shift key, lock/unlock Shift.
-partial modifier_keys
-xkb_symbols "rshift_both_shiftlock" {
- key <RTSH> {
- type[Group1]="TWO_LEVEL",
- symbols[Group1] = [ Shift_R, Shift_Lock ]
- };
-};
-partial modifier_keys
-xkb_symbols "both_shiftlock" {
- include "shift(lshift_both_shiftlock)"
- include "shift(rshift_both_shiftlock)"
-};
+// $XKeyboardConfig$
+
+partial modifier_keys
+xkb_symbols "breaks_caps" {
+ key <LFSH> {
+ type = "ALPHABETIC",
+ actions [Group1] = [
+ SetMods(modifiers=Shift),
+ SetMods(modifiers=Shift+Lock,clearLocks)
+ ]
+ };
+ key <RTSH> {
+ type = "ALPHABETIC",
+ actions [Group1] = [
+ SetMods(modifiers=Shift),
+ SetMods(modifiers=Shift+Lock,clearLocks)
+ ]
+ };
+};
+
+// When pressed together with another Shift key, set/release Lock.
+partial modifier_keys
+xkb_symbols "lshift_both_capslock" {
+ key <LFSH> {
+ type[Group1]="TWO_LEVEL",
+ symbols[Group1] = [ Shift_L, Caps_Lock ],
+ actions[Group1] = [ SetMods(modifiers=Shift), LockMods(modifiers=Lock) ]
+ };
+};
+// When pressed together with another Shift key, set or unset Lock.
+partial modifier_keys
+xkb_symbols "rshift_both_capslock" {
+ key <RTSH> {
+ type[Group1]="TWO_LEVEL",
+ symbols[Group1] = [ Shift_R, Caps_Lock ],
+ actions[Group1] = [ SetMods(modifiers=Shift), LockMods(modifiers=Lock) ]
+ };
+};
+partial modifier_keys
+xkb_symbols "both_capslock" {
+ include "shift(lshift_both_capslock)"
+ include "shift(rshift_both_capslock)"
+};
+
+// Release Lock when pressed alone and set Lock when pressed with another Shift key.
+partial modifier_keys
+xkb_symbols "lshift_both_capslock_cancel" {
+ key <LFSH> {
+ type[Group1]="ALPHABETIC",
+ symbols[Group1] = [ Shift_L, Caps_Lock ]
+ };
+};
+// Release Lock when pressed alone and set Lock when pressed with another Shift key.
+partial modifier_keys
+xkb_symbols "rshift_both_capslock_cancel" {
+ key <RTSH> {
+ type[Group1]="ALPHABETIC",
+ symbols[Group1] = [ Shift_R, Caps_Lock ]
+ };
+};
+partial modifier_keys
+xkb_symbols "both_capslock_cancel" {
+ include "shift(lshift_both_capslock_cancel)"
+ include "shift(rshift_both_capslock_cancel)"
+};
+
+
+// When pressed together with another Shift key, lock/unlock Shift.
+partial modifier_keys
+xkb_symbols "lshift_both_shiftlock" {
+ key <LFSH> {
+ type[Group1]="TWO_LEVEL",
+ symbols[Group1] = [ Shift_L, Shift_Lock ]
+ };
+};
+// When pressed together with another Shift key, lock/unlock Shift.
+partial modifier_keys
+xkb_symbols "rshift_both_shiftlock" {
+ key <RTSH> {
+ type[Group1]="TWO_LEVEL",
+ symbols[Group1] = [ Shift_R, Shift_Lock ]
+ };
+};
+partial modifier_keys
+xkb_symbols "both_shiftlock" {
+ include "shift(lshift_both_shiftlock)"
+ include "shift(rshift_both_shiftlock)"
+};