1
0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00

extras/keymap: Rename KEY_COFFEE to KEY_SCREENLOCK

Unfortunately KEY_COFFEE is the canonical name in linux/input.h, and the more
sensible KEY_SCREENLOCK is an alias. Manually override this particular case,
since it's better to have "screenlock" in keymaps.

However, we still keep the automatic filtering for the general case, to avoid
introducing this problem again when input.h changes.
This commit is contained in:
Martin Pitt 2009-09-09 15:22:48 +02:00
parent 6983c0d0f2
commit 7f06ec2e19
10 changed files with 10 additions and 10 deletions

View File

@ -528,7 +528,7 @@ dist_udevkeymap_DATA = \
extras/keymap/keymaps/zepto-znote
extras/keymap/keys.txt: /usr/include/linux/input.h
$(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[[:space:]]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< > $@
$(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[[:space:]]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt
$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@

View File

@ -2,4 +2,4 @@
0x68 up
0x69 down
0x6B fn
0x6C coffee # FIXME: lock tablet device/buttons
0x6C screenlock # FIXME: lock tablet device/buttons

View File

@ -23,5 +23,5 @@
0x9B switchvideomode # Display Toggle button
0xA2 playpause # Front panel play/pause
0xA4 stopcd # Front panel stop
0xD8 coffee # FIXME: Tablet lock button
0xD8 screenlock # FIXME: Tablet lock button
0xED media # MediaDirect button

View File

@ -1,6 +1,6 @@
0x81 fn_esc
0x89 battery # FnF8
0x8A coffee # FnF6
0x8A screenlock # FnF6
0x8B camera
0x8C media # music
0x8E dvd

View File

@ -1,3 +1,3 @@
0xF0 help
0xF1 coffee
0xF1 screenlock
0xF3 search

View File

@ -1,6 +1,6 @@
0x5D menu
0x63 fn
0x66 coffee
0x66 screenlock
0x67 cyclewindows # bezel circular arrow
0x68 setup # bezel setup / menu
0x6c direction # rotate screen

View File

@ -1,5 +1,5 @@
0x6C f21 # rotate
0x68 coffee # screenlock
0x68 screenlock # screenlock
0x6B esc # escape
0x6D right # right on d-pad
0x6E left # left on d-pad

View File

@ -1,5 +1,5 @@
0x01 battery # Fn+F2
0x02 coffee # Fn+F3
0x02 screenlock # Fn+F3
0x03 sleep # Fn+F4
0x04 wlan # Fn+F5
0x06 switchvideomode # Fn+F7

View File

@ -1,4 +1,4 @@
0x1 coffee # Fn+F2
0x1 screenlock # Fn+F2
0x2 battery # Fn+F3
0x3 sleep # Fn+F4
0x4 wlan # Fn+F5

View File

@ -5,6 +5,6 @@
0x9F f21 # FIXME: Touchpad off
0xB9 nextsong
0xD9 brightnessup
0xEE coffee
0xEE screenlock
0xF4 previoussong
0xF7 playpause