[Pommed-commits] [SCM] pommed - hotkeys handler for Apple laptops branch, master, updated. 1.30-3-gf925b6b

[Julien BLACHE]

The following commit has been merged in the master branch:
commit f925b6b4748fa25b09635ba0563e18fdd48abcda
Author: Julien BLACHE <jb at jblache.org>
Date:   Wed Jan 6 17:58:22 2010 +0100

    Add IDs for newer wireless keyboard

diff --git a/ChangeLog b/ChangeLog
index 501087e..7d38ced 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ ChangeLog for pommed
 --------------------
 
 version 1.31:
+	- pommed: add IDs for newer wireless keyboard.
 
 version 1.30:
 	- pommed: fix a crasher in the i2c probe routine on pmac.
diff --git a/pommed/evdev.c b/pommed/evdev.c
index d6e45f8..05bc109 100644
--- a/pommed/evdev.c
+++ b/pommed/evdev.c
@@ -766,6 +766,32 @@ evdev_is_extkbd_alu_wl(unsigned short *id)
   return 0;
 }
 
+/* Apple external wireless keyboard, aluminium, newer model */
+static int
+evdev_is_extkbd_alu_wl_2(unsigned short *id)
+{
+  unsigned short product = id[ID_PRODUCT];
+
+  if (id[ID_BUS] != BUS_BLUETOOTH)
+    return 0;
+
+  if (id[ID_VENDOR] != USB_VENDOR_ID_APPLE)
+    return 0;
+
+  if ((product == USB_PRODUCT_ID_APPLE_EXTKBD_ALU_WL_2_ANSI)
+      || (product == USB_PRODUCT_ID_APPLE_EXTKBD_ALU_WL_2_ISO)
+      || (product == USB_PRODUCT_ID_APPLE_EXTKBD_ALU_WL_2_JIS))
+    {
+      logdebug(" -> External Apple wireless keyboard 2 (aluminium)\n");
+
+      kbd_set_fnmode();
+
+      return 1;
+    }
+
+  return 0;
+}
+
 /* Any external Apple USB keyboard */
 static int
 evdev_is_extkbd(unsigned short *id)
@@ -773,7 +799,8 @@ 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));
+	  || evdev_is_extkbd_alu_wl(id)
+	  || evdev_is_extkbd_alu_wl_2(id));
 }
 
 /* Mouseemu virtual keyboard */
diff --git a/pommed/evdev.h b/pommed/evdev.h
index 38094f0..43ee863 100644
--- a/pommed/evdev.h
+++ b/pommed/evdev.h
@@ -81,6 +81,11 @@
 #define USB_PRODUCT_ID_APPLE_EXTKBD_ALU_WL_ISO  0x022d
 #define USB_PRODUCT_ID_APPLE_EXTKBD_ALU_WL_JIS  0x022e
 
+/* Apple external wireless keyboard, aluminium, newer model */
+#define USB_PRODUCT_ID_APPLE_EXTKBD_ALU_WL_2_ANSI 0x0239
+#define USB_PRODUCT_ID_APPLE_EXTKBD_ALU_WL_2_ISO  0x023a
+#define USB_PRODUCT_ID_APPLE_EXTKBD_ALU_WL_2_JIS  0x023b
+
 /* Apple Remote IR Receiver */
 #define USB_PRODUCT_ID_APPLEIR        0x8240
 #define USB_PRODUCT_ID_APPLEIR_2      0x8242

-- 
pommed - hotkeys handler for Apple laptops