diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-28 12:47:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-28 12:47:32 +0000 |
| commit | 717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed (patch) | |
| tree | 1512dddc255b89d5d3ec35bfc541a357184a7d7f /xorg-server/xkeyboard-config/rules | |
| parent | 46ff5affddfec90a099d55945ab2f857a5a75e57 (diff) | |
| parent | feee2b5ceb37101bd1c4162e49805e6ad63e28ae (diff) | |
| download | vcxsrv-717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed.tar.gz vcxsrv-717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed.tar.bz2 vcxsrv-717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed.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 | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part index 00634858d..fc01ea82e 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:super = +capslock(super)
caps:hyper = +capslock(hyper)
caps:none = +capslock(none)
+ caps:ctrl_modifier = +capslock(ctrl_modifier)
ctrl:nocaps = +ctrl(nocaps)
ctrl:lctrl_meta = +ctrl(lctrl_meta)
ctrl:swapcaps = +ctrl(swapcaps)
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index d6061b0ec..37e7a56d4 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -1394,14 +1394,14 @@ </variant>
<variant>
<configItem>
- <name>olpc-fa</name>
+ <name>fa-olpc</name>
<_description>OLPC Dari</_description>
<!-- No ISO code in ISO639-2, only draft ISO693-3 -->
</configItem>
</variant>
<variant>
<configItem>
- <name>olpc-uz</name>
+ <name>uz-olpc</name>
<_description>OLPC Southern Uzbek</_description>
<languageList><iso639Id>uzb</iso639Id></languageList>
</configItem>
@@ -5295,6 +5295,12 @@ <_description>Caps Lock is disabled</_description>
</configItem>
</option>
+ <option>
+ <configItem>
+ <name>caps:ctrl_modifier</name>
+ <_description>Make Caps Lock an additional Control but keep the Caps_Lock keysym</_description>
+ </configItem>
+ </option>
</group>
<group allowMultipleSelection="false">
<!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) -->
|