X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui.cpp;h=c9621175297bfdf7a7238b70e32a8de6e311a75b;hb=eec42b43c8befbc06fbf8172aa9ca7d178494e96;hp=4797e600aec57acfb661e2ab8f49cdda5e402295;hpb=432a82c9d473fc33c4fe6b9d2db60db0d84c6612;p=virtualjaguar diff --git a/src/gui.cpp b/src/gui.cpp index 4797e60..c962117 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -10,6 +10,7 @@ #include #include #include +#include // For toupper() #include "types.h" #include "settings.h" #include "tom.h" @@ -26,7 +27,7 @@ using namespace std; // For STL stuff 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, ...); Window * LoadROM(void); @@ -34,6 +35,7 @@ Window * ResetJaguar(void); Window * RunEmu(void); Window * Quit(void); Window * About(void); +Window * MiscOptions(void); int gzfilelength(gzFile gd); @@ -113,10 +115,136 @@ uint16 downArrowBox[] = { 0x0217,0x0217,0x0217,0x0217,0x0217,0x0217,0x0217,0x0217 // ........ }; +uint16 pushButtonUp[] = { + 8, 8, + + 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, 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[] = { + 8, 16, + + 0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E, // ++++++++ + 0x4B5E,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0217, // + . + 0x4B5E,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0217, // + . + 0x4B5E,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0217, // + . + 0x4B5E,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0217, // + . + 0x4B5E,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0217, // + . + 0x4B5E,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0217, // + . + 0x4B5E,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0217, // + . + 0x4B5E,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0217, // +....... + 0x4B5E,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0217, // +....... + 0x4B5E,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0217, // +....... + 0x4B5E,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0217, // +....... + 0x4B5E,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0217, // +....... + 0x4B5E,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0217, // +....... + 0x4B5E,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0217, // +....... + 0x0217,0x0217,0x0217,0x0217,0x0217,0x0217,0x0217,0x0217 // ........ +}; + +uint16 slideSwitchDown[] = { + 8, 16, + + 0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E, // ++++++++ + 0x4B5E,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0217, // +....... + 0x4B5E,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0217, // +....... + 0x4B5E,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0217, // +....... + 0x4B5E,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0217, // +....... + 0x4B5E,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0217, // +....... + 0x4B5E,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0217, // +....... + 0x4B5E,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0217, // +....... + 0x4B5E,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0217, // + . + 0x4B5E,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0217, // + . + 0x4B5E,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0217, // + . + 0x4B5E,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0217, // + . + 0x4B5E,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0217, // + . + 0x4B5E,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0217, // + . + 0x4B5E,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0217, // + . + 0x0217,0x0217,0x0217,0x0217,0x0217,0x0217,0x0217,0x0217 // ........ +}; + +/*uint16 [] = { + 8, 8, + + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // ........ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // ........ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // ........ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // ........ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // ........ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // ........ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // ........ + 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000 // ........ +};*/ + char separator[] = "--------------------------------------------------------"; uint16 background[1280 * 240]; +// +// Case insensitive string compare function +// Taken straight out of Thinking In C++ by Bruce Eckel. Thanks Bruce! +// + +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 + { + if (toupper(*p1) != toupper(*p2)) // Compare upper-cased chars + return (toupper(*p1) < toupper(*p2) ? -1 : 1);// Report which was lexically greater + + p1++; + p2++; + } + + // If they match up to the detected eos, say which was longer. Return 0 if the same. + return s2.size() - s1.size(); +} + // // Local GUI classes // @@ -156,6 +284,7 @@ bool Element::Inside(uint32 x, uint32 y) && y >= (uint32)extents.y && y < (uint32)(extents.y + extents.h) ? true : false); } + class Button: public Element { public: @@ -239,6 +368,161 @@ void Button::Draw(uint32 offsetX/*= 0*/, uint32 offsetY/*= 0*/) DrawString(screenBuffer, extents.x + offsetX, extents.y + offsetY, false, "%s", text.c_str()); } + +class PushButton: public Element +{ +// How to handle? +// Save state externally? + + public: +// PushButton(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0): Element(x, y, w, h), +// activated(false), clicked(false), inside(false), fgColor(0xFFFF), +// bgColor(0x03E0), pic(NULL), elementToTell(NULL) {} + PushButton(uint32 x, uint32 y, bool * st, string s): Element(x, y, 8, 8), state(st), + inside(false), text(s) { if (st == NULL) state = &internalState; } +/* Button(uint32 x, uint32 y, uint32 w, uint32 h, uint16 * p): Element(x, y, w, h), + activated(false), clicked(false), inside(false), fgColor(0xFFFF), + bgColor(0x03E0), pic(p), elementToTell(NULL) {} + Button(uint32 x, uint32 y, uint16 * p): Element(x, y, 0, 0), + activated(false), clicked(false), inside(false), fgColor(0xFFFF), + bgColor(0x03E0), pic(p), elementToTell(NULL) + { if (pic) extents.w = pic[0], extents.h = pic[1]; } + Button(uint32 x, uint32 y, uint32 w, uint32 h, string s): Element(x, y, w, h), + activated(false), clicked(false), inside(false), fgColor(0xFFFF), + bgColor(0x03E0), pic(NULL), text(s), elementToTell(NULL) {} + PushButton(uint32 x, uint32 y, string s): Element(x, y, 0, 8), + activated(false), clicked(false), inside(false), fgColor(0xFFFF), + bgColor(0x03E0), pic(NULL), text(s), elementToTell(NULL) + { extents.w = s.length() * 8; }*/ + virtual void HandleKey(SDLKey key) {} + virtual void HandleMouseMove(uint32 x, uint32 y); + virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown); + virtual void Draw(uint32 offsetX = 0, uint32 offsetY = 0); + virtual void Notify(Element *) {} +// bool ButtonClicked(void) { return activated; } +// void SetNotificationElement(Element * e) { elementToTell = e; } + + protected: + bool * state; + bool inside; +// bool activated, clicked, inside; +// uint16 fgColor, bgColor; +// uint16 * pic; + string text; +// Element * elementToTell; + bool internalState; +}; + +void PushButton::HandleMouseMove(uint32 x, uint32 y) +{ + inside = Inside(x, y); +} + +void PushButton::HandleMouseButton(uint32 x, uint32 y, bool mouseDown) +{ + if (inside && mouseDown) + { +/* if (mouseDown) + clicked = true; + + if (clicked && !mouseDown) + { + clicked = false, activated = true; + + // Send a message that we're activated (if there's someone to tell, that is) + if (elementToTell) + elementToTell->Notify(this); + }*/ + *state = !(*state); + } +// else +// clicked = activated = false; +} + +void PushButton::Draw(uint32 offsetX/*= 0*/, uint32 offsetY/*= 0*/) +{ +/* uint32 addr = (extents.x + offsetX) + ((extents.y + offsetY) * pitch); + + for(uint32 y=0; y 0) + DrawString(screenBuffer, extents.x + offsetX + 12, extents.y + offsetY, false, "%s", text.c_str()); +} + + +class SlideSwitch: public Element +{ +// How to handle? +// Save state externally? + + public: + SlideSwitch(uint32 x, uint32 y, bool * st, string s1, string s2): Element(x, y, 8, 16), state(st), + inside(false), text1(s1), text2(s2) {} + virtual void HandleKey(SDLKey key) {} + virtual void HandleMouseMove(uint32 x, uint32 y); + virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown); + virtual void Draw(uint32 offsetX = 0, uint32 offsetY = 0); + virtual void Notify(Element *) {} +// bool ButtonClicked(void) { return activated; } +// void SetNotificationElement(Element * e) { elementToTell = e; } + + protected: + bool * state; + bool inside; +// bool activated, clicked, inside; +// uint16 fgColor, bgColor; +// uint16 * pic; + string text1, text2; +// Element * elementToTell; +}; + +void SlideSwitch::HandleMouseMove(uint32 x, uint32 y) +{ + inside = Inside(x, y); +} + +void SlideSwitch::HandleMouseButton(uint32 x, uint32 y, bool mouseDown) +{ + if (inside && mouseDown) + { +/* if (mouseDown) + clicked = true; + + if (clicked && !mouseDown) + { + clicked = false, activated = true; + + // Send a message that we're activated (if there's someone to tell, that is) + if (elementToTell) + elementToTell->Notify(this); + }*/ + *state = !(*state); + } +// else +// clicked = activated = false; +} + +void SlideSwitch::Draw(uint32 offsetX/*= 0*/, uint32 offsetY/*= 0*/) +{ + DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, (*state ? slideSwitchDown : slideSwitchUp)); + if (text1.length() > 0) + DrawString(screenBuffer, extents.x + offsetX + 12, extents.y + offsetY, false, "%s", text1.c_str()); + if (text2.length() > 0) + DrawString(screenBuffer, extents.x + offsetX + 12, extents.y + offsetY + 8, false, "%s", text2.c_str()); +} + + class Window: public Element { public: @@ -342,6 +626,7 @@ void Window::Notify(Element * e) } } + class Text: public Element { public: @@ -366,6 +651,7 @@ void Text::Draw(uint32 offsetX/*= 0*/, uint32 offsetY/*= 0*/) DrawString(screenBuffer, extents.x + offsetX, extents.y + offsetY, false, "%s", text.c_str()); } + class ListBox: public Element //class ListBox: public Window { @@ -452,14 +738,6 @@ void ListBox::HandleKey(SDLKey key) windowPtr -= limit; } } -//How to handle these??? -/* if (key == SDLK_RETURN) - done = true; - if (key == SDLK_ESCAPE) - { - WriteLog("GUI: Aborting VJ by user request.\n"); - return false; // Bail out! - }*/ else if (key >= SDLK_a && key <= SDLK_z) { // Advance cursor to filename with first letter pressed... @@ -471,11 +749,9 @@ void ListBox::HandleKey(SDLKey key) { cursor = i - windowPtr; if (i > windowPtr + limit - 1) - windowPtr = i - limit + 1, - cursor = limit - 1; + windowPtr = i - limit + 1, cursor = limit - 1; if (i < windowPtr) - windowPtr = i, - cursor = 0; + windowPtr = i, cursor = 0; break; } } @@ -491,21 +767,20 @@ void ListBox::HandleMouseMove(uint32 x, uint32 y) if (thumbClicked) { uint32 sbHeight = extents.h - 24, - thumb = (uint32)(((float)limit / (float)item.size()) * (float)sbHeight), - thumbStart = (uint32)(((float)windowPtr / (float)item.size()) * (float)sbHeight); + thumb = (uint32)(((float)limit / (float)item.size()) * (float)sbHeight); //yRelativePoint is the spot on the thumb where we clicked... -// int32 thumbDelta = y - yRelativePoint; int32 newThumbStart = y - yRelativePoint; 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()); //Check for cursor bounds as well... Or do we need to??? +//Actually, we don't...! } } @@ -519,8 +794,8 @@ void ListBox::HandleMouseButton(uint32 x, uint32 y, bool mouseDown) } // 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) { @@ -600,13 +875,23 @@ void ListBox::Notify(Element * e) void ListBox::AddItem(string s) { - item.push_back(s); - limit = (item.size() > charHeight ? charHeight : item.size()); -//WriteLog("ListBox: Adding item [%s], limit = %u...\n", s.c_str(), limit); + // Do a simple insertion sort + bool inserted = false; + + for(vector::iterator i=item.begin(); i charHeight ? charHeight : item.size()); } string ListBox::GetSelectedItem(void) @@ -614,6 +899,7 @@ string ListBox::GetSelectedItem(void) return item[windowPtr + cursor]; } + class FileList: public Window { public: @@ -639,7 +925,6 @@ FileList::FileList(uint32 x, uint32 y, uint32 w, uint32 h): Window(x, y, w, h) AddElement(load); load->SetNotificationElement(this); -// DIR * dp = opendir(path); DIR * dp = opendir(vjs.ROMPath); dirent * de; @@ -648,7 +933,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 (stricmp(ext, ".zip") == 0 || stricmp(ext, ".j64") == 0 + || stricmp(ext, ".abs") == 0 || stricmp(ext, ".jag") == 0 + || stricmp(ext, ".rom") == 0) files->AddItem(string(de->d_name)); } @@ -676,24 +963,26 @@ void FileList::Notify(Element * e) strcat(filename, files->GetSelectedItem().c_str()); - uint32 romSize = JaguarLoadROM(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 +// uint32 romSize = JaguarLoadROM(jaguar_mainRom, filename); +// JaguarLoadCart(jaguar_mainRom, filename); + if (JaguarLoadFile(filename)) { - jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, romSize); - WriteLog("CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32); - eeprom_init(); - 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); + SDL_PushEvent(&event); + } + else + { + SDL_Event event; + event.type = SDL_USEREVENT, event.user.code = WINDOW_CLOSE; + SDL_PushEvent(&event); + + // Handle the error, but don't run... + // Tell the user that we couldn't run their file for some reason... !!! FIX !!! } } else @@ -711,6 +1000,7 @@ struct NameAction action(a), hotKey(k) {} }; + class MenuItems { public: @@ -904,6 +1194,7 @@ void Menu::Add(MenuItems mi) extents.w += (mi.title.length() + 2) * 8; } + //Do we even *need* this? class RootWindow: public Window { @@ -1065,6 +1356,7 @@ void DrawStringTrans(int16 * screen, uint32 x, uint32 y, uint16 color, uint8 tra // bool GUIMain(void) { +// 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; SDL_Event event; @@ -1086,7 +1378,7 @@ bool GUIMain(void) mi.item.clear(); mi.item.push_back(NameAction("Video...")); mi.item.push_back(NameAction("Audio...")); - mi.item.push_back(NameAction("Misc...")); + mi.item.push_back(NameAction("Misc...", MiscOptions, SDLK_m)); mainMenu.Add(mi); mi.title = "Info"; mi.item.clear(); @@ -1225,17 +1517,25 @@ Window * RunEmu(void) { //This is crappy... !!! FIX !!! extern int16 * backbuffer; - extern bool finished; - extern bool showGUI; + extern bool finished, showGUI; + uint32 nFrame = 0, nFrameskip = 0; uint32 totalFrames = 0; finished = false; bool showMessage = true; - uint32 showMsgFrames = 60; + uint32 showMsgFrames = 120; uint8 transparency = 0; // Pass a message to the "joystick" code to debounce the ESC key... debounceRunKey = true; + uint32 cartType = 2; + if (jaguarRomSize == 0x200000) + cartType = 0; + else if (jaguarRomSize == 0x400000) + cartType = 1; + + char * cartTypeName[3] = { "2M Cartridge", "4M Cartridge", "Homebrew" }; + while (!finished) { // Set up new backbuffer with new pixels and data @@ -1262,13 +1562,20 @@ Window * RunEmu(void) if (showMessage) { DrawStringTrans(backbuffer, 8, 24*8, 0xFF0F, transparency, "Running..."); + DrawStringTrans(backbuffer, 8, 26*8, 0x3FE3, transparency, "%s, run address: %06X", cartTypeName[cartType], jaguarRunAddress); + DrawStringTrans(backbuffer, 8, 27*8, 0x3FE3, transparency, "CRC: %08X", jaguar_mainRom_crc32); if (showMsgFrames == 0) { transparency++; if (transparency == 33) +{ showMessage = false; +/*extern bool doGPUDis; +doGPUDis = true;//*/ +} + } else showMsgFrames--; @@ -1304,8 +1611,16 @@ Window * RunEmu(void) 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"); - log_done(); + +// log_done(); + jaguar_done(); + version_done(); + memory_done(); + VideoDone(); // Free SDL components last...! + log_done(); + exit(0); return NULL; // We never get here... @@ -1324,11 +1639,35 @@ Window * About(void) return window; } +Window * MiscOptions(void) +{ + Window * window = new Window(8, 16, 304, 160); + window->AddElement(new PushButton(8, 8, &vjs.useJaguarBIOS, "BIOS")); + window->AddElement(new SlideSwitch(8, 20, &vjs.hardwareTypeNTSC, "PAL", "NTSC")); + window->AddElement(new PushButton(8, 40, &vjs.DSPEnabled, "DSP")); + window->AddElement(new SlideSwitch(16, 52, &vjs.usePipelinedDSP, "Original", "Pipelined")); + window->AddElement(new SlideSwitch(8, 72, (bool *)&vjs.glFilter, "Sharp", "Blurry")); + +// Missing: +// * BIOS path +// * ROM path +// * EEPROM path +// * joystick +// * joystick port +// * OpenGL? +// * GL Filter type +// * Window/fullscreen + + return window; +} + + // // Draw "picture" // Uses zero as transparent color +// Can also use an optional alpha channel // -void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap) +void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap, uint8 * alpha/*=NULL*/) { uint16 width = bitmap[0], height = bitmap[1]; bitmap += 2; @@ -1340,9 +1679,38 @@ void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap) { for(int xx=0; xx> 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++; } } } @@ -1523,6 +1891,8 @@ GUIMain(); // 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, '.'); @@ -1578,40 +1948,225 @@ uint32 JaguarLoadROM(uint8 * rom, char * path) } // -// Jaguar cartridge ROM loading +// Jaguar file loading // -void JaguarLoadCart(uint8 * mem, char * path) +//void JaguarLoadCart(uint8 * mem, char * path) +bool JaguarLoadFile(char * path) { - uint32 romSize = JaguarLoadROM(mem, path); +// jaguarRomSize = JaguarLoadROM(mem, path); + jaguarRomSize = JaguarLoadROM(jaguar_mainRom, path); - if (romSize == 0) +/*//This is not *nix friendly for some reason... +// if (!UserSelectFile(path, newPath)) + if (!UserSelectFile((strlen(path) == 0 ? (char *)"." : path), newPath)) { -/* char newPath[2048]; - WriteLog("VJ: Trying GUI...\n"); + WriteLog("VJ: Could not find valid ROM in directory \"%s\"...\nAborting!\n", path); + log_done(); + exit(0); + }*/ -//This is not *nix friendly for some reason... -// if (!UserSelectFile(path, newPath)) - if (!UserSelectFile((strlen(path) == 0 ? (char *)"." : path), newPath)) + 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 (stricmp(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);*/ + +/* +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 (stricmp(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) { - WriteLog("VJ: Could not find valid ROM in directory \"%s\"...\nAborting!\n", path); - log_done(); - exit(0); + 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); - romSize = JaguarLoadROM(mem, newPath); -*/ - if (romSize == 0) + 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("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: Couldn't find correct ABS format: %02X %02X\n", jaguar_mainRom[0], jaguar_mainRom[1]); + return false; + } + } + else if (stricmp(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... - jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, romSize); - WriteLog("CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32); - eeprom_init(); + return true; } //