]> Shamusworld >> Repos - virtualjaguar/blobdiff - src/joystick.cpp
Update for 1.0.6 release
[virtualjaguar] / src / joystick.cpp
index b764bdd0b7445803358f6ca006220c88488a834f..9b0f3c7075a5b3e09b634ce9c462d78a5f48aff1 100644 (file)
@@ -3,28 +3,22 @@
 //
 // by cal2
 // GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS)
-// Cleanups by James L. Hammons
+// Cleanups/fixes by James L. Hammons
 //
 
-#ifndef __PORT__
-#include "include/stdafx.h"
-#include <mmsystem.h>
-#endif
 #include <time.h>
 #include <SDL.h>
-#include "SDLptc.h"
 #include "jaguar.h"
-
-void main_screen_switch(void);
+#include "video.h"
 
 #define BUTTON_U               0
 #define BUTTON_D               1
 #define BUTTON_L               2
 #define BUTTON_R               3
-#define BUTTON_1               4
-#define BUTTON_4               5
-#define BUTTON_7               6
-#define BUTTON_s               7
+#define BUTTON_s               4
+#define BUTTON_7               5
+#define BUTTON_4               6
+#define BUTTON_1               7
 #define BUTTON_0               8
 #define BUTTON_8               9
 #define BUTTON_5               10
@@ -34,18 +28,35 @@ void main_screen_switch(void);
 #define BUTTON_6               14
 #define BUTTON_3               15
 
-
 #define BUTTON_A               16
 #define BUTTON_B               17
 #define BUTTON_C               18
 #define BUTTON_OPTION  19
 #define BUTTON_PAUSE   20
 
+// Private function prototypes
+
+//void main_screen_switch(void);
+
+// Global vars
+
 static uint8 joystick_ram[4];
 static uint8 joypad_0_buttons[21];
 static uint8 joypad_1_buttons[21];
-extern uint8 finished;
+extern bool finished;
+extern bool showGUI;
+bool GUIKeyHeld = false;
 extern int start_logging;
+int gpu_start_log = 0;
+int op_start_log = 0;
+int blit_start_log = 0;
+int effect_start = 0;
+int effect_start2 = 0, effect_start3 = 0, effect_start4 = 0, effect_start5 = 0, effect_start6 = 0;
+bool interactiveMode = false;
+bool iLeft, iRight, iToggle = false;
+bool keyHeld1 = false, keyHeld2 = false, keyHeld3 = false;
+int objectPtr = 0;
+bool startMemLog = false;
 
 
 void joystick_init(void)
@@ -55,14 +66,20 @@ void joystick_init(void)
 
 void joystick_exec(void)
 {
+       extern SDL_Joystick * joystick;
+       extern bool useJoystick;
        uint8 * keystate = SDL_GetKeyState(NULL);
-       extern Console console;
        
        memset(joypad_0_buttons, 0, 21);
        memset(joypad_1_buttons, 0, 21);
+       gpu_start_log = 0;                                                      // Only log while key down!
+       effect_start = 0;
+       effect_start2 = effect_start3 = effect_start4 = effect_start5 = effect_start6 = 0;
+       blit_start_log = 0;
+       iLeft = iRight = false;
 
-       if ((keystate[SDLK_LALT]) & (keystate[SDLK_RETURN]))
-               main_screen_switch();
+       if ((keystate[SDLK_LALT] || keystate[SDLK_RALT]) & keystate[SDLK_RETURN])
+               ToggleFullscreen();
 
        /* Added/Changed by SDLEMU (http://sdlemu.ngemu.com) */
 
@@ -70,11 +87,22 @@ void joystick_exec(void)
        if (keystate[SDLK_DOWN])        joypad_0_buttons[BUTTON_D] = 0x01;
        if (keystate[SDLK_LEFT])        joypad_0_buttons[BUTTON_L] = 0x01;
        if (keystate[SDLK_RIGHT])       joypad_0_buttons[BUTTON_R] = 0x01;
-       if (keystate[SDLK_z])           joypad_0_buttons[BUTTON_A] = 0x01;
+       // The buttons are labelled C,B,A on the controller (going from left to right)
+       if (keystate[SDLK_z])           joypad_0_buttons[BUTTON_C] = 0x01;
        if (keystate[SDLK_x])           joypad_0_buttons[BUTTON_B] = 0x01;
-       if (keystate[SDLK_c])           joypad_0_buttons[BUTTON_C] = 0x01;
-       if (keystate[SDLK_TAB])         joypad_0_buttons[BUTTON_OPTION] = 0x01;
+       if (keystate[SDLK_c])           joypad_0_buttons[BUTTON_A] = 0x01;
+//I may yet move these to O and P...
+       if (keystate[SDLK_QUOTE])       joypad_0_buttons[BUTTON_OPTION] = 0x01;
        if (keystate[SDLK_RETURN])      joypad_0_buttons[BUTTON_PAUSE] = 0x01;
+
+       if (keystate[SDLK_TAB])
+       {
+               if (!GUIKeyHeld)
+                       showGUI = !showGUI, GUIKeyHeld = true;
+       }
+       else
+               GUIKeyHeld = false;
+
        if (keystate[SDLK_q])
                start_logging = 1;
        if (keystate[SDLK_w])
@@ -82,6 +110,57 @@ void joystick_exec(void)
 //     if (keystate[SDLK_u])           jaguar_long_write(0xf1c384,jaguar_long_read(0xf1c384)+1);
        if (keystate[SDLK_d])
                DumpMainMemory();
+       if (keystate[SDLK_l])
+               gpu_start_log = 1;
+       if (keystate[SDLK_o])
+               op_start_log = 1;
+       if (keystate[SDLK_b])
+               blit_start_log = 1;
+
+       if (keystate[SDLK_1])
+               effect_start = 1;
+       if (keystate[SDLK_2])
+               effect_start2 = 1;
+       if (keystate[SDLK_3])
+               effect_start3 = 1;
+       if (keystate[SDLK_4])
+               effect_start4 = 1;
+       if (keystate[SDLK_5])
+               effect_start5 = 1;
+       if (keystate[SDLK_6])
+               effect_start6 = 1;
+
+       if (keystate[SDLK_i])
+               interactiveMode = true;
+
+       if (keystate[SDLK_8] && interactiveMode)
+       {
+               if (!keyHeld1)
+                       objectPtr--, keyHeld1 = true;
+       }
+       else
+               keyHeld1 = false;
+
+       if (keystate[SDLK_0] && interactiveMode)
+       {
+               if (!keyHeld2)
+                       objectPtr++, keyHeld2 = true;
+       }
+       else
+               keyHeld2 = false;
+
+       if (keystate[SDLK_9] && interactiveMode)
+       {
+               if (!keyHeld3)
+                       iToggle = !iToggle, keyHeld3 = true;
+       }
+       else
+               keyHeld3 = false;
+
+       if (keystate[SDLK_e])
+               startMemLog = true;
+       if (keystate[SDLK_r])
+               WriteLog("\n--------> MARK!\n\n");
 
        if (keystate[SDLK_KP0])         joypad_0_buttons[BUTTON_0] = 0x01;
        if (keystate[SDLK_KP1])         joypad_0_buttons[BUTTON_1] = 0x01;
@@ -95,15 +174,15 @@ void joystick_exec(void)
        if (keystate[SDLK_KP9])         joypad_0_buttons[BUTTON_9] = 0x01;
 
     if (keystate[SDLK_ESCAPE])
-       finished = 1;
+       finished = true;
 
     /* Added/Changed by SDLEMU (http://sdlemu.ngemu.com */
     /* Joystick support                                 */
     
-    if (console.JoyEnabled() == 1)
+    if (useJoystick)
     {
-               int16 x = SDL_JoystickGetAxis(console.joystick, 0),
-                       y = SDL_JoystickGetAxis(console.joystick, 1);
+               int16 x = SDL_JoystickGetAxis(joystick, 0),
+                       y = SDL_JoystickGetAxis(joystick, 1);
        
                if (x > 16384)
                        joypad_0_buttons[BUTTON_R] = 0x01;
@@ -114,11 +193,11 @@ void joystick_exec(void)
                if (y < -16384)
                        joypad_0_buttons[BUTTON_U] = 0x01;
        
-               if (SDL_JoystickGetButton(console.joystick, 0) == SDL_PRESSED)
+               if (SDL_JoystickGetButton(joystick, 0) == SDL_PRESSED)
                        joypad_0_buttons[BUTTON_A] = 0x01;
-               if (SDL_JoystickGetButton(console.joystick, 1) == SDL_PRESSED)
+               if (SDL_JoystickGetButton(joystick, 1) == SDL_PRESSED)
                        joypad_0_buttons[BUTTON_B] = 0x01;
-               if (SDL_JoystickGetButton(console.joystick, 2) == SDL_PRESSED)
+               if (SDL_JoystickGetButton(joystick, 2) == SDL_PRESSED)
                        joypad_0_buttons[BUTTON_C] = 0x01;
        }
        
@@ -138,20 +217,9 @@ void joystick_done(void)
 {
 }
 
-void joystick_byte_write(uint32 offset, uint8 data)
-{
-       joystick_ram[offset&0x03] = data;
-}
-
-void joystick_word_write(uint32 offset, uint16 data)
-{
-       offset &= 0x03;
-       joystick_ram[offset+0] = (data >> 8) & 0xFF;
-       joystick_ram[offset+1] = data & 0xFF;
-}
-
 uint8 joystick_byte_read(uint32 offset)
 {
+       extern bool hardwareTypeNTSC;
        offset &= 0x03;
 
        if (offset == 0)
@@ -160,6 +228,7 @@ uint8 joystick_byte_read(uint32 offset)
                int pad0Index = joystick_ram[1] & 0x0F;
                int pad1Index = (joystick_ram[1] >> 4) & 0x0F;
                
+// This is bad--we're assuming that a bit is set in the last case. Might not be so!
                if (!(pad0Index & 0x01)) 
                        pad0Index = 0;
                else if (!(pad0Index & 0x02)) 
@@ -191,7 +260,7 @@ uint8 joystick_byte_read(uint32 offset)
        }
        else if (offset == 3)
        {
-               uint8 data = ((1 << 5) | (1 << 4) | 0x0F);
+               uint8 data = 0x2F | (hardwareTypeNTSC ? 0x10 : 0x00);
                int pad0Index = joystick_ram[1] & 0x0F;
 //unused               int pad1Index = (joystick_ram[1] >> 4) & 0x0F;
                
@@ -227,3 +296,15 @@ uint16 joystick_word_read(uint32 offset)
 {
        return ((uint16)joystick_byte_read((offset+0)&0x03) << 8) | joystick_byte_read((offset+1)&0x03);
 }
+
+void joystick_byte_write(uint32 offset, uint8 data)
+{
+       joystick_ram[offset&0x03] = data;
+}
+
+void joystick_word_write(uint32 offset, uint16 data)
+{
+       offset &= 0x03;
+       joystick_ram[offset+0] = (data >> 8) & 0xFF;
+       joystick_ram[offset+1] = data & 0xFF;
+}