hal: Branch 'master'
Richard Hughes
hughsient at kemper.freedesktop.org
Sun Jul 22 21:26:27 EEST 2007
fdi/information/10freedesktop/30-keymap-acer.fdi | 166 ++++++++++++++++++++++-
1 files changed, 163 insertions(+), 3 deletions(-)
New commits:
diff-tree 9d995bcfc0922251d10b291d8998ae9f835ddb40 (from 82031b8600fd4a8ed4fd34b17c3225320bb62f86)
Author: Carlos Corbacho <cathectic at gmail.com>
Date: Sun Jul 22 19:22:10 2007 +0100
add keymap for acer 1360, 1520, 1690, 3020, 3030, 3040, 5030, 5040
The following patch adds support for the following Acer laptops to the
keyboard quirks:
Aspire: 1360, 1520, 1690, 3020, 3030, 3040, 5030, 5040
Ferrari: 4000
As per my discussion on the HAL mailing list with Richard Hughes, Fn+F3 (Power
Management) is remapped to KEY_BATTERY, and the extra Euro and Dollar keys
are left mapped to F14 and F15, but marked FIXME (pending a better solution
upstream).
-Carlos
(Small informative aside - many of Acer's models are identical versions of the
same hardware, just with a different processor. e.g. the 3020 and 5020 are
the same hardware, except with an AMD Sempron and Turion processor,
respectively).
1360 == 1520 (Odd, but the manual confirms this)
3020 == 5020
3030 == 5030
3040 == 5040
diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index 1474bc4..1fbb329 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -8,13 +8,173 @@
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Acer">
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Aspire">
+ <!-- Aspire 1360 and Aspire 1520 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="1360">
+ <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">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">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</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>
+ <!-- Aspire 1360 and Aspire 1520 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="1520">
+ <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">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">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</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>
+ <!-- Aspire 1690 taken from hotkey-setup -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="1690">
+ <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:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME 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">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</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>
+ <!-- Aspire 3020 and Aspire 5020 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3020">
+ <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:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME 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">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</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>
+ <!-- Aspire 3030 and Aspire 5030 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3020">
+ <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:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME 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">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</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>
+ <!-- Aspire 3040 and Aspire 5040 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3040">
+ <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:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME 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">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</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>
+ <!-- Aspire 3020 and Aspire 5020 are identical -->
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5020">
<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:power2</append> <!-- Fn+F3 Power Management -->
+ <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:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME 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">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</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>
+ <!-- Aspire 3030 and Aspire 5030 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5030">
+ <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:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME 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">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</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>
+ <!-- Aspire 3040 and Aspire 5040 are identical -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5040">
+ <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:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME 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">e071:f22</append> <!-- Fn+F7 Touchpad toggle (off-to-on) -->
+ <append key="input.keymap.data" type="strlist">e072:f22</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">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="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 -->
<append key="input.keymap.data" type="strlist">e029:switchvideomode</append> <!-- Fn+F5 Display toggle -->
- <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- Euro sign -->
- <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- Dollar sign -->
+ <append key="input.keymap.data" type="strlist">e033:f14</append> <!-- FIXME Euro symbol -->
+ <append key="input.keymap.data" type="strlist">e034:f15</append> <!-- FIXME 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 -->
More information about the hal-commit
mailing list