macos keys (patch 10713).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@71965 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 100 insertions, 84 deletions

diff --git a/macosx/plugins/DFInput/macsrc/cfg.c b/macosx/plugins/DFInput/macsrc/cfg.c
index e27dafb0..f251996d 100644
--- a/macosx/plugins/DFInput/macsrc/cfg.c
+++ b/macosx/plugins/DFInput/macsrc/cfg.c
@@ -375,87 +375,103 @@ struct {
 	uint16_t code;
 	const char *desc;
 } KeyString[] = {
-	{ 0x01, "A" },
-	{ 0x0C, "B" },
-	{ 0x09, "C" },
-	{ 0x03, "D" },
-	{ 0x0F, "E" },
-	{ 0x04, "F" },
-	{ 0x06, "G" },
-	{ 0x05, "H" },
-	{ 0x23, "I" },
-	{ 0x27, "J" },
-	{ 0x29, "K" },
-	{ 0x26, "L" },
-	{ 0x2F, "M" },
-	{ 0x2E, "N" },
-	{ 0x20, "O" },
-	{ 0x24, "P" },
-	{ 0x0D, "Q" },
-	{ 0x10, "R" },
-	{ 0x02, "S" },
-	{ 0x12, "T" },
-	{ 0x21, "U" },
-	{ 0x0A, "V" },
-	{ 0x0E, "W" },
-	{ 0x08, "X" },
-	{ 0x11, "Y" },
-	{ 0x07, "Z" },
-	{ 0x22, "[" },
-	{ 0x1F, "]" },
-	{ 0x2A, ";" },
-	{ 0x28, "'" },
-	{ 0x2C, "," },
-	{ 0x30, "." },
-	{ 0x2D, "/" },
-	{ 0x33, "`" },
-	{ 0x13, "1" },
-	{ 0x14, "2" },
-	{ 0x15, "3" },
-	{ 0x16, "4" },
-	{ 0x18, "5" },
-	{ 0x17, "6" },
-	{ 0x1B, "7" },
-	{ 0x1D, "8" },
-	{ 0x1A, "9" },
-	{ 0x1E, "0" },
-	{ 0x1C, "-" },
-	{ 0x19, "=" },
-	{ 0x2B, "\\" },
-	{ 0x31, "Tab" },
-	{ 0x39, "Shift" },
-	{ 0x3C, "Control" },
-	{ 0x38, "Command" },
-	{ 0x32, "Spacebar" },
-	{ 0x34, "Backspace" },
-	{ 0x25, "Enter" },
-	{ 0x7F, "Up" },
-	{ 0x7E, "Down" },
-	{ 0x7C, "Left" },
-	{ 0x7D, "Right" },
-	{ 0x73, "Insert" },
-	{ 0x76, "Delete" },
-	{ 0x74, "Home" },
-	{ 0x78, "End" },
-	{ 0x75, "Page Up" },
-	{ 0x7A, "Page Down" },
-	{ 0x48, "Num Lock" },
-	{ 0x4C, "Keypad /" },
-	{ 0x44, "Keypad *" },
-	{ 0x4F, "Keypad -" },
-	{ 0x46, "Keypad +" },
-	{ 0x4D, "Keypad Enter" },
-	{ 0x53, "Keypad 0" },
-	{ 0x54, "Keypad 1" },
-	{ 0x55, "Keypad 2" },
-	{ 0x56, "Keypad 3" },
-	{ 0x57, "Keypad 4" },
-	{ 0x58, "Keypad 5" },
-	{ 0x59, "Keypad 6" },
-	{ 0x5A, "Keypad 7" },
-	{ 0x5C, "Keypad 8" },
-	{ 0x5D, "Keypad 9" },
-	{ 0x42, "Keypad ." },
+	{ kVK_ANSI_A + 1, "A" },
+	{ kVK_ANSI_B + 1, "B" },
+	{ kVK_ANSI_C + 1, "C" },
+	{ kVK_ANSI_D + 1, "D" },
+	{ kVK_ANSI_E + 1, "E" },
+	{ kVK_ANSI_F + 1, "F" },
+	{ kVK_ANSI_G + 1, "G" },
+	{ kVK_ANSI_H + 1, "H" },
+	{ kVK_ANSI_I + 1, "I" },
+	{ kVK_ANSI_J + 1, "J" },
+	{ kVK_ANSI_K + 1, "K" },
+	{ kVK_ANSI_L + 1, "L" },
+	{ kVK_ANSI_M + 1, "M" },
+	{ kVK_ANSI_N + 1, "N" },
+	{ kVK_ANSI_O + 1, "O" },
+	{ kVK_ANSI_P + 1, "P" },
+	{ kVK_ANSI_Q + 1, "Q" },
+	{ kVK_ANSI_R + 1, "R" },
+	{ kVK_ANSI_S + 1, "S" },
+	{ kVK_ANSI_T + 1, "T" },
+	{ kVK_ANSI_U + 1, "U" },
+	{ kVK_ANSI_V + 1, "V" },
+	{ kVK_ANSI_W + 1, "W" },
+	{ kVK_ANSI_X + 1, "X" },
+	{ kVK_ANSI_Y + 1, "Y" },
+	{ kVK_ANSI_Z + 1, "Z" },
+	{ kVK_ANSI_LeftBracket + 1, "[" },
+	{ kVK_ANSI_RightBracket + 1, "]" },
+	{ kVK_ANSI_Semicolon + 1, ";" },
+	{ kVK_ANSI_Quote + 1, "'" },
+	{ kVK_ANSI_Comma + 1, "," },
+	{ kVK_ANSI_Period + 1, "." },
+	{ kVK_ANSI_Slash + 1, "/" },
+	{ kVK_ANSI_Grave + 1, "`" },
+	{ kVK_ANSI_1 + 1, "1" },
+	{ kVK_ANSI_2 + 1, "2" },
+	{ kVK_ANSI_3 + 1, "3" },
+	{ kVK_ANSI_4 + 1, "4" },
+	{ kVK_ANSI_5 + 1, "5" },
+	{ kVK_ANSI_6 + 1, "6" },
+	{ kVK_ANSI_7 + 1, "7" },
+	{ kVK_ANSI_8 + 1, "8" },
+	{ kVK_ANSI_9 + 1, "9" },
+	{ kVK_ANSI_0 + 1, "0" },
+	{ kVK_ANSI_Minus + 1, "-" },
+	{ kVK_ANSI_Equal + 1, "=" },
+	{ kVK_ANSI_Backslash + 1, "\\" },
+	{ kVK_Tab + 1, "Tab" },
+	{ kVK_Shift + 1, "Shift" },
+	{ kVK_Option + 1, "Option" },
+	{ kVK_Control + 1, "Control" },
+	{ kVK_Command + 1, "Command" },
+	{ kVK_Space + 1, "Spacebar" },
+	{ kVK_Delete + 1, "Delete" },
+	{ kVK_Return + 1, "Return" },
+	{ kVK_UpArrow + 1, "Up" },
+	{ kVK_DownArrow + 1, "Down" },
+	{ kVK_LeftArrow + 1, "Left" },
+	{ kVK_RightArrow + 1, "Right" },
+	{ kVK_Help + 1, "Help" },
+	{ kVK_ForwardDelete + 1, "Forward Delete" },
+	{ kVK_Home + 1, "Home" },
+	{ kVK_End + 1, "End" },
+	{ kVK_PageUp + 1, "Page Up" },
+	{ kVK_PageDown + 1, "Page Down" },
+	{ kVK_ANSI_KeypadClear + 1, "Keypad Clear" },
+	{ kVK_ANSI_KeypadDivide + 1, "Keypad /" },
+	{ kVK_ANSI_KeypadMultiply + 1, "Keypad *" },
+	{ kVK_ANSI_KeypadMinus + 1, "Keypad -" },
+	{ kVK_ANSI_KeypadPlus + 1, "Keypad +" },
+	{ kVK_ANSI_KeypadEnter + 1, "Keypad Enter" },
+	{ kVK_ANSI_Keypad0 + 1, "Keypad 0" },
+	{ kVK_ANSI_Keypad1 + 1, "Keypad 1" },
+	{ kVK_ANSI_Keypad2 + 1, "Keypad 2" },
+	{ kVK_ANSI_Keypad3 + 1, "Keypad 3" },
+	{ kVK_ANSI_Keypad4 + 1, "Keypad 4" },
+	{ kVK_ANSI_Keypad5 + 1, "Keypad 5" },
+	{ kVK_ANSI_Keypad6 + 1, "Keypad 6" },
+	{ kVK_ANSI_Keypad7 + 1, "Keypad 7" },
+	{ kVK_ANSI_Keypad8 + 1, "Keypad 8" },
+	{ kVK_ANSI_Keypad9 + 1, "Keypad 9" },
+	{ kVK_ANSI_KeypadDecimal + 1, "Keypad ." },
+	{ kVK_F1 + 1, "F1" },
+	{ kVK_F2 + 1, "F2" },
+	{ kVK_F3 + 1, "F3" },
+	{ kVK_F4 + 1, "F4" },
+	{ kVK_F5 + 1, "F5" },
+	{ kVK_F6 + 1, "F6" },
+	{ kVK_F7 + 1, "F7" },
+	{ kVK_F8 + 1, "F8" },
+	{ kVK_F9 + 1, "F9" },
+	{ kVK_F10 + 1, "F10" },
+	{ kVK_F11 + 1, "F11" },
+	{ kVK_F12 + 1, "F12" },
+	{ kVK_F13 + 1, "F13" },
+	{ kVK_F14 + 1, "F14" },
+	{ kVK_F15 + 1, "F15" },
 	{ 0x00, NULL }
 };
 
@@ -558,7 +574,7 @@ int CheckKeyDown() {
 	keybytes = (unsigned char *) theKeys;
 
 	for (i = 0; i < 128; i++) {
-		if (i == 0x3A) continue; // Ignore capslock
+		if (i == kVK_CapsLock) continue; // Ignore capslock
 
 		if (keybytes[i >> 3] & (1 << (i & 7)))
 			return i + 1;
@@ -650,7 +666,7 @@ int ReadDKeyEvent(int padnum, int key) {
 		// check keyboard events
 		i = CheckKeyDown();
 		if (i != 0) {
-			if (i != 0x36) g.cfg.PadDef[padnum].KeyDef[key].Key = i;
+			if (i != (kVK_Escape + 1)) g.cfg.PadDef[padnum].KeyDef[key].Key = i;
 			changed = 1;
 			goto end;
 		}
@@ -733,7 +749,7 @@ int ReadAnalogEvent(int padnum, int analognum, int analogdir) {
 		// check keyboard events
 		i = CheckKeyDown();
 		if (i != 0) {
-			if (i != 0x36) g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].Key = i;
+			if (i != (kVK_Escape + 1)) g.cfg.PadDef[padnum].AnalogDef[analognum][analogdir].Key = i;
 			changed = 1;
 			goto end;
 		}