Skip to contentSkip to conversation

Update key codes for Apple aluminium keyboards

PATCH In review Michael Hanselmann 2 participants 4 messages Mar 17, 2008 HID

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Update key codes for Apple aluminium keyboards

After a discussion with the autor of the original patch adding support for Apple's new aluminium keyboards (a45d82d19a6c2a717bcc33cff243199b77fa0082), Michel Dänzer, we decided that some changes should be done.

Please push this patch into 2.6.25 before it's released. Changing the key codes later might confuse users.

---

drivers/hid/hid-input.c +10 -12
@@ -98,18 +98,16 @@ struct hidinput_key_translation {
 
 static struct hidinput_key_translation apple_fn_keys[] = {
 	{ KEY_BACKSPACE, KEY_DELETE },
-	{ KEY_F1,       KEY_BRIGHTNESSDOWN,     APPLE_FLAG_FKEY },
-	{ KEY_F2,       KEY_BRIGHTNESSUP,       APPLE_FLAG_FKEY },
-	{ KEY_F3,       KEY_CYCLEWINDOWS,       APPLE_FLAG_FKEY }, /* Exposé */
-	{ KEY_F4,       KEY_FN_F4,              APPLE_FLAG_FKEY }, /* Dashboard */
-	{ KEY_F5,       KEY_FN_F5 },
-	{ KEY_F6,       KEY_FN_F6 },
-	{ KEY_F7,       KEY_BACK,               APPLE_FLAG_FKEY },
-	{ KEY_F8,       KEY_PLAYPAUSE,          APPLE_FLAG_FKEY },
-	{ KEY_F9,       KEY_FORWARD,            APPLE_FLAG_FKEY },
-	{ KEY_F10,      KEY_MUTE,               APPLE_FLAG_FKEY },
-	{ KEY_F11,      KEY_VOLUMEDOWN,         APPLE_FLAG_FKEY },
-	{ KEY_F12,      KEY_VOLUMEUP,           APPLE_FLAG_FKEY },
+	{ 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_F7,       KEY_PREVIOUSSONG,   APPLE_FLAG_FKEY },
+	{ KEY_F8,       KEY_PLAYPAUSE,      APPLE_FLAG_FKEY },
+	{ KEY_F9,       KEY_NEXTSONG,       APPLE_FLAG_FKEY },
+	{ KEY_F10,      KEY_MUTE,           APPLE_FLAG_FKEY },
+	{ KEY_F11,      KEY_VOLUMEDOWN,     APPLE_FLAG_FKEY },
+	{ KEY_F12,      KEY_VOLUMEUP,       APPLE_FLAG_FKEY },
 	{ KEY_UP,       KEY_PAGEUP },
 	{ KEY_DOWN,     KEY_PAGEDOWN },
 	{ KEY_LEFT,     KEY_HOME },
#1 lore raw
Quoted 4 lines · Michael Hanselmann

After a discussion with the autor of the original patch adding support for Apple's new aluminium keyboards (a45d82d19a6c2a717bcc33cff243199b77fa0082), Michel Dänzer, we decided that some changes should be done.

Could you please describe the changes in more detailed way, explaining why are they needed, so that we have it in changelog properly? Thanks.

Signature · 2 lines
Jiri Kosina
SUSE Labs
#2 lore raw
Quoted 8 lines · Jiri Kosina
Quoted 4 lines · Michael Hanselmann

After a discussion with the autor of the original patch adding support for Apple's new aluminium keyboards (a45d82d19a6c2a717bcc33cff243199b77fa0082), Michel Dänzer, we decided that some changes should be done.

Could you please describe the changes in more detailed way, explaining why are they needed, so that we have it in changelog properly? Thanks.

Sure:

---
F5 and F6 have no second function printed on them. Thus their definitions have been removed from the table.

KEY_CYCLEWINDOWS doesn't name the function of Mac OS X' Exposé properly and because we couldn't find a better key code, we decided to use KEY_FN_F4 instead.

We also changed KEY_BACK and KEY_FORWARD, which apply to browser functions, to KEY_PREVIOUSSONG and KEY_NEXTSONG, since the keys are intended to control a music player.
---

Does this contain enough details?

Thanks,
Michael

#3 lore raw
Quoted 8 lines · Michael Hanselmann

---
F5 and F6 have no second function printed on them. Thus their definitions have been removed from the table.

KEY_CYCLEWINDOWS doesn't name the function of Mac OS X' Exposé properly and because we couldn't find a better key code, we decided to use KEY_FN_F4 instead.

Quoted 5 lines

We also changed KEY_BACK and KEY_FORWARD, which apply to browser functions, to KEY_PREVIOUSSONG and KEY_NEXTSONG, since the keys are intended to control a music player.
---
Does this contain enough details?

It indeed does. I will queue it in my tree, thanks a lot.

Signature · 2 lines
Jiri Kosina
SUSE Labs