X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui.cpp;h=13ea5b20c08024cd2dd81ebc15635812e5e4f7be;hb=4b32affecce8cf8f557feb96daa76ba1692c3afe;hp=d6ae7dbf434038661c9de932b9f920da10fe83bb;hpb=b9917a7b287b02ae3eee071f970d57c9e8720f0a;p=virtualjaguar diff --git a/src/gui.cpp b/src/gui.cpp index d6ae7db..13ea5b2 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -5,13 +5,14 @@ // by James L. Hammons // +#include +#include // For MacOS dependency #include #include #include #include #include -#include // For toupper() -#include "types.h" +#include // For toupper() #include "settings.h" #include "tom.h" #include "video.h" @@ -30,8 +31,10 @@ class Window; // Forward declaration... 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); @@ -42,12 +45,17 @@ int gzfilelength(gzFile gd); // 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, @@ -220,8 +228,6 @@ uint16 slideSwitchDown[] = { char separator[] = "--------------------------------------------------------"; -uint16 background[1280 * 240]; - // // Case insensitive string compare function // Taken straight out of Thinking In C++ by Bruce Eckel. Thanks Bruce! @@ -232,9 +238,9 @@ int stringCmpi(const string &s1, const string &s2) // Select the first element of each string: string::const_iterator p1 = s1.begin(), p2 = s2.begin(); - while (p1 != s1.end() && p2 != s2.end()) // Don’t run past the end + while (p1 != s1.end() && p2 != s2.end()) // Don’t 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++; @@ -256,7 +262,7 @@ class Element 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; @@ -275,6 +281,7 @@ class Element static uint32 pitch; }; +// Initialize class variables (Element) int16 * Element::screenBuffer = NULL; uint32 Element::pitch = 0; @@ -373,6 +380,9 @@ class PushButton: public Element { // 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), @@ -465,6 +475,7 @@ class SlideSwitch: public Element { // 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), @@ -632,8 +643,8 @@ class Text: public Element 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) {} @@ -648,7 +659,8 @@ class Text: public Element 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()); } @@ -775,7 +787,7 @@ void ListBox::HandleMouseMove(uint32 x, uint32 y) 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()); @@ -789,13 +801,13 @@ void ListBox::HandleMouseButton(uint32 x, uint32 y, bool mouseDown) 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) { @@ -808,10 +820,15 @@ void ListBox::HandleMouseButton(uint32 x, uint32 y, bool 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); @@ -925,6 +942,7 @@ FileList::FileList(uint32 x, uint32 y, uint32 w, uint32 h): Window(x, y, w, h) AddElement(load); load->SetNotificationElement(this); +//!!! FIX !!! Directory might not exist--this shouldn't cause VJ to crash! DIR * dp = opendir(vjs.ROMPath); dirent * de; @@ -933,7 +951,9 @@ FileList::FileList(uint32 x, uint32 y, uint32 w, uint32 h): Window(x, y, w, h) 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)); } @@ -962,25 +982,27 @@ void FileList::Notify(Element * e) 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); @@ -1193,7 +1215,8 @@ void Menu::Add(MenuItems mi) //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) {} @@ -1209,24 +1232,9 @@ class RootWindow: public Window 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. // @@ -1349,12 +1357,83 @@ void DrawStringTrans(int16 * screen, uint32 x, uint32 y, uint16 color, uint8 tra } // -// GUI Main loop +// Draw "picture" +// Uses zero as transparent color +// Can also use an optional alpha channel +// +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> 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! ;-) // -bool GUIMain(void) + +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; @@ -1363,9 +1442,11 @@ bool GUIMain(void) 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)); @@ -1384,14 +1465,40 @@ bool GUIMain(void) 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) + { + 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) { - while (SDL_PollEvent(&event)) + if (SDL_PollEvent(&event)) { if (event.type == SDL_USEREVENT) { @@ -1476,9 +1583,11 @@ bool GUIMain(void) // 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(); @@ -1495,6 +1604,7 @@ bool GUIMain(void) // // GUI "action" functions // + Window * LoadROM(void) { FileList * fileList = new FileList(8, 16, 304, 216); @@ -1505,6 +1615,21 @@ Window * LoadROM(void) 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(); } @@ -1524,15 +1649,20 @@ Window * RunEmu(void) // 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); @@ -1544,6 +1674,7 @@ Window * RunEmu(void) //This sucks... !!! FIX !!! joystick_exec(); +//This is done here so that the crud below doesn't get on our GUI background... if (finished) break; @@ -1593,7 +1724,7 @@ doGPUDis = true;//*/ // 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> 10) & 0x1F, g = (word >> 5) & 0x1F, b = word & 0x1F; @@ -1607,30 +1738,31 @@ doGPUDis = true;//*/ 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; } @@ -1658,235 +1790,13 @@ Window * MiscOptions(void) } -// -// Draw "picture" -// Uses zero as transparent color -// Can also use an optional alpha channel -// -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> 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++; - } - } -} - -// -// Very very crude GUI file selector -// -/*bool UserSelectFile(char * path, char * filename) -{ -//Testing... -GUIMain(); - - extern int16 * backbuffer; - vector 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 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 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, '.'); @@ -1894,7 +1804,7 @@ uint32 JaguarLoadROM(uint8 * rom, char * path) { WriteLog("VJ: Loading \"%s\"...", path); - if (stricmp(ext, ".zip") == 0) + if (strcasecmp(ext, ".zip") == 0) { // Handle ZIP file loading here... WriteLog("(ZIPped)..."); @@ -1921,6 +1831,8 @@ uint32 JaguarLoadROM(uint8 * rom, char * path) fread(rom, 1, romSize, fp); fclose(fp);*/ + // Handle gzipped files transparently [Adam Green]... + gzFile fp = gzopen(path, "rb"); if (fp == NULL) @@ -1942,61 +1854,105 @@ uint32 JaguarLoadROM(uint8 * rom, char * path) } // -// 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): @@ -2044,7 +2000,80 @@ Starting Address for executable = 0x00802000 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