X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=drivers%2Fcli%2Finput.c;h=212c34d07b1cd25b300eb641042ac6b6383c43ab;hp=b946c5bb2df7a9a9a7797364f1e648315146175c;hb=5232c20c0fa2c80964fe1d3f597c239bcf93d6fc;hpb=c62d28102c77e19c291c78bf6bf7f0a81abd54b9

diff --git a/drivers/cli/input.c b/drivers/cli/input.c
index b946c5b..212c34d 100644
--- a/drivers/cli/input.c
+++ b/drivers/cli/input.c
@@ -27,8 +27,23 @@
 #define JOY_LEFT        0x40
 #define JOY_RIGHT       0x80
 
+
+#include "minimal.h"
+extern int swapbuttons;
+extern int stretch_offset;
+extern void SetVideoScaling(int pixels,int width,int height);
+long UpdateGamepadGP2X(void);
+
+
+
+
+
 static void UpdateFKB(void);
 
+
+
+
+
 /* UsrInputType[] is user-specified.  InputType[] is current
 	(game loading can override user settings) 
 */
@@ -62,14 +77,17 @@ static void DoCheatSeq(void)
 #include "keyscan.h"
 static char *keys;
 static int DIPS=0;
+#ifndef GP2X
 static uint8 keyonce[MK_COUNT];
 #define KEY(__a) keys[MK(__a)]
 #define keyonly(__a,__z) {if(KEY(__a)){if(!keyonce[MK(__a)]) {keyonce[MK(__a)]=1;__z}}else{keyonce[MK(__a)]=0;}}
+#endif
+
 static int JoySwap=0;
 static int cidisabled=0;
 static int KeyboardUpdate(void)
 {
-
+#ifndef GP2X
  if(!UpdateKeyboard())
    if(keys)
     return 0;
@@ -156,10 +174,14 @@ static int KeyboardUpdate(void)
   keyonly(9,FCEUI_SelectState(9);)
  }
  return 1;
+#else
+ return 1;
+#endif
 }
 
 static uint32 KeyboardDodo(void)
 {
+#ifndef GP2X
  uint32 JS=0;
 
  if(gametype!=GIT_NSF)
@@ -186,8 +208,12 @@ static uint32 KeyboardDodo(void)
   if(x!=(JOY_LEFT|JOY_RIGHT)) JS|=x<<JoySwap;
  }
  return JS;
+#else
+ return 0;
+#endif
 }
 
+#ifndef GP2X
 static int powerpadsc[2][12]={
                               {
                                MK(O),MK(P),MK(BRACKET_LEFT),
@@ -204,10 +230,15 @@ static int powerpadsc[2][12]={
                              };
 
 static uint32 powerpadbuf[2];
+#else
+static int powerpadsc[2][12];
+#endif
 static int powerpadside=0;
 
+
 static uint32 UpdatePPadData(int w)
 {
+#ifndef GP2X
  static const char shifttableA[12]={8,9,0,1,11,7,4,2,10,6,5,3};
  static const char shifttableB[12]={1,0,9,8,2,4,7,11,3,5,6,10};
  uint32 r=0;
@@ -225,19 +256,47 @@ static uint32 UpdatePPadData(int w)
    if(keys[ppadtsc[x]]) r|=1<<shifttableB[x];
  }
  return r;
+#endif
+ return 0;
 }
 
 static uint32 MouseData[3];
 static uint8 fkbkeys[0x48];
+unsigned long lastpad=0;
 
 void FCEUD_UpdateInput(void)
 {
-  int x;
   int t=0;
+#ifndef GP2X	
+  int x;
   static uint32 KeyBJS=0;
   uint32 JS;
   int b;
+#endif 
+#ifdef GP2X
+  long lastpad2=lastpad;
+  long pad = UpdateGamepadGP2X();
+  t=1;
+  //  JSreturn=(JSreturn&0xFF000000)|(JSreturn&0xFF)|((JSreturn&0xFF0000)>>8)|((JSreturn&0xFF00)<<8);
+  if(gametype==GIT_FDS)
+  {  	
+    NoWaiting&=~1;
+  	if ((pad & GP2X_PUSH) && (!(pad & GP2X_SELECT)) && (!(pad & GP2X_L)) && (!(pad & GP2X_R)) && (!(lastpad2 & GP2X_PUSH)))
+  	{
+      DriverInterface(DES_FDSSELECT,0);
+  	}
+  	else if ((pad & GP2X_L) && (!(pad & GP2X_SELECT)) && (!(pad & GP2X_PUSH)) && (!(pad & GP2X_R))&& (!(lastpad2 & GP2X_L)))
+  	{
+      DriverInterface(DES_FDSINSERT,0);
+  	}
+  	else if ((pad & GP2X_R) && (!(pad & GP2X_SELECT)) && (!(pad & GP2X_L)) && (!(pad & GP2X_PUSH)) && (!(lastpad2 & GP2X_R)))
+  	{
+      DriverInterface(DES_FDSEJECT,0);
+  	}
+  }
 
+#else
+  UpdateGamepadGP2X();
   b=KeyboardUpdate();
 
   for(x=0;x<2;x++)
@@ -266,10 +325,326 @@ void FCEUD_UpdateInput(void)
   }
   if(t&2)
    GetMouseData(MouseData);
+   
+#endif
+}
+
+
+
+
+
+//#ifdef GP2X
+
+extern void ResetNES(void);
+extern void CleanSurface(void);
+
+char soundvolmeter[21];
+int soundvolIndex=0;
+int L_count=0;
+int R_count=0;
+extern int CurrentState;
+int TurboFireOff=1;
+int TurboFireTop=0;  // 0 is none  // 1 is  A & X turbo  // 2 is Y & B turbo
+int TurboFireBottom=0;
+int turbo_toggle_A=0;
+int turbo_toggle_B=0;
+
+static void setsoundvol(int soundvolume)
+{
+    //FCEUI_SetSoundVolume(soundvol);
+    // draw on screen :D
+    gp2x_sound_volume(soundvolume, soundvolume);
+    int meterval=soundvolume/5;
+    for (soundvolIndex=0; soundvolIndex < 20; soundvolIndex++)
+    {
+       if (soundvolIndex < meterval)
+       {
+       	  soundvolmeter[soundvolIndex]='*';
+       }
+       else
+       { 
+       	  soundvolmeter[soundvolIndex]='_';
+       }
+    }
+    soundvolmeter[20]=0;
+    FCEU_DispMessage("|%s|", soundvolmeter);    
 }
+/**
+ * GP2x joystick reader
+ *
+ */ 
+INLINE long UpdateGamepadGP2X(void)
+{
+  uint32 JS=0;
+
+  unsigned long pad=gp2x_joystick_read();
+#define L_down (pad & GP2X_L)
+#define R_down (pad & GP2X_R)
+#define last_L_down (lastpad & GP2X_L)
+#define last_R_down (lastpad & GP2X_R)
+  
+  if (L_down && R_down && (!(pad & GP2X_PUSH))
+      && (!(last_R_down && last_L_down)))
+  {
+     ResetNES();
+     puts("Reset"); 
+     JSreturn=0;
+     lastpad=pad;
+     return pad;
+  }
+
+
+
+  
+  if (pad & GP2X_VOL_UP)
+  {
+    soundvol+=1;
+    if (soundvol >= 100) soundvol=100;
+    //FCEUI_SetSoundVolume(soundvol);
+    setsoundvol(soundvol);
+  }
+  if (pad & GP2X_VOL_DOWN)
+  {
+    soundvol-=1;
+    if (soundvol < 0) soundvol=0;
+    //FCEUI_SetSoundVolume(soundvol);
+    setsoundvol(soundvol);
+  }
+  if (pad & GP2X_PUSH)
+  {    
+    // only if it's something else then last time, and not moving around the joystick
+    if (!((pad & GP2X_UP) ||(pad & GP2X_DOWN) || (pad & GP2X_LEFT) || (pad & GP2X_RIGHT)))
+    {
+      if (pad & GP2X_SELECT)
+      {
+        if ((lastpad & GP2X_SELECT) && (lastpad & GP2X_PUSH))
+	{
+          // still pressed down from stretching from last one
+          JSreturn=0; 
+          lastpad=pad;
+          return 0;
+	}
+        if (stretch_offset == 32)
+	{
+          stretch_offset=0;
+	}
+        else
+	{
+          stretch_offset=32;
+	}
+
+        if (stretch_offset == 32)
+	{          
+          SetVideoScaling(320, 320, 240);
+          CleanSurface();
+	}
+        else
+	{
+	  SetVideoScaling(320, 256, 240);
+	}
+
+        JSreturn=0;
+        lastpad=pad;
+        return pad;
+      }
+      else if (L_down && R_down)
+      {
+        FCEUI_CloseGame();
+        puts("Quit"); 
+        JSreturn=0;
+        return 0;
+      }
+      else if (R_down && (!((lastpad & GP2X_R) && (lastpad & GP2X_PUSH))))
+      {
+       FCEUI_LoadState();
+       JSreturn=0;
+       lastpad=pad;
+       return 0;
+      }
+      else if (L_down && (!((lastpad & GP2X_L) && (lastpad & GP2X_PUSH))))
+      {
+       FCEUI_SaveState();
+       JSreturn=0;
+       lastpad=pad;
+       return 0;
+      }
+    }
+  }
+  
+  // r is toggle savestate
+  if (R_down)
+  {
+  	if (last_R_down)
+  	{
+  	  R_count++;
+      if ((R_count & 31)== 31)
+      {
+  		CurrentState=(CurrentState+1) % 10;
+  		FCEUI_DispMessage("Now Using Save State %d", CurrentState);
+  	  }
+  	}
+  }
+  else
+  {
+    R_count=0;
+  }
+  
+  // l is toggle turbo
+  if (L_down)
+  {
+  	if (last_L_down)
+  	{
+  	  L_count++;
+      if ((L_count & 31)== 31)
+      {
+       // 0 is none  // 1 is  Y & B turbo  // 2 is X & A turbo
+        if ((!TurboFireTop) && (!TurboFireBottom))
+        {
+        	// was off
+        	TurboFireTop=1;
+        	TurboFireBottom=0;        	
+        	if (swapbuttons)
+        	{
+ 	     	  FCEUI_DispMessage("Turbo A and Y");        	
+        	}
+        	else
+        	{
+ 	     	  FCEUI_DispMessage("Turbo Y and B");        	
+        	}
+        }
+        else if (TurboFireTop)
+        {
+        	TurboFireTop=0;
+        	TurboFireBottom=1;        	
+        	if (swapbuttons)
+        	{
+       		  FCEUI_DispMessage("Turbo X and B");        	
+        	}
+        	else
+        	{
+       		  FCEUI_DispMessage("Turbo A and X");        	
+        	}
+        }
+        else
+        {
+        	TurboFireTop=0;
+        	TurboFireBottom=0;        	
+        	FCEUI_DispMessage("Turbo Off");        	
+        }
+      	
+  	  }
+  	}
+  }
+  else
+  {
+    L_count=0;
+  }
+  
+  
+  
+  //unsigned long padTmp=0;
+  // shift the bits in
+  // up
+  //padTmp=(pad & GP2X_UP) ;  // 1 is 2^0, 
+  JS |= ((pad & GP2X_UP) << (4-0));  // 0x10 is 2^4
+
+  //padTmp=(pad & GP2X_DOWN);  // 0x10 is 2^4, 
+  JS |= ((pad & GP2X_DOWN) << (5-4));  // 0x20 is 2^5
+
+  //padTmp=(pad & GP2X_LEFT);  // 0x4 is 2^2, 
+  JS |= ((pad & GP2X_LEFT) << (6-2));  // 0x40 is 2^6
+
+  //padTmp=(pad & GP2X_RIGHT);  // 0x40 is 2^6,  
+  JS |= ((pad & GP2X_RIGHT) << (7-6));  // 0x80 is 2^7
+
+
+#define  A_down (pad & GP2X_A)
+#define  B_down (pad & GP2X_B)
+#define  X_down (pad & GP2X_X)
+#define  Y_down (pad & GP2X_Y)
+
+  // should be 2 cycles held, 1 cycle release
+  turbo_toggle_A=(turbo_toggle_A+1) % 3;
+  turbo_toggle_B=(turbo_toggle_B+1) % 3;
+ 
+   // 0 is none  // 1 is  Y & B turbo  // 2 is X & A turbo
+  // B or X are both considered A
+  //padTmp=B_down >> 13;  // 2^13,
+  
+   if (!(TurboFireTop && (!turbo_toggle_A)))
+   {
+    JS |= ((B_down >> 13) << 0);  // 0x1 is 2^0
+   }
+   // A or Y are both considered B
+   //padTmp=A_down >> 12;  // 2^13,  
+   if (!(TurboFireBottom && (!turbo_toggle_B)))
+   {
+    JS |= ((A_down >> 12) << 1);  // 0x2 is 2^1
+   }
+  
+  if (swapbuttons)
+  {
+   //padTmp=X_down >> 14;  // 2^13,  
+   if (!(TurboFireBottom && (!turbo_toggle_A)))
+   {
+//    JS |= ((X_down >> 14) << 0);  // 0x1 is 2^0
+    JS |= ((Y_down >> 15) << 0);  // 0x1 is 2^0
+   }
+
+   //padTmp=Y_down >> 15;  // 2^13,  
+   if (!(TurboFireTop && (!turbo_toggle_B)))
+   {
+    JS |= ((X_down >> 14) << 1);  // 0x2 is 2^1
+   }
+  }
+  else
+  {  
+   //padTmp=X_down >> 14;  // 2^13,  
+   if (!(TurboFireBottom && (!turbo_toggle_A)))
+   {
+    JS |= ((X_down >> 14) << 0);  // 0x1 is 2^0
+   }
+
+   //padTmp=Y_down >> 15;  // 2^13,  
+   if (!(TurboFireTop && (!turbo_toggle_B)))
+   {
+    JS |= ((Y_down >> 15) << 1);  // 0x2 is 2^1
+   }
+  }
+
+  // select
+  //padTmp=(pad & GP2X_SELECT) >> 9;  // 0x40 is 2^9,  
+  JS |= (((pad & GP2X_SELECT) >> 9) << 2);  // 0x4 is 2^2
+
+  // start
+  //padTmp=(pad & GP2X_START) >> 8;  //   2^8,  
+  JS |= (((pad & GP2X_START) >> 8) << 3);  // 0x8 is 2^3
+
+
+  JSreturn = JS;
+  lastpad=pad;
+
+  return pad;
+  //JSreturn=(JS&0xFF000000)|(JS&0xFF)|((JS&0xFF0000)>>8)|((JS&0xFF00)<<8);
+}
+//#endif
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 static void InitOtherInput(void)
 {
+
    void *InputDPtr;
 
    int t;
@@ -282,7 +657,7 @@ static void InitOtherInput(void)
     InputDPtr=0;
     switch(InputType[x])
     {
-     case SI_POWERPAD:InputDPtr=&powerpadbuf[x];break;
+      //case SI_POWERPAD:InputDPtr=&powerpadbuf[x];break;
      case SI_GAMEPAD:InputDPtr=((uint8 *)&JSreturn)+(x<<1);break;     
      case SI_ARKANOID:InputDPtr=MouseData;t|=1;break;
      case SI_ZAPPER:InputDPtr=MouseData;
@@ -310,8 +685,9 @@ static void InitOtherInput(void)
     InitMouse();
     inited|=16;
    }
-}
 
+}
+#ifndef GP2X
 int fkbmap[0x48]=
 {
  MK(F1),MK(F2),MK(F3),MK(F4),MK(F5),MK(F6),MK(F7),MK(F8),
@@ -326,9 +702,11 @@ int fkbmap[0x48]=
  MK(DELETE),MK(END),MK(PAGEDOWN),
  MK(CURSORUP),MK(CURSORLEFT),MK(CURSORRIGHT),MK(CURSORDOWN)
 };
+#endif
 
 static void UpdateFKB(void)
 {
+#ifndef GP2X
  int x;
 
  for(x=0;x<0x48;x++)
@@ -337,4 +715,5 @@ static void UpdateFKB(void)
   if(keys[fkbmap[x]])
    fkbkeys[x]=1;
  }
+#endif
 }