diff options
| author | marha <marha@users.sourceforge.net> | 2011-08-08 13:41:53 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-08-08 13:41:53 +0200 |
| commit | 0c2b3e6fd26158cb97f4210cc891e218801b4b25 (patch) | |
| tree | cd9cabb6972dab80fa1278aebb17704dcc34d8ba /xorg-server/xkeyboard-config/rules | |
| parent | d105412503ea250e07d3cb008f10f60e6e48bf8a (diff) | |
| download | vcxsrv-0c2b3e6fd26158cb97f4210cc891e218801b4b25.tar.gz vcxsrv-0c2b3e6fd26158cb97f4210cc891e218801b4b25.tar.bz2 vcxsrv-0c2b3e6fd26158cb97f4210cc891e218801b4b25.zip | |
mesa xkeyboard-config git update 8 aug 2011
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.o_s.part | 9 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 20 |
2 files changed, 18 insertions, 11 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part index 3e23396da..6cf9f1406 100644 --- a/xorg-server/xkeyboard-config/rules/base.o_s.part +++ b/xorg-server/xkeyboard-config/rules/base.o_s.part @@ -64,10 +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: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/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index b56551a67..062fe1d72 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/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,26 +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 as Right Ctrl</_description> </configItem> </option> </group> |