Temporarily reverted r64524 until I (or someone else) find the time to sort out the stuff.

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

1 files changed, 177 insertions, 179 deletions

diff --git a/plugins/peopsxgl/key.c b/plugins/peopsxgl/key.c
index 200446a2..dba1c839 100644
--- a/plugins/peopsxgl/key.c
+++ b/plugins/peopsxgl/key.c
@@ -1,179 +1,177 @@
-/***************************************************************************
-                          key.c  -  description
-                             -------------------
-    begin                : Sun Mar 08 2009
-    copyright            : (C) 1999-2009 by Pete Bernert
-    web                  : www.pbernert.com   
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-#include "stdafx.h"
-
-#define _IN_KEY
-
-#include "externals.h"
-#include "menu.h"
-#include "texture.h"
-#include "draw.h"
-#include "fps.h"
-#include "key.h"
-#include "psemu_plugin_defs.h"
-
-////////////////////////////////////////////////////////////////////////
-// KeyBoard handler stuff
-////////////////////////////////////////////////////////////////////////
-
-uint32_t   ulKeybits = 0;                     
-
-////////////////////////////////////////////////////////////////////////
-// keyboard handler (LINUX)
-////////////////////////////////////////////////////////////////////////
-
-#define VK_INSERT      65379
-#define VK_HOME        65360
-#define VK_PRIOR       65365
-#define VK_NEXT        65366
-#define VK_END         65367
-#define VK_DEL         65535
-#define VK_F5          65474
-
-void GPUkeypressed(int keycode)
-{
-/* arrives via the input plugin, so who knows what thread you're in */
-    switch(keycode)
-     {
-      case VK_F5:
-       bSnapShot=1;
-      break;
-
-      case VK_INSERT:
-       ulKeybits|=KEY_RESETTEXSTORE;
-       if(iBlurBuffer) iBlurBuffer=0;
-       else            iBlurBuffer=1;
-       break;
-
-      case VK_DEL: 
-       if(ulKeybits&KEY_SHOWFPS)
-        {
-         ulKeybits&=~KEY_SHOWFPS;
-         HideText();
-         DestroyPic();
-        }
-       else 
-        {
-         ulKeybits|=KEY_SHOWFPS;
-         szDispBuf[0]=0;
-         BuildDispMenu(0);
-
-        }
-       break;
-
-      case VK_PRIOR: BuildDispMenu(-1);            break;
-      case VK_NEXT:  BuildDispMenu( 1);            break;
-      case VK_END:   SwitchDispMenu( 1);           break;
-      case VK_HOME:  SwitchDispMenu(-1);           break;
-#if defined (_MACGL)
-      default: { void HandleKey(int keycode); HandleKey(keycode); };
-#endif
-     }
-
-}
-
-void InitKeyHandler(void)
-{
-}
-
-void ExitKeyHandler(void)
-{
-}
-
-////////////////////////////////////////////////////////////////////////
-// reset stuff on special keyboard commands
-////////////////////////////////////////////////////////////////////////
-
-void ResetStuff(void)
-{
- ResetTextureArea(TRUE);
- ulKeybits&=~KEY_RESETTEXSTORE;
-
- if(ulKeybits&KEY_BLACKWHITE)
-  {
-   if(bUseFixes) {bUseFixes=FALSE;dwActFixes=0;}
-   else          {bUseFixes=TRUE; dwActFixes=dwCfgFixes;}
-   SetExtGLFuncs();
-   if(iFrameLimit==2) SetAutoFrameCap();
-   ulKeybits&=~KEY_BLACKWHITE;
-  }
-
- if(ulKeybits&KEY_RESETFILTER)
-  {
-   if(ulKeybits&KEY_STEPDOWN)
-        iFilterType--;
-   else iFilterType++;
-   if(iFilterType>6) iFilterType=0;
-   if(iFilterType<0) iFilterType=6;
-   SetExtGLFuncs();
-   ulKeybits&=~(KEY_RESETFILTER|KEY_STEPDOWN);
-   BuildDispMenu(0);
-  }
-
- if(ulKeybits&KEY_RESETOPAQUE)
-  {
-   bOpaquePass=!bOpaquePass;
-   SetExtGLFuncs();
-   ulKeybits&=~KEY_RESETOPAQUE;
-   BuildDispMenu(0);
-  }
-
- if(ulKeybits&KEY_RESETADVBLEND)
-  {
-   bAdvancedBlend=!bAdvancedBlend;
-   SetExtGLFuncs();
-   ulKeybits&=~KEY_RESETADVBLEND;
-   BuildDispMenu(0);
-  }
-
- if(ulKeybits&KEY_RESETDITHER)
-  {
-   bDrawDither=!bDrawDither;
-   if(bDrawDither)  glEnable(GL_DITHER); 
-   else             glDisable(GL_DITHER); 
-   ulKeybits&=~KEY_RESETDITHER;
-   BuildDispMenu(0);
-  }
-
- if(ulKeybits & KEY_TOGGLEFBTEXTURE)
-  {
-   if(ulKeybits&KEY_STEPDOWN)
-        iFrameTexType--;
-   else iFrameTexType++;
-   if(iFrameTexType>3) iFrameTexType=0;
-   if(iFrameTexType<0) iFrameTexType=3;
-   if(gTexFrameName!=0)                              
-    glDeleteTextures(1, &gTexFrameName);             
-   gTexFrameName=0;                                  
-   ulKeybits&=~(KEY_TOGGLEFBTEXTURE|KEY_STEPDOWN);
-  }
-
- if(ulKeybits & KEY_TOGGLEFBREAD)
-  {
-   if(ulKeybits&KEY_STEPDOWN)
-        iFrameReadType--;
-   else iFrameReadType++;
-   if(iFrameReadType>4) iFrameReadType=0;
-   if(iFrameReadType<0) iFrameReadType=4;
-   if(iFrameReadType==4) bFullVRam=TRUE;
-   else                  bFullVRam=FALSE;
-   iRenderFVR=0;
-   ulKeybits&=~(KEY_TOGGLEFBREAD|KEY_STEPDOWN);
-  }
-}
+/***************************************************************************

+                          key.c  -  description

+                             -------------------

+    begin                : Sun Mar 08 2009

+    copyright            : (C) 1999-2009 by Pete Bernert

+    web                  : www.pbernert.com   

+ ***************************************************************************/

+

+/***************************************************************************

+ *                                                                         *

+ *   This program is free software; you can redistribute it and/or modify  *

+ *   it under the terms of the GNU General Public License as published by  *

+ *   the Free Software Foundation; either version 2 of the License, or     *

+ *   (at your option) any later version. See also the license.txt file for *

+ *   additional informations.                                              *

+ *                                                                         *

+ ***************************************************************************/

+

+#include "stdafx.h"

+

+#define _IN_KEY

+

+#include "externals.h"

+#include "menu.h"

+#include "texture.h"

+#include "draw.h"

+#include "fps.h"

+

+////////////////////////////////////////////////////////////////////////

+// KeyBoard handler stuff

+////////////////////////////////////////////////////////////////////////

+

+uint32_t   ulKeybits = 0;                     

+

+////////////////////////////////////////////////////////////////////////

+// keyboard handler (LINUX)

+////////////////////////////////////////////////////////////////////////

+

+#define VK_INSERT      65379

+#define VK_HOME        65360

+#define VK_PRIOR       65365

+#define VK_NEXT        65366

+#define VK_END         65367

+#define VK_DEL         65535

+#define VK_F5          65474

+

+void GPUkeypressed(int keycode)

+{

+/* arrives via the input plugin, so who knows what thread you're in */

+    switch(keycode)

+     {

+      case VK_F5:

+       bSnapShot=1;

+      break;

+

+      case VK_INSERT:

+       ulKeybits|=KEY_RESETTEXSTORE;

+       if(iBlurBuffer) iBlurBuffer=0;

+       else            iBlurBuffer=1;

+       break;

+

+      case VK_DEL: 

+       if(ulKeybits&KEY_SHOWFPS)

+        {

+         ulKeybits&=~KEY_SHOWFPS;

+         HideText();

+         DestroyPic();

+        }

+       else 

+        {

+         ulKeybits|=KEY_SHOWFPS;

+         szDispBuf[0]=0;

+         BuildDispMenu(0);

+

+        }

+       break;

+

+      case VK_PRIOR: BuildDispMenu(-1);            break;

+      case VK_NEXT:  BuildDispMenu( 1);            break;

+      case VK_END:   SwitchDispMenu( 1);           break;

+      case VK_HOME:  SwitchDispMenu(-1);           break;

+#if defined (_MACGL)

+      default: { void HandleKey(int keycode); HandleKey(keycode); };

+#endif

+     }

+

+}

+

+void InitKeyHandler(void)

+{

+}

+

+void ExitKeyHandler(void)

+{

+}

+

+////////////////////////////////////////////////////////////////////////

+// reset stuff on special keyboard commands

+////////////////////////////////////////////////////////////////////////

+

+void ResetStuff(void)

+{

+ ResetTextureArea(TRUE);

+ ulKeybits&=~KEY_RESETTEXSTORE;

+

+ if(ulKeybits&KEY_BLACKWHITE)

+  {

+   if(bUseFixes) {bUseFixes=FALSE;dwActFixes=0;}

+   else          {bUseFixes=TRUE; dwActFixes=dwCfgFixes;}

+   SetExtGLFuncs();

+   if(iFrameLimit==2) SetAutoFrameCap();

+   ulKeybits&=~KEY_BLACKWHITE;

+  }

+

+ if(ulKeybits&KEY_RESETFILTER)

+  {

+   if(ulKeybits&KEY_STEPDOWN)

+        iFilterType--;

+   else iFilterType++;

+   if(iFilterType>6) iFilterType=0;

+   if(iFilterType<0) iFilterType=6;

+   SetExtGLFuncs();

+   ulKeybits&=~(KEY_RESETFILTER|KEY_STEPDOWN);

+   BuildDispMenu(0);

+  }

+

+ if(ulKeybits&KEY_RESETOPAQUE)

+  {

+   bOpaquePass=!bOpaquePass;

+   SetExtGLFuncs();

+   ulKeybits&=~KEY_RESETOPAQUE;

+   BuildDispMenu(0);

+  }

+

+ if(ulKeybits&KEY_RESETADVBLEND)

+  {

+   bAdvancedBlend=!bAdvancedBlend;

+   SetExtGLFuncs();

+   ulKeybits&=~KEY_RESETADVBLEND;

+   BuildDispMenu(0);

+  }

+

+ if(ulKeybits&KEY_RESETDITHER)

+  {

+   bDrawDither=!bDrawDither;

+   if(bDrawDither)  glEnable(GL_DITHER); 

+   else             glDisable(GL_DITHER); 

+   ulKeybits&=~KEY_RESETDITHER;

+   BuildDispMenu(0);

+  }

+

+ if(ulKeybits & KEY_TOGGLEFBTEXTURE)

+  {

+   if(ulKeybits&KEY_STEPDOWN)

+        iFrameTexType--;

+   else iFrameTexType++;

+   if(iFrameTexType>3) iFrameTexType=0;

+   if(iFrameTexType<0) iFrameTexType=3;

+   if(gTexFrameName!=0)                              

+    glDeleteTextures(1, &gTexFrameName);             

+   gTexFrameName=0;                                  

+   ulKeybits&=~(KEY_TOGGLEFBTEXTURE|KEY_STEPDOWN);

+  }

+

+ if(ulKeybits & KEY_TOGGLEFBREAD)

+  {

+   if(ulKeybits&KEY_STEPDOWN)

+        iFrameReadType--;

+   else iFrameReadType++;

+   if(iFrameReadType>4) iFrameReadType=0;

+   if(iFrameReadType<0) iFrameReadType=4;

+   if(iFrameReadType==4) bFullVRam=TRUE;

+   else                  bFullVRam=FALSE;

+   iRenderFVR=0;

+   ulKeybits&=~(KEY_TOGGLEFBREAD|KEY_STEPDOWN);

+  }

+}