aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-12-28 23:31:50 +0100
committerMarc Haesen <marc@hc-consult.be>2011-12-28 23:31:50 +0100
commit9715b7fab0757c86e1bb151f3dce0b324bcff692 (patch)
tree805e01d9e21e3f5316e8827dd59173a7a5cfd4ae /xorg-server/xkeyboard-config/rules
parent0fd2d56b0fc0ce74c5f3e5e23cb26b0d1a075ba1 (diff)
downloadvcxsrv-9715b7fab0757c86e1bb151f3dce0b324bcff692.tar.gz
vcxsrv-9715b7fab0757c86e1bb151f3dce0b324bcff692.tar.bz2
vcxsrv-9715b7fab0757c86e1bb151f3dce0b324bcff692.zip
xserver libX11 mesa xkeyboard-config git update 28 dec 2011
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.o_s.part17
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in6
2 files changed, 18 insertions, 5 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part
index e1188ba34..b4772b4c6 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_s.part
@@ -16,17 +16,12 @@
grp:shifts_toggle = +group(shifts_toggle)
grp:ctrls_toggle = +group(ctrls_toggle)
grp:alts_toggle = +group(alts_toggle)
- grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
- grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle)
- grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle)
grp:caps_toggle = +capslock(grouplock)
grp:caps_switch = +capslock(groupshift)
grp:shift_caps_toggle = +group(shift_caps_toggle)
grp:shift_caps_switch = +group(shift_caps_switch)
grp:win_menu_switch = +group(win_menu_switch)
grp:alt_caps_toggle = +group(alt_caps_toggle)
- grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
- grp:alt_shift_toggle = +group(alt_shift_toggle)
grp:alt_space_toggle = +group(alt_space_toggle)
grp:menu_toggle = +group(menu_toggle)
grp:lwin_toggle = +group(lwin_toggle)
@@ -40,6 +35,18 @@
grp:sclk_toggle = +group(sclk_toggle)
grp:lctrl_rctrl_switch = +group(lctrl_rctrl_switch)
grp:lctrl_lwin_rctrl_menu = +group(lctrl_lwin_rctrl_menu)
+ grp:lctrl_lalt_toggle = +group(lctrl_lalt_toggle)
+ grp:rctrl_ralt_toggle = +group(rctrl_ralt_toggle)
+ grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
+ grp:ctrl_alt_toggle_bidir = +group(ctrl_alt_toggle_bidir)
+ grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle)
+ grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle)
+ grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
+ grp:ctrl_shift_toggle_bidir = +group(ctrl_shift_toggle_bidir)
+ grp:lalt_lshift_toggle = +group(lalt_lshift_toggle)
+ grp:ralt_rshift_toggle = +group(ralt_rshift_toggle)
+ grp:alt_shift_toggle = +group(alt_shift_toggle)
+ grp:alt_shift_toggle_bidir = +group(alt_shift_toggle_bidir)
lv3:switch = +level3(switch)
lv3:ralt_switch = +level3(ralt_switch)
lv3:ralt_switch_multikey = +level3(ralt_switch_multikey)
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 7c94620ab..22b720f20 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -5604,6 +5604,12 @@
</option>
<option>
<configItem>
+ <name>grp:lalt_lshift_toggle</name>
+ <_description>Left Alt+Left Shift</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
<name>grp:alt_space_toggle</name>
<_description>Alt+Space</_description>
</configItem>