diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-19 10:34:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-19 10:34:59 +0000 |
| commit | b41a5d529c8208ebb68fd39f25ec368816ca0f00 (patch) | |
| tree | a392621a6300b1434d26fdbd43e15286bdc21c6b /xorg-server/xkeyboard-config/rules | |
| parent | f586b49ae23c573681b939ca44b3f418c83c84b2 (diff) | |
| parent | 0b67cceb98ba4ab7b5cdaf9d6e9583d3c53802ea (diff) | |
| download | vcxsrv-b41a5d529c8208ebb68fd39f25ec368816ca0f00.tar.gz vcxsrv-b41a5d529c8208ebb68fd39f25ec368816ca0f00.tar.bz2 vcxsrv-b41a5d529c8208ebb68fd39f25ec368816ca0f00.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 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/xfree98 | 59 |
3 files changed, 37 insertions, 29 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part index 2b400e634..0d46fa00c 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:hyper = +capslock(hyper)
caps:none = +capslock(none)
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)
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 27cf6e6ff..d9faa2d87 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -4994,6 +4994,12 @@ </option>
<option>
<configItem>
+ <name>ctrl:lctrl_meta</name>
+ <_description>Meta on Left Ctrl</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
<name>ctrl:swapcaps</name>
<_description>Swap Ctrl and Caps Lock</_description>
</configItem>
diff --git a/xorg-server/xkeyboard-config/rules/xfree98 b/xorg-server/xkeyboard-config/rules/xfree98 index ca7a18bf7..4e16c6dc9 100644 --- a/xorg-server/xkeyboard-config/rules/xfree98 +++ b/xorg-server/xkeyboard-config/rules/xfree98 @@ -1,29 +1,30 @@ -// -// Rules for resolving XKB components for use with XFree86 -// Copyright 1996 by Joseph Moss -// -// $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.5 1996/12/17 21:03:59 dawes Exp $ -// - -! model = keycodes geometry - pc98 = xfree98(pc98) nec(pc98) - jp106 = xfree98(jp106) pc(jp106) - -! model layout = symbols - pc98 nec_vndr/jp = nec_vndr/jp(pc98) - jp106 jp = jp - -! model layout = compat types - * * = complete complete - -! option = symbols - grp:switch = +group(switch) - grp:toggle = +group(toggle) - grp:shift_toggle = +group(shifts_toggle) - grp:ctrl_shift_toggle = +group(ctrl_shift_toggle) - grp:ctrl_alt_toggle = +group(ctrl_alt_toggle) - ctrl:nocaps = +ctrl(nocaps) - ctrl:swapcaps = +ctrl(swapcaps) - ctrl:ctrl_ac = +ctrl(ctrl_ac) - ctrl:ctrl_aa = +ctrl(ctrl_aa) - +//
+// Rules for resolving XKB components for use with XFree86
+// Copyright 1996 by Joseph Moss
+//
+// $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.5 1996/12/17 21:03:59 dawes Exp $
+//
+
+! model = keycodes geometry
+ pc98 = xfree98(pc98) nec(pc98)
+ jp106 = xfree98(jp106) pc(jp106)
+
+! model layout = symbols
+ pc98 nec_vndr/jp = nec_vndr/jp(pc98)
+ jp106 jp = jp
+
+! model layout = compat types
+ * * = complete complete
+
+! option = symbols
+ grp:switch = +group(switch)
+ grp:toggle = +group(toggle)
+ grp:shift_toggle = +group(shifts_toggle)
+ grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
+ grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
+ 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)
+
|