[Pommed-commits] [SCM] pommed - hotkeys handler for Apple laptops branch, master, updated. 1.25-5-g4436f94

[Julien BLACHE]

The following commit has been merged in the master branch:
commit 4436f94efec791ef8416601e60d98b154ab3f83b
Author: Julien BLACHE <jb at jblache.org>
Date:   Thu Mar 5 09:56:53 2009 +0100

    Add USB IDs for the Apple external aluminium mini keyboard
    
    Released in march 2009, model number A1242.

diff --git a/ChangeLog b/ChangeLog
index ddb42b2..73ef169 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ ChangeLog for pommed
 version 1.26:
 	- pommed: only keystrokes on the built-in keyboard should reset
 	the keyboard idle timer.
+	- pommed: add USB IDs for the Apple external aluminium mini keyboard.
 
 version 1.25:
 	- pommed: check current hardware backlight level before setting AC
diff --git a/pommed/evdev.c b/pommed/evdev.c
index a8ca30c..4675e0e 100644
--- a/pommed/evdev.c
+++ b/pommed/evdev.c
@@ -688,6 +688,32 @@ evdev_is_extkbd_white(unsigned short *id)
   return 0;
 }
 
+/* Apple external USB mini keyboard, aluminium */
+static int
+evdev_is_extkbd_mini_alu(unsigned short *id)
+{
+  unsigned short product = id[ID_PRODUCT];
+
+  if (id[ID_BUS] != BUS_USB)
+    return 0;
+
+  if (id[ID_VENDOR] != USB_VENDOR_ID_APPLE)
+    return 0;
+
+  if ((product == USB_PRODUCT_ID_APPLE_EXTKBD_MINI_ALU_ANSI)
+      || (product == USB_PRODUCT_ID_APPLE_EXTKBD_MINI_ALU_ISO)
+      || (product == USB_PRODUCT_ID_APPLE_EXTKBD_MINI_ALU_JIS))
+    {
+      logdebug(" -> External Apple USB mini keyboard (aluminium)\n");
+
+      kbd_set_fnmode();
+
+      return 1;
+    }
+
+  return 0;
+}
+
 /* Apple external USB keyboard, aluminium */
 static int
 evdev_is_extkbd_alu(unsigned short *id)
@@ -745,6 +771,7 @@ static int
 evdev_is_extkbd(unsigned short *id)
 {
   return (evdev_is_extkbd_white(id)
+	  || evdev_is_extkbd_mini_alu(id)
 	  || evdev_is_extkbd_alu(id)
 	  || evdev_is_extkbd_alu_wl(id));
 }
diff --git a/pommed/evdev.h b/pommed/evdev.h
index 295dc8f..38094f0 100644
--- a/pommed/evdev.h
+++ b/pommed/evdev.h
@@ -66,6 +66,11 @@
 /* Apple external USB keyboard, white */
 #define USB_PRODUCT_ID_APPLE_EXTKBD_WHITE   0x020c
 
+/* Apple external USB mini keyboard, aluminium */
+#define USB_PRODUCT_ID_APPLE_EXTKBD_MINI_ALU_ANSI 0x021d
+#define USB_PRODUCT_ID_APPLE_EXTKBD_MINI_ALU_ISO  0x021e
+#define USB_PRODUCT_ID_APPLE_EXTKBD_MINI_ALU_JIS  0x021f
+
 /* Apple external USB keyboard, aluminium */
 #define USB_PRODUCT_ID_APPLE_EXTKBD_ALU_ANSI 0x0220
 #define USB_PRODUCT_ID_APPLE_EXTKBD_ALU_ISO  0x0221

-- 
pommed - hotkeys handler for Apple laptops