Attachment 10944 Details for Bug 11686 – These are the changes I made to X 7.2

[patch] These are the changes I made to X 7.2

X11-config.diff (text/plain), 7.79 KB, created by John Woods on 2007-08-01 12:24:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Woods

Created: 2007-08-01 12:24:18 UTC

Size: 7.79 KB

patch

obsolete

>diff -r -U 3 /etc/X11-orig/xkb/rules/base /etc/X11/xkb/rules/base
>--- /etc/X11-orig/xkb/rules/base	2007-06-09 17:55:08.000000000 -0400
>+++ /etc/X11/xkb/rules/base	2007-08-01 11:14:32.000000000 -0400
>@@ -50,7 +50,7 @@
>               hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
>               ipaq inspiron latitude \
>               logiaccess logicdp logicdpa logicdit logicink logiciink logiclx300 \
>-              logiinkse logiinkseusb logiitc logiik itouch logiultrax ltcd \
>+              logiinkse logiinkseusb logiitc logiik itouch logiultrax ltcd logiex110 \
>               microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
>               microsoftoffice microsoftmult \
>               mx1998 mx2500 mx2750 \
>diff -r -U 3 /etc/X11-orig/xkb/rules/base.lst /etc/X11/xkb/rules/base.lst
>--- /etc/X11-orig/xkb/rules/base.lst	2007-06-09 17:55:08.000000000 -0400
>+++ /etc/X11/xkb/rules/base.lst	2007-08-01 11:16:05.000000000 -0400
>@@ -87,6 +87,7 @@
>   logiinkse       Logitech iTouch Internet Navigator Keyboard SE
>   logiinkseusb    Logitech iTouch Internet Navigator Keyboard SE (USB)
>   logiultrax      Logitech Ultra-X Keyboard
>+  logiex110       Logitech Cordless Desktop EX110
>   dinovo          Logitech diNovo Keyboard
>   mx1998          Memorex MX1998
>   mx2500          Memorex MX2500 EZ-Access Keyboard
>diff -r -U 3 /etc/X11-orig/xkb/rules/base.xml /etc/X11/xkb/rules/base.xml
>--- /etc/X11-orig/xkb/rules/base.xml	2007-06-09 17:55:08.000000000 -0400
>+++ /etc/X11/xkb/rules/base.xml	2007-08-01 11:22:42.000000000 -0400
>@@ -2376,6 +2376,15 @@
>     </model>
>     <model>
>       <configItem>
>+        <name>logiex110</name>
>+        <description>Logitech Ultra-X Keyboard</description>
>+	<description xml:lang="nl">Logitech EX110 toetsenbord</description>	
>+       </configItem>
>+    </model>
>+    <model>    
>+    
>+    <model>
>+      <configItem>
>         <name>dinovo</name>
>         <description>Logitech diNovo Keyboard</description>
>         <description xml:lang="es">Logitech diNovo Keyboard</description>
>diff -r -U 3 /etc/X11-orig/xkb/rules/xfree86 /etc/X11/xkb/rules/xfree86
>--- /etc/X11-orig/xkb/rules/xfree86	2007-06-09 17:55:08.000000000 -0400
>+++ /etc/X11/xkb/rules/xfree86	2007-08-01 11:14:32.000000000 -0400
>@@ -50,7 +50,7 @@
>               hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
>               ipaq inspiron latitude \
>               logiaccess logicdp logicdpa logicdit logicink logiciink logiclx300 \
>-              logiinkse logiinkseusb logiitc logiik itouch logiultrax ltcd \
>+              logiinkse logiinkseusb logiitc logiik itouch logiultrax ltcd logiex110 \
>               microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
>               microsoftoffice microsoftmult \
>               mx1998 mx2500 mx2750 \
>diff -r -U 3 /etc/X11-orig/xkb/rules/xfree86.lst /etc/X11/xkb/rules/xfree86.lst
>--- /etc/X11-orig/xkb/rules/xfree86.lst	2007-06-09 17:55:08.000000000 -0400
>+++ /etc/X11/xkb/rules/xfree86.lst	2007-08-01 11:16:05.000000000 -0400
>@@ -87,6 +87,7 @@
>   logiinkse       Logitech iTouch Internet Navigator Keyboard SE
>   logiinkseusb    Logitech iTouch Internet Navigator Keyboard SE (USB)
>   logiultrax      Logitech Ultra-X Keyboard
>+  logiex110       Logitech Cordless Desktop EX110
>   dinovo          Logitech diNovo Keyboard
>   mx1998          Memorex MX1998
>   mx2500          Memorex MX2500 EZ-Access Keyboard
>diff -r -U 3 /etc/X11-orig/xkb/rules/xfree86.xml /etc/X11/xkb/rules/xfree86.xml
>--- /etc/X11-orig/xkb/rules/xfree86.xml	2007-06-09 17:55:08.000000000 -0400
>+++ /etc/X11/xkb/rules/xfree86.xml	2007-08-01 11:22:42.000000000 -0400
>@@ -2376,6 +2376,15 @@
>     </model>
>     <model>
>       <configItem>
>+        <name>logiex110</name>
>+        <description>Logitech Ultra-X Keyboard</description>
>+	<description xml:lang="nl">Logitech EX110 toetsenbord</description>	
>+       </configItem>
>+    </model>
>+    <model>    
>+    
>+    <model>
>+      <configItem>
>         <name>dinovo</name>
>         <description>Logitech diNovo Keyboard</description>
>         <description xml:lang="es">Logitech diNovo Keyboard</description>
>diff -r -U 3 /etc/X11-orig/xkb/rules/xorg /etc/X11/xkb/rules/xorg
>--- /etc/X11-orig/xkb/rules/xorg	2007-06-09 17:55:08.000000000 -0400
>+++ /etc/X11/xkb/rules/xorg	2007-08-01 11:14:32.000000000 -0400
>@@ -50,7 +50,7 @@
>               hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
>               ipaq inspiron latitude \
>               logiaccess logicdp logicdpa logicdit logicink logiciink logiclx300 \
>-              logiinkse logiinkseusb logiitc logiik itouch logiultrax ltcd \
>+              logiinkse logiinkseusb logiitc logiik itouch logiultrax ltcd logiex110 \
>               microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
>               microsoftoffice microsoftmult \
>               mx1998 mx2500 mx2750 \
>diff -r -U 3 /etc/X11-orig/xkb/rules/xorg.lst /etc/X11/xkb/rules/xorg.lst
>--- /etc/X11-orig/xkb/rules/xorg.lst	2007-06-09 17:55:08.000000000 -0400
>+++ /etc/X11/xkb/rules/xorg.lst	2007-08-01 11:16:05.000000000 -0400
>@@ -87,6 +87,7 @@
>   logiinkse       Logitech iTouch Internet Navigator Keyboard SE
>   logiinkseusb    Logitech iTouch Internet Navigator Keyboard SE (USB)
>   logiultrax      Logitech Ultra-X Keyboard
>+  logiex110       Logitech Cordless Desktop EX110
>   dinovo          Logitech diNovo Keyboard
>   mx1998          Memorex MX1998
>   mx2500          Memorex MX2500 EZ-Access Keyboard
>diff -r -U 3 /etc/X11-orig/xkb/rules/xorg.xml /etc/X11/xkb/rules/xorg.xml
>--- /etc/X11-orig/xkb/rules/xorg.xml	2007-06-09 17:55:08.000000000 -0400
>+++ /etc/X11/xkb/rules/xorg.xml	2007-08-01 11:22:42.000000000 -0400
>@@ -2376,6 +2376,15 @@
>     </model>
>     <model>
>       <configItem>
>+        <name>logiex110</name>
>+        <description>Logitech Ultra-X Keyboard</description>
>+	<description xml:lang="nl">Logitech EX110 toetsenbord</description>	
>+       </configItem>
>+    </model>
>+    <model>    
>+    
>+    <model>
>+      <configItem>
>         <name>dinovo</name>
>         <description>Logitech diNovo Keyboard</description>
>         <description xml:lang="es">Logitech diNovo Keyboard</description>
>diff -r -U 3 /etc/X11-orig/xkb/symbols/inet /etc/X11/xkb/symbols/inet
>--- /etc/X11-orig/xkb/symbols/inet	2007-06-09 17:55:09.000000000 -0400
>+++ /etc/X11/xkb/symbols/inet	2007-08-01 11:29:34.000000000 -0400
>@@ -1472,11 +1472,37 @@
>     key <I2D>	{	[ XF86AudioRaiseVolume	]	};
> };
> 
>+// Logitech Cordless Desktop EX110
> partial alphanumeric_keys
>-xkb_symbols "logiultrax" {
>+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>   {       [ XF86Support           ]       };      // 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
>+
> };
> 
>+
> partial alphanumeric_keys 
> xkb_symbols "dinovo" {
>

Actions: View | Splinter Review

Attachments on bug 11686: 10944 | 10945

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.