Added logiex110 model, b.fd.o#11686

4 files changed, 42 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 66f55800..81ffc6b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-22  Sergey Udaltsov
+
+	* symbols/inet, rules/base.lists.part, rules/base.xml.in: adding
+	logiex110 model, https://bugs.freedesktop.org/show_bug.cgi?id=11686
+
 2007-07-20  Sergey Udaltsov
 
 	* symbols/gr: adding pound sign,
diff --git a/rules/base.lists.part b/rules/base.lists.part
index 0d11e1ed..fab7973d 100644
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -40,7 +40,8 @@
               hp2501 hp2505 hp5xx hp500fa hp5181 hp5185 \
               hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
               ipaq inspiron latitude \
-              logiaccess logicdp logicdpa logicdit logicdo logicink logiciink logiclx300 \
+              logiaccess logicdp logicdpa logicdit logicdo logicink \
+              logiex110 logiciink logiclx300 \
               logiinkse logiinkseusb logiitc logiik itouch logiultrax ltcd \
               logitech_g15 \
               microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
diff --git a/rules/base.xml.in b/rules/base.xml.in
index cd02c0e9..56fd8c87 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -624,6 +624,13 @@
     </model>
     <model>
       <configItem>
+        <name>logiex110</name>
+        <_description>Logitech Cordless Desktop EX110</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>logiinkse</name>
         <_description>Logitech iTouch Internet Navigator Keyboard SE</_description>
         <vendor>Logitech</vendor>
diff --git a/symbols/inet b/symbols/inet
index aab5b678..ba4b3ba7 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -1002,8 +1002,6 @@ xkb_symbols "geniuscomfy2" {
     // From Radics Laszlo <garaboncias@mailbox.hu>
     include "inet(geniuscomfy)"
     key <I10>   {       [ XF86AudioPrev         ]       };
-    key <I13>   {       [ XF86Word              ]       };
-    key <I14>   {       [ XF86Excel             ]       };
     key <I19>   {       [ XF86AudioNext         ]       };
     key <I20>   {       [ XF86AudioMute         ]       };
     key <I23>   {       [ Return                ]       };
@@ -1479,6 +1477,34 @@ xkb_symbols "logiclx300" {
     key <I21>	{	[ XF86Calculator	]	};
 };
 
+// Logitech Cordless Desktop EX110
+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
+    key <FK15>  {       [ XF86Pictures          ]       };      // F4
+    key <FK16>  {       [ Undo                  ]       };      // F5
+    key <I65>   {       [ Redo                  ]       };      // F6 *
+    key <I42>   {       [ Print                 ]       };      // F7
+    key <I43>   {       [ XF86Save              ]       };      // F8
+    key <I44>   {       [ XF86Launch1           ]       };      // F9 *
+    key <I45>   {       [ XF86Launch2           ]       };      // F10
+    key <I14>   {       [ XF86Launch3           ]       };      // F11
+    key <I4A>   {       [ XF86Launch4           ]       };      // F12
+};
+
 // Logitech iTouch Internet Navigator Keyboard SE
 partial alphanumeric_keys
 xkb_symbols "logiinkse" {
@@ -1785,8 +1811,6 @@ xkb_symbols "microsoftoffice" {
     key <I25>	{	[ XF86AudioRaiseVolume	]	};
     key <I26>	{	[ XF86AudioMute		]	};
     key <I3C>	{	[ XF86Cut		]	};
-    key <I44>	{	[ XF86Word		]	};
-    key <I45>	{	[ XF86Excel		]	};
     key <I4A>	{	[ XF86LogOff		]	};
     key <I54>	{	[ XF86ApplicationLeft	]	};
     key <I55>	{	[ XF86TaskPane		]	};
@@ -2405,7 +2429,6 @@ xkb_symbols "logitech_g15" {
     key  <I04> {         [       XF86Phone ] };
     key  <I08> {         [     XF86LaunchD ] };
     key  <I09> {         [     XF86Support ] };
-    key  <I0A> {         [        XF86Word ] };
     key  <I0F> {         [     XF86LaunchF ] };
     key  <I10> {         [   XF86AudioPrev ] };
     key  <I16> {         [      XF86LogOff ] };