fix HAL's XO keymap

1 files changed, 26 insertions, 21 deletions

diff --git a/soas-xo.ks b/soas-xo.ks
index c9ee2ed..518e35d 100644
--- a/soas-xo.ks
+++ b/soas-xo.ks
@@ -326,10 +326,11 @@ cat > /usr/share/hal/fdi/information/10freedesktop/30-keymap-olpc.fdi <<EOF
     <match key="info.parent" string="/org/freedesktop/Hal/devices/platform_i8042_i8042_KBD_port">
 
       <match key="@input.originating_device:info.linux.driver" string="atkbd">
-        <append key="input.keymap.data" type="strlist">e059:fn</append>
+        <append key="input.keymap.data" type="strlist">59:fn</append>
         <append key="input.keymap.data" type="strlist">e001:fn_esc</append>
 
         <append key="input.keymap.data" type="strlist">e079:camera</append>
+        <!-- FN-CAMERA is 'Mic', KEY_SOUND is as close as I see. -->
         <append key="input.keymap.data" type="strlist">e078:sound</append>
 
         <append key="input.keymap.data" type="strlist">e03b:fn_f1</append>
@@ -345,6 +346,7 @@ cat > /usr/share/hal/fdi/information/10freedesktop/30-keymap-olpc.fdi <<EOF
         <append key="input.keymap.data" type="strlist">e057:fn_f11</append>
         <append key="input.keymap.data" type="strlist">e058:fn_f12</append>
 
+        <!-- Using KEY_F13-KEY_F21 for the .5 F keys right now. -->
         <append key="input.keymap.data" type="strlist">e077:fn_f13</append>
         <append key="input.keymap.data" type="strlist">e076:fn_f14</append>
         <append key="input.keymap.data" type="strlist">e075:fn_f15</append>
@@ -356,11 +358,14 @@ cat > /usr/share/hal/fdi/information/10freedesktop/30-keymap-olpc.fdi <<EOF
         <append key="input.keymap.data" type="strlist">e06f:fn_f21</append>
 
         <append key="input.keymap.data" type="strlist">e06e:chat</append>
+        <!-- FIXME: FN-CHAT, just mapping to KEY_CHAT right now -->
         <append key="input.keymap.data" type="strlist">e064:chat</append>
 
+        <!-- Frame and Fn-frame , which is listed as 'Win App', try -->
         <append key="input.keymap.data" type="strlist">e05d:menu</append>
         <append key="input.keymap.data" type="strlist">e05a:prog1</append>
 
+        <!-- The FN of some keys is other keys -->
         <append key="input.keymap.data" type="strlist">e053:delete</append>
         <append key="input.keymap.data" type="strlist">e052:insert</append>
         <append key="input.keymap.data" type="strlist">e049:pageup</append>
@@ -368,34 +373,34 @@ cat > /usr/share/hal/fdi/information/10freedesktop/30-keymap-olpc.fdi <<EOF
         <append key="input.keymap.data" type="strlist">e047:home</append>
         <append key="input.keymap.data" type="strlist">e04f:end</append>
 
-        <append key="input.keymap.data" type="strlist">e073:hp</append>
-        <append key="input.keymap.data" type="strlist">e07e:hp</append>
+        <!-- FIXME: These should be the language key. Don't ask what they
+             are doing as KEY_HP. It will make your brain hurt. -->
+        <append key="input.keymap.data" type="strlist">73:hp</append>
+        <append key="input.keymap.data" type="strlist">7e:hp</append>
 
+        <!-- L/R grab -->
         <append key="input.keymap.data" type="strlist">e05b:leftmeta</append>
         <append key="input.keymap.data" type="strlist">e05c:rightmeta</append>
+        <!-- FIXME: right grab seems to be releasing on a different scancode -->
+        <append key="input.keymap.data" type="strlist">85:rightmeta</append>
 
-        <append key="input.keymap.data" type="strlist">e085:rightmeta</append>
-
+        <!-- Fn-space toggles the backlight.
+             At least in a dream I had last night. -->
         <append key="input.keymap.data" type="strlist">e056:kbdillumtoggle</append>
 
-        <append key="input.keymap.data" type="strlist">e065:kp8</append>
-        <append key="input.keymap.data" type="strlist">e066:kp2</append> 
-        <append key="input.keymap.data" type="strlist">e067:kp4</append> 
-        <append key="input.keymap.data" type="strlist">e068:kp6</append> 
-
-        <append key="input.keymap.data" type="strlist">e065:kp9</append> 
-        <append key="input.keymap.data" type="strlist">e066:kp3</append> 
-        <append key="input.keymap.data" type="strlist">e067:kp7</append> 
-        <append key="input.keymap.data" type="strlist">e068:kp1</append> 
+        <!-- Set the game keys to map to up/down/left/right for now -->
+        <append key="input.keymap.data" type="strlist">65:kp8</append>
+        <append key="input.keymap.data" type="strlist">66:kp2</append>
+        <append key="input.keymap.data" type="strlist">67:kp4</append>
+        <append key="input.keymap.data" type="strlist">68:kp6</append>
 
-<!--
+        <!-- set the other game keys to map to pgup/pgdn/home/end -->
+        <append key="input.keymap.data" type="strlist">e065:kp9</append>
+        <append key="input.keymap.data" type="strlist">e066:kp3</append>
+        <append key="input.keymap.data" type="strlist">e067:kp7</append>
+        <append key="input.keymap.data" type="strlist">e068:kp1</append>
 
-        DISABLED because doing this causes the screen to blank and be
-        unusable - forces a restart of X and a suspend/resume to get
-        the display back (or a chvt and suspend/resume)
-
-        <append key="input.keymap.data" type="strlist">0069:switchvideomode</append>
--->
+        <append key="input.keymap.data" type="strlist">69:switchvideomode</append>
 
         <append key="info.capabilities" type="strlist">input.keymap</append>