diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-14 14:46:43 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-14 14:46:43 +0000 |
| commit | 0f63823d473bf956ec5bddf06da6e4b591e994f8 (patch) | |
| tree | c8fa2b17686616a7443c583e09bbf6eceec883c2 /xorg-server/xkeyboard-config/rules | |
| parent | 9acb2b3cd11b530debce5008074fa03587ac3331 (diff) | |
| parent | 026b85e62b3d8812afb5f04df29aeac28c52b331 (diff) | |
| download | vcxsrv-0f63823d473bf956ec5bddf06da6e4b591e994f8.tar.gz vcxsrv-0f63823d473bf956ec5bddf06da6e4b591e994f8.tar.bz2 vcxsrv-0f63823d473bf956ec5bddf06da6e4b591e994f8.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.o_s.part | 1 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part index 0d46fa00c..00634858d 100644 --- a/xorg-server/xkeyboard-config/rules/base.o_s.part +++ b/xorg-server/xkeyboard-config/rules/base.o_s.part @@ -39,6 +39,7 @@ grp:lalt_toggle = +group(lalt_toggle)
grp:sclk_toggle = +group(sclk_toggle)
grp:lctrl_rctrl_switch = +group(lctrl_rctrl_switch)
+ grp:lctrl_lwin_rctrl_menu = +group(lctrl_lwin_rctrl_menu)
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 cdb3bf96c..6600d3bcb 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -4886,6 +4886,12 @@ <_description>Scroll Lock</_description>
</configItem>
</option>
+ <option>
+ <configItem>
+ <name>grp:lctrl_lwin_rctrl_menu</name>
+ <_description>LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)</_description>
+ </configItem>
+ </option>
</group>
<group allowMultipleSelection="true">
<!-- The key combination used to choose the 3rd (and 4th, together with Shift)
|