hal: Branch 'master' - 2 commits
Danny Kukawka
dkukawka at kemper.freedesktop.org
Mon Nov 19 04:03:10 PST 2007
fdi/information/10freedesktop/30-keymap-acer.fdi | 36 ++++++++++++++++++++---
1 file changed, 32 insertions(+), 4 deletions(-)
New commits:
commit 98dc95eb054c2609d1344a1053ea2b3dab1a4f7b
Author: Carlos Corbacho <carlos at strangeworlds.co.uk>
Date: Mon Nov 19 13:02:58 2007 +0100
add Aspire 1510 keymap support
Add support for the Aspire 1510 - this is a new type (for HAL) layout -
these are laptops that are pre mid-2004 and do not use the 'folio' or
later Acer laptop designs (such as 'gemstone').
diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index c049cb6..09eb94f 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -8,6 +8,15 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Acer">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Aspire">
+ <!-- Laptops without extra Euro and Dollar keys, pre mid-2004 & pre 'folio' design -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1510">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P2" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "P1" programmable button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
<!-- Laptops without extra Euro and Dollar keys -->
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1360;1520">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
commit 46d98d635bb05d2e480feb7b01340eea90295f1b
Author: Carlos Corbacho <carlos at strangeworlds.co.uk>
Date: Mon Nov 19 13:02:12 2007 +0100
add more Aspire, Extensa and TravelMate laptops
Keymap: Acer: Add more Aspire, Extensa and TravelMate laptops
Add keymaps for the following Acer laptop series:
Aspire
* 1410, 1640, 1680, 3100, 5100, 7110, 9110, 9410, 9420
Extensa
* 4100
TravelMate
* 2300, 2400, 3200, 3210, 3220, 4000
diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 4069c5e..c049cb6 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -25,7 +25,7 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<!-- Laptops with extra Euro and Dollar keys -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="3020;3030;3040;3610;3620;5020;5030;5040">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="3020;3030;3040;3610;3620;5020;5030;5040;7110;9410;9420">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
<append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
<append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
@@ -43,7 +43,7 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 1) -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1690;3050;5050">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1410;1640;1680;1690;3050;5050">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
<append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
<append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
@@ -62,7 +62,7 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 2) -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5650">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3100;5100;5650;9110">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
<append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
<append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
@@ -100,6 +100,25 @@
<append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
+ <!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 1) -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="4100">
+ <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
+ <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
+ <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
+ <append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
+ <append key="input.keymap.data" type="strlist">e033:euro</append> <!-- Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:dollar</append> <!-- Dollar symbol -->
+ <append key="input.keymap.data" type="strlist">e055:wlan</append> <!-- Wireless (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e056:wlan</append> <!-- Wireless (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e057:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+ <append key="input.keymap.data" type="strlist">e058:bluetooth</append> <!-- Bluetooth (toggle) off-to-on -->
+ <append key="input.keymap.data" type="strlist">e06e:brightnessup</append> <!-- Fn+Right Brightness Up -->
+ <append key="input.keymap.data" type="strlist">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f23</append> <!-- Fn+F7 Touchpad toggle (on-to-off) -->
+ <append key="input.keymap.data" type="strlist">e073:prog2</append> <!-- "P" programmable button -->
+ <append key="input.keymap.data" type="strlist">e074:prog1</append> <!-- "e" Acer eManager button -->
+ <append key="info.capabilities" type="strlist">input.keymap</append>
+ </match>
</match>
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Ferrari">
<!-- Laptops with extra Euro and Dollar keys -->
@@ -149,7 +168,7 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 1) -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="2480;3260">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="2300;2400;2480;3200;3210;3220;3260;4000">
<append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
<append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
<append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->
More information about the hal-commit
mailing list