summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--symbols/inet294
2 files changed, 37 insertions, 261 deletions
diff --git a/ChangeLog b/ChangeLog
index 9932ffa3..8e06f499 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-24 Sergey Udaltsov
+
+ * symbols/inet: consolidated a lot of mappings into nav_common
+
2008-12-21 Sergey Udaltsov
* docs/README.enhancing: fixing the location of XKB proto docs,
diff --git a/symbols/inet b/symbols/inet
index 304ae447..991a24a6 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -36,9 +36,17 @@ xkb_symbols "media_common" {
// popular web navigation combination
partial hidden alphanumeric_keys
xkb_symbols "nav_common" {
+ key <I21> { [ XF86Calculator ] };
+ key <I32> { [ XF86WWW ] };
key <I65> { [ XF86Search ] };
+ key <I66> { [ XF86Favorites ] };
+ key <I67> { [ XF86Reload ] };
+ key <I68> { [ XF86Stop ] };
key <I69> { [ XF86Forward ] };
key <I6A> { [ XF86Back ] };
+ key <I6B> { [ XF86MyComputer ] };
+ key <I6C> { [ XF86Mail ] };
+ key <I6D> { [ XF86AudioMedia ] };
};
partial hidden alphanumeric_keys
@@ -176,41 +184,26 @@ xkb_symbols "evdev" {
partial alphanumeric_keys
xkb_symbols "a4techKB21" {
include "inet(media_nav_common)"
- key <I32> { [ XF86WWW ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
};
// A4 KBS-8. Contributed by ojo at force dot sk
partial alphanumeric_keys
xkb_symbols "a4techKBS8" {
include "inet(a4techKB21)"
- key <I21> { [ XF86Calculator ] };
key <I5F> { [ XF86Standby ] };
- key <I6D> { [ XF86AudioMedia ] };
};
// A4Tech Wireless Desktop (RFKB-23)
partial alphanumeric_keys
xkb_symbols "a4_rfkb23" {
include "inet(media_nav_common)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86WWW ] };
key <I5F> { [ XF86Sleep ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
};
// Acer AirKey V
partial alphanumeric_keys
xkb_symbols "airkey" {
+ include "inet(acpi)"
key <I13> { [ XF86AudioNext ] };
key <I15> { [ XF86AudioPlay, XF86AudioPause ] };
key <I16> { [ XF86Mail ] };
@@ -221,22 +214,18 @@ xkb_symbols "airkey" {
key <I2D> { [ XF86AudioRaiseVolume ] };
key <I2F> { [ XF86Terminal ] };
key <I31> { [ XF86AudioStop, XF86Eject ] };
- key <I5E> { [ XF86PowerOff ] };
- key <I63> { [ XF86Standby ] };
};
// Acer C300 Laptop
partial alphanumeric_keys
xkb_symbols "acer_c300" {
-
+ include "inet(nav_common)"
key <I17> { [ F14 ] };
key <I1F> { [ F13 ] };
key <I20> { [ XF86AudioMute ] };
key <I2E> { [ XF86AudioLowerVolume ] };
key <I30> { [ XF86AudioRaiseVolume ] };
- key <I32> { [ XF86Mail ] };
key <I5E> { [ XF86Launch2 ] };
- key <I6C> { [ XF86WWW ] };
key <I75> { [ Help ] };
key <XFER> { [ XF86Launch1 ] };
};
@@ -245,12 +234,10 @@ xkb_symbols "acer_c300" {
// From Alex Dubov <oakad@yahoo.com>
partial alphanumeric_keys
xkb_symbols "acer_ferrari4k" {
- include "inet(media_common)"
+ include "inet(media_nav_common)"
key <I24> { [ dollar ] };
key <I25> { [ EuroSign ] };
key <I26> { [ XF86Display ] };
- key <I32> { [ XF86WWW ] }; //"Saturn" button
- key <I6C> { [ XF86Mail ] }; //"mail" button
// Missing keycodes - set-up with setkeycodes
key <I70> { [ Help ] };
key <I71> { [ XF86Launch1 ] };
@@ -266,17 +253,15 @@ xkb_symbols "acer_ferrari4k" {
// (Not all these keys will be available on every Acer laptop)
partial alphanumeric_keys
xkb_symbols "acer_laptop" {
- include "inet(media_common)"
+ include "inet(media_nav_common)"
key <I17> { [ XF86Launch2 ] }; // "P" or "P2" (HAL)
key <I1F> { [ XF86Launch1 ] }; // "e" or "P1" (HAL)
// Hotkeys (Function)
// Launch Keys
// Device keys
- key <I32> { [ XF86WWW ] }; // "Saturn" button
key <I56> { [ XF86Display ] }; // Fn+F5 (HAL)
key <I5F> { [ XF86Sleep ] }; // Fn+F4
- key <I6C> { [ XF86Mail ] }; // "mail" button
key <I71> { [ XF86Launch4 ] }; // Fn+F3 (HAL)
key <I72> { [ XF86LaunchB ] }; // Bluetooth (HAL)
key <I73> { [ XF86LaunchA ] }; // Wireless (HAL)
@@ -298,8 +283,6 @@ xkb_symbols "acer_laptop" {
partial alphanumeric_keys
xkb_symbols "asus_laptop" {
include "inet(media_common)"
- key <I32> { [ XF86WWW ] };
- key <I6C> { [ XF86Mail ] };
};
// Azona
@@ -313,15 +296,12 @@ xkb_symbols "azonaRF2300" {
key <I17> { [ XF86AudioStop ] };
key <I1E> { [ XF86AudioRaiseVolume ] };
key <I1F> { [ XF86AudioPlay, XF86AudioPause ] };
- key <I21> { [ XF86Calculator ] };
key <I22> { [ XF86AudioNext ] };
key <I24> { [ XF86AudioPrev ] };
key <I25> { [ XF86AudioLowerVolume ] };
key <I26> { [ XF86AudioMute ] };
key <I3C> { [ XF86Copy ] };
key <I5F> { [ XF86Standby ] };
- key <I66> { [ XF86Favorites ] };
- key <I6C> { [ XF86Mail ] };
key <I78> { [ XF86Cut ] };
// key <RCTL> { [ XF86Paste ] };
};
@@ -342,14 +322,6 @@ partial alphanumeric_keys
xkb_symbols "scorpius" {
include "inet(media_nav_common)"
include "inet(acpi)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86WWW ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
};
@@ -401,9 +373,8 @@ xkb_symbols "btc5113rf" {
// BTC 5126T
partial alphanumeric_keys
xkb_symbols "btc5126t" {
- key <I32> { [ XF86WWW ] };
+ include "inet(nav_common)"
key <I5F> { [ XF86Standby ] };
- key <I6C> { [ XF86Mail ] };
};
// BTC 6301URF
@@ -411,7 +382,6 @@ partial alphanumeric_keys
xkb_symbols "btc6301urf" {
include "inet(media_nav_common)"
include "inet(btc5126t)"
- key <I66> { [ XF86Favorites ] };
};
// BTC 9000
@@ -470,24 +440,19 @@ xkb_symbols "btc9001ah" {
// BTC 5090
partial alphanumeric_keys
xkb_symbols "btc5090" {
- include "inet(media_common)"
+ include "inet(media_nav_common)"
include "inet(acpi)"
key <I26> { [ XF86Start ] };
- key <I32> { [ XF86WWW ] };
key <I33> { [ XF86Eject ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
};
// BTC 9019U
partial alphanumeric_keys
xkb_symbols "btc9019u" {
- include "inet(media_common)"
+ include "inet(media_nav_common)"
key <FK17> { [ XF86Search ] };
key <I02> { [ XF86HomePage ] };
key <I5F> { [ XF86Sleep ] };
- key <I66> { [ XF86Favorites ] };
- key <I6C> { [ XF86Mail ] };
key <K6C> { [ XF86Eject ] };
};
@@ -502,15 +467,11 @@ xkb_symbols "cherryblue" {
key <I17> { [ XF86AudioStop ] };
key <I1E> { [ XF86AudioRaiseVolume ] };
key <I1F> { [ XF86AudioPlay, XF86AudioPause ] };
- key <I21> { [ XF86Calculator ] };
key <I22> { [ XF86AudioNext ] };
key <I24> { [ XF86AudioPrev ] };
key <I25> { [ XF86AudioLowerVolume ] };
key <I26> { [ XF86AudioMute ] };
key <I63> { [ XF86Standby ] };
- key <I66> { [ XF86MyComputer ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
key <PRSC> { [ XF86Terminal ] };
key <XFER> { [ XF86Go ] };
};
@@ -529,17 +490,12 @@ xkb_symbols "cherryblueb" {
key <I17> { [ XF86Cut ] };
key <I18> { [ XF86Paste ] };
key <I1E> { [ XF86AudioRaiseVolume ] };
- key <I21> { [ XF86Calculator ] };
key <I25> { [ XF86AudioLowerVolume ] };
key <I26> { [ XF86AudioMute ] };
key <I2C> { [ XF86Book ] };
key <I32> { [ XF86Finance ] };
key <I63> { [ XF86Standby ] };
- key <I66> { [ XF86MyComputer ] };
key <I67> { [ XF86AudioRewind ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
key <I70> { [ XF86Eject ] };
key <I71> { [ XF86Book ] };
key <I72> { [ XF86Book ] };
@@ -551,14 +507,7 @@ xkb_symbols "cherryblueb" {
partial alphanumeric_keys
xkb_symbols "cherrybluea" {
include "inet(media_nav_common)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86WWW ] };
key <I5F> { [ XF86Standby ] };
- key <I66> { [ XF86MyComputer ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6B> { [ XF86Terminal ] };
- key <I6C> { [ XF86Mail ] };
key <I6D> { [ XF86Go ] };
};
@@ -568,12 +517,7 @@ xkb_symbols "cherrycyboard" {
include "inet(media_nav_common)"
key <FK17> { [ XF86Search ] };
key <I02> { [ XF86HomePage ] };
- key <I21> { [ XF86Calculator ] };
key <I5F> { [ XF86Standby ] };
- key <I66> { [ XF86MyComputer ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
key <K67> { [ XF86Terminal ] };
key <XFER> { [ XF86AudioMedia ] };
};
@@ -584,9 +528,6 @@ xkb_symbols "cherrycmexpert" {
include "inet(cherryblueb)"
key <FK15> { [ XF86Mail ] };
key <I5F> { [ XF86PowerOff ] };
- key <I66> { [ XF86HomePage ] };
- key <I67> { [ XF86Reload ] };
- key <I6B> { [ XF86MyComputer ] };
};
@@ -618,7 +559,6 @@ xkb_symbols "chicony" {
partial alphanumeric_keys
xkb_symbols "chicony0108" {
include "inet(cherrycyboard)"
- key <I66> { [ XF86New ] };
};
// Chicony KB-9885
@@ -762,15 +702,7 @@ xkb_symbols "dellm65" {
partial alphanumeric_keys
xkb_symbols "geniuskb19e" {
include "inet(media_nav_common)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86WWW ] };
key <I5F> { [ XF86Sleep ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
};
// Laptop/notebook Dell Inspiron 8xxx
@@ -795,8 +727,7 @@ partial alphanumeric_keys
xkb_symbols "precision_m" {
// Describes the extra keys on a Precision M series
// From Olivier Lahaye <olivier dot lahaye at motorola dot com>
- include "inet(media_common)"
- key <I32> { [ XF86WWW ] };
+ include "inet(media_nav_common)"
};
// DELL USB Multimedia Keyboard (former 8135, generalized, superset of 8125)
@@ -806,10 +737,6 @@ xkb_symbols "dellusbmm" {
// From Olivier Lahaye <olivier dot lahaye at motorola dot com>
include "inet(media_nav_common)"
key <I02> { [ XF86HomePage ] };
- key <I21> { [ XF86Calculator ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
key <K67> { [ XF86MyComputer ] };
key <XFER> { [ XF86AudioMedia ] };
};
@@ -820,12 +747,7 @@ xkb_symbols "dellusbmm" {
// Dexxa Wireless Desktop Keyboard
partial alphanumeric_keys
xkb_symbols "dexxa" {
- include "inet(media_common)"
- key <I32> { [ XF86WWW ] };
- key <I65> { [ XF86Search ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I6C> { [ XF86Mail ] };
+ include "inet(media_nav_common)"
};
@@ -836,13 +758,6 @@ partial alphanumeric_keys
xkb_symbols "diamond" {
include "inet(media_nav_common)"
include "inet(acpi)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86WWW ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
key <I6D> { [ XF86Go ] };
};
@@ -855,14 +770,6 @@ xkb_symbols "dtk2000" {
// From Radics Laszlo <garaboncias@mailbox.hu>
include "inet(media_nav_common)"
include "inet(acpi)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86WWW ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
};
@@ -873,11 +780,6 @@ partial alphanumeric_keys
xkb_symbols "ennyah_dkb1008" {
include "inet(media_nav_common)"
include "inet(acpi)"
- key <I32> { [ XF86WWW ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
key <XFER> { [ XF86AudioMedia ] };
};
@@ -887,9 +789,7 @@ xkb_symbols "ennyah_dkb1008" {
// Fujitsu-Siemens Computers AMILO A1667G laptop
partial alphanumeric_keys
xkb_symbols "fscaa1667g" {
- include "inet(media_common)"
- key <I32> { [ XF86WWW ] };
- key <I6C> { [ XF86Mail ] };
+ include "inet(media_nav_common)"
};
@@ -898,6 +798,7 @@ xkb_symbols "fscaa1667g" {
// Genius Comfy KB-16M / Genius MM Keyboard KWD-910
partial alphanumeric_keys
xkb_symbols "genius" {
+ include "inet(acpi)"
key <I12> { [ XF86AudioRaiseVolume ] };
key <I17> { [ XF86Calculator ] };
key <I19> { [ XF86AudioLowerVolume ] };
@@ -912,8 +813,6 @@ xkb_symbols "genius" {
key <I2E> { [ XF86Mail ] };
key <I30> { [ XF86Eject ] };
key <I32> { [ XF86WWW ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
};
@@ -922,12 +821,7 @@ xkb_symbols "geniuscomfy" {
// Describes the extra keys on a Genius Comfy KB-12e
// From Jurica Vukadin <jura@webit.hr>
include "inet(media_nav_common)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86WWW ] };
key <I5F> { [ XF86Sleep ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
};
@@ -938,9 +832,6 @@ xkb_symbols "geniuscomfy2" {
// From Radics Laszlo <garaboncias@mailbox.hu>
include "inet(geniuscomfy)"
key <I23> { [ Return ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
};
// Gyration
@@ -957,9 +848,6 @@ xkb_symbols "gyration" {
key <I24> { [ XF86AudioPrev ] };
key <I25> { [ XF86AudioLowerVolume ] };
key <I26> { [ XF86AudioMute ] };
- key <I66> { [ XF86Favorites ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
};
@@ -968,7 +856,7 @@ xkb_symbols "gyration" {
// Hewlett-Packard Internet Keyboard
partial alphanumeric_keys
xkb_symbols "hpi6" {
- include "inet(media_common)"
+ include "inet(media_nav_common)"
key <I02> { [ XF86HomePage ] };
key <I12> { [ XF86Search ] };
key <I14> { [ XF86VendorHome ] };
@@ -979,11 +867,8 @@ xkb_symbols "hpi6" {
key <I1F> { [ XF86Launch1 ] };
key <I26> { [ Help ] };
key <I27> { [ XF86Finance ] };
- key <I32> { [ XF86WWW ] };
key <I39> { [ Print ] };
key <I5F> { [ XF86Standby ] };
- key <I65> { [ XF86Search ] };
- key <I6C> { [ XF86Mail ] };
key <I75> { [ Help ] };
};
@@ -1026,9 +911,7 @@ xkb_symbols "hpxe3gf" {
// Describes the OneTouch buttons on HP Omnibook XE3 GF models.
// See http://sourceforge.net/projects/omke for details on enabling
// these keys
- include "inet(media_common)"
- key <I32> { [ XF86WWW ] };
- key <I6C> { [ XF86Mail ] };
+ include "inet(media_nav_common)"
key <I73> { [ Help ] };
key <I74> { [ XF86Launch1 ] };
};
@@ -1039,9 +922,7 @@ xkb_symbols "hpxt1000" {
// Describes the OneTouch buttons on HP Omnibook XT1000 models.
// See http://sourceforge.net/projects/omke for details on enabling
// these keys
- include "inet(media_common)"
- key <I32> { [ XF86WWW ] };
- key <I6C> { [ XF86Mail ] };
+ include "inet(media_nav_common)"
key <I71> { [ XF86Launch3 ] };
key <I72> { [ Help ] };
key <I73> { [ XF86Launch2 ] };
@@ -1054,9 +935,7 @@ xkb_symbols "hpzt11xx" {
// Describes the OneTouch buttons on HP Pavilion ZT11xx models.
// See http://sourceforge.net/projects/omke for details on enabling
// these keys
- include "inet(media_common)"
- key <I32> { [ XF86WWW ] };
- key <I6C> { [ XF86Mail ] };
+ include "inet(media_nav_common)"
key <I71> { [ XF86Launch3 ] };
key <I72> { [ Help ] };
key <I73> { [ XF86Launch2 ] };
@@ -1083,9 +962,7 @@ xkb_symbols "hpxe4xxx" {
// models.
// See http://sourceforge.net/projects/omke for details on enabling
// these keys
- include "inet(media_common)"
- key <I32> { [ XF86WWW ] };
- key <I6C> { [ XF86Mail ] };
+ include "inet(media_nav_common)"
key <I70> { [ Help ] };
key <I71> { [ XF86Launch2 ] };
key <I73> { [ XF86Launch1 ] };
@@ -1178,7 +1055,6 @@ xkb_symbols "rapidaccess2" {
key <I30> { [ XF86MyComputer ] };
key <I32> { [ XF86VendorHome ] };
key <I5F> { [ XF86Standby ] };
- key <MENU> { [ Menu ] };
};
// IBM ThinkPad 41
@@ -1192,7 +1068,6 @@ xkb_symbols "thinkpad" {
partial alphanumeric_keys
xkb_symbols "thinkpad60" {
include "inet(media_nav_common)"
-
key <I1F> { [ XF86VendorHome ] };
};
@@ -1208,13 +1083,11 @@ xkb_symbols "ibm_spacesaver" {
// Logitech common definitions
partial alphanumeric_keys
xkb_symbols "logitech_base" {
-
include "inet(media_nav_common)"
key <I02> { [ XF86HomePage ] };
key <I15> { [ XF86Community ] };
key <I16> { [ XF86ScrollClick ] };
key <I21> { [ XF86VendorHome ] };
- key <I32> { [ XF86WWW ] };
key <I3B> { [ XF86New ] };
key <I3C> { [ XF86Reply ] };
key <I43> { [ XF86MyComputer ] };
@@ -1222,9 +1095,6 @@ xkb_symbols "logitech_base" {
key <I57> { [ XF86Pictures ] };
key <I58> { [ XF86Music ] };
key <I5F> { [ XF86Standby ] };
- key <I66> { [ XF86Favorites ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
};
// Logitech second set of common keys
@@ -1251,7 +1121,6 @@ xkb_symbols "logitech_set3" {
partial alphanumeric_keys
xkb_symbols "logiaccess" {
include "inet(logitech_base)"
-
key <FK13> { [ XF86MailForward ] };
key <FK14> { [ XF86Send ] };
key <I11> { [ XF86Messenger ] };
@@ -1279,16 +1148,13 @@ xkb_symbols "logicink" {
partial alphanumeric_keys
xkb_symbols "logiex110" {
include "inet(logitech_base)"
-
key <I2F> { [ XF86Close ] }; // Close
- key <I21> { [ XF86Calculator ] };
// Extended function keys
// In the Console before starting X
// Using setkeycodes e03b 212 e03c 213 e03d 214 e03e 215 e03f 216 e040 217
// setkeycodes e041 218 e042 219 e043 220 e044 221 e057 222 e058 223 6d 206
// *=keys that are there but need different symbol names.
-
key <I3B> { [ Help ] }; // F1
key <FK13> { [ XF86Word ] }; // F2
key <FK14> { [ XF86Excel ] }; // F3
@@ -1307,7 +1173,6 @@ xkb_symbols "logiex110" {
partial alphanumeric_keys
xkb_symbols "logiinkse" {
include "inet(logitech_base)"
-
key <FK13> { [ XF86MailForward ] }; // F3
key <FK14> { [ XF86Send ] }; // F4
key <FK15> { [ Undo ] }; // F5
@@ -1331,7 +1196,6 @@ xkb_symbols "logiinkseusb" {
partial alphanumeric_keys
xkb_symbols "logiitc" {
include "inet(logitech_base)"
-
key <I2F> { [ XF86AudioRaiseVolume ] };
// Just to override RaiseVolume from logitech_base,
@@ -1344,7 +1208,6 @@ xkb_symbols "logiitc" {
partial alphanumeric_keys
xkb_symbols "logiik" {
include "inet(logitech_base)"
-
key <I12> { [ Find ] };
key <I17> { [ Print ] };
key <I18> { [ XF86Favorites ] };
@@ -1364,7 +1227,6 @@ xkb_symbols "logiik" {
partial alphanumeric_keys
xkb_symbols "itouch" {
include "inet(logitech_base)"
-
key <I1F> { [ XF86AudioMute ] };
key <I2B> { [ XF86AudioLowerVolume ] };
key <I2D> { [ XF86AudioRaiseVolume ] };
@@ -1383,13 +1245,11 @@ xkb_symbols "logiultraxc" {
partial alphanumeric_keys
xkb_symbols "logidinovo" {
- include "inet(media_common)"
+ include "inet(media_nav_common)"
key <I02> { [ XF86HomePage ] };
key <I12> { [ XF86Standby ] };
key <I17> { [ XF86Search ] };
key <I21> { [ XF86AudioRaiseVolume ] };
- key <I66> { [ XF86Start ] };
- key <I6C> { [ XF86Mail ] };
key <K66> { [ XF86AudioLowerVolume ] };
key <KPDC> { [ XF86AudioMute ] };
key <XFER> { [ XF86AudioMedia ] };
@@ -1432,7 +1292,7 @@ xkb_symbols "mx1998" {
// Memorex MX2500 EZ-Access Keyboard
partial alphanumeric_keys
xkb_symbols "mx2500" {
- include "inet(media_common)"
+ include "inet(media_nav_common)"
key <I12> { [ XF86Clear ] };
key <I13> { [ XF86Phone ] };
key <I14> { [ XF86DOS ] };
@@ -1440,17 +1300,11 @@ xkb_symbols "mx2500" {
key <I18> { [ XF86Xfer ] };
key <I1E> { [ XF86Eject ] };
key <I1F> { [ XF86Documents ] };
- key <I21> { [ XF86Calculator ] };
key <I26> { [ XF86News ] };
- key <I32> { [ XF86WWW ] };
key <I5E> { [ XF86PowerOff ] };
key <I5F> { [ XF86Standby ] };
key <I6B> { [ XF86WakeUp ] };
- key <I6C> { [ XF86Mail ] };
key <I6D> { [ XF86RotateWindows ] };
- key <LWIN> { [ Meta_L ] };
- key <MENU> { [ Menu ] };
- key <RWIN> { [ Meta_R ] };
};
// Memorex MX2750
@@ -1459,8 +1313,6 @@ xkb_symbols "mx2750" {
include "inet(media_nav_common)"
include "inet(acpi)"
key <I32> { [ XF86Launch0 ] };
- key <I66> { [ XF86Favorites ] };
- key <I6C> { [ XF86Mail ] };
};
@@ -1474,16 +1326,12 @@ xkb_symbols "microsoft7000" {
key <I09> { [ XF86New ] };
key <I0A> { [ Redo ] };
key <I0E> { [ XF86MailForward ] };
- key <I21> { [ XF86Calculator ] };
key <I2F> { [ XF86Close ] };
- key <I32> { [ XF86WWW ] };
key <I39> { [ Print ] };
key <I55> { [ XF86Save ] };
key <I5A> { [ XF86Send ] };
key <I62> { [ Help ] };
key <I64> { [ XF86Reply ] };
- key <I66> { [ XF86Favorites ] };
- key <I6C> { [ XF86Mail ] };
key <I76> { [ parenleft ] };
key <I7B> { [ parenright ] };
key <K59> { [ KP_Equal ] };
@@ -1496,28 +1344,15 @@ xkb_symbols "microsoft7000" {
partial alphanumeric_keys
xkb_symbols "microsoftinet" {
include "inet(nav_common)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86WWW ] };
key <I5F> { [ XF86Standby ] };
- key <I66> { [ XF86Favorites ] };
key <I68> { [ XF86AudioStop ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
};
// Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
partial alphanumeric_keys
xkb_symbols "microsoftpro" {
include "inet(media_nav_common)"
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86WWW ] };
key <I5F> { [ XF86Standby ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
// Internet Section -- Left Side
// Multimedia Section -- Right Side
// My Computer Section -- Far Right
@@ -1533,15 +1368,11 @@ partial alphanumeric_keys
key <I17> { [ XF86AudioStop ] };
key <I1E> { [ XF86AudioRaiseVolume ] };
key <I1F> { [ XF86AudioPlay, XF86AudioPause ] };
- key <I21> { [ XF86Calculator ] };
key <I22> { [ XF86AudioNext ] };
key <I24> { [ XF86AudioPrev ] };
key <I25> { [ XF86AudioLowerVolume ] };
key <I26> { [ XF86AudioMute ] };
key <I63> { [ XF86Standby ] };
- key <I66> { [ XF86Favorites ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
// Internet Section -- Left Side
// Multimedia Section -- Right Side
// My Computer Section -- Far Right
@@ -1555,12 +1386,7 @@ xkb_symbols "microsoftprooem" {
include "inet(media_nav_common)"
key <FK17> { [ XF86Search ] };
key <I02> { [ XF86HomePage ] };
- key <I21> { [ XF86Calculator ] };
key <I63> { [ XF86Standby ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
key <K67> { [ XF86MyComputer ] };
// Internet Section -- Left Side
// Multimedia Section -- Right Side
@@ -1576,15 +1402,12 @@ xkb_symbols "microsoftprose" {
key <I17> { [ XF86AudioStop ] };
key <I1E> { [ XF86AudioRaiseVolume ] };
key <I1F> { [ XF86AudioPlay, XF86AudioPause ] };
- key <I21> { [ XF86Calculator ] };
key <I22> { [ XF86AudioNext ] };
key <I24> { [ XF86AudioPrev ] };
key <I25> { [ XF86AudioLowerVolume ] };
key <I26> { [ XF86AudioMute ] };
key <I63> { [ XF86Standby ] };
- key <I66> { [ XF86Favorites ] };
key <I68> { [ XF86AudioStop ] };
- key <I6C> { [ XF86Mail ] };
key <PRSC> { [ XF86MyComputer ] };
key <XFER> { [ XF86AudioMedia ] };
};
@@ -1597,7 +1420,6 @@ xkb_symbols "microsoftoffice" {
key <END> { [ Undo ] };
key <I02> { [ XF86HomePage ] };
key <I1E> { [ XF86AudioLowerVolume ] };
- key <I21> { [ XF86Calculator ] };
key <I25> { [ XF86AudioRaiseVolume ] };
key <I26> { [ XF86AudioMute ] };
key <I3C> { [ XF86Cut ] };
@@ -1613,7 +1435,6 @@ xkb_symbols "microsoftoffice" {
key <I62> { [ Help ] };
key <I64> { [ XF86Save ] };
key <I67> { [ Print ] };
- key <I6C> { [ XF86Mail ] };
key <I6D> { [ XF86OfficeHome ] };
key <I70> { [ Redo ] };
key <I71> { [ XF86Reply ] };
@@ -1627,7 +1448,7 @@ xkb_symbols "microsoftoffice" {
// Microsoft Wireless Multimedia Keyboard 1.0A
partial alphanumeric_keys
xkb_symbols "microsoftmult" {
- include "inet(media_common)"
+ include "inet(media_nav_common)"
key <AE13> { [ XF86Messenger ] };
key <FK14> { [ XF86New ] };
key <FK15> { [ XF86Open ] };
@@ -1636,9 +1457,7 @@ xkb_symbols "microsoftmult" {
key <I07> { [ Redo ] };
key <I08> { [ Undo ] };
key <I16> { [ XF86LogOff ] };
- key <I21> { [ XF86Calculator ] };
key <I23> { [ XF86Spell ] };
- key <I32> { [ XF86WWW ] };
key <I3B> { [ Help ] };
key <I3C> { [ XF86Music ] };
key <I42> { [ XF86Forward ] };
@@ -1647,8 +1466,6 @@ xkb_symbols "microsoftmult" {
key <I58> { [ Print ] };
key <I5F> { [ XF86Sleep ] };
key <I64> { [ XF86Pictures ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
key <I80> { [ XF86Documents ] };
// Control Section -- Far Right
// F-Locked Function keys
@@ -1735,7 +1552,7 @@ xkb_symbols "qtronix" {
// Samsung SDM 4500P
partial alphanumeric_keys
xkb_symbols "samsung4500" {
- include "inet(media_common)"
+ include "inet(media_nav_common)"
key <AE13> { [ XF86Launch4 ] };
key <I02> { [ XF86Launch1 ] };
key <I04> { [ XF86Launch3 ] };
@@ -1744,10 +1561,8 @@ xkb_symbols "samsung4500" {
key <I0A> { [ XF86Book ] };
key <I18> { [ XF86Eject ] };
key <I26> { [ Help ] };
- key <I32> { [ XF86WWW ] };
key <I59> { [ XF86Explorer ] };
key <I5F> { [ XF86Standby ] };
- key <I6C> { [ XF86Mail ] };
key <NFER> { [ XF86Launch2 ] };
};
@@ -1780,18 +1595,16 @@ xkb_symbols "sk1300" {
// SK-2500
partial alphanumeric_keys
xkb_symbols "sk2500" {
- include "inet(media_common)"
+ include "inet(media_nav_common)"
key <I12> { [ XF86AudioRewind ] };
key <I17> { [ XF86Close ] };
key <I18> { [ XF86Eject ] };
key <I18> { [ XF86Eject ] };
key <I19> { [ XF86Forward ] };
key <I1E> { [ XF86AudioRecord ] };
- key <I21> { [ XF86Calculator ] };
key <I23> { [ XF86Xfer ] };
key <I25> { [ XF86PowerOff ] };
key <I26> { [ Menu ] };
- key <I32> { [ XF86WWW ] };
key <I7A> { [ XF86ScreenSaver ] };
};
@@ -1872,6 +1685,7 @@ xkb_symbols "sven303" {
// Symplon PaceBook (tablet PC)
partial alphanumeric_keys
xkb_symbols "symplon" {
+ include "inet(nav_common)"
key <HOME> { [ XF86RotationPB ] };
key <I13> { [ XF86SplitScreen ] };
key <I14> { [ XF86Support ] };
@@ -1879,10 +1693,8 @@ xkb_symbols "symplon" {
key <I21> { [ XF86User2KB ] };
key <I25> { [ XF86RotationKB ] };
key <I26> { [ XF86MenuKB ] };
- key <I32> { [ XF86WWW ] };
key <I5F> { [ XF86Standby ] };
key <I6B> { [ XF86User1KB ] };
- key <I6C> { [ XF86Mail ] };
key <PAUS> { [ XF86UserPB ] };
key <UP> { [ XF86MenuPB ] };
};
@@ -1910,13 +1722,9 @@ xkb_symbols "toshiba_s3000" {
partial alphanumeric_keys
xkb_symbols "trust" {
include "inet(media_nav_common)"
+ include "inet(acpi)"
key <I11> { [ XF86ScreenSaver ] };
key <I1E> { [ XF86Eject ] };
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86WWW ] };
- key <I5F> { [ XF86Standby ] };
- key <I63> { [ XF86WakeUp ] };
- key <I6C> { [ XF86Mail ] };
};
@@ -1928,7 +1736,6 @@ xkb_symbols "trustda" {
key <I17> { [ XF86Close ] };
key <I18> { [ XF86Eject ] };
key <I1E> { [ XF86AudioRecord ] };
- key <I21> { [ XF86Calculator ] };
key <I23> { [ XF86Xfer ] };
key <I25> { [ XF86Standby ] };
key <I26> { [ Help ] };
@@ -1964,11 +1771,6 @@ xkb_symbols "yahoo" {
xkb_symbols "sp_inet" {
include "inet(media_nav_common)"
include "inet(acpi)"
- key <I32> { [ XF86WWW ] };
- key <I66> { [ XF86Favorites ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
};
// Apple keyboards (macbooks, powerbooks, powermac G5, etc)
@@ -2004,21 +1806,16 @@ xkb_symbols "cymotionlinux" {
key <I0F> { [ XF86ScrollDown ] };
key <I17> { [ XF86Launch2 ] };
key <I1F> { [ XF86Launch1 ] };
- key <I21> { [ XF86Calculator ] };
key <I28> { [ XF86MenuKB ] };
key <I2B> { [ XF86Launch3 ] };
key <I3C> { [ XF86Cut ] };
key <I47> { [ XF86PowerOff ] };
key <I63> { [ XF86Standby ] };
- key <I67> { [ XF86Reload ] };
- key <I68> { [ XF86Stop ] };
- key <I6C> { [ XF86Mail ] };
key <I78> { [ XF86Copy ] };
key <K65> { [ XF86Paste ] };
key <K68> { [ XF86Standby ] };
key <K6C> { [ XF86Eject ] };
key <K75> { [ XF86ScrollUp ] };
- key <RWIN> { [ at ] };
key <XFER> { [ XF86AudioMedia ] };
};
@@ -2028,9 +1825,6 @@ xkb_symbols "silvercrest" {
key <I02> { [ XF86HomePage ] };
key <I21> { [ XF86Launch2 ] };
key <I5F> { [ XF86Standby ] };
- key <I66> { [ XF86Favorites ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
key <K67> { [ XF86Launch1 ] };
};
@@ -2038,12 +1832,9 @@ xkb_symbols "silvercrest" {
partial alphanumeric_keys
xkb_symbols "emachines" {
- include "inet(media_common)"
+ include "inet(media_nav_common)"
key <I32> { [ XF86iTouch ] };
key <I5F> { [ XF86Sleep ] };
- key <I65> { [ XF86Search ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
key <KP0> { [ KP_0 ] };
key <KP1> { [ KP_1 ] };
key <KP2> { [ KP_2 ] };
@@ -2078,20 +1869,13 @@ xkb_symbols "benqx" {
key <I21> { [ XF86WWW ] };
key <I2B> { [ XF86Go ] };
key <I31> { [ XF86Calendar ] };
- key <I32> { [ XF86WWW ] };
- key <I66> { [ XF86Favorites ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
};
partial alphanumeric_keys
xkb_symbols "logitech_g15" {
-
- include "inet(media_common)"
+ include "inet(media_nav_common)"
key <AE13> { [ XF86Messenger ] };
-
key <HKTG> { [ XF86Launch7 ] };
-
key <I02> { [ XF86Launch9 ] };
key <I04> { [ XF86Phone ] };
key <I08> { [ XF86LaunchD ] };
@@ -2102,7 +1886,6 @@ xkb_symbols "logitech_g15" {
key <I21> { [ XF86Travel ] };
key <I23> { [ XF86Spell ] };
key <I31> { [ XF86Launch4 ] };
- key <I32> { [ XF86WWW ] };
key <I3C> { [ XF86Music ] };
key <I42> { [ XF86Forward ] };
key <I43> { [ XF86Send ] };
@@ -2110,13 +1893,10 @@ xkb_symbols "logitech_g15" {
key <I5F> { [ XF86Sleep ] };
key <I64> { [ XF86Pictures ] };
key <I67> { [ XF86LaunchA ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
key <I76> { [ XF86iTouch ] };
key <I77> { [ XF86Launch3 ] };
key <I79> { [ XF86ToDoList ] };
key <I7B> { [ XF86Calculator ] };
-
key <K5A> { [ XF86VendorHome ] };
key <K5D> { [ XF86Away ] };
key <K5E> { [ XF86WebCam ] };
@@ -2127,12 +1907,9 @@ xkb_symbols "logitech_g15" {
key <K72> { [ XF86LaunchC ] };
key <K74> { [ XF86WWW ] };
key <K75> { [ XF86LaunchE ] };
-
key <MDSW> { [ XF86Launch1 ] };
key <NFER> { [ XF86Launch2 ] };
-
key <XFER> { [ XF86Launch8 ] };
-
};
// Intel
@@ -2155,10 +1932,5 @@ xkb_symbols "unitek_kb1925" {
key <I16> { [ XF86WakeUp ] };
key <I18> { [ XF86Search ] };
key <I1A> { [ XF86Reload ] };
- key <I21> { [ XF86Calculator ] };
- key <I32> { [ XF86WWW ] };
- key <I6B> { [ XF86MyComputer ] };
- key <I6C> { [ XF86Mail ] };
- key <I6D> { [ XF86AudioMedia ] };
};