diff options
| author | marha <marha@users.sourceforge.net> | 2014-08-22 21:55:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-08-22 21:55:11 +0200 |
| commit | 6c0c95d6045d2d2b4e6a3a2f11457850031c57bc (patch) | |
| tree | 32dfc45d688fa198bf0d41597e82589890012cf1 /xorg-server/xkeyboard-config/rules | |
| parent | fdbedba4d50e1b28b0249c83ba11c029f096e400 (diff) | |
| download | vcxsrv-6c0c95d6045d2d2b4e6a3a2f11457850031c57bc.tar.gz vcxsrv-6c0c95d6045d2d2b4e6a3a2f11457850031c57bc.tar.bz2 vcxsrv-6c0c95d6045d2d2b4e6a3a2f11457850031c57bc.zip | |
fontconfig libxcb/xcb-proto mesa xkeyboard-config git update 22 Aug 2014
libxcb/xcb-proto commit 8e3db42d67a0035bb16d16da28bd5eea7a269178
xkeyboard-config commit 10fce2c2baae471795d069f3a5f1307eedb9ff0a
fontconfig commit 286cdc9c10b0453c25950103b6a1f7170d15bfdc
mesa commit 97d03b9366bfa55b27feb92aa5afacd9c5f6f421
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.o_s.part | 4 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 11 |
2 files changed, 15 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 e31ab64e4..cda36e459 100644 --- a/xorg-server/xkeyboard-config/rules/base.o_s.part +++ b/xorg-server/xkeyboard-config/rules/base.o_s.part @@ -79,6 +79,10 @@ ctrl:rctrl_ralt = +ctrl(rctrl_ralt) ctrl:menu_rctrl = +ctrl(menu_rctrl) ctrl:ralt_rctrl = +ctrl(ralt_rctrl) + ctrl:swap_lalt_lctl = +ctrl(swap_lalt_lctl) + ctrl:swap_lwin_lctl = +ctrl(swap_lwin_lctl) + ctrl:swap_rwin_rctl = +ctrl(swap_rwin_rctl) + ctrl:swap_lalt_lctl_lwin = +ctrl(swap_lalt_lctl_lwin) compose:ralt = +compose(ralt) compose:lwin = +compose(lwin) compose:lwin-altgr = +compose(lwin-altgr) diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 319878fab..a7aa5de29 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -3513,6 +3513,12 @@ </variant> <variant> <configItem> + <name>mac_legacy</name> + <_description>Icelandic (Macintosh, legacy)</_description> + </configItem> + </variant> + <variant> + <configItem> <name>mac</name> <_description>Icelandic (Macintosh)</_description> </configItem> @@ -6103,6 +6109,11 @@ <name>ctrl:swap_lwin_lctl</name> <_description>Swap Left Win key with Left Ctrl key</_description> </configItem> + </option><option> + <configItem> + <name>ctrl:swap_rwin_rctl</name> + <_description>Swap Right Win key with Right Ctrl key</_description> + </configItem> </option> <option> <configItem> |