Commit 437184ae authored by Henrik Rydberg's avatar Henrik Rydberg Committed by Jiri Kosina
Browse files

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: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarHenrik Rydberg <rydberg@euromail.se>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent a96d6ef3

drivers/hid/hid-apple.c

+3 −2
Original line number Diff line number Diff line
@@ -55,10 +55,11 @@ struct apple_key_translation { 


static struct apple_key_translation apple_fn_keys[] = {

	{ KEY_BACKSPACE, KEY_DELETE },

	{ KEY_ENTER,	KEY_INSERT },

	{ KEY_F1,	KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY },

	{ KEY_F2,	KEY_BRIGHTNESSUP,   APPLE_FLAG_FKEY },

	{ KEY_F3,	KEY_FN_F5,          APPLE_FLAG_FKEY }, /* Exposé */

	{ KEY_F4,	KEY_FN_F4,          APPLE_FLAG_FKEY }, /* Dashboard */

	{ KEY_F3,	KEY_SCALE,          APPLE_FLAG_FKEY },

	{ KEY_F4,	KEY_DASHBOARD,      APPLE_FLAG_FKEY },

	{ KEY_F5,	KEY_KBDILLUMDOWN,   APPLE_FLAG_FKEY },

	{ KEY_F6,	KEY_KBDILLUMUP,     APPLE_FLAG_FKEY },

	{ KEY_F7,	KEY_PREVIOUSSONG,   APPLE_FLAG_FKEY },

include/linux/input.h

+2 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ struct input_absinfo { 
#define KEY_KPEQUAL		117

#define KEY_KPPLUSMINUS		118

#define KEY_PAUSE		119

#define KEY_SCALE		120	/* AL Compiz Scale (Expose) */



#define KEY_KPCOMMA		121

#define KEY_HANGEUL		122
@@ -322,6 +323,7 @@ struct input_absinfo { 
#define KEY_PAUSECD		201

#define KEY_PROG3		202

#define KEY_PROG4		203

#define KEY_DASHBOARD		204	/* AL Dashboard */

#define KEY_SUSPEND		205

#define KEY_CLOSE		206	/* AC Close */

#define KEY_PLAY		207

CRA Git | Maintained and supported by SUSTech CRA and CCSE