// by James L. Hammons
//
+#include <stdarg.h>
+#include <sys/types.h> // For MacOS <dirent.h> dependency
#include <dirent.h>
#include <SDL.h>
#include <string>
#include <vector>
#include <algorithm>
-#include <ctype.h> // For toupper()
-#include "types.h"
+#include <ctype.h> // For toupper()
#include "settings.h"
#include "tom.h"
#include "video.h"
class Window; // Forward declaration...
-void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap);
+void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap, uint8 * alpha = NULL);
void DrawStringTrans(int16 * screen, uint32 x, uint32 y, uint16 color, uint8 opacity, const char * text, ...);
void DrawStringOpaque(int16 * screen, uint32 x, uint32 y, uint16 color1, uint16 color2, const char * text, ...);
+void DrawString(int16 * screen, uint32 x, uint32 y, bool invert, const char * text, ...);
Window * LoadROM(void);
Window * ResetJaguar(void);
+Window * ResetJaguarCD(void);
Window * RunEmu(void);
Window * Quit(void);
Window * About(void);
// External variables
extern uint8 * jaguar_mainRam;
-extern uint8 * jaguar_bootRom;
extern uint8 * jaguar_mainRom;
+extern uint8 * jaguar_bootRom;
+extern uint8 * jaguar_CDBootROM;
+extern bool BIOSLoaded;
+extern bool CDBIOSLoaded;
// Local global variables
+bool exitGUI = false; // GUI (emulator) done variable
int mouseX, mouseY;
+uint16 background[1280 * 256]; // GUI background buffer
uint16 mousePic[] = {
6, 8,
uint16 pushButtonUp[] = {
8, 8,
- 0x0000,0x0000,0x0000,0x000A,0x000A,0x0000,0x0000,0x0000, // ...##...
- 0x0000,0x000A,0x000A,0x000A,0x000A,0x000A,0x000A,0x0000, // .######.
- 0x0000,0x000A,0x000A,0x000A,0x000A,0x000A,0x000A,0x0000, // .######.
- 0x000A,0x000A,0x000A,0x000A,0x000A,0x000A,0x000A,0x000A, // ########
- 0x000A,0x000A,0x000A,0x000A,0x000A,0x000A,0x000A,0x000A, // ########
- 0x0000,0x000A,0x000A,0x000A,0x000A,0x000A,0x000A,0x0000, // .######.
- 0x0000,0x000A,0x000A,0x000A,0x000A,0x000A,0x000A,0x0000, // .######.
- 0x0000,0x0000,0x0000,0x000A,0x000A,0x0000,0x0000,0x0000 // ...##...
+ 0x0000, 0x0C63, 0x394A, 0x494A, 0x4108, 0x2CC6, 0x0421, 0x0000,
+ 0x0C63, 0x518C, 0x48E7, 0x48C6, 0x48A5, 0x48A5, 0x3CE7, 0x0421,
+ 0x3D4A, 0x48E7, 0x48C6, 0x48C6, 0x44A5, 0x48A5, 0x48A5, 0x2CC6,
+ 0x494A, 0x48C6, 0x48C6, 0x44A5, 0x44A5, 0x44A5, 0x48A5, 0x40E7,
+ 0x4529, 0x48A5, 0x44A5, 0x44A5, 0x44A5, 0x44A5, 0x4CA5, 0x40E7,
+ 0x2CC6, 0x48A5, 0x48A5, 0x44A5, 0x44A5, 0x48A5, 0x4CA5, 0x2CC6,
+ 0x0421, 0x3CE7, 0x48A5, 0x48A5, 0x4CA5, 0x4CA5, 0x44E7, 0x0421,
+ 0x0000, 0x0421, 0x28C6, 0x40E7, 0x40E7, 0x2CC6, 0x0421, 0x0000
+};
+
+uint8 pbuAlpha[] = {
+ 0xFF, 0xE4, 0xA0, 0x99, 0xA4, 0xBE, 0xF0, 0xFF,
+ 0xE3, 0x85, 0x00, 0x00, 0x00, 0x00, 0xAF, 0xF0,
+ 0x9F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0,
+ 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAD,
+ 0xA3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAC,
+ 0xBD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF,
+ 0xF1, 0xAD, 0x00, 0x00, 0x00, 0x00, 0xAC, 0xF1,
+ 0xFF, 0xF2, 0xC0, 0xAD, 0xAD, 0xC0, 0xF2, 0xFF
};
uint16 pushButtonDown[] = {
8, 8,
- 0x0000,0x0000,0x0000,0x000A,0x000A,0x0000,0x0000,0x0000, // ...@@...
- 0x0000,0x000A,0x000A,0x0C7F,0x0C7F,0x000A,0x000A,0x0000, // .@@##@@.
- 0x0000,0x000A,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x000A,0x0000, // .@####@.
- 0x000A,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x000A, // @######@
- 0x000A,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x000A, // @######@
- 0x0000,0x000A,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x000A,0x0000, // .@####@.
- 0x0000,0x000A,0x000A,0x0C7F,0x0C7F,0x000A,0x000A,0x0000, // .@@##@@.
- 0x0000,0x0000,0x0000,0x000A,0x000A,0x0000,0x0000,0x0000 // ...@@...
+ 0x0000, 0x0C63, 0x4A31, 0x5631, 0x4DCE, 0x2D4A, 0x0421, 0x0000,
+ 0x0C63, 0x6AF7, 0x714A, 0x7908, 0x7908, 0x6908, 0x418C, 0x0421,
+ 0x4A31, 0x714A, 0x7508, 0x6CE7, 0x6CE7, 0x74E7, 0x68E7, 0x2929,
+ 0x5A31, 0x7908, 0x6CE7, 0x6CE7, 0x6CE7, 0x6CE7, 0x78E7, 0x3D6B,
+ 0x4DCE, 0x7908, 0x6CE7, 0x6CE7, 0x6CE7, 0x6CE7, 0x78E7, 0x416B,
+ 0x2D4A, 0x6D08, 0x74E7, 0x6CE7, 0x6CE7, 0x74E7, 0x6CE7, 0x2929,
+ 0x0842, 0x418C, 0x6CE7, 0x78E7, 0x78E7, 0x6CE7, 0x416B, 0x0842,
+ 0x0000, 0x0842, 0x2929, 0x416B, 0x416B, 0x2929, 0x0842, 0x0000
+};
+
+uint8 pbdAlpha[] = {
+ 0xFF, 0xE4, 0x72, 0x68, 0x7E, 0xA7, 0xF0, 0xFF,
+ 0xE4, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x93, 0xF0,
+ 0x71, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB2,
+ 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A,
+ 0x7D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A,
+ 0xA6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB1,
+ 0xEF, 0x91, 0x00, 0x00, 0x00, 0x00, 0x96, 0xEF,
+ 0xFF, 0xEF, 0xAE, 0x98, 0x97, 0xAF, 0xEF, 0xFF
};
uint16 slideSwitchUp[] = {
char separator[] = "--------------------------------------------------------";
-uint16 background[1280 * 240];
-
//
// Case insensitive string compare function
// Taken straight out of Thinking In C++ by Bruce Eckel. Thanks Bruce!
// Select the first element of each string:
string::const_iterator p1 = s1.begin(), p2 = s2.begin();
- while (p1 != s1.end() && p2 != s2.end()) // Don\92t run past the end
+ while (p1 != s1.end() && p2 != s2.end()) // Don\92t run past the end
{
- if (toupper(*p1) != toupper(*p2)) // Compare upper-cased chars
+ if (toupper(*p1) != toupper(*p2)) // Compare upper-cased chars
return (toupper(*p1) < toupper(*p2) ? -1 : 1);// Report which was lexically greater
p1++;
public:
Element(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0)
{ extents.x = x, extents.y = y, extents.w = w, extents.h = h; }
- virtual void HandleKey(SDLKey key) = 0;
+ virtual void HandleKey(SDLKey key) = 0; // These are "pure" virtual functions...
virtual void HandleMouseMove(uint32 x, uint32 y) = 0;
virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown) = 0;
virtual void Draw(uint32, uint32) = 0;
static uint32 pitch;
};
+// Initialize class variables (Element)
int16 * Element::screenBuffer = NULL;
uint32 Element::pitch = 0;
{
// How to handle?
// Save state externally?
+//We pass in a state variable if we want to track it externally, otherwise we use our own
+//internal state var. Still need to do some kind of callback for pushbuttons that do things
+//like change from fullscreen to windowed... !!! FIX !!!
public:
// PushButton(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0): Element(x, y, w, h),
}
}*/
- DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, (*state ? pushButtonDown : pushButtonUp));
+// DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, (*state ? pushButtonDown : pushButtonUp));
+ DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, (*state ? pushButtonDown : pushButtonUp), (*state ? pbdAlpha : pbuAlpha));
if (text.length() > 0)
DrawString(screenBuffer, extents.x + offsetX + 12, extents.y + offsetY, false, "%s", text.c_str());
}
{
// How to handle?
// Save state externally?
+//Seems to be handled the same as PushButton, but without sanity checks. !!! FIX !!!
public:
SlideSwitch(uint32 x, uint32 y, bool * st, string s1, string s2): Element(x, y, 8, 16), state(st),
public:
Text(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0): Element(x, y, w, h),
fgColor(0x4FF0), bgColor(0xFE10) {}
- Text(uint32 x, uint32 y, string s): Element(x, y, 0, 0),
- fgColor(0x4FF0), bgColor(0xFE10), text(s) {}
+ Text(uint32 x, uint32 y, string s, uint16 fg = 0x4FF0, uint16 bg = 0xFE10): Element(x, y, 0, 0),
+ fgColor(fg), bgColor(bg), text(s) {}
virtual void HandleKey(SDLKey key) {}
virtual void HandleMouseMove(uint32 x, uint32 y) {}
virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown) {}
void Text::Draw(uint32 offsetX/*= 0*/, uint32 offsetY/*= 0*/)
{
if (text.length() > 0)
- DrawString(screenBuffer, extents.x + offsetX, extents.y + offsetY, false, "%s", text.c_str());
+// DrawString(screenBuffer, extents.x + offsetX, extents.y + offsetY, false, "%s", text.c_str());
+ DrawStringOpaque(screenBuffer, extents.x + offsetX, extents.y + offsetY, fgColor, bgColor, "%s", text.c_str());
}
if (newThumbStart < 0)
newThumbStart = 0;
- if (newThumbStart > sbHeight - thumb)
+ if ((uint32)newThumbStart > sbHeight - thumb)
newThumbStart = sbHeight - thumb;
windowPtr = (uint32)(((float)newThumbStart / (float)sbHeight) * (float)item.size());
if (Inside(x, y) && mouseDown)
{
// Why do we have to do this??? (- extents.y?)
- // I guess it's because only the Window class has offsetting implemented...
+ // I guess it's because only the Window class has offsetting implemented... !!! FIX !!!
cursor = (y - extents.y) / 8;
}
// Check for a hit on the scrollbar...
- if (x > (extents.x + extents.w) && x <= (extents.x + extents.w + 8)
- && y > (extents.y + 8) && y <= (extents.y + extents.h - 16))
+ if (x > (uint32)(extents.x + extents.w) && x <= (uint32)(extents.x + extents.w + 8)
+ && y > (uint32)(extents.y + 8) && y <= (uint32)(extents.y + extents.h - 16))
{
if (mouseDown)
{
if (y >= (extents.y + 8 + thumbStart) && y < (extents.y + 8 + thumbStart + thumb))
thumbClicked = true, yRelativePoint = y - thumbStart;
}
- else
- thumbClicked = false;
+//Seems that this is useless--never reached except in rare cases and that the code outside is
+//more effective...
+// else
+// thumbClicked = false;
}
+ if (!mouseDown)
+ thumbClicked = false;
+
upArrow.HandleMouseButton(x - extents.x, y - extents.y, mouseDown);
downArrow.HandleMouseButton(x - extents.x, y - extents.y, mouseDown);
upArrow2.HandleMouseButton(x - extents.x, y - extents.y, mouseDown);
AddElement(load);
load->SetNotificationElement(this);
+//!!! FIX !!! Directory might not exist--this shouldn't cause VJ to crash!
DIR * dp = opendir(vjs.ROMPath);
dirent * de;
char * ext = strrchr(de->d_name, '.');
if (ext != NULL)
- if (stricmp(ext, ".zip") == 0 || stricmp(ext, ".jag") == 0)
+ if (strcasecmp(ext, ".zip") == 0 || strcasecmp(ext, ".j64") == 0
+ || strcasecmp(ext, ".abs") == 0 || strcasecmp(ext, ".jag") == 0
+ || strcasecmp(ext, ".rom") == 0)
files->AddItem(string(de->d_name));
}
strcat(filename, files->GetSelectedItem().c_str());
// uint32 romSize = JaguarLoadROM(jaguar_mainRom, filename);
- JaguarLoadCart(jaguar_mainRom, filename);
-
-// if (romSize == 0)
-//We need better error checking here... !!! FIX !!!
-// WriteLog("VJ: Could not load ROM from file \"%s\"...", files->GetSelectedItem().c_str());
-// else
-// {
-// jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, romSize);
-// WriteLog("CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32);
-// eeprom_init();
+// JaguarLoadCart(jaguar_mainRom, filename);
+ if (JaguarLoadFile(filename))
+ {
+ SDL_Event event;
+ event.type = SDL_USEREVENT, event.user.code = WINDOW_CLOSE;
+ SDL_PushEvent(&event);
- SDL_Event event;
- event.type = SDL_USEREVENT, event.user.code = WINDOW_CLOSE;
- SDL_PushEvent(&event);
+ event.type = SDL_USEREVENT, event.user.code = MENU_ITEM_CHOSEN;
+ event.user.data1 = (void *)ResetJaguar;
+ SDL_PushEvent(&event);
+ }
+ else
+ {
+ SDL_Event event;
+ event.type = SDL_USEREVENT, event.user.code = WINDOW_CLOSE;
+ SDL_PushEvent(&event);
- event.type = SDL_USEREVENT, event.user.code = MENU_ITEM_CHOSEN;
- event.user.data1 = (void *)ResetJaguar;
- SDL_PushEvent(&event);
-// }
+ // Handle the error, but don't run...
+ // Tell the user that we couldn't run their file for some reason... !!! FIX !!!
+//how to kludge: Make a function like ResetJaguar which creates the dialog window
+ }
}
else
Window::Notify(e);
//Do we even *need* this?
-class RootWindow: public Window
+//Doesn't seem like it...
+/*class RootWindow: public Window
{
public:
RootWindow(Menu * m, Window * w = NULL): menu(m), window(w) {}
Menu * menu;
Window * window;
int16 * rootImage[1280 * 240 * 2];
-};
-
-
-
-//
-// GUI stuff--it's not crunchy, it's GUI! ;-)
-//
-
-void InitGUI(void)
-{
- SDL_ShowCursor(SDL_DISABLE);
- SDL_GetMouseState(&mouseX, &mouseY);
-}
+};//*/
-void GUIDone(void)
-{
-}
//
// Draw text at the given x/y coordinates. Can invert text as well.
}
//
-// GUI Main loop
+// Draw "picture"
+// Uses zero as transparent color
+// Can also use an optional alpha channel
//
-bool GUIMain(void)
+void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap, uint8 * alpha/*=NULL*/)
{
+ uint16 width = bitmap[0], height = bitmap[1];
+ bitmap += 2;
+
+ uint32 pitch = GetSDLScreenPitch() / 2; // Returns pitch in bytes but we need words...
+ uint32 address = x + (y * pitch);
+
+ for(int yy=0; yy<height; yy++)
+ {
+ for(int xx=0; xx<width; xx++)
+ {
+ if (alpha == NULL)
+ {
+ if (*bitmap && x + xx < pitch) // NOTE: Still doesn't clip the Y val...
+ *(screen + address + xx + (yy * pitch)) = *bitmap;
+ }
+ else
+ {
+ uint8 trans = *alpha;
+ uint16 color = *bitmap;
+ uint16 existingColor = *(screen + address + xx + (yy * pitch));
+
+ uint8 eRed = (existingColor >> 10) & 0x1F,
+ eGreen = (existingColor >> 5) & 0x1F,
+ eBlue = existingColor & 0x1F,
+
+ nRed = (color >> 10) & 0x1F,
+ nGreen = (color >> 5) & 0x1F,
+ nBlue = color & 0x1F;
+
+ uint8 invTrans = 255 - trans;
+ uint16 bRed = (eRed * trans + nRed * invTrans) / 255;
+ uint16 bGreen = (eGreen * trans + nGreen * invTrans) / 255;
+ uint16 bBlue = (eBlue * trans + nBlue * invTrans) / 255;
+
+ uint16 blendedColor = (bRed << 10) | (bGreen << 5) | bBlue;
+
+ *(screen + address + xx + (yy * pitch)) = blendedColor;
+
+ alpha++;
+ }
+
+ bitmap++;
+ }
+ }
+}
+
+
+//
+// GUI stuff--it's not crunchy, it's GUI! ;-)
+//
+
+void InitGUI(void)
+{
+ SDL_ShowCursor(SDL_DISABLE);
+ SDL_GetMouseState(&mouseX, &mouseY);
+}
+
+void GUIDone(void)
+{
+}
+
+//
+// GUI main loop
+//
+//bool GUIMain(void)
+bool GUIMain(char * filename)
+{
+WriteLog("GUI: Inside GUIMain...\n");
+// Need to set things up so that it loads and runs a file if given on the command line. !!! FIX !!!
extern int16 * backbuffer;
- bool done = false;
+// bool done = false;
SDL_Event event;
Window * mainWindow = NULL;
Menu mainMenu;
MenuItems mi;
- mi.title = "File";
+ mi.title = "Jaguar";
mi.item.push_back(NameAction("Load...", LoadROM, SDLK_l));
- mi.item.push_back(NameAction("Reset", ResetJaguar));
+ mi.item.push_back(NameAction("Reset", ResetJaguar, SDLK_r));
+ if (CDBIOSLoaded)
+ mi.item.push_back(NameAction("Reset CD", ResetJaguarCD, SDLK_c));
mi.item.push_back(NameAction("Run", RunEmu, SDLK_ESCAPE));
mi.item.push_back(NameAction(""));
mi.item.push_back(NameAction("Quit", Quit, SDLK_q));
bool showMouse = true;
//This is crappy!!! !!! FIX !!!
+//Is this even needed any more? Hmm. Maybe. Dunno.
+WriteLog("GUI: Resetting Jaguar...\n");
jaguar_reset();
+WriteLog("GUI: Clearing BG save...\n");
// Set up our background save...
memset(background, 0x11, tom_getVideoModeWidth() * 240 * 2);
- while (!done)
+ // Handle loading file passed in on the command line...!
+
+ if (filename)
{
- while (SDL_PollEvent(&event))
+ if (JaguarLoadFile(filename))
+ {
+ event.type = SDL_USEREVENT, event.user.code = MENU_ITEM_CHOSEN;
+ event.user.data1 = (void *)ResetJaguar;
+ SDL_PushEvent(&event);
+ }
+ else
+ {
+ // Create error dialog...
+ char errText[1024];
+ sprintf(errText, "The file %40s could no be loaded.", filename);
+
+ mainWindow = new Window(8, 16, 304, 160);
+ mainWindow->AddElement(new Text(8, 8, "Error!"));
+ mainWindow->AddElement(new Text(8, 24, errText));
+ }
+ }
+
+WriteLog("GUI: Entering main loop...\n");
+ while (!exitGUI)
+ {
+ if (SDL_PollEvent(&event))
{
if (event.type == SDL_USEREVENT)
{
// it's simple. Perhaps there may be a reason down the road to be more selective with
// our clearing, but for now, this will suffice.
// memset(backbuffer, 0x11, tom_getVideoModeWidth() * 240 * 2);
- memcpy(backbuffer, background, tom_getVideoModeWidth() * 240 * 2);
+ memcpy(backbuffer, background, tom_getVideoModeWidth() * 256 * 2);
mainMenu.Draw();
+//Could do multiple windows here by using a vector + priority info...
+//Though the way ZSNES does it seems to be by a bool (i.e., they're always active, just not shown)
if (mainWindow)
mainWindow->Draw();
//
// GUI "action" functions
//
+
Window * LoadROM(void)
{
FileList * fileList = new FileList(8, 16, 304, 216);
Window * ResetJaguar(void)
{
jaguar_reset();
+
+ return RunEmu();
+}
+
+Window * ResetJaguarCD(void)
+{
+ memcpy(jaguar_mainRom, jaguar_CDBootROM, 0x40000);
+ jaguarRunAddress = 0x802000;
+ jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, 0x40000);
+ jaguar_reset();
+//This is a quick kludge to get the CDBIOS to boot properly...
+//Wild speculation: It could be that this memory location is wired into the CD unit
+//somehow, which lets it know whether or not a cart is present in the unit...
+ jaguar_mainRom[0x0040B] = 0x03;
+
return RunEmu();
}
// Pass a message to the "joystick" code to debounce the ESC key...
debounceRunKey = true;
- uint32 cartType = 2;
+ uint32 cartType = 4;
if (jaguarRomSize == 0x200000)
cartType = 0;
else if (jaguarRomSize == 0x400000)
cartType = 1;
+ else if (jaguar_mainRom_crc32 == 0x687068D5)
+ cartType = 2;
+ else if (jaguar_mainRom_crc32 == 0x55A0669C)
+ cartType = 3;
- char * cartTypeName[3] = { "2M Cartridge", "4M Cartridge", "Homebrew" };
+ char * cartTypeName[5] = { "2M Cartridge", "4M Cartridge", "CD BIOS", "CD Dev BIOS", "Homebrew" };
- while (!finished)
+// while (!finished)
+ while (true)
{
// Set up new backbuffer with new pixels and data
JaguarExecute(backbuffer, true);
//This sucks... !!! FIX !!!
joystick_exec();
+//This is done here so that the crud below doesn't get on our GUI background...
if (finished)
break;
// Save the background for the GUI...
// memcpy(background, backbuffer, tom_getVideoModeWidth() * 240 * 2);
// In this case, we squash the color to monochrome, then force it to blue + green...
- for(uint32 i=0; i<tom_getVideoModeWidth() * 240; i++)
+ for(uint32 i=0; i<tom_getVideoModeWidth() * 256; i++)
{
uint16 word = backbuffer[i];
uint8 r = (word >> 10) & 0x1F, g = (word >> 5) & 0x1F, b = word & 0x1F;
Window * Quit(void)
{
-//This is crap. We need some REAL exit code, instead of this psuedo crap... !!! FIX !!!
WriteLog("GUI: Quitting due to user request.\n");
+ exitGUI = true;
-// log_done();
- jaguar_done();
- version_done();
- memory_done();
- VideoDone(); // Free SDL components last...!
- log_done();
-
- exit(0);
-
- return NULL; // We never get here...
+ return NULL;
}
Window * About(void)
{
Window * window = new Window(8, 16, 304, 160);
window->AddElement(new Text(8, 8, "Virtual Jaguar 1.0.7"));
+// window->AddElement(new Text(8, 8, "Virtual Jaguar CVS 20040417"));
window->AddElement(new Text(8, 24, "Coders:"));
window->AddElement(new Text(16, 32, "Niels Wagenaar (nwagenaar)"));
window->AddElement(new Text(16, 40, "Carwin Jones (Caz)"));
window->AddElement(new Text(16, 48, "James L. Hammons (shamus)"));
window->AddElement(new Text(16, 56, "Adam Green"));
+ window->AddElement(new Text(8, 72, "Testers:"));
+ window->AddElement(new Text(16, 80, "Guruma"));
+ window->AddElement(new Text(8, 96, "Thanks go out to:"));
+ window->AddElement(new Text(16, 104, "Aaron Giles (original CoJag)"));
+ window->AddElement(new Text(16, 112, "David Raingeard (original VJ)"));
+ window->AddElement(new Text(16, 120, "Karl Stenerud (Musashi 68K emu)"));
+ window->AddElement(new Text(16, 128, "Sam Lantinga (amazing SDL libs)"));
+ window->AddElement(new Text(16, 136, "Ryan C. Gordon (VJ's web presence)"));
+ window->AddElement(new Text(16, 144, "The guys over at Atari Age ;-)"));
return window;
}
}
-//
-// Draw "picture"
-// Uses zero as transparent color
-//
-void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap)
-{
- uint16 width = bitmap[0], height = bitmap[1];
- bitmap += 2;
-
- uint32 pitch = GetSDLScreenPitch() / 2; // Returns pitch in bytes but we need words...
- uint32 address = x + (y * pitch);
-
- for(int yy=0; yy<height; yy++)
- {
- for(int xx=0; xx<width; xx++)
- {
- if (*bitmap && x + xx < pitch) // NOTE: Still doesn't clip the Y val...
- *(screen + address + xx + (yy * pitch)) = *bitmap;
- bitmap++;
- }
- }
-}
-
-//
-// Very very crude GUI file selector
-//
-/*bool UserSelectFile(char * path, char * filename)
-{
-//Testing...
-GUIMain();
-
- extern int16 * backbuffer;
- vector<string> fileList;
-
- // Read in the candidate files from the directory pointed to by "path"
-
- DIR * dp = opendir(path);
- dirent * de;
-
- while ((de = readdir(dp)) != NULL)
- {
- char * ext = strrchr(de->d_name, '.');
-
- if (ext != NULL)
- if (stricmp(ext, ".zip") == 0 || stricmp(ext, ".jag") == 0)
- fileList.push_back(string(de->d_name));
- }
-
- closedir(dp);
-
- if (fileList.size() == 0) // Any files found?
- return false; // Nope. Bail!
-
- // Main GUI selection loop
-
- uint32 cursor = 0, startFile = 0;
-
- if (fileList.size() > 1) // Only go GUI if more than one possibility!
- {
- sort(fileList.begin(), fileList.end());
-
- bool done = false;
- uint32 limit = (fileList.size() > 30 ? 30 : fileList.size());
- SDL_Event event;
-
- // Ensure that the GUI is drawn before any user input...
- event.type = SDL_USEREVENT;
- SDL_PushEvent(&event);
-
- while (!done)
- {
- while (SDL_PollEvent(&event))
- {
- if (event.type == SDL_KEYDOWN)
- {
- SDLKey key = event.key.keysym.sym;
-
- if (key == SDLK_DOWN)
- {
- if (cursor != limit - 1) // Cursor is within its window
- cursor++;
- else // Otherwise, scroll the window...
- {
- if (cursor + startFile != fileList.size() - 1)
- startFile++;
- }
- }
- if (key == SDLK_UP)
- {
- if (cursor != 0)
- cursor--;
- else
- {
- if (startFile != 0)
- startFile--;
- }
- }
- if (key == SDLK_PAGEDOWN)
- {
- if (cursor != limit - 1)
- cursor = limit - 1;
- else
- {
- startFile += limit;
- if (startFile > fileList.size() - limit)
- startFile = fileList.size() - limit;
- }
- }
- if (key == SDLK_PAGEUP)
- {
- if (cursor != 0)
- cursor = 0;
- else
- {
- if (startFile < limit)
- startFile = 0;
- else
- startFile -= limit;
- }
- }
- if (key == SDLK_RETURN)
- done = true;
- if (key == SDLK_ESCAPE)
- {
- WriteLog("GUI: Aborting VJ by user request.\n");
- return false; // Bail out!
- }
- if (key >= SDLK_a && key <= SDLK_z)
- {
- // Advance cursor to filename with first letter pressed...
- uint8 which = (key - SDLK_a) + 65; // Convert key to A-Z char
-
- for(uint32 i=0; i<fileList.size(); i++)
- {
- if ((fileList[i][0] & 0xDF) == which)
- {
- cursor = i - startFile;
- if (i > startFile + limit - 1)
- startFile = i - limit + 1,
- cursor = limit - 1;
- if (i < startFile)
- startFile = i,
- cursor = 0;
- break;
- }
- }
- }
- }
- else if (event.type == SDL_MOUSEMOTION)
- {
- mouseX = event.motion.x, mouseY = event.motion.y;
- if (vjs.useOpenGL)
- mouseX /= 2, mouseY /= 2;
- }
- else if (event.type == SDL_MOUSEBUTTONDOWN)
- {
- uint32 mx = event.button.x, my = event.button.y;
- if (vjs.useOpenGL)
- mx /= 2, my /= 2;
- cursor = my / 8;
- }
-
- // Draw the GUI...
-// memset(backbuffer, 0x11, tom_getVideoModeWidth() * tom_getVideoModeHeight() * 2);
- memset(backbuffer, 0x11, tom_getVideoModeWidth() * 240 * 2);
-
- for(uint32 i=0; i<limit; i++)
- {
- // Clip our strings to guarantee that they fit on the screen...
- // (and strip off the extension too)
- string s(fileList[startFile + i], 0, fileList[startFile + i].length() - 4);
- if (s.length() > 38)
- s[38] = 0;
- DrawString(backbuffer, 0, i*8, (cursor == i ? true : false), " %s ", s.c_str());
- }
-
- DrawTransparentBitmap(backbuffer, mouseX, mouseY, mousePic);
-
- RenderBackbuffer();
- }
- }
- }
-
- strcpy(filename, path);
-
- if (strlen(path) > 0)
- if (path[strlen(path) - 1] != '/')
- strcat(filename, "/");
-
- strcat(filename, fileList[startFile + cursor].c_str());
-
- return true;
-}*/
-
//
// Generic ROM loading
//
uint32 JaguarLoadROM(uint8 * rom, char * path)
{
+// We really should have some kind of sanity checking for the ROM size here to prevent
+// a buffer overflow... !!! FIX !!!
uint32 romSize = 0;
char * ext = strrchr(path, '.');
{
WriteLog("VJ: Loading \"%s\"...", path);
- if (stricmp(ext, ".zip") == 0)
+ if (strcasecmp(ext, ".zip") == 0)
{
// Handle ZIP file loading here...
WriteLog("(ZIPped)...");
fread(rom, 1, romSize, fp);
fclose(fp);*/
+ // Handle gzipped files transparently [Adam Green]...
+
gzFile fp = gzopen(path, "rb");
if (fp == NULL)
}
//
-// Jaguar cartridge ROM loading
+// Jaguar file loading
//
-void JaguarLoadCart(uint8 * mem, char * path)
+bool JaguarLoadFile(char * path)
{
- jaguarRomSize = JaguarLoadROM(mem, path);
+// jaguarRomSize = JaguarLoadROM(mem, path);
+ jaguarRomSize = JaguarLoadROM(jaguar_mainRom, path);
-// if (romSize == 0)
-// {
-/* char newPath[2048];
- WriteLog("VJ: Trying GUI...\n");
-
-//This is not *nix friendly for some reason...
+/*//This is not *nix friendly for some reason...
// if (!UserSelectFile(path, newPath))
- if (!UserSelectFile((strlen(path) == 0 ? (char *)"." : path), newPath))
- {
- WriteLog("VJ: Could not find valid ROM in directory \"%s\"...\nAborting!\n", path);
- log_done();
- exit(0);
- }
+ if (!UserSelectFile((strlen(path) == 0 ? (char *)"." : path), newPath))
+ {
+ WriteLog("VJ: Could not find valid ROM in directory \"%s\"...\nAborting!\n", path);
+ log_done();
+ exit(0);
+ }*/
- romSize = JaguarLoadROM(mem, newPath);
-*/
- if (jaguarRomSize == 0)
- {
+ if (jaguarRomSize == 0)
+ {
// WriteLog("VJ: Could not load ROM from file \"%s\"...\nAborting!\n", newPath);
- WriteLog("VJ: Could not load ROM from file \"%s\"...\nAborting!\n", path);
- log_done();
- exit(0);
- }
-// }
+ WriteLog("GUI: Could not load ROM from file \"%s\"...\nAborting load!\n", path);
+// Need to do something else here, like throw up an error dialog instead of aborting. !!! FIX !!!
+// log_done();
+// exit(0);
+ return false; // This is a start...
+ }
jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, jaguarRomSize);
WriteLog("CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32);
eeprom_init();
jaguarRunAddress = 0x802000;
-//NOTE: The bytes 'JAGR' should also be at position $1C...
-// Also, there's *always* a $601A header at position $00...
- if (jaguar_mainRom[0] == 0x60 && jaguar_mainRom[1] == 0x1A)
+
+ char * ext = strrchr(path, '.'); // Get the file's extension for non-cartridge checking
+
+//NOTE: Should fix JaguarLoadROM() to replace .zip with what's *in* the zip (.abs, .j64, etc.)
+ if (strcasecmp(ext, ".rom") == 0)
{
- uint32 loadAddress = GET32(jaguar_mainRom, 0x22), runAddress = GET32(jaguar_mainRom, 0x2A);
-//This is not always right! Especially when converted via bin2jag1!!!
-//We should have access to the length of the furshlumiger file that was loaded anyway!
-//Now, we do! ;-)
-// uint32 progLength = GET32(jaguar_mainRom, 0x02);
-//jaguarRomSize
-//jaguarRunAddress
-// WriteLog("Jaguar: Setting up PD ROM... Run address: %08X, length: %08X\n", runAddress, progLength);
-// memcpy(jaguar_mainRam + loadAddress, jaguar_mainRom + 0x2E, progLength);
- WriteLog("Jaguar: Setting up homebrew... Run address: %08X, length: %08X\n", runAddress, jaguarRomSize - 0x2E);
- memcpy(jaguar_mainRam + loadAddress, jaguar_mainRom + 0x2E, jaguarRomSize - 0x2E);
-// SET32(jaguar_mainRam, 4, runAddress);
- jaguarRunAddress = runAddress;
+ // File extension ".ROM": Alpine image that loads/runs at $802000
+ WriteLog("GUI: Setting up homebrew (ROM)... Run address: 00802000, length: %08X\n", jaguarRomSize);
+
+ for(int i=jaguarRomSize-1; i>=0; i--)
+ jaguar_mainRom[0x2000 + i] = jaguar_mainRom[i];
+
+ memset(jaguar_mainRom, 0xFF, 0x2000);
+/* memcpy(jaguar_mainRam, jaguar_mainRom, jaguarRomSize);
+ memset(jaguar_mainRom, 0xFF, 0x600000);
+ memcpy(jaguar_mainRom + 0x2000, jaguar_mainRam, jaguarRomSize);
+ memset(jaguar_mainRam, 0x00, 0x400000);*/
+
+/*
+Stubulator ROM vectors...
+handler 001 at $00E00008
+handler 002 at $00E008DE
+handler 003 at $00E008E2
+handler 004 at $00E008E6
+handler 005 at $00E008EA
+handler 006 at $00E008EE
+handler 007 at $00E008F2
+handler 008 at $00E0054A
+handler 009 at $00E008FA
+handler 010 at $00000000
+handler 011 at $00000000
+handler 012 at $00E008FE
+handler 013 at $00E00902
+handler 014 at $00E00906
+handler 015 at $00E0090A
+handler 016 at $00E0090E
+handler 017 at $00E00912
+handler 018 at $00E00916
+handler 019 at $00E0091A
+handler 020 at $00E0091E
+handler 021 at $00E00922
+handler 022 at $00E00926
+handler 023 at $00E0092A
+handler 024 at $00E0092E
+handler 025 at $00E0107A
+handler 026 at $00E0107A
+handler 027 at $00E0107A
+handler 028 at $00E008DA
+handler 029 at $00E0107A
+handler 030 at $00E0107A
+handler 031 at $00E0107A
+handler 032 at $00000000
+
+Let's try setting up the illegal instruction vector for a stubulated jaguar...
+*/
+/* SET32(jaguar_mainRam, 0x08, 0x00E008DE);
+ SET32(jaguar_mainRam, 0x0C, 0x00E008E2);
+ SET32(jaguar_mainRam, 0x10, 0x00E008E6); // <-- Should be here (it is)...
+ SET32(jaguar_mainRam, 0x14, 0x00E008EA);//*/
+
+ // Try setting the vector to say, $1000 and putting an instruction there that loops forever:
+ // This kludge works! Yeah!
+ SET32(jaguar_mainRam, 0x10, 0x00001000);
+ SET16(jaguar_mainRam, 0x1000, 0x60FE); // Here: bra Here
}
-}
+ else if (strcasecmp(ext, ".abs") == 0)
+ {
+ // File extension ".ABS": Atari linker output file with header (w/o is useless to us here)
/*
ABS Format sleuthing (LBUGDEMO.ABS):
Start of Text Segment = 0x00802000
Start of Data Segment = 0x00803dd0
*/
+ if (jaguar_mainRom[0] == 0x60 && jaguar_mainRom[1] == 0x1B)
+ {
+ uint32 loadAddress = GET32(jaguar_mainRom, 0x16), //runAddress = GET32(jaguar_mainRom, 0x2A),
+ codeSize = GET32(jaguar_mainRom, 0x02) + GET32(jaguar_mainRom, 0x06);
+ WriteLog("GUI: Setting up homebrew (ABS-1)... Run address: %08X, length: %08X\n", loadAddress, codeSize);
+ if (loadAddress < 0x800000)
+ memcpy(jaguar_mainRam + loadAddress, jaguar_mainRom + 0x24, codeSize);
+ else
+ {
+ for(int i=codeSize-1; i>=0; i--)
+ jaguar_mainRom[(loadAddress - 0x800000) + i] = jaguar_mainRom[i + 0x24];
+/* memcpy(jaguar_mainRam, jaguar_mainRom + 0x24, codeSize);
+ memset(jaguar_mainRom, 0xFF, 0x600000);
+ memcpy(jaguar_mainRom + (loadAddress - 0x800000), jaguar_mainRam, codeSize);
+ memset(jaguar_mainRam, 0x00, 0x400000);*/
+ }
+
+ jaguarRunAddress = loadAddress;
+ }
+ else if (jaguar_mainRom[0] == 0x01 && jaguar_mainRom[1] == 0x50)
+ {
+ uint32 loadAddress = GET32(jaguar_mainRom, 0x28), runAddress = GET32(jaguar_mainRom, 0x24),
+ codeSize = GET32(jaguar_mainRom, 0x18) + GET32(jaguar_mainRom, 0x1C);
+ WriteLog("GUI: Setting up homebrew (ABS-2)... Run address: %08X, length: %08X\n", runAddress, codeSize);
+
+ if (loadAddress < 0x800000)
+ memcpy(jaguar_mainRam + loadAddress, jaguar_mainRom + 0xA8, codeSize);
+ else
+ {
+ for(int i=codeSize-1; i>=0; i--)
+ jaguar_mainRom[(loadAddress - 0x800000) + i] = jaguar_mainRom[i + 0xA8];
+/* memcpy(jaguar_mainRam, jaguar_mainRom + 0xA8, codeSize);
+ memset(jaguar_mainRom, 0xFF, 0x600000);
+ memcpy(jaguar_mainRom + (loadAddress - 0x800000), jaguar_mainRam, codeSize);
+ memset(jaguar_mainRam, 0x00, 0x400000);*/
+ }
+
+ jaguarRunAddress = runAddress;
+ }
+ else
+ {
+ WriteLog("GUI: Couldn't find correct ABS format: %02X %02X\n", jaguar_mainRom[0], jaguar_mainRom[1]);
+ return false;
+ }
+ }
+ else if (strcasecmp(ext, ".jag") == 0)
+ {
+ // File extension ".JAG": Atari server file with header
+//NOTE: The bytes 'JAGR' should also be at position $1C...
+// Also, there's *always* a $601A header at position $00...
+ if (jaguar_mainRom[0] == 0x60 && jaguar_mainRom[1] == 0x1A)
+ {
+ uint32 loadAddress = GET32(jaguar_mainRom, 0x22), runAddress = GET32(jaguar_mainRom, 0x2A);
+//This is not always right! Especially when converted via bin2jag1!!!
+//We should have access to the length of the furshlumiger file that was loaded anyway!
+//Now, we do! ;-)
+// uint32 progLength = GET32(jaguar_mainRom, 0x02);
+//jaguarRomSize
+//jaguarRunAddress
+// WriteLog("Jaguar: Setting up PD ROM... Run address: %08X, length: %08X\n", runAddress, progLength);
+// memcpy(jaguar_mainRam + loadAddress, jaguar_mainRom + 0x2E, progLength);
+ WriteLog("GUI: Setting up homebrew (JAG)... Run address: %08X, length: %08X\n", runAddress, jaguarRomSize - 0x2E);
+ memcpy(jaguar_mainRam + loadAddress, jaguar_mainRom + 0x2E, jaguarRomSize - 0x2E);
+// SET32(jaguar_mainRam, 4, runAddress);
+ jaguarRunAddress = runAddress;
+ }
+ else
+ return false;
+ }
+ // .J64 (Jaguar cartridge ROM image) is implied by the FileList object...
+
+ return true;
+}
//
// Get the length of a (possibly) gzipped file
projects / virtualjaguar / blobdiff