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.

diff --git a/Makefile.am b/Makefile.am
index 9f8ca8c3ae429a600c5298a40dbc39d402cb5a77..5a6bc80adb18c6cacb9cc0ce996d76b34f454585 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 }' < $< > $@

diff --git a/extras/keymap/keymaps/acer-travelmate_c300 b/extras/keymap/keymaps/acer-travelmate_c300
index 790332a8a56a0c53164337e3ef56e10f24fc1e65..bfef4cf868cbcf6f9f653017b991a2c202b5a5ec 100644 (file)
--- a/extras/keymap/keymaps/acer-travelmate_c300
+++ b/extras/keymap/keymaps/acer-travelmate_c300
@@ -2,4 +2,4 @@
 0x68 up
 0x69 down
 0x6B fn
-0x6C coffee # FIXME: lock tablet device/buttons
+0x6C screenlock # FIXME: lock tablet device/buttons

diff --git a/extras/keymap/keymaps/dell b/extras/keymap/keymaps/dell
index 917ea982eabdbd006c15b33910a9133bc134ae39..5ff44d6b38367dfab872e276ff70f84d97796d60 100644 (file)
--- a/extras/keymap/keymaps/dell
+++ b/extras/keymap/keymaps/dell
@@ -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

diff --git a/extras/keymap/keymaps/hewlett-packard b/extras/keymap/keymaps/hewlett-packard
index 76178f2697ec4b495c8a7353a84c9716d1cb8692..4461fa2ce5750da10ab0e0ba9cde9dea435aea02 100644 (file)
--- a/extras/keymap/keymaps/hewlett-packard
+++ b/extras/keymap/keymaps/hewlett-packard
@@ -1,6 +1,6 @@
 0x81 fn_esc
 0x89 battery # FnF8
-0x8A coffee # FnF6
+0x8A screenlock # FnF6
 0x8B camera
 0x8C media # music
 0x8E dvd

diff --git a/extras/keymap/keymaps/hewlett-packard-presario-2100 b/extras/keymap/keymaps/hewlett-packard-presario-2100
index f274cfdae499299e3f15acdcc8f0890e5aef13ba..1df39dcbd23ab804f180422848ff8f507e9147d8 100644 (file)
--- a/extras/keymap/keymaps/hewlett-packard-presario-2100
+++ b/extras/keymap/keymaps/hewlett-packard-presario-2100
@@ -1,3 +1,3 @@
 0xF0 help
-0xF1 coffee
+0xF1 screenlock
 0xF3 search

diff --git a/extras/keymap/keymaps/lenovo-thinkpad_x200_tablet b/extras/keymap/keymaps/lenovo-thinkpad_x200_tablet
index f15e9cc947e41a61a82e87b40b58a8679ac77862..31ea3b2c7030aa9df95ec1fb22e60a1cceca8e2e 100644 (file)
--- a/extras/keymap/keymaps/lenovo-thinkpad_x200_tablet
+++ b/extras/keymap/keymaps/lenovo-thinkpad_x200_tablet
@@ -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

diff --git a/extras/keymap/keymaps/lenovo-thinkpad_x6_tablet b/extras/keymap/keymaps/lenovo-thinkpad_x6_tablet
index 25fc84280887472fe75fbc242fda680ddb01a8cc..6fd16b5662960925bbb0cd6106137c128993422d 100644 (file)
--- a/extras/keymap/keymaps/lenovo-thinkpad_x6_tablet
+++ b/extras/keymap/keymaps/lenovo-thinkpad_x6_tablet
@@ -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

diff --git a/extras/keymap/keymaps/module-ibm b/extras/keymap/keymaps/module-ibm
index 7afe6fa50a4cf147fc9fc4d4474b41b605d44c4a..a92dfa2506ce8e725117536d544daa1ba3a007e9 100644 (file)
--- a/extras/keymap/keymaps/module-ibm
+++ b/extras/keymap/keymaps/module-ibm
@@ -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

diff --git a/extras/keymap/keymaps/module-lenovo b/extras/keymap/keymaps/module-lenovo
index 82be94f372ff5de1bfe7371a90cde02c4123a99e..7c597bd8515589bc6687eb5e43e94cc9e92f7f82 100644 (file)
--- a/extras/keymap/keymaps/module-lenovo
+++ b/extras/keymap/keymaps/module-lenovo
@@ -1,4 +1,4 @@
-0x1 coffee # Fn+F2
+0x1 screenlock # Fn+F2
 0x2 battery # Fn+F3
 0x3 sleep # Fn+F4
 0x4 wlan # Fn+F5

diff --git a/extras/keymap/keymaps/toshiba-satellite_a110 b/extras/keymap/keymaps/toshiba-satellite_a110
index 5561e4a3af8005a414230465fe444b4d98c3744f..0f2aaec4207480db1543fe0c197593abc419a39c 100644 (file)
--- a/extras/keymap/keymaps/toshiba-satellite_a110
+++ b/extras/keymap/keymaps/toshiba-satellite_a110
@@ -5,6 +5,6 @@
 0x9F f21 # FIXME: Touchpad off
 0xB9 nextsong
 0xD9 brightnessup
-0xEE coffee
+0xEE screenlock
 0xF4 previoussong
 0xF7 playpause