[PATCH] input: Map missing keys to appropriate functions

[PATCH] input: Map missing keys to appropriate functions

[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 <rydberg@euromail.se>
---
 drivers/hid/hid-apple.c |    5 +++--
 include/linux/input.h   |    2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index c6ab4ba..b25d90c 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -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 },
diff --git a/include/linux/input.h b/include/linux/input.h
index b86fb55..5341e82 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -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
-- 
1.5.6.3

Re: [PATCH] input: Map missing keys to appropriate functions

[Jiri Kosina]

On Tue, 4 Nov 2008, Henrik Rydberg wrote:

> 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 <rydberg@euromail.se>
> ---
>  drivers/hid/hid-apple.c |    5 +++--
>  include/linux/input.h   |    2 ++
[ ... ]
> diff --git a/include/linux/input.h b/include/linux/input.h
> index b86fb55..5341e82 100644
> --- a/include/linux/input.h
> +++ b/include/linux/input.h
> @@ -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

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

-- 
Jiri Kosina
SUSE Labs

Re: [PATCH] input: Map missing keys to appropriate functions

[Dmitry Torokhov]

On Tue, Nov 11, 2008 at 06:27:42PM +0100, Jiri Kosina wrote:
> On Tue, 4 Nov 2008, Henrik Rydberg wrote:
> 
> > 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 <rydberg@euromail.se>
> > ---
> >  drivers/hid/hid-apple.c |    5 +++--
> >  include/linux/input.h   |    2 ++
> [ ... ]
> > diff --git a/include/linux/input.h b/include/linux/input.h
> > index b86fb55..5341e82 100644
> > --- a/include/linux/input.h
> > +++ b/include/linux/input.h
> > @@ -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
> 
> 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.

-- 
Dmitry

Re: [PATCH] input: Map missing keys to appropriate functions

[Jiri Kosina]

On Tue, 11 Nov 2008, Dmitry Torokhov wrote:

> > 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.

-- 
Jiri Kosina
SUSE Labs