Skip to contentSkip to conversation

input: Map missing keys to appropriate functions

PATCH In review Henrik Rydberg 3 participants 4 messages Nov 4, 2008 – Nov 11, 2008

Subsystems (2)
HID Input drivers
lore
Share & tools
lore

Henrik Rydberg

author
#0 lore raw

PATCH 1/1 input: Map missing keys to appropriate functions

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.

Signed-off-by Henrik Rydberg <[email protected]>
---
 drivers/hid/hid-apple.c |    5 +++--
 include/linux/input.h   |    2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/hid/hid-apple.c +3 -2
index c6ab4ba..b25d90c 100644
@@ -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
index b86fb55..5341e82 100644
@@ -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
Signature · 6 lines
1.5.6.3

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#1 lore raw
Quoted 7 lines · Henrik Rydberg

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.

Signed-off-by Henrik Rydberg <[email protected]>
---
 drivers/hid/hid-apple.c |    5 +++--
 include/linux/input.h   |    2 ++

[ ... ]

Quoted 13 lines
include/linux/input.h +1 -0
index b86fb55..5341e82 100644
@@ -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

include/linux/input.h struct input_absinfo { · line 329

Quoted 7 lines
include/linux/input.h +1 -0
@@ -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

Dmitry, could you please Ack this? Is it OK if I take it through my tree, together with the hid-apple mapping update? Thanks.

Signature · 2 lines
Jiri Kosina
SUSE Labs
maintainer
#2 lore raw
Quoted 20 lines · Jiri Kosina
Quoted 7 lines · Henrik Rydberg

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.

Signed-off-by Henrik Rydberg <[email protected]>
---
 drivers/hid/hid-apple.c |    5 +++--
 include/linux/input.h   |    2 ++

[ ... ]

Quoted 10 lines
include/linux/input.h +1 -0
index b86fb55..5341e82 100644
@@ -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) */
Quoted 14 lines

include/linux/input.h struct input_absinfo { · line 329

Quoted 10 lines
include/linux/input.h +1 -0
 #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

Dmitry, could you please Ack this? Is it OK if I take it through my tree, together with the hid-apple mapping update? Thanks.

Sorry, running a bit behind... Yep, please take these through your tree.

Signature · 1 line
Dmitry
#3 lore raw
Quoted 4 lines · Dmitry Torokhov
Quoted 2 lines

Dmitry, could you please Ack this? Is it OK if I take it through my tree, together with the hid-apple mapping update? Thanks.

Sorry, running a bit behind... Yep, please take these through your tree.

Thanks a lot, applied to my tree.

Signature · 2 lines
Jiri Kosina
SUSE Labs