projects / packages / X11.git / blame
| Commit | Line | Data |
|---|---|---|
| e420eb4a PS |
1 | This patch add support for the new keyboard model called `logiultrax`. |
| 2 | The Logitech Ultra-X (extremely flat and thin) keyborad works fine now. | |
| 3 | ||
| 4 | rules/xorg | 2 +- | |
| 5 | rules/xorg.lst | 1 + | |
| 6 | rules/xorg.xml | 6 ++++++ | |
| 7 | symbols/inet | 12 ++++++++++++ | |
| 8 | 4 files changed, 20 insertions(+), 1 deletion(-) | |
| 9 | ||
| 10 | diff -uNr X11-6.8.2/xc/programs/xkbcomp.orig/rules/xorg X11-6.8.2/xc/programs/xkbcomp/rules/xorg | |
| 11 | --- X11-6.8.2/xc/programs/xkbcomp.orig/rules/xorg 2004-04-23 21:54:52.000000000 +0200 | |
| 12 | +++ X11-6.8.2/xc/programs/xkbcomp/rules/xorg 2005-06-11 15:22:36.000000000 +0200 | |
| 13 | @@ -111,7 +111,7 @@ | |
| 14 | honeywell_euroboard \ | |
| 15 | rapidaccess rapidaccess2 rapidaccess2a \ | |
| 16 | ltcd logiaccess logicdp logicdpa logicink logiciink \ | |
| 17 | - logiinkse logiinkseusb logiik itouch \ | |
| 18 | + logiinkse logiinkseusb logiik itouch logiultrax \ | |
| 19 | mx1998 mx2500 mx2750 \ | |
| 20 | microsoftinet microsoftpro microsoftprooem microsoftprose \ | |
| 21 | microsoftoffice microsoftmult \ | |
| 22 | diff -uNr X11-6.8.2/xc/programs/xkbcomp.orig/rules/xorg.lst X11-6.8.2/xc/programs/xkbcomp/rules/xorg.lst | |
| 23 | --- X11-6.8.2/xc/programs/xkbcomp.orig/rules/xorg.lst 2004-04-23 21:54:52.000000000 +0200 | |
| 24 | +++ X11-6.8.2/xc/programs/xkbcomp/rules/xorg.lst 2005-06-11 15:22:36.000000000 +0200 | |
| 25 | @@ -75,6 +75,7 @@ | |
| 26 | logiinkse Logitech iTouch Internet Navigator Keyboard SE | |
| 27 | logiinkseusb Logitech iTouch Internet Navigator Keyboard SE (USB) | |
| 28 | logiik Logitech Internet Keyboard | |
| 29 | + logiultrax Logitech Ultra-X Keyboard | |
| 30 | itouch Logitech iTouch | |
| 31 | mx1998 Memorex MX1998 | |
| 32 | mx2500 Memorex MX2500 EZ-Access Keyboard | |
| 33 | diff -uNr X11-6.8.2/xc/programs/xkbcomp.orig/rules/xorg.xml X11-6.8.2/xc/programs/xkbcomp/rules/xorg.xml | |
| 34 | --- X11-6.8.2/xc/programs/xkbcomp.orig/rules/xorg.xml 2004-04-23 21:54:52.000000000 +0200 | |
| 35 | +++ X11-6.8.2/xc/programs/xkbcomp/rules/xorg.xml 2005-06-11 15:22:36.000000000 +0200 | |
| 36 | @@ -798,6 +798,12 @@ | |
| 37 | </model> | |
| 38 | <model> | |
| 39 | <configItem> | |
| 40 | + <name>logiultrax</name> | |
| 41 | + <description>Logitech Ultra-X Keyboard</description> | |
| 42 | + </configItem> | |
| 43 | + </model> | |
| 44 | + <model> | |
| 45 | + <configItem> | |
| 46 | <name>mx1998</name> | |
| 47 | <description>Memorex MX1998</description> | |
| 48 | </configItem> | |
| 49 | diff -uNr X11-6.8.2/xc/programs/xkbcomp.orig/symbols/inet X11-6.8.2/xc/programs/xkbcomp/symbols/inet | |
| 50 | --- X11-6.8.2/xc/programs/xkbcomp.orig/symbols/inet 2004-12-15 04:00:47.000000000 +0100 | |
| 51 | +++ X11-6.8.2/xc/programs/xkbcomp/symbols/inet 2005-06-11 15:22:36.000000000 +0200 | |
| 52 | @@ -1305,6 +1305,18 @@ | |
| 53 | key <I66> { [ XF86Start ] }; | |
| 54 | }; | |
| 55 | ||
| 56 | +partial alphanumeric_keys | |
| 57 | +xkb_symbols "logiultrax" { | |
| 58 | + name[Group1]= "Logitech Ultra-X Keyboard"; | |
| 59 | + | |
| 60 | + key <I01> { [ XF86AudioMedia ] }; | |
| 61 | + key <I22> { [ XF86AudioPlay, XF86AudioPause ] }; | |
| 62 | + key <I20> { [ XF86AudioMute ] }; | |
| 63 | + key <I66> { [ XF86Favorites ] }; | |
| 64 | + key <I6C> { [ XF86Mail ] }; | |
| baa6e809 | 65 | + key <I02> { [ XF86WWW ] }; |
| e420eb4a PS |
66 | +}; |
| 67 | + | |
| 68 | // Memorex | |
| 69 | ||
| 70 | partial alphanumeric_keys |