From 836c7fa1f3e2dc3ec9849cac2584d4544bf2fba4 Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Sat, 1 Nov 2008 15:39:47 +0000 Subject: [PATCH] Moved *actual* files into source tree... --- Makefile | 2 +- src/gui/gui.cpp | 411 +++++++----------------------------------------- src/gui/gui.h | 12 +- 3 files changed, 66 insertions(+), 359 deletions(-) diff --git a/Makefile b/Makefile index 811b07d..5df0a73 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLL # Also, remove the "-DHAVE_LIB_CDIO" from CPPFLAGS above. #LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB) -INCS = -I. -I./src -I/usr/local/include -I/usr/include +INCS = -I. -I./src -I./src/gui -I/usr/local/include -I/usr/include OBJS = \ obj/m68kcpu.o \ diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 5af68c0..a8805c9 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -7,28 +7,25 @@ #include "gui.h" -#include -#include // For MacOS dependency -#include +#include +#include // For toupper() #include #include +#include // For MacOS dependency +#include #include -#include -#include // For toupper() -#include "settings.h" -#include "tom.h" -#include "video.h" -#include "clock.h" +#include "crc32.h" +#include "event.h" +#include "file.h" #include "font1.h" #include "font14pt.h" // Also 15, 16, 17, 18 #include "guielements.h" -#include "crc32.h" -#include "zlib.h" -#include "unzip.h" -#include "sdlemu_opengl.h" -#include "log.h" #include "jaguar.h" -#include "eeprom.h" +#include "log.h" +#include "sdlemu_opengl.h" +#include "settings.h" +#include "tom.h" +#include "video.h" using namespace std; // For STL stuff @@ -55,22 +52,16 @@ Window * Quit(void); Window * About(void); Window * MiscOptions(void); -int gzfilelength(gzFile gd); - -// External variables - -extern uint8 * jaguar_mainRam; -extern uint8 * jaguar_mainRom; -extern uint8 * jaguar_bootRom; -extern uint8 * jaguar_CDBootROM; -extern bool BIOSLoaded; -extern bool CDBIOSLoaded; - // Local global variables +bool showGUI = false; bool exitGUI = false; // GUI (emulator) done variable int mouseX = 0, mouseY = 0; uint32 background[1280 * 256]; // GUI background buffer +bool showMessage = false; +//uint32 showMessageTimeout; +//char messageBuffer[200]; +bool finished = false; const char separator[] = "--------------------------------------------------------"; @@ -84,7 +75,7 @@ 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 return (toupper(*p1) < toupper(*p2) ? -1 : 1);// Report which was lexically greater @@ -942,7 +933,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! +#warning !!! FIX !!! Directory might not exist--this shouldn't cause VJ to crash! DIR * dp = opendir(vjs.ROMPath); dirent * de; @@ -1619,7 +1610,7 @@ void FillScreenRectangle(uint32 * screen, uint32 x, uint32 y, uint32 w, uint32 h // GUI stuff--it's not crunchy, it's GUI! ;-) // -void InitGUI(void) +void GUIInit(void) { SDL_ShowCursor(SDL_DISABLE); SDL_GetMouseState(&mouseX, &mouseY); @@ -1642,7 +1633,7 @@ WriteLog("GUI: Inside GUIMain...\n"); pointerBGSave[1] = 8; // Need to set things up so that it loads and runs a file if given on the command line. !!! FIX !!! [DONE] - extern uint32 * backbuffer; +// extern uint32 * backbuffer; // bool done = false; SDL_Event event; Window * mainWindow = NULL; @@ -1702,13 +1693,13 @@ Bitmap ptr = { 6, 8, 4, //This is crappy!!! !!! FIX !!! //Is this even needed any more? Hmm. Maybe. Dunno. WriteLog("GUI: Resetting Jaguar...\n"); - jaguar_reset(); + JaguarReset(); WriteLog("GUI: Clearing BG save...\n"); // Set up our background save... // memset(background, 0x11, tom_getVideoModeWidth() * 240 * 2); //1111 -> 000100 01000 10001 -> 0001 0000 0100 0010 1000 1100 -> 10 42 8C - for(uint32 i=0; ifullscreen switching... +uint8 * keystate = SDL_GetKeyState(NULL); + +if ((keystate[SDLK_LALT] || keystate[SDLK_RALT]) & keystate[SDLK_RETURN]) + ToggleFullscreen(); + if (mainWindow) mainWindow->HandleKey(event.key.keysym.sym); else @@ -1897,21 +1894,21 @@ Window * LoadROM(void) Window * ResetJaguar(void) { - jaguar_reset(); + JaguarReset(); return RunEmu(); } Window * ResetJaguarCD(void) { - memcpy(jaguar_mainRom, jaguar_CDBootROM, 0x40000); + memcpy(jaguarMainRom, jaguarCDBootROM, 0x40000); jaguarRunAddress = 0x802000; - jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, 0x40000); - jaguar_reset(); + jaguarMainRomCRC32 = crc32_calcCheckSum(jaguarMainRom, 0x40000); + JaguarReset(); //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; + jaguarMainRom[0x0040B] = 0x03; return RunEmu(); } @@ -2046,12 +2043,12 @@ doGPUDis = true;//*/ bool debounceRunKey = true; Window * RunEmu(void) { - extern uint32 * backbuffer; +// extern uint32 * backbuffer; uint32 * overlayPixels = (uint32 *)sdlemuGetOverlayPixels(); memset(overlayPixels, 0x00, 640 * 480 * 4); // Clear out overlay... //This is crappy... !!! FIX !!! - extern bool finished, showGUI; +// extern bool finished, showGUI; sdlemuDisableOverlay(); @@ -2069,9 +2066,9 @@ Window * RunEmu(void) cartType = 0; else if (jaguarRomSize == 0x400000) cartType = 1; - else if (jaguar_mainRom_crc32 == 0x687068D5) + else if (jaguarMainRomCRC32 == 0x687068D5) cartType = 2; - else if (jaguar_mainRom_crc32 == 0x55A0669C) + else if (jaguarMainRomCRC32 == 0x55A0669C) cartType = 3; const char * cartTypeName[5] = { "2M Cartridge", "4M Cartridge", "CD BIOS", "CD Dev BIOS", "Homebrew" }; @@ -2096,6 +2093,8 @@ else //Add in a new function for clearing patches of screen (ClearOverlayRect) +// Also: Take frame rate into account when calculating fade time... + // Some QnD GUI stuff here... if (showGUI) { @@ -2110,7 +2109,7 @@ else { DrawString2(overlayPixels, 8, 24*FONT_HEIGHT, 0x007F63FF, transparency, "Running..."); DrawString2(overlayPixels, 8, 26*FONT_HEIGHT, 0x001FFF3F, transparency, "%s, run address: %06X", cartTypeName[cartType], jaguarRunAddress); - DrawString2(overlayPixels, 8, 27*FONT_HEIGHT, 0x001FFF3F, transparency, "CRC: %08X", jaguar_mainRom_crc32); + DrawString2(overlayPixels, 8, 27*FONT_HEIGHT, 0x001FFF3F, transparency, "CRC: %08X", jaguarMainRomCRC32); if (showMsgFrames == 0) { @@ -2136,7 +2135,7 @@ doGPUDis = true;//*/ // Save the background for the GUI... // In this case, we squash the color to monochrome, then force it to blue + green... - for(uint32 i=0; i> 16) & 0xFF, g = (pixel >> 8) & 0xFF, r = pixel & 0xFF; @@ -2163,7 +2162,6 @@ Window * Quit(void) Window * About(void) { char buf[512]; -// sprintf(buf, "Virtual Jaguar CVS %s", __DATE__); sprintf(buf, "SVN %s", __DATE__); //fprintf(fp, "VirtualJaguar v1.0.8 (Last full build was on %s %s)\n", __DATE__, __TIME__); //VirtualJaguar v1.0.8 (Last full build was on Dec 30 2004 20:01:31) @@ -2226,320 +2224,29 @@ Window * MiscOptions(void) return window; } +// Function prototype +Window * CrashGracefullyCallback(void); -// -// Generic ROM loading -// -uint32 JaguarLoadROM(uint8 * rom, char * path) +//NOTE: Probably should set a flag as well telling it to do a full reset +// of the Jaguar hardware if this happens... +void GUICrashGracefully(const char * reason) { -// We really should have some kind of sanity checking for the ROM size here to prevent -// a buffer overflow... !!! FIX !!! - uint32 romSize = 0; - -WriteLog("JaguarLoadROM: Attempting to load file '%s'...", path); - char * ext = strrchr(path, '.'); -if (ext == NULL) - WriteLog("FAILED!\n"); -else - WriteLog("Succeeded in finding extension (%s)!\n", ext); - - if (ext != NULL) - { - WriteLog("VJ: Loading \"%s\"...", path); - - if (strcasecmp(ext, ".zip") == 0) - { - // Handle ZIP file loading here... - WriteLog("(ZIPped)..."); - - if (load_zipped_file(0, 0, path, NULL, &rom, &romSize) == -1) - { - WriteLog("Failed!\n"); - return 0; - } - } - else - { -/* FILE * fp = fopen(path, "rb"); - - if (fp == NULL) - { - WriteLog("Failed!\n"); - return 0; - } - - fseek(fp, 0, SEEK_END); - romSize = ftell(fp); - fseek(fp, 0, SEEK_SET); - fread(rom, 1, romSize, fp); - fclose(fp);*/ - - // Handle gzipped files transparently [Adam Green]... - - gzFile fp = gzopen(path, "rb"); - - if (fp == NULL) - { - WriteLog("Failed!\n"); - return 0; - } - - romSize = gzfilelength(fp); - gzseek(fp, 0, SEEK_SET); - gzread(fp, rom, romSize); - gzclose(fp); - } - - WriteLog("OK (%i bytes)\n", romSize); - } + finished = true; // We're finished for now! - return romSize; -} - -// -// Jaguar file loading -// -bool JaguarLoadFile(char * path) -{ -// jaguarRomSize = JaguarLoadROM(mem, path); - jaguarRomSize = JaguarLoadROM(jaguar_mainRom, path); - -/*//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 (jaguarRomSize == 0) - { -// WriteLog("VJ: Could not load ROM from file \"%s\"...\nAborting!\n", newPath); - 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; - - 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) - { - // 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): - -000000 60 1B 00 00 05 0C 00 04 62 C0 00 00 04 28 00 00 -000010 12 A6 00 00 00 00 00 80 20 00 FF FF 00 80 25 0C -000020 00 00 40 00 - -DRI-format file detected... -Text segment size = 0x0000050c bytes -Data segment size = 0x000462c0 bytes -BSS Segment size = 0x00000428 bytes -Symbol Table size = 0x000012a6 bytes -Absolute Address for text segment = 0x00802000 -Absolute Address for data segment = 0x0080250c -Absolute Address for BSS segment = 0x00004000 - -(CRZDEMO.ABS): -000000 01 50 00 03 00 00 00 00 00 03 83 10 00 00 05 3b -000010 00 1c 00 03 00 00 01 07 00 00 1d d0 00 03 64 98 -000020 00 06 8b 80 00 80 20 00 00 80 20 00 00 80 3d d0 - -000030 2e 74 78 74 00 00 00 00 00 80 20 00 00 80 20 00 .txt (+36 bytes) -000040 00 00 1d d0 00 00 00 a8 00 00 00 00 00 00 00 00 -000050 00 00 00 00 00 00 00 20 -000058 2e 64 74 61 00 00 00 00 00 80 3d d0 00 80 3d d0 .dta (+36 bytes) -000068 00 03 64 98 00 00 1e 78 00 00 00 00 00 00 00 00 -000078 00 00 00 00 00 00 00 40 -000080 2e 62 73 73 00 00 00 00 00 00 50 00 00 00 50 00 .bss (+36 bytes) -000090 00 06 8b 80 00 03 83 10 00 00 00 00 00 00 00 00 -0000a0 00 00 00 00 00 00 00 80 - -Header size is $A8 bytes... - -BSD/COFF format file detected... -3 sections specified -Symbol Table offset = 230160 ($00038310) -Symbol Table contains 1339 symbol entries ($0000053B) -The additional header size is 28 bytes ($001C) -Magic Number for RUN_HDR = 0x00000107 -Text Segment Size = 7632 ($00001DD0) -Data Segment Size = 222360 ($00036498) -BSS Segment Size = 428928 ($00068B80) -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; + // Since this is used in the menu code as well, we could create another + // internal function called "PushWindowOnQueue" or somesuch + SDL_Event event; + event.type = SDL_USEREVENT; + event.user.code = MENU_ITEM_CHOSEN; + event.user.data1 = (void *)CrashGracefullyCallback; + SDL_PushEvent(&event); } -// -// Get the length of a (possibly) gzipped file -// -int gzfilelength(gzFile gd) +Window * CrashGracefullyCallback(void) { - int size = 0, length = 0; - unsigned char buffer[0x10000]; - - gzrewind(gd); - - do - { - // Read in chunks until EOF - size = gzread(gd, buffer, 0x10000); - - if (size <= 0) - break; + Window * window = new Window(8, 16, 304, 192); - length += size; - } - while (!gzeof(gd)); + window->AddElement(new Text(8, 8+0*FONT_HEIGHT, "We CRASHED!!!")); - gzrewind(gd); - return length; + return window; } diff --git a/src/gui/gui.h b/src/gui/gui.h index ebd04c9..6520f53 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -7,20 +7,20 @@ #ifndef __GUI_H__ #define __GUI_H__ -#include "types.h" - #ifdef __cplusplus extern "C" { #endif -void InitGUI(void); +void GUIInit(void); void GUIDone(void); bool GUIMain(char *); +void GUICrashGracefully(const char *); -// Not sure why these are in *this* file, but here they are... :-/ +// Exported vars -uint32 JaguarLoadROM(uint8 * rom, char * path); -bool JaguarLoadFile(char * path); +extern bool showGUI; +extern bool exitGUI; // Hmm. +extern bool finished; // Current emulator loop is finished #ifdef __cplusplus } -- 2.37.2