X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui.cpp;h=5575496243fac23d18a63697fc3f31cd2a96f4eb;hb=847f593941ee60d7be72cd07309201bfdb3651f8;hp=e8947ddd1117f7167e179158647549282c130a6f;hpb=a1ad40785ac6d954051e4e5882436da9a58cc3a6;p=virtualjaguar diff --git a/src/gui.cpp b/src/gui.cpp index e8947dd..5575496 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" @@ -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,114 @@ uint16 downArrowBox[] = { 0x0217,0x0217,0x0217,0x0217,0x0217,0x0217,0x0217,0x0217 // ........ }; +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 // ...##... +}; + +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 // ...@@... +}; + +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 +262,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 +346,160 @@ 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 +603,7 @@ void Window::Notify(Element * e) } } + class Text: public Element { public: @@ -366,6 +628,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 { @@ -385,16 +648,20 @@ class ListBox: public Element string GetSelectedItem(void); protected: + bool thumbClicked; uint32 windowPtr, cursor, limit; uint32 charWidth, charHeight; // Box width/height in characters Element * elementToTell; Button upArrow, downArrow, upArrow2; vector item; + + private: + uint32 yRelativePoint; }; ListBox::ListBox(uint32 x, uint32 y, uint32 w, uint32 h): Element(x, y, w, h), - windowPtr(0), cursor(0), limit(0), charWidth((w / 8) - 1), charHeight(h / 8), - elementToTell(NULL), upArrow(w - 8, 0, upArrowBox), + thumbClicked(false), windowPtr(0), cursor(0), limit(0), charWidth((w / 8) - 1), + charHeight(h / 8), elementToTell(NULL), upArrow(w - 8, 0, upArrowBox), downArrow(w - 8, h - 8, downArrowBox), upArrow2(w - 8, h - 16, upArrowBox) { upArrow.SetNotificationElement(this); @@ -448,14 +715,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... @@ -467,11 +726,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; } } @@ -483,6 +740,25 @@ void ListBox::HandleMouseMove(uint32 x, uint32 y) upArrow.HandleMouseMove(x - extents.x, y - extents.y); downArrow.HandleMouseMove(x - extents.x, y - extents.y); upArrow2.HandleMouseMove(x - extents.x, y - extents.y); + + if (thumbClicked) + { + uint32 sbHeight = extents.h - 24, + thumb = (uint32)(((float)limit / (float)item.size()) * (float)sbHeight); + +//yRelativePoint is the spot on the thumb where we clicked... + int32 newThumbStart = y - yRelativePoint; + + if (newThumbStart < 0) + newThumbStart = 0; + + if (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...! + } } void ListBox::HandleMouseButton(uint32 x, uint32 y, bool mouseDown) @@ -494,6 +770,25 @@ void ListBox::HandleMouseButton(uint32 x, uint32 y, bool mouseDown) 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 (mouseDown) + { +// This shiaut should be calculated in AddItem(), not here... (or in Draw() for that matter) + uint32 sbHeight = extents.h - 24, + thumb = (uint32)(((float)limit / (float)item.size()) * (float)sbHeight), + thumbStart = (uint32)(((float)windowPtr / (float)item.size()) * (float)sbHeight); + + // Did we hit the thumb? + if (y >= (extents.y + 8 + thumbStart) && y < (extents.y + 8 + thumbStart + thumb)) + thumbClicked = true, yRelativePoint = y - thumbStart; + } + else + 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); @@ -524,9 +819,9 @@ void ListBox::Draw(uint32 offsetX/*= 0*/, uint32 offsetY/*= 0*/) for(uint32 x=extents.x+offsetX+extents.w; x= thumbStart + (extents.y+offsetY+8) && y < thumbStart + thumb + (extents.y+offsetY+8)) - screenBuffer[x + (y * pitch)] = 0xFFFF; + screenBuffer[x + (y * pitch)] = (thumbClicked ? 0x458E : 0xFFFF); else - screenBuffer[x + (y * pitch)] = 0x0000; + screenBuffer[x + (y * pitch)] = 0x0200; } } } @@ -557,12 +852,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) @@ -570,6 +876,7 @@ string ListBox::GetSelectedItem(void) return item[windowPtr + cursor]; } + class FileList: public Window { public: @@ -595,7 +902,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; @@ -632,25 +938,26 @@ void FileList::Notify(Element * e) strcat(filename, files->GetSelectedItem().c_str()); - uint32 romSize = JaguarLoadROM(jaguar_mainRom, filename); +// uint32 romSize = JaguarLoadROM(jaguar_mainRom, filename); + JaguarLoadCart(jaguar_mainRom, filename); - if (romSize == 0) +// 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(); +// 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(); - 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); - } + event.type = SDL_USEREVENT, event.user.code = MENU_ITEM_CHOSEN; + event.user.data1 = (void *)ResetJaguar; + SDL_PushEvent(&event); +// } } else Window::Notify(e); @@ -667,6 +974,7 @@ struct NameAction action(a), hotKey(k) {} }; + class MenuItems { public: @@ -860,6 +1168,7 @@ void Menu::Add(MenuItems mi) extents.w += (mi.title.length() + 2) * 8; } + //Do we even *need* this? class RootWindow: public Window { @@ -961,7 +1270,7 @@ void DrawStringOpaque(int16 * screen, uint32 x, uint32 y, uint16 color1, uint16 } // -// Draw text at the given x/y coordinates. Can invert text as well. +// Draw text at the given x/y coordinates with transparency (0 is fully opaque, 32 is fully transparent). // void DrawStringTrans(int16 * screen, uint32 x, uint32 y, uint16 color, uint8 trans, const char * text, ...) { @@ -1032,7 +1341,7 @@ bool GUIMain(void) Menu mainMenu; MenuItems mi; mi.title = "File"; - mi.item.push_back(NameAction("Load...", LoadROM)); + mi.item.push_back(NameAction("Load...", LoadROM, SDLK_l)); mi.item.push_back(NameAction("Reset", ResetJaguar)); mi.item.push_back(NameAction("Run", RunEmu, SDLK_ESCAPE)); mi.item.push_back(NameAction("")); @@ -1042,7 +1351,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(); @@ -1181,17 +1490,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 @@ -1218,13 +1535,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--; @@ -1260,8 +1584,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... @@ -1273,13 +1605,36 @@ Window * About(void) window->AddElement(new Text(8, 8, "Virtual Jaguar 1.0.7")); window->AddElement(new Text(8, 24, "Coders:")); window->AddElement(new Text(16, 32, "Niels Wagenaar (nwagenaar)")); - window->AddElement(new Text(16, 40, "Caz")); + 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")); 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 @@ -1538,10 +1893,10 @@ uint32 JaguarLoadROM(uint8 * rom, char * path) // void JaguarLoadCart(uint8 * mem, char * path) { - uint32 romSize = JaguarLoadROM(mem, path); + jaguarRomSize = JaguarLoadROM(mem, path); - if (romSize == 0) - { +// if (romSize == 0) +// { /* char newPath[2048]; WriteLog("VJ: Trying GUI...\n"); @@ -1556,20 +1911,88 @@ void JaguarLoadCart(uint8 * mem, char * path) romSize = JaguarLoadROM(mem, newPath); */ - if (romSize == 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); } - } +// } - jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, romSize); + 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) + { + 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; + } } +/* +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 +*/ + + // // Get the length of a (possibly) gzipped file //