hal: Branch 'master' - 2 commits

[Richard Hughes]

 fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi |   13 ++++++++++
 1 files changed, 13 insertions(+)

New commits:
diff-tree 5f238c85f3387949b0c7f9d4ae9923d877527a0f (from parents)
Merge: 109e79e0bcd16e18c1a965d08632775d01a43733 00ded4be1c4037cf06c04230ff05745dccdc929d
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Jul 10 23:19:23 2007 +0100

    Merge branch 'master' of git+ssh://hughsient@git.freedesktop.org/git/hal-info

diff-tree 109e79e0bcd16e18c1a965d08632775d01a43733 (from f6a3238fa22256e17864c27e37167830aa8fc4d4)
Author: Zack Cerza <zcerza at redhat.com>
Date:   Tue Jul 10 23:18:56 2007 +0100

    add keymap for ibm x40
    
    Attached is a patch for the X41 keymap. I don't have the tablet version,
    though, so we'll see if that matters later...

diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
index 36fdd52..4d951b2 100644
--- a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
@@ -116,6 +116,19 @@
           <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="X4">
+          <append key="input.keymap.data" type="strlist">0x02:lock</append> <!-- Fn+F3 lock -->
+          <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
+          <append key="input.keymap.data" type="strlist">0x04:radio</append> <!-- Fn+F5 switch radio -->
+          <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
+          <append key="input.keymap.data" type="strlist">0x08:f24</append> <!-- Fn+F9 undock -->
+          <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+          <append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
+          <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
+          <append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
+          <append key="input.keymap.data" type="strlist">0x17:vendor</append> <!-- ThinkPad/ThinkVantage button -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
       </match>
 
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LENOVO">