hal: Branch 'master'
Danny Kukawka
dkukawka at kemper.freedesktop.org
Tue Aug 28 11:22:13 PDT 2007
fdi/information/10freedesktop/30-keymap-acer.fdi | 205 ----------
fdi/information/10freedesktop/30-keymap-dell.fdi | 26 -
fdi/information/10freedesktop/30-keymap-hp.fdi | 37 -
fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi | 79 ---
4 files changed, 12 insertions(+), 335 deletions(-)
New commits:
diff-tree 7fe452a469d29b55d0378a3d6d7e01563ca804d1 (from b46eda547a87e846d37afa5778052a0e2877c962)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Aug 28 20:21:50 2007 +0200
updated 30-keymap-* files to use the new *_outof directives
Updated 30-keymap-* files to use the new <match> *_outof directives
to reduce the size of the files by consolidate devices of the same
vendor which have the same capabilities/properties into one match.
diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index dc8fcff..e87f8ef 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -9,23 +9,7 @@
<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">
+ <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 -->
<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 -->
@@ -41,151 +25,7 @@
<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="3030">
- <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 3610 and Aspire 3620 are identical -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3610">
- <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 3610 and Aspire 3620 are identical -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3620">
- <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: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">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1690;3020;3030;3040;3610;3620;5020;5030;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 -->
@@ -203,6 +43,7 @@
<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 -->
@@ -257,45 +98,7 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
<!-- TravelMate 5110, TravelMate 5610 and TravelMate 5620 are identical -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5110">
- <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">e059:brightnessdown</append> <!-- Fn+Left Brightness down -->
- <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>
- <!-- TravelMate 5110, TravelMate 5610 and TravelMate 5620 are identical -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5610">
- <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">e059:brightnessdown</append> <!-- Fn+Left Brightness down -->
- <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>
- <!-- TravelMate 5110, TravelMate 5610 and TravelMate 5620 are identical -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="5620">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="5110;5610;5620">
<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 -->
diff --git a/fdi/information/10freedesktop/30-keymap-dell.fdi b/fdi/information/10freedesktop/30-keymap-dell.fdi
index f3bc047..a6d7aa9 100644
--- a/fdi/information/10freedesktop/30-keymap-dell.fdi
+++ b/fdi/information/10freedesktop/30-keymap-dell.fdi
@@ -63,7 +63,8 @@
</match>
</match> <!-- prefix="Latitude" -->
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MP061"> <!-- Dell Inspiron 9400 -->
+ <!-- Dell Inspiron 9400, 640m, E1505/6400 -->
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix_outof="MP061;MXC061;MM061">
<append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
<append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
<append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
@@ -76,18 +77,6 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MXC061"> <!-- Dell Inspiron 640m -->
- <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
- <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
- <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
- <append key="input.keymap.data" type="strlist">e008:wlan</append> <!-- Fn+F2 Toggle WiFi -->
- <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
- <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 hibernate -->
- <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
- <append key="input.keymap.data" type="strlist">e012:media</append> <!-- MediaDirect button (house icon) -->
- <append key="info.capabilities" type="strlist">input.keymap</append>
- </match>
-
<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MXC062"> <!-- Dell XPS M1210 -->
<append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
<append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
@@ -111,17 +100,6 @@
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
</match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="MM061"> <!-- Inspiron E1505/6400 -->
- <append key="input.keymap.data" type="strlist">e005:brightnessdown</append> <!-- Fn+Down arrow Brightness Down -->
- <append key="input.keymap.data" type="strlist">e006:brightnessup</append> <!-- Fn+Up arrow Brightness Up -->
- <append key="input.keymap.data" type="strlist">e007:battery</append> <!-- Fn+F3 battery icon -->
- <append key="input.keymap.data" type="strlist">e008:bluetooth</append> <!-- Fn+F2 bluetooth -->
- <append key="input.keymap.data" type="strlist">e009:ejectclosecd</append> <!-- Fn+F10 Eject CD -->
- <append key="input.keymap.data" type="strlist">e00a:suspend</append> <!-- Fn+F1 Hibernate -->
- <append key="input.keymap.data" type="strlist">e00b:switchvideomode</append> <!-- Fn+F8 CRT/LCD -->
- <append key="input.keymap.data" type="strlist">e012:media</append> <!-- MediaDirect button (house icon) -->
- <append key="info.capabilities" type="strlist">input.keymap</append>
- </match>
</match>
</match>
</device>
diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index e0ad344..e855b1b 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -15,51 +15,20 @@
<append key="input.keymap.data" type="strlist">e057:wlan</append> <!-- Wlan -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6120">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6120;nc6320">
<append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
<append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
<append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6230">
- <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
- <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
- <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
- <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 Lock -->
- <append key="input.keymap.data" type="strlist">e033:f22</append> <!-- FIXME: Auto brightness -->
- <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
- <append key="info.capabilities" type="strlist">input.keymap</append>
- </match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6320">
- <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
- <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
- <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
- <append key="info.capabilities" type="strlist">input.keymap</append>
- </match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nc6400">
- <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
- <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
- <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
- <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
- <append key="info.capabilities" type="strlist">input.keymap</append>
- </match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nw8440">
- <append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
- <append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
- <append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
- <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 Lock -->
- <append key="input.keymap.data" type="strlist">e033:f22</append> <!-- FIXME: Auto brightness -->
- <append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
- <append key="info.capabilities" type="strlist">input.keymap</append>
- </match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx6125">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6400;nx6125">
<append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
<append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
<append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
<append key="input.keymap.data" type="strlist">e059:www</append> <!-- I key -->
<append key="info.capabilities" type="strlist">input.keymap</append>
</match>
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx6325">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nc6230;nw8440;nx6325">
<append key="input.keymap.data" type="strlist">e001:fn_esc</append> <!-- FnEsc -->
<append key="input.keymap.data" type="strlist">e008:tv</append> <!-- SVideo -->
<append key="input.keymap.data" type="strlist">e009:battery</append> <!-- FnF8 (battery) -->
diff --git a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
index 0a7435a..1064cbd 100644
--- a/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
@@ -25,40 +25,6 @@
<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="A2">
- <append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
- <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
- <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
- <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 key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="G40">
- <append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
- <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
- <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
- <append key="input.keymap.data" type="strlist">0x07:radio</append> <!-- Fn+F8 switch radio -->
- <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 key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="R3">
- <append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
- <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
- <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
- <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 key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="R5">
<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 wifi -->
@@ -70,7 +36,7 @@
<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="T3">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains_outof="T3;X2;R3;A2">
<append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
<append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
<append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
@@ -93,18 +59,7 @@
<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="X2">
- <append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
- <append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
- <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
- <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 key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="X3">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains_outof="X3;G40">
<append key="input.keymap.data" type="strlist">0x02:screenlock</append> <!-- Fn+F3 lock -->
<append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
<append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
@@ -129,23 +84,10 @@
<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:screenlock</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">
- <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="X6">
+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains_outof="X6;Z6">
<append key="input.keymap.data" type="strlist">0x01:screenlock</append> <!-- Fn+F2 lock -->
<append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
<append key="input.keymap.data" type="strlist">0x03:sleep</append> <!-- Fn+F4 suspend -->
@@ -194,21 +136,6 @@
<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="Z6">
- <append key="input.keymap.data" type="strlist">0x01:screenlock</append> <!-- Fn+F2 lock -->
- <append key="input.keymap.data" type="strlist">0x02:battery</append> <!-- Fn+F3 battery -->
- <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 wifi -->
- <append key="input.keymap.data" type="strlist">0x06:switchvideomode</append> <!-- Fn+F7 switch video output device -->
- <append key="input.keymap.data" type="strlist">0x07:f22</append> <!-- Fn+F8 touchpad toggle -->
- <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>
</device>
More information about the hal-commit
mailing list