Merge pull request #180 from octalmage/fix-mac-multimedia

Fix mac multimedia keycode conflict.

Author: octalmage

src/keycode.h

@@ -50,24 +50,24 @@ enum _MMKeyCode {
 	K_SPACE = kVK_Space,
 	K_PRINTSCREEN = K_NOT_A_KEY,
 
-	K_AUDIO_VOLUME_MUTE = NX_KEYTYPE_MUTE,
-	K_AUDIO_VOLUME_DOWN = NX_KEYTYPE_SOUND_DOWN,
-	K_AUDIO_VOLUME_UP = NX_KEYTYPE_SOUND_UP,
-	K_AUDIO_PLAY = NX_KEYTYPE_PLAY,
+	K_AUDIO_VOLUME_MUTE = 1007,
+	K_AUDIO_VOLUME_DOWN = 1001,
+	K_AUDIO_VOLUME_UP = 1000,
+	K_AUDIO_PLAY = 1016,
 	K_AUDIO_STOP = K_NOT_A_KEY,
-	K_AUDIO_PAUSE = NX_KEYTYPE_PLAY,
-	K_AUDIO_PREV = NX_KEYTYPE_PREVIOUS,
-	K_AUDIO_NEXT = NX_KEYTYPE_NEXT,
+	K_AUDIO_PAUSE = 1016,
+	K_AUDIO_PREV = 1018,
+	K_AUDIO_NEXT = 1017,
 	K_AUDIO_REWIND = K_NOT_A_KEY,
 	K_AUDIO_FORWARD = K_NOT_A_KEY,
 	K_AUDIO_REPEAT = K_NOT_A_KEY,
 	K_AUDIO_RANDOM = K_NOT_A_KEY,
 
-	K_LIGHTS_MON_UP = NX_KEYTYPE_BRIGHTNESS_UP,
-	K_LIGHTS_MON_DOWN = NX_KEYTYPE_BRIGHTNESS_DOWN,
-	K_LIGHTS_KBD_TOGGLE = NX_KEYTYPE_ILLUMINATION_TOGGLE,
-	K_LIGHTS_KBD_UP = NX_KEYTYPE_ILLUMINATION_UP,
-	K_LIGHTS_KBD_DOWN = NX_KEYTYPE_ILLUMINATION_DOWN
+	K_LIGHTS_MON_UP = 1002,
+	K_LIGHTS_MON_DOWN = 1003,
+	K_LIGHTS_KBD_TOGGLE = 1023,
+	K_LIGHTS_KBD_UP = 1021,
+	K_LIGHTS_KBD_DOWN = 1022
 };
 
 typedef CGKeyCode MMKeyCode;

src/keypress.c

@@ -29,20 +29,6 @@
 #endif
 
 #if defined(IS_MACOSX)
-bool keyCodeRequiresSystemDefinedEvent(MMKeyCode code) {
-	return  code == NX_KEYTYPE_SOUND_UP ||
-		code == NX_KEYTYPE_SOUND_DOWN ||
-		code == NX_KEYTYPE_MUTE ||
-		code == NX_KEYTYPE_PLAY ||
-		code == NX_KEYTYPE_BRIGHTNESS_UP ||
-		code == NX_KEYTYPE_BRIGHTNESS_DOWN ||
-		code == NX_KEYTYPE_PLAY ||
-		code == NX_KEYTYPE_PREVIOUS ||
-		code == NX_KEYTYPE_NEXT ||
-		code == NX_KEYTYPE_ILLUMINATION_UP ||
-		code == NX_KEYTYPE_ILLUMINATION_DOWN ||
-		code == NX_KEYTYPE_ILLUMINATION_TOGGLE;
-}
 static io_connect_t _getAuxiliaryKeyDriver(void)
 {
 	static mach_port_t sEventDrvrRef = 0;
@@ -123,7 +109,9 @@ void win32KeyEvent(int key, MMKeyFlags flags)
 void toggleKeyCode(MMKeyCode code, const bool down, MMKeyFlags flags)
 {
 #if defined(IS_MACOSX)
-	if (keyCodeRequiresSystemDefinedEvent(code)) {
+	/* The media keys all have 1000 added to them to help us detect them. */
+	if (code >= 1000) {
+		code = code - 1000; /* Get the real keycode. */
 		NXEventData   event;
 		kern_return_t kr;
 		IOGPoint loc = { 0, 0 };

test/keyboard.js

@@ -3,19 +3,32 @@ var robot = require('..');
 
 //TODO: Need tests for keyToggle, typeString, typeStringDelayed, and setKeyboardDelay.
 
-test('Tap a key.', function(t) 
+test('Tap a key.', function(t)
 {
 	t.plan(4);
 	t.ok(robot.keyTap("a") === 1, 'successfully tapped "a".');
 	t.ok(robot.keyTap("a", "control") === 1, 'successfully tapped "ctrl+a".');
-	
+
 	t.throws(function()
 	{
 		robot.keyTap();
 	}, /Invalid number/, 'tap nothing.');
-	
+
 	t.throws(function()
 	{
 		robot.keyTap();
 	}, /Invalid number/, 'tap "ctrl+a" with an extra argument.');
+});
+
+// This test won't fail if there's an issue, but it will help you identify an issue if ran locally.
+test('Tap all keys', function(t)
+{
+	var chars = 'abcdefghijklmnopqrstuvwxyz1234567890,./;\'[]\\'.split('');
+
+	for (var x in chars)
+	{
+		t.ok(robot.keyTap(chars[x]), 'tap ' + chars[x] + '.');
+	}
+
+	t.end();
 });