diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-16 08:45:43 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-16 08:45:43 +0100 |
| commit | b8219a4680768e14b7fe4930adf86e9be261b31f (patch) | |
| tree | 193855ef8d48765d67cc11153a15e3c1e2568e50 /xorg-server/xkeyboard-config/rules/base.xml.in | |
| parent | 15cdb95b194cb051a5d469cc9eb73eb0eed4db41 (diff) | |
| parent | 811d1bcf6d61ea49551abdd7f2294c5af2776913 (diff) | |
| download | vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.tar.gz vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.tar.bz2 vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Switched to xcalc-1.0.5
Switched to bdftopcf-1.0.4
libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama libXmu libfontenc mesa xkeyboard-config
Diffstat (limited to 'xorg-server/xkeyboard-config/rules/base.xml.in')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 72 |
1 files changed, 70 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index d21891db2..fd9cc274f 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -1199,8 +1199,64 @@ </model> <model> <configItem> - <name>sun6</name> - <_description>Sun Type 5/6</_description> + <name>sun_type7_usb</name> + <_description>Sun Type 7 USB</_description> + <vendor>Sun Microsystems</vendor> + </configItem> + </model> + <model> + <configItem> + <name>sun_type7_euro_usb</name> + <_description>Sun Type 7 USB (European layout)</_description> + <vendor>Sun Microsystems</vendor> + </configItem> + </model> + <model> + <configItem> + <name>sun_type7_unix_usb</name> + <_description>Sun Type 7 USB (Unix layout)</_description> + <vendor>Sun Microsystems</vendor> + </configItem> + </model> + <model> + <configItem> + <name>sun_type7_jp_usb</name> + <_description>Sun Type 7 USB (Japanese layout) / Japanese 106-key</_description> + <vendor>Sun Microsystems</vendor> + </configItem> + </model> + <model> + <configItem> + <name>sun_type6_usb</name> + <_description>Sun Type 6/7 USB</_description> + <vendor>Sun Microsystems</vendor> + </configItem> + </model> + <model> + <configItem> + <name>sun_type6_euro_usb</name> + <_description>Sun Type 6/7 USB (European layout)</_description> + <vendor>Sun Microsystems</vendor> + </configItem> + </model> + <model> + <configItem> + <name>sun_type6_unix_usb</name> + <_description>Sun Type 6 USB (Unix layout)</_description> + <vendor>Sun Microsystems</vendor> + </configItem> + </model> + <model> + <configItem> + <name>sun_type6_jp_usb</name> + <_description>Sun Type 6 USB (Japanese layout)</_description> + <vendor>Sun Microsystems</vendor> + </configItem> + </model> + <model> + <configItem> + <name>sun_type6_jp</name> + <_description>Sun Type 6 (Japanese layout)</_description> <vendor>Sun Microsystems</vendor> </configItem> </model> @@ -6598,6 +6654,18 @@ </group> <group allowMultipleSelection="true"> <configItem> + <name>solaris</name> + <_description>Maintain key compatibility with old Solaris keycodes</_description> + </configItem> + <option> + <configItem> + <name>solaris:sun_compat</name> + <_description>Sun Key compatibility</_description> + </configItem> + </option> + </group> + <group allowMultipleSelection="true"> + <configItem> <name>terminate</name> <_description>Key sequence to kill the X server</_description> </configItem> |