Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
HID: map macbook keys for "Expose" and "Dashboard"
On macbooks there are specific keys for the user-space functions Expose
and Dashboard, which currently has no counterpart in input.h. This patch
adds KEY_SCALE and KEY_DASHBOARD, and maps the keyboard accordingly.
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
authored by Henrik Rydberg and committed by Jiri Kosina 437184ae a96d6ef3
+3
-2
drivers/hid/hid-apple.c
+3
-2
drivers/hid/hid-apple.c
···
55
56
static struct apple_key_translation apple_fn_keys[] = {
57
{ KEY_BACKSPACE, KEY_DELETE },
58
{ KEY_F1, KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY },
59
{ KEY_F2, KEY_BRIGHTNESSUP, APPLE_FLAG_FKEY },
60
-
{ KEY_F3, KEY_FN_F5, APPLE_FLAG_FKEY }, /* Exposé */
61
-
{ KEY_F4, KEY_FN_F4, APPLE_FLAG_FKEY }, /* Dashboard */
62
{ KEY_F5, KEY_KBDILLUMDOWN, APPLE_FLAG_FKEY },
63
{ KEY_F6, KEY_KBDILLUMUP, APPLE_FLAG_FKEY },
64
{ KEY_F7, KEY_PREVIOUSSONG, APPLE_FLAG_FKEY },
···
55
56
static struct apple_key_translation apple_fn_keys[] = {
57
{ KEY_BACKSPACE, KEY_DELETE },
58
+
{ KEY_ENTER, KEY_INSERT },
59
{ KEY_F1, KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY },
60
{ KEY_F2, KEY_BRIGHTNESSUP, APPLE_FLAG_FKEY },
61
+
{ KEY_F3, KEY_SCALE, APPLE_FLAG_FKEY },
62
+
{ KEY_F4, KEY_DASHBOARD, APPLE_FLAG_FKEY },
63
{ KEY_F5, KEY_KBDILLUMDOWN, APPLE_FLAG_FKEY },
64
{ KEY_F6, KEY_KBDILLUMUP, APPLE_FLAG_FKEY },
65
{ KEY_F7, KEY_PREVIOUSSONG, APPLE_FLAG_FKEY },
+2
include/linux/input.h
+2
include/linux/input.h
···
238
#define KEY_KPEQUAL 117
239
#define KEY_KPPLUSMINUS 118
240
#define KEY_PAUSE 119
241
242
#define KEY_KPCOMMA 121
243
#define KEY_HANGEUL 122
···
323
#define KEY_PAUSECD 201
324
#define KEY_PROG3 202
325
#define KEY_PROG4 203
326
#define KEY_SUSPEND 205
327
#define KEY_CLOSE 206 /* AC Close */
328
#define KEY_PLAY 207
···
238
#define KEY_KPEQUAL 117
239
#define KEY_KPPLUSMINUS 118
240
#define KEY_PAUSE 119
241
+
#define KEY_SCALE 120 /* AL Compiz Scale (Expose) */
242
243
#define KEY_KPCOMMA 121
244
#define KEY_HANGEUL 122
···
322
#define KEY_PAUSECD 201
323
#define KEY_PROG3 202
324
#define KEY_PROG4 203
325
+
#define KEY_DASHBOARD 204 /* AL Dashboard */
326
#define KEY_SUSPEND 205
327
#define KEY_CLOSE 206 /* AC Close */
328
#define KEY_PLAY 207