diff -ur xkb.orig/rules/base xkb/rules/base --- xkb.orig/rules/base 2008-05-24 23:32:30.000000000 +0200 +++ xkb/rules/base 2008-05-24 23:29:46.000000000 +0200 @@ -19,7 +19,7 @@ ! $pcmodels = pc101 pc102 pc104 pc105 // Microsoft models (using MS geometry) -! $msmodels = microsoft microsoftpro microsoftprousb microsoftprose +! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose // PC geometries - they have special geometry but symbols are mostly pc105 ! $pcgeometries = abnt2 latitude jp106 kr106 @@ -59,7 +59,7 @@ logitech_base itouch logiultrax \ logitech_g15 \ logidinovo logidinovoedge \ - microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \ + microsoft7000 microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \ microsoftoffice microsoftmult \ mx1998 mx2500 mx2750 \ oretec \ diff -ur xkb.orig/rules/base.lst xkb/rules/base.lst --- xkb.orig/rules/base.lst 2008-05-24 23:32:30.000000000 +0200 +++ xkb/rules/base.lst 2008-05-24 23:30:25.000000000 +0200 @@ -109,6 +109,7 @@ mx1998 Memorex MX1998 mx2500 Memorex MX2500 EZ-Access Keyboard mx2750 Memorex MX2750 + microsoft7000 Microsoft Natural Wireless Ergonomic Keyboard 7000 microsoftinet Microsoft Internet Keyboard microsoftpro Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro microsoftprousb Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro diff -ur xkb.orig/rules/base.xml xkb/rules/base.xml --- xkb.orig/rules/base.xml 2008-05-24 23:32:30.000000000 +0200 +++ xkb/rules/base.xml 2008-05-24 23:38:58.000000000 +0200 @@ -772,6 +772,13 @@ + microsoft7000 + Microsoft Natural Wireless Ergonomic Keyboard 7000 + Microsoft Inc. + + + + microsoftinet Microsoft Internet Keyboard Microsoft Inc. diff -ur xkb.orig/rules/xfree86 xkb/rules/xfree86 --- xkb.orig/rules/xfree86 2008-05-24 23:32:30.000000000 +0200 +++ xkb/rules/xfree86 2008-05-24 23:38:05.000000000 +0200 @@ -19,7 +19,7 @@ ! $pcmodels = pc101 pc102 pc104 pc105 // Microsoft models (using MS geometry) -! $msmodels = microsoft microsoftpro microsoftprousb microsoftprose +! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose // PC geometries - they have special geometry but symbols are mostly pc105 ! $pcgeometries = abnt2 latitude jp106 kr106 @@ -59,7 +59,7 @@ logitech_base itouch logiultrax \ logitech_g15 \ logidinovo logidinovoedge \ - microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \ + microsoft7000 microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \ microsoftoffice microsoftmult \ mx1998 mx2500 mx2750 \ oretec \ diff -ur xkb.orig/rules/xfree86.lst xkb/rules/xfree86.lst --- xkb.orig/rules/xfree86.lst 2008-05-24 23:32:30.000000000 +0200 +++ xkb/rules/xfree86.lst 2008-05-24 23:38:37.000000000 +0200 @@ -110,6 +110,7 @@ mx2500 Memorex MX2500 EZ-Access Keyboard mx2750 Memorex MX2750 microsoftinet Microsoft Internet Keyboard + microsoft7000 Microsoft Natural Wireless Ergonomic Keyboard 7000 microsoftpro Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro microsoftprousb Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro microsoftprooem Microsoft Natural Keyboard Pro OEM diff -ur xkb.orig/rules/xfree86.xml xkb/rules/xfree86.xml --- xkb.orig/rules/xfree86.xml 2008-05-24 23:32:30.000000000 +0200 +++ xkb/rules/xfree86.xml 2008-05-24 23:39:12.000000000 +0200 @@ -772,6 +772,13 @@ + microsoft7000 + Microsoft Natural Wireless Ergonomic Keyboard 7000 + Microsoft Inc. + + + + microsoftinet Microsoft Internet Keyboard Microsoft Inc. diff -ur xkb.orig/rules/xorg xkb/rules/xorg --- xkb.orig/rules/xorg 2008-05-24 23:32:30.000000000 +0200 +++ xkb/rules/xorg 2008-05-24 23:39:39.000000000 +0200 @@ -19,7 +19,7 @@ ! $pcmodels = pc101 pc102 pc104 pc105 // Microsoft models (using MS geometry) -! $msmodels = microsoft microsoftpro microsoftprousb microsoftprose +! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose // PC geometries - they have special geometry but symbols are mostly pc105 ! $pcgeometries = abnt2 latitude jp106 kr106 @@ -59,7 +59,7 @@ logitech_base itouch logiultrax \ logitech_g15 \ logidinovo logidinovoedge \ - microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \ + microsoft7000 microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \ microsoftoffice microsoftmult \ mx1998 mx2500 mx2750 \ oretec \ diff -ur xkb.orig/rules/xorg.lst xkb/rules/xorg.lst --- xkb.orig/rules/xorg.lst 2008-05-24 23:32:30.000000000 +0200 +++ xkb/rules/xorg.lst 2008-05-24 23:39:57.000000000 +0200 @@ -109,6 +109,7 @@ mx1998 Memorex MX1998 mx2500 Memorex MX2500 EZ-Access Keyboard mx2750 Memorex MX2750 + microsoft7000 Microsoft Natural Wireless Ergonomic Keyboard 7000 microsoftinet Microsoft Internet Keyboard microsoftpro Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro microsoftprousb Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro diff -ur xkb.orig/rules/xorg.xml xkb/rules/xorg.xml --- xkb.orig/rules/xorg.xml 2008-05-24 23:32:30.000000000 +0200 +++ xkb/rules/xorg.xml 2008-05-24 23:40:13.000000000 +0200 @@ -772,6 +772,13 @@ + microsoft7000 + Microsoft Natural Wireless Ergonomic Keyboard 7000 + Microsoft Inc. + + + + microsoftinet Microsoft Internet Keyboard Microsoft Inc. diff -ur xkb.orig/symbols/inet xkb/symbols/inet --- xkb.orig/symbols/inet 2008-05-24 23:15:23.000000000 +0200 +++ xkb/symbols/inet 2008-05-24 23:30:30.000000000 +0200 @@ -1534,6 +1534,30 @@ // Microsoft +// Microsoft Natural Wireless Ergonomic Keyboard 7000 +partial alphanumeric_keys +xkb_symbols "microsoft7000" { + include "inet(media_nav_common)" + key { [ Undo ] }; + key { [ XF86New ] }; + key { [ Redo ] }; + key { [ XF86MailForward ] }; + key { [ XF86Calculator ] }; + key { [ XF86Close ] }; + key { [ XF86HomePage ] }; + key { [ Print ] }; + key { [ XF86Open ] }; + key { [ XF86Save ] }; + key { [ XF86Send ] }; + key { [ Help ] }; + key { [ XF86Reply ] }; + key { [ XF86Search ] }; + key { [ XF86Favorites ] }; + key { [ XF86Mail ] }; +// The Spell and Launch buttons don't seem to produce events +// The Zoom slide doesn't seem to produce events +}; + // Microsoft Internet Keyboard partial alphanumeric_keys xkb_symbols "microsoftinet" { diff -ur xkb.orig/symbols.dir xkb/symbols.dir --- xkb.orig/symbols.dir 2008-05-24 23:16:33.000000000 +0200 +++ xkb/symbols.dir 2008-05-24 23:16:27.000000000 +0200 @@ -371,6 +371,7 @@ h-p----- a------- inet(logitech_set3) --p----- a------- inet(logiultrax) --p----- a------- inet(ltcd) +--p----- a------- inet(microsoft7000) --p----- a------- inet(microsoftinet) --p----- a------- inet(microsoftmult) --p----- a------- inet(microsoftoffice)