X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjoystick.cpp;h=5d969d0fd26d0d7b122c30d0ea2d07103968b0f5;hb=f3e5bb2807319c210d124d6150e019130c54867b;hp=07135cc6bc81dc7ea45ba31e5906bab444df4c2b;hpb=fa566a2c8ec532eb5325b4d5a663fb2a7d72adc6;p=virtualjaguar diff --git a/src/joystick.cpp b/src/joystick.cpp index 07135cc..5d969d0 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -6,16 +6,16 @@ // Cleanups/fixes by James L. Hammons // -//#ifndef __PORT__ -//#include "include/stdafx.h" -//#include -//#endif +#include "joystick.h" + #include #include -#include "SDLptc.h" #include "jaguar.h" - -void main_screen_switch(void); +#include "log.h" +#include "gpu.h" +#include "gui.h" +#include "settings.h" +#include "video.h" #define BUTTON_U 0 #define BUTTON_D 1 @@ -34,59 +34,124 @@ 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 +// Global vars + static uint8 joystick_ram[4]; static uint8 joypad_0_buttons[21]; static uint8 joypad_1_buttons[21]; -extern bool 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; +extern bool doDSPDis, doGPUDis; -void joystick_init(void) +bool blitterSingleStep = false; +bool bssGo = false; +bool bssHeld = false; + +void JoystickInit(void) { - joystick_reset(); + JoystickReset(); } -void joystick_exec(void) +void JoystickExec(void) { +// 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) */ + // Keybindings in order of U, D, L, R, C, B, A, Op, Pa, 0-9, #, * +// vjs.p1KeyBindings[0] = sdlemu_getval_int("p1k_up", SDLK_UP); - if (keystate[SDLK_UP]) joypad_0_buttons[BUTTON_U] = 0x01; - 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[vjs.p1KeyBindings[0]]) + joypad_0_buttons[BUTTON_U] = 0x01; + if (keystate[vjs.p1KeyBindings[1]]) + joypad_0_buttons[BUTTON_D] = 0x01; + if (keystate[vjs.p1KeyBindings[2]]) + joypad_0_buttons[BUTTON_L] = 0x01; + if (keystate[vjs.p1KeyBindings[3]]) + joypad_0_buttons[BUTTON_R] = 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_A] = 0x01; - if (keystate[SDLK_TAB]) joypad_0_buttons[BUTTON_OPTION] = 0x01; - if (keystate[SDLK_RETURN]) joypad_0_buttons[BUTTON_PAUSE] = 0x01; + if (keystate[vjs.p1KeyBindings[4]]) + joypad_0_buttons[BUTTON_C] = 0x01; + if (keystate[vjs.p1KeyBindings[5]]) + joypad_0_buttons[BUTTON_B] = 0x01; + if (keystate[vjs.p1KeyBindings[6]]) + joypad_0_buttons[BUTTON_A] = 0x01; +//I may yet move these to O and P... + if (keystate[vjs.p1KeyBindings[7]]) + joypad_0_buttons[BUTTON_OPTION] = 0x01; + if (keystate[vjs.p1KeyBindings[8]]) + joypad_0_buttons[BUTTON_PAUSE] = 0x01; + + if (keystate[vjs.p1KeyBindings[9]]) + joypad_0_buttons[BUTTON_0] = 0x01; + if (keystate[vjs.p1KeyBindings[10]]) + joypad_0_buttons[BUTTON_1] = 0x01; + if (keystate[vjs.p1KeyBindings[11]]) + joypad_0_buttons[BUTTON_2] = 0x01; + if (keystate[vjs.p1KeyBindings[12]]) + joypad_0_buttons[BUTTON_3] = 0x01; + if (keystate[vjs.p1KeyBindings[13]]) + joypad_0_buttons[BUTTON_4] = 0x01; + if (keystate[vjs.p1KeyBindings[14]]) + joypad_0_buttons[BUTTON_5] = 0x01; + if (keystate[vjs.p1KeyBindings[15]]) + joypad_0_buttons[BUTTON_6] = 0x01; + if (keystate[vjs.p1KeyBindings[16]]) + joypad_0_buttons[BUTTON_7] = 0x01; + if (keystate[vjs.p1KeyBindings[17]]) + joypad_0_buttons[BUTTON_8] = 0x01; + if (keystate[vjs.p1KeyBindings[18]]) + joypad_0_buttons[BUTTON_9] = 0x01; + if (keystate[vjs.p1KeyBindings[19]]) + joypad_0_buttons[BUTTON_s] = 0x01; + if (keystate[vjs.p1KeyBindings[20]]) + joypad_0_buttons[BUTTON_d] = 0x01; + + extern bool debounceRunKey; + if (keystate[SDLK_ESCAPE]) + { + if (!debounceRunKey) + finished = true; + } + else + debounceRunKey = false; + + if (keystate[SDLK_TAB]) + { + if (!GUIKeyHeld) + showGUI = !showGUI, GUIKeyHeld = true; + } + else + GUIKeyHeld = false; + if (keystate[SDLK_q]) start_logging = 1; if (keystate[SDLK_w]) @@ -100,8 +165,19 @@ void joystick_exec(void) 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; @@ -130,28 +206,38 @@ void joystick_exec(void) else keyHeld3 = false; - if (keystate[SDLK_KP0]) joypad_0_buttons[BUTTON_0] = 0x01; - if (keystate[SDLK_KP1]) joypad_0_buttons[BUTTON_1] = 0x01; - if (keystate[SDLK_KP2]) joypad_0_buttons[BUTTON_2] = 0x01; - if (keystate[SDLK_KP3]) joypad_0_buttons[BUTTON_3] = 0x01; - if (keystate[SDLK_KP4]) joypad_0_buttons[BUTTON_4] = 0x01; - if (keystate[SDLK_KP5]) joypad_0_buttons[BUTTON_5] = 0x01; - if (keystate[SDLK_KP6]) joypad_0_buttons[BUTTON_6] = 0x01; - if (keystate[SDLK_KP7]) joypad_0_buttons[BUTTON_7] = 0x01; - if (keystate[SDLK_KP8]) joypad_0_buttons[BUTTON_8] = 0x01; - if (keystate[SDLK_KP9]) joypad_0_buttons[BUTTON_9] = 0x01; + if (keystate[SDLK_e]) + startMemLog = true; + if (keystate[SDLK_r]) + WriteLog("\n--------> MARK!\n\n"); + if (keystate[SDLK_t]) + doDSPDis = true; + if (keystate[SDLK_y]) + doGPUDis = true; - if (keystate[SDLK_ESCAPE]) - finished = true; + // BLITTER single step + if (keystate[SDLK_F5]) + blitterSingleStep = true; + + if (keystate[SDLK_F6]) + { + if (!bssHeld) + { + bssHeld = true; + bssGo = true; + } + } + else + bssHeld = false; + + // Joystick support [nwagenaar] - /* Added/Changed by SDLEMU (http://sdlemu.ngemu.com */ - /* Joystick support */ - - if (console.JoyEnabled() == 1) + if (vjs.useJoystick) { - int16 x = SDL_JoystickGetAxis(console.joystick, 0), - y = SDL_JoystickGetAxis(console.joystick, 1); - + extern SDL_Joystick * joystick; + int16 x = SDL_JoystickGetAxis(joystick, 0), + y = SDL_JoystickGetAxis(joystick, 1); + if (x > 16384) joypad_0_buttons[BUTTON_R] = 0x01; if (x < -16384) @@ -160,46 +246,34 @@ void joystick_exec(void) joypad_0_buttons[BUTTON_D] = 0x01; 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; } - - /* ADDED by SDLEMU (http://sdlemu.ngemu.com */ - /* Needed to make sure that the events queue is empty */ - SDL_PumpEvents(); + + // Needed to ensure that the events queue is empty [nwagenaar] + SDL_PumpEvents(); } -void joystick_reset(void) +void JoystickReset(void) { memset(joystick_ram, 0x00, 4); memset(joypad_0_buttons, 0, 21); memset(joypad_1_buttons, 0, 21); } -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) +void JoystickDone(void) { - offset &= 0x03; - joystick_ram[offset+0] = (data >> 8) & 0xFF; - joystick_ram[offset+1] = data & 0xFF; } -uint8 joystick_byte_read(uint32 offset) +uint8 JoystickReadByte(uint32 offset) { - extern bool hardwareTypeNTSC; +#warning No bounds checking done in JoystickReadByte! +// extern bool hardwareTypeNTSC; offset &= 0x03; if (offset == 0) @@ -207,22 +281,22 @@ uint8 joystick_byte_read(uint32 offset) uint8 data = 0x00; 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 - if (!(pad0Index & 0x01)) + +// 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)) + else if (!(pad0Index & 0x02)) pad0Index = 1; - else if (!(pad0Index & 0x04)) + else if (!(pad0Index & 0x04)) pad0Index = 2; - else + else pad0Index = 3; - - if (!(pad1Index & 0x01)) + + if (!(pad1Index & 0x01)) pad1Index = 0; - else if (!(pad1Index & 0x02)) + else if (!(pad1Index & 0x02)) pad1Index = 1; - else if (!(pad1Index & 0x04)) + else if (!(pad1Index & 0x04)) pad1Index = 2; else pad1Index = 3; @@ -240,11 +314,11 @@ uint8 joystick_byte_read(uint32 offset) } else if (offset == 3) { -// uint8 data = ((1 << 5) | (1 << 4) | 0x0F); - uint8 data = 0x2F | (hardwareTypeNTSC ? 0x10 : 0x00); + // Hardware ID returns NTSC/PAL identification bit here + uint8 data = 0x2F | (vjs.hardwareTypeNTSC ? 0x10 : 0x00); int pad0Index = joystick_ram[1] & 0x0F; //unused int pad1Index = (joystick_ram[1] >> 4) & 0x0F; - + if (!(pad0Index & 0x01)) { if (joypad_0_buttons[BUTTON_PAUSE]) @@ -266,14 +340,27 @@ uint8 joystick_byte_read(uint32 offset) { if (joypad_0_buttons[BUTTON_OPTION]) data ^= 0x02; - } + } return data; } return joystick_ram[offset]; } -uint16 joystick_word_read(uint32 offset) +uint16 JoystickReadWord(uint32 offset) +{ + return ((uint16)JoystickReadByte((offset + 0) & 0x03) << 8) | JoystickReadByte((offset + 1) & 0x03); +} + +void JoystickWriteByte(uint32 offset, uint8 data) +{ + joystick_ram[offset & 0x03] = data; +} + +void JoystickWriteWord(uint32 offset, uint16 data) { - return ((uint16)joystick_byte_read((offset+0)&0x03) << 8) | joystick_byte_read((offset+1)&0x03); +#warning No bounds checking done for JoystickWriteWord! + offset &= 0x03; + joystick_ram[offset + 0] = (data >> 8) & 0xFF; + joystick_ram[offset + 1] = data & 0xFF; }