hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/30-keymap-lenovo.fdi |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit 1191320aeb9b143254714736f80c4c3d4dd5d9c6
Author: Jeremy Katz <katzj at redhat.com>
Date:   Tue Oct 23 11:20:38 2007 +0200

    keymap tablet buttons from Lenovo x60t
    
    Add keymap for tablet buttons from Lenovo x60t.

diff --git a/fdi/information/10freedesktop/30-keymap-lenovo.fdi b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
index 23fcd28..72e985b 100644
--- a/fdi/information/10freedesktop/30-keymap-lenovo.fdi
+++ b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
@@ -13,6 +13,18 @@
           <append key="input.keymap.data" type="strlist">e018:suspend</append> <!-- Fn+F12 hibernate -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="X60 Tablet">
+          <append key="input.keymap.data" type="strlist">006c:f21</append> <!-- rotate -->
+          <append key="input.keymap.data" type="strlist">0068:screenlock</append> <!-- screenlock -->
+          <append key="input.keymap.data" type="strlist">006b:esc</append> <!-- escape -->
+          <append key="input.keymap.data" type="strlist">006d:right</append> <!-- right on d-pad -->
+          <append key="input.keymap.data" type="strlist">006e:left</append> <!-- left on d-pad -->
+          <append key="input.keymap.data" type="strlist">0071:up</append> <!-- up on d-pad -->
+          <append key="input.keymap.data" type="strlist">006f:down</append> <!-- down on d-pad -->
+          <append key="input.keymap.data" type="strlist">0069:kpenter</append> <!-- enter on d-pad -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
+
       </match>
 
     </match>