Finally finish applying patch 13469.

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

1 files changed, 15 insertions, 1 deletions

diff --git a/plugins/dfxvideo/key.c b/plugins/dfxvideo/key.c
index 4d75c8f4..c47a605b 100755
--- a/plugins/dfxvideo/key.c
+++ b/plugins/dfxvideo/key.c
@@ -23,6 +23,18 @@
 #include "draw.h"
 #include "key.h"
 
+////////////////////////////////////////////////////////////////////////
+// keyboard handler (UNIX)
+////////////////////////////////////////////////////////////////////////
+#ifdef _MACGL
+#define VK_INSERT      114
+#define VK_HOME        115
+#define VK_PRIOR       116
+#define VK_NEXT        121
+#define VK_END         119
+#define VK_DEL         117
+#define VK_F5          96
+#else
 #define VK_INSERT      65379
 #define VK_HOME        65360
 #define VK_PRIOR       65365
@@ -30,6 +42,7 @@
 #define VK_END         65367
 #define VK_DEL         65535
 #define VK_F5          65474
+#endif
 
 void GPUmakeSnapshot(void);
 
@@ -69,6 +82,7 @@ void GPUkeypressed(int keycode)
    case VK_NEXT:  BuildDispMenu( 1);            break;
    case VK_END:   SwitchDispMenu(1);            break;
    case VK_HOME:  SwitchDispMenu(-1);           break;
+#ifndef _MACGL // 0x60 is VK_F5 in OSX, so I put this here until I figure something better -npepinpe
    case 0x60:
     {
      iFastFwd = 1 - iFastFwd;
@@ -77,7 +91,7 @@ void GPUkeypressed(int keycode)
      BuildDispMenu(0);
      break;
     }
-#ifdef _MACGL
+#else
    default: { void HandleKey(int keycode); HandleKey(keycode); }
 #endif
   }