extras/keymap: Make touchpad buttons consistent

We'll need to standardise on the Touchpad related keys in udev, kernel, and
X.org. I selected F21 for XF86TouchpadToggle, F22 for XF86TouchpadOn and F23
for XF86TouchpadOff.

See:
https://bugs.freedesktop.org/show_bug.cgi?id=31333

Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
This commit is contained in:
Bastien Nocera 2010-11-04 23:58:56 +00:00 committed by Martin Pitt
parent ecfad20871
commit a1ca5f60e0
16 changed files with 23 additions and 23 deletions

View file

@ -14,7 +14,7 @@
0xEE brightnessup # Fn+Right
0xEF brightnessdown # Fn+Left
0xF1 f22 # Fn+F7 Touchpad toggle (off-to-on)
0xF2 f22 # Fn+F7 Touchpad toggle (on-to-off)
0xF2 f23 # Fn+F7 Touchpad toggle (on-to-off)
0xF3 prog2 # "P2" programmable button
0xF4 prog1 # "P1" programmable button
0xF5 presentation

View file

@ -21,9 +21,9 @@
0x99 nextsong # Front panel next song
0x9A setup # Tablet tools button
0x9B switchvideomode # Display Toggle button
0x9E f22 #touchpad toggle
0x9E f21 #touchpad toggle
0xA2 playpause # Front panel play/pause
0xA4 stopcd # Front panel stop
0xED media # MediaDirect button
0xD8 screenlock # FIXME: Tablet lock button
0xD9 f22 # touchpad toggle
0xD9 f21 # touchpad toggle

View file

@ -1,5 +1,5 @@
0x5C media
0x65 f22 # Fn+F5 Touchpad toggle
0x65 f21 # Fn+F5 Touchpad toggle
0x67 prog3 # Fan Speed Control button
0x6F brightnessup
0x7F brightnessdown

View file

@ -1,2 +1,2 @@
0xD8 f22 # touchpad off
0xD9 f23 # touchpad on
0xD8 f23 # touchpad off
0xD9 f22 # touchpad on

View file

@ -1,3 +1,3 @@
0x88 media # FIXME: quick play
0xD8 f22 # touchpad off
0xD9 f23 # touchpad on
0xD8 f23 # touchpad off
0xD9 f22 # touchpad on

View file

@ -1,3 +1,3 @@
0xC2 media
0xD8 f22 # Toggle touchpad button on tx2 (OFF)
0xD8 f23 # Toggle touchpad button on tx2 (OFF)
0xD9 f22 # Toggle touchpad button on tx2 (ON)

View file

@ -2,7 +2,7 @@
0x90013 battery # Fn+F3
0x90014 wlan # Fn+F5
0x90016 switchvideomode # Fn+F7
0x90017 f22 # Fn+F8 touchpadtoggle
0x90017 f21 # Fn+F8 touchpadtoggle
0x90019 suspend # Fn+F12
0x9001A brightnessup # Fn+Home
0x9001B brightnessdown # Fn+End

View file

@ -6,7 +6,7 @@
0xB3 suspend # Fn-F12
0xDF sleep # Fn-F4
# 0xE2 bluetooth # satellite dish2
0xE4 f22 # Fn-F5 Touchpad disable
0xE4 f21 # Fn-F5 Touchpad disable
0xF6 wlan # Fn-F6
0xF7 reserved # brightnessdown # Fn-Down
0xF8 reserved # brightnessup # Fn-Up
0xF8 reserved # brightnessup # Fn-Up

View file

@ -4,7 +4,7 @@
0xB2 www # e button
0xDF sleep # Fn-F12
0xE2 bluetooth # satellite dish2
0xE4 f22 # Fn-F3 Touchpad disable
0xE4 f21 # Fn-F3 Touchpad disable
0xEC email # envelope button
0xEE camera # Fn-F6 camera disable
0xF6 wlan # satellite dish1

View file

@ -3,7 +3,7 @@
0x3 sleep # Fn+F4
0x4 wlan # Fn+F5
0x6 switchvideomode # Fn+F7
0x7 f22 # Fn+F8 touchpadtoggle
0x7 f21 # Fn+F8 touchpadtoggle
0x8 f24 # Fn+F9 undock
0xB suspend # Fn+F12
0xF brightnessup # Fn+Home

View file

@ -8,7 +8,7 @@
0xF0 media # Fn+R
0xF5 switchvideomode # Fn+E
0xF6 camera # Fn+T
0xF7 f22 # Fn+Y (touchpad toggle)
0xF7 f21 # Fn+Y (touchpad toggle)
0xF8 brightnessup # Fn+S
0xF9 brightnessdown # Fn+A
0xFB wlan # Fn+J

View file

@ -11,4 +11,4 @@
0xB3 prog3 # Fn+F8 switch power mode (battery/dynamic/performance)
0xB4 wlan # Fn+F9 (X60P)
0xF7 f22 # Fn+F10 Touchpad on
0xF9 f22 # Fn+F10 Touchpad off
0xF9 f23 # Fn+F10 Touchpad off

View file

@ -1,4 +1,4 @@
0x74 mute
0x75 mute
0x77 f21 # FIXME: Touchpad on
0x79 f21 # FIXME: Touchpad off
0x77 f22 # Touchpad on
0x79 f23 # Touchpad off

View file

@ -1,8 +1,8 @@
0x92 stop
0x93 www
0x94 media
0x9E f21 # FIXME: Touchpad on
0x9F f21 # FIXME: Touchpad off
0x9E f22 # Touchpad on
0x9F f23 # Touchpad off
0xB9 nextsong
0xD9 brightnessup
0xEE screenlock

View file

@ -2,6 +2,6 @@
0xd9 brightnessup
0xee screenlock
0x93 media
0x9e prog1 #touchpad_enable
0x9f prog2 #touchpad_disable
0x9e f22 #touchpad_enable
0x9f f23 #touchpad_disable

View file

@ -1,7 +1,7 @@
0x93 switchvideomode # Fn+F3 Toggle Video Output
0x95 brightnessdown # Fn+F4 Brightness Down
0x91 brightnessup # Fn+F5 Brightness Up
0xA5 f22 # Fn+F6 Disable Touchpad
0xA5 f23 # Fn+F6 Disable Touchpad
0xA6 f22 # Fn+F6 Enable Touchpad
0xA7 bluetooth # Fn+F10 Enable Bluetooth
0XA9 bluetooth # Fn+F10 Disable Bluetooth