convert some keymaps to use X11 friendly symbols

Sometimes hal-info assigns key symbols which are > 255; However, X.org
currently cannot use those [1][2]. According to the ML discussion [3] this
changes some of those to similar key symbols which are < 256, so that they can
actually be used in X.org.

This command finds all affected ones:

grep -r 'append.*input.keymap.data' . | \
  sed -r 's/.*:([[:alnum:]]+).*/key_\1/' | sort -u | tr '[:lower:]' '[:upper:]' | \
  while read; do grep "$REPLY\>.*0x" /usr/include/linux/input.h; done

[1] https://bugs.freedesktop.org/show_bug.cgi?id=11227
[2] http://lists.freedesktop.org/archives/xorg/2009-January/042441.html
[3] http://lists.freedesktop.org/archives/hal/2009-February/012938.html

5 files changed, 8 insertions, 8 deletions

diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index 93e6331..349cb17 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -18,7 +18,7 @@
           <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Turn On/Off Wireless -->
           <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
           <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
-          <append key="input.keymap.data" type="strlist">e00b:displaytoggle</append> <!-- Fn+F8 CRT/LCD -->
+          <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD (high keycode: "displaytoggle") -->
           <append key="input.keymap.data" type="strlist">e00f:switchvideomode</append> <!-- Fn+F7 aspect ratio -->
           <append key="input.keymap.data" type="strlist">e010:previoussong</append> <!-- Front panel previous song -->
           <append key="input.keymap.data" type="strlist">e011:prog1</append> <!-- Wifi Catcher (DELL Specific) -->
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index c6b8d83..a2929b9 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -29,7 +29,7 @@
 
 	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_ncase="Pavilion">
             <!-- Home and entertainment machines -->
-            <append key="input.keymap.data" type="strlist">e008:player</append> <!-- FIXME: quick play -->
+            <append key="input.keymap.data" type="strlist">e008:media</append> <!-- FIXME: quick play -->
             <append key="input.keymap.data" type="strlist">e058:f22</append>    <!-- touchpad off -->
             <append key="input.keymap.data" type="strlist">e059:f23</append>    <!-- touchpad on  -->
           </match>
@@ -37,7 +37,7 @@
 	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_ncase="Compaq">
             <!-- Business and enterprise machines -->
             <append key="input.keymap.data" type="strlist">e008:presentation</append>   <!-- Presentation -->
-            <append key="input.keymap.data" type="strlist">e059:info</append>   <!-- I key -->
+            <append key="input.keymap.data" type="strlist">e059:help</append>   <!-- I key (high keycode: "info") -->
           </match>
 
           <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="4410s;4411s;4415s;6730s">
@@ -48,7 +48,7 @@
 
 	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="2510p">
             <!-- The 2510p seems to be unique in having a touchpad disable button despite being an enterprise model -->
-            <remove key="input.keymap.data" type="strlist">e059:info</remove>
+            <remove key="input.keymap.data" type="strlist">e059:help</remove>
             <append key="input.keymap.data" type="strlist">e058:f22</append>    <!-- touchpad off -->
             <append key="input.keymap.data" type="strlist">e059:f23</append>    <!-- touchpad on  -->
 	  </match>
diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index dcf19ac..d8b4042 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -106,7 +106,7 @@
 
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix_ncase="samsung">
 	<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="NC10;SP55S;SQ45S70S;SX60P;R59P/R60P/R61P;Q310;X05">
-          <append key="input.keymap.data" type="strlist">e002:displaytoggle</append> <!-- Fn+F4 CRT/LCD -->
+          <append key="input.keymap.data" type="strlist">e002:switchvideomode</append> <!-- Fn+F4 CRT/LCD (high keycode: "displaytoggle") -->
           <append key="input.keymap.data" type="strlist">e003:battery</append> <!-- Fn+F2 battery icon -->
           <append key="input.keymap.data" type="strlist">e004:prog1</append> <!-- Fn+F5 backlight on/off -->
           <append key="input.keymap.data" type="strlist">e006:wlan</append> <!-- Fn+F9 Turn On/Off Wireless -->
diff --git a/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi
index a4f3001..9f561fb 100644
--- a/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi
@@ -19,7 +19,7 @@
           <append key="input.keymap.data" type="strlist">0x07e:bluetooth</append>
           <!-- Performance -->
           <!-- <append key="input.keymap.data" type="strlist">0x05c:unknown</append> -->
-          <append key="input.keymap.data" type="strlist">0x08a:tv</append>
+          <append key="input.keymap.data" type="strlist">0x08a:media</append> <!-- high keycode: "tv" -->
           <!-- TODO: sleep/power buttons -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
index bdc4fe9..9710d9d 100644
--- a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
@@ -20,7 +20,7 @@
         <append key="input.keymap.data" type="strlist">0x14:volumeup</append> <!-- Volume Up button -->
 	<append key="input.keymap.data" type="strlist">0x15:volumedown</append> <!-- Volume Down button -->
         <append key="input.keymap.data" type="strlist">0x16:mute</append> <!-- Mute button -->
-        <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+        <append key="input.keymap.data" type="strlist">0x17:prog1</append> <!-- ThinkPad/ThinkVantage button  (high keycode: "vendor") -->
         <append key="info.capabilities" type="strlist">input.keymap</append>
       </match>
       <!-- Lenovo systems have a similar but different layout to IBM systems -->
@@ -40,7 +40,7 @@
         <append key="input.keymap.data" type="strlist">0x14:volumeup</append> <!-- Volume Up button -->
 	<append key="input.keymap.data" type="strlist">0x15:volumedown</append> <!-- Volume Down button -->
         <append key="input.keymap.data" type="strlist">0x16:mute</append> <!-- Mute button -->
-        <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+        <append key="input.keymap.data" type="strlist">0x17:prog1</append> <!-- ThinkPad/ThinkVantage button (high keycode: "vendor") -->
         <append key="info.capabilities" type="strlist">input.keymap</append>
       </match>
     </match>