// 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"
+#include "settings.h"
#define BUTTON_U 0
#define BUTTON_D 1
#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 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;
+
void joystick_init(void)
{
void joystick_exec(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])
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;
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_ESCAPE])
- finished = true;
- /* Added/Changed by SDLEMU (http://sdlemu.ngemu.com */
- /* Joystick support */
-
- if (console.JoyEnabled() == 1)
+ // Joystick support [nwagenaar]
+
+ 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 (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 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;
+// extern bool hardwareTypeNTSC;
offset &= 0x03;
if (offset == 0)
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
+// 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 (offset == 3)
{
-// uint8 data = ((1 << 5) | (1 << 4) | 0x0F);
- uint8 data = 0x2F | (hardwareTypeNTSC ? 0x10 : 0x00);
+ uint8 data = 0x2F | (vjs.hardwareTypeNTSC ? 0x10 : 0x00);
int pad0Index = joystick_ram[1] & 0x0F;
//unused int pad1Index = (joystick_ram[1] >> 4) & 0x0F;
{
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;
+}
projects / virtualjaguar / blobdiff