summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martinpitt@gnome.org>2013-05-24 08:35:47 +0200
committerMartin Pitt <martinpitt@gnome.org>2013-05-24 08:35:47 +0200
commit98627dced719f047e9e47af1f855d9c032e548f9 (patch)
treefdd6495d3d686eca20bac03bf484d82285f0be4f
parent9b3848f2e2dc737bd6e7df1c765821d227d3f22f (diff)
keymap: Add Logitech USB (iTouch)
https://launchpad.net/bugs/1152377
-rw-r--r--Makefile.am1
-rw-r--r--keymaps/logitech-usb6
-rw-r--r--src/udev/keymap/95-keymap.rules1
3 files changed, 8 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index b278143af..e63563f87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2505,6 +2505,7 @@ dist_udevkeymap_DATA = \
keymaps/lenovo-thinkpad_x6_tablet \
keymaps/lenovo-thinkpad_x200_tablet \
keymaps/lg-x110 \
+ keymaps/logitech-usb \
keymaps/logitech-wave \
keymaps/logitech-wave-cordless \
keymaps/logitech-wave-pro-cordless \
diff --git a/keymaps/logitech-usb b/keymaps/logitech-usb
new file mode 100644
index 000000000..728f0e02b
--- /dev/null
+++ b/keymaps/logitech-usb
@@ -0,0 +1,6 @@
+0x90001 shop # Shopping
+0x90002 config # iTouch
+0x90003 finance # Finance
+0x90004 prog1 # My Sites
+0x90005 prog2 # Community
+0xC0183 media # Media
diff --git a/src/udev/keymap/95-keymap.rules b/src/udev/keymap/95-keymap.rules
index df1bffefd..994950cba 100644
--- a/src/udev/keymap/95-keymap.rules
+++ b/src/udev/keymap/95-keymap.rules
@@ -23,6 +23,7 @@ LABEL="keyboard_usbcheck"
ENV{ID_VENDOR}=="Genius", ENV{ID_MODEL_ID}=="0708", ENV{ID_USB_INTERFACE_NUM}=="01", RUN+="keymap $name genius-slimstar-320"
ENV{ID_VENDOR}=="Logitech*", ATTRS{name}=="Logitech USB Multimedia Keyboard", RUN+="keymap $name logitech-wave"
ENV{ID_VENDOR}=="Logitech*", ATTRS{name}=="Logitech USB Receiver", RUN+="keymap $name logitech-wave-cordless"
+ENV{ID_VENDOR}=="Logitech*", ATTRS{name}=="* Logitech USB Keyboard*", RUN+="keymap $name logitech-usb"
# Logitech Cordless Wave Pro looks slightly weird; some hotkeys are coming through the mouse interface
ENV{ID_VENDOR_ID}=="046d", ENV{ID_MODEL_ID}=="c52[9b]", ATTRS{name}=="Logitech USB Receiver", RUN+="keymap $name logitech-wave-pro-cordless"