diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-13 21:22:39 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-13 21:22:39 +0000 |
| commit | 6a16283d10f9d0ade43528b537c8ac68ad571bc1 (patch) | |
| tree | b5e0b46175a22bd690c180e27d8c37886d84b32f /xorg-server/xkeyboard-config | |
| parent | e0058f158bae56c5a10cad4f9ace808a27022a9d (diff) | |
| parent | b5d1fd89898edb34f73679b542c754d837d44cf8 (diff) | |
| download | vcxsrv-6a16283d10f9d0ade43528b537c8ac68ad571bc1.tar.gz vcxsrv-6a16283d10f9d0ade43528b537c8ac68ad571bc1.tar.bz2 vcxsrv-6a16283d10f9d0ade43528b537c8ac68ad571bc1.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.lists.part | 6 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.xml.in | 7 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/symbols/inet | 13 |
3 files changed, 23 insertions, 3 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.lists.part b/xorg-server/xkeyboard-config/rules/base.lists.part index a0fecdff1..64319d376 100644 --- a/xorg-server/xkeyboard-config/rules/base.lists.part +++ b/xorg-server/xkeyboard-config/rules/base.lists.part @@ -9,7 +9,7 @@ ! $pcmodels = pc101 pc102 pc104 pc105
// Microsoft models (using MS geometry)
-! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose
+! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose
// Nokia devices and keyboards
! $nokiamodels = nokiasu8w nokiarx44 nokiarx51
@@ -57,8 +57,8 @@ logiinkse logiinkseusb logiitc logiik \
logitech_base itouch logiultrax \
logitech_g15 \
- logidinovo logidinovoedge \
- microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
+ logidinovo logidinovoedge \
+ microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
microsoftoffice microsoftmult \
mx1998 mx2500 mx2750 \
oretec \
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 8a83c2f0d..1a3d528d1 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -792,6 +792,13 @@ </model>
<model>
<configItem>
+ <name>microsoft4000</name>
+ <_description>Microsoft Natural Wireless Ergonomic Keyboard 4000</_description>
+ <vendor>Microsoft Inc.</vendor>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>microsoft7000</name>
<_description>Microsoft Natural Wireless Ergonomic Keyboard 7000</_description>
<vendor>Microsoft Inc.</vendor>
diff --git a/xorg-server/xkeyboard-config/symbols/inet b/xorg-server/xkeyboard-config/symbols/inet index 8f1151768..5fbc8a7a7 100644 --- a/xorg-server/xkeyboard-config/symbols/inet +++ b/xorg-server/xkeyboard-config/symbols/inet @@ -1266,6 +1266,19 @@ xkb_symbols "mx2750" { // Microsoft
+// Microsoft Natural Wireless Ergonomic Keyboard 4000
+partial alphanumeric_keys
+xkb_symbols "microsoft4000" {
+ include "inet(media_nav_common)"
+ key <I192> { [ XF86Launch1 ] };
+ key <I193> { [ XF86Launch2 ] };
+ key <I194> { [ XF86Launch3 ] };
+ key <I195> { [ XF86Launch4 ] };
+ key <I196> { [ XF86Launch5 ] };
+// Missing because of lack of support from kbd driver: Zoom in and
+// slider.
+};
+
// Microsoft Natural Wireless Ergonomic Keyboard 7000
partial alphanumeric_keys
xkb_symbols "microsoft7000" {
|