X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui.cpp;h=0ff948f70e182f2c1f33761eece233f1e0383463;hb=f3e5bb2807319c210d124d6150e019130c54867b;hp=5575496243fac23d18a63697fc3f31cd2a96f4eb;hpb=ee350277fa74790fbd2611b9434cbb30f3b2472d;p=virtualjaguar diff --git a/src/gui.cpp b/src/gui.cpp index 5575496..0ff948f 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -5,21 +5,27 @@ // by James L. Hammons // +#include "gui.h" + +#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" +#include "clock.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 "gui.h" +#include "sdlemu_opengl.h" +#include "log.h" +#include "jaguar.h" +#include "file.h" using namespace std; // For STL stuff @@ -27,178 +33,37 @@ using namespace std; // For STL stuff class Window; // Forward declaration... -void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap); -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 DrawTransparentBitmap(uint32 * screen, uint32 x, uint32 y, uint32 * bitmap, uint8 * alpha = NULL); +void DrawTransparentBitmapDeprecated(uint32 * screen, uint32 x, uint32 y, uint32 * bitmap); +void DrawTransparentBitmap(uint32 * screen, uint32 x, uint32 y, const void * bitmap); +void DrawBitmap(uint32 * screen, uint32 x, uint32 y, const void * bitmap); +//Should call this FillScreenRectangle with a number representing the RGBA value to fill. !!! FIX !!! +//void ClearScreenRectangle(uint32 * screen, uint32 x, uint32 y, uint32 w, uint32 h); +void FillScreenRectangle(uint32 * screen, uint32 x, uint32 y, uint32 w, uint32 h, uint32 color); +void DrawStringTrans(uint32 * screen, uint32 x, uint32 y, uint32 color, uint8 opacity, const char * text, ...); +void DrawStringOpaque(uint32 * screen, uint32 x, uint32 y, uint32 color1, uint32 color2, const char * text, ...); +void DrawString(uint32 * screen, uint32 x, uint32 y, bool invert, const char * text, ...); +void DrawString2(uint32 * screen, uint32 x, uint32 y, uint32 color, uint8 transparency, const char * text, ...); Window * LoadROM(void); Window * ResetJaguar(void); +Window * ResetJaguarCD(void); Window * RunEmu(void); Window * Quit(void); Window * About(void); Window * MiscOptions(void); -int gzfilelength(gzFile gd); - -// External variables - -extern uint8 * jaguar_mainRam; -extern uint8 * jaguar_bootRom; -extern uint8 * jaguar_mainRom; - // Local global variables -int mouseX, mouseY; - -uint16 mousePic[] = { - 6, 8, - - 0x03E0,0x0000,0x0000,0x0000,0x0000,0x0000, // + - 0x0300,0x03E0,0x0000,0x0000,0x0000,0x0000, // @+ - 0x0300,0x03E0,0x03E0,0x0000,0x0000,0x0000, // @++ - 0x0300,0x0300,0x03E0,0x03E0,0x0000,0x0000, // @@++ - 0x0300,0x0300,0x03E0,0x03E0,0x03E0,0x0000, // @@+++ - 0x0300,0x0300,0x0300,0x03E0,0x03E0,0x03E0, // @@@+++ - 0x0300,0x0300,0x0300,0x0000,0x0000,0x0000, // @@@ - 0x0300,0x0000,0x0000,0x0000,0x0000,0x0000 // @ -/* - 0xFFFF,0x0000,0x0000,0x0000,0x0000,0x0000, // + - 0xE318,0xFFFF,0x0000,0x0000,0x0000,0x0000, // @+ - 0xE318,0xFFFF,0xFFFF,0x0000,0x0000,0x0000, // @++ - 0xE318,0xE318,0xFFFF,0xFFFF,0x0000,0x0000, // @@++ - 0xE318,0xE318,0xFFFF,0xFFFF,0xFFFF,0x0000, // @@+++ - 0xE318,0xE318,0xE318,0xFFFF,0xFFFF,0xFFFF, // @@@+++ - 0xE318,0xE318,0xE318,0x0000,0x0000,0x0000, // @@@ - 0xE318,0x0000,0x0000,0x0000,0x0000,0x0000 // @ -*/ -}; -// 1 111 00 11 100 1 1100 -> F39C -// 1 100 00 10 000 1 0000 -> C210 -// 1 110 00 11 000 1 1000 -> E318 -// 0 000 00 11 111 0 0000 -> 03E0 -// 0 000 00 11 000 0 0000 -> 0300 - -uint16 closeBox[] = { - 7, 7, - - 0x0000,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x0000, // +++++ - 0x4B5E,0xFFFF,0x0000,0x0000,0x0000,0xFFFF,0x0217, // +@ @. - 0x4B5E,0x0000,0xFFFF,0x0000,0xFFFF,0x0000,0x0217, // + @ @ . - 0x4B5E,0x0000,0x0000,0xFFFF,0x0000,0x0000,0x0217, // + @ . - 0x4B5E,0x0000,0xFFFF,0x0000,0xFFFF,0x0000,0x0217, // + @ @ . - 0x4B5E,0xFFFF,0x0000,0x0000,0x0000,0xFFFF,0x0217, // +@ @. - 0x0000,0x0217,0x0217,0x0217,0x0217,0x0217,0x0000 // ..... -}; - -uint16 upArrowBox[] = { - 8, 8, - - 0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E, // ++++++++ - 0x4B5E,0x0000,0x0000,0xFFFF,0xFFFF,0x0000,0x0000,0x0217, // + @@ . - 0x4B5E,0x0000,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0x0000,0x0217, // + @@@@ . - 0x4B5E,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0x0217, // +@@@@@@. - 0x4B5E,0x0000,0x0000,0xFFFF,0xFFFF,0x0000,0x0000,0x0217, // + @@ . - 0x4B5E,0x0000,0x0000,0xFFFF,0xFFFF,0x0000,0x0000,0x0217, // + @@ . - 0x4B5E,0x0000,0x0000,0xFFFF,0xFFFF,0x0000,0x0000,0x0217, // + @@ . - 0x0217,0x0217,0x0217,0x0217,0x0217,0x0217,0x0217,0x0217 // ........ -}; - -uint16 downArrowBox[] = { - 8, 8, - - 0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E,0x4B5E, // ++++++++ - 0x4B5E,0x0000,0x0000,0xFFFF,0xFFFF,0x0000,0x0000,0x0217, // + @@ . - 0x4B5E,0x0000,0x0000,0xFFFF,0xFFFF,0x0000,0x0000,0x0217, // + @@ . - 0x4B5E,0x0000,0x0000,0xFFFF,0xFFFF,0x0000,0x0000,0x0217, // + @@ . - 0x4B5E,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0x0217, // +@@@@@@. - 0x4B5E,0x0000,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0x0000,0x0217, // + @@@@ . - 0x4B5E,0x0000,0x0000,0xFFFF,0xFFFF,0x0000,0x0000,0x0217, // + @@ . - 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[] = "--------------------------------------------------------"; +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; -uint16 background[1280 * 240]; +const char separator[] = "--------------------------------------------------------"; // // Case insensitive string compare function @@ -210,9 +75,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++; @@ -234,7 +99,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; @@ -243,17 +108,21 @@ class Element //We're not allocating anything in the base class, so the answer would be NO. bool Inside(uint32 x, uint32 y); // Class method - static void SetScreenAndPitch(int16 * s, uint32 p) { screenBuffer = s, pitch = p; } +// static void SetScreenAndPitch(int16 * s, uint32 p) { screenBuffer = s, pitch = p; } + static void SetScreenAndPitch(uint32 * s, uint32 p) { screenBuffer = s, pitch = p; } protected: SDL_Rect extents; uint32 state; // Class variables... - static int16 * screenBuffer; +// static int16 * screenBuffer; + static uint32 * screenBuffer; static uint32 pitch; }; -int16 * Element::screenBuffer = NULL; +// Initialize class variables (Element) +//int16 * Element::screenBuffer = NULL; +uint32 * Element::screenBuffer = NULL; uint32 Element::pitch = 0; bool Element::Inside(uint32 x, uint32 y) @@ -263,26 +132,31 @@ bool Element::Inside(uint32 x, uint32 y) } +// +// Button class +// + class Button: public Element { public: Button(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) {} - 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) + activated(false), clicked(false), inside(false), fgColor(0xFFFFFFFF), + bgColor(0xFF00FF00), pic(NULL), elementToTell(NULL) {} + Button(uint32 x, uint32 y, uint32 w, uint32 h, uint32 * p): Element(x, y, w, h), + activated(false), clicked(false), inside(false), fgColor(0xFFFFFFFF), + bgColor(0xFF00FF00), pic(p), elementToTell(NULL) {} +// Button(uint32 x, uint32 y, uint32 * p): Element(x, y, 0, 0), + Button(uint32 x, uint32 y, uint32 * p, uint32 * pH = NULL, uint32 * pD = NULL): Element(x, y, 0, 0), + activated(false), clicked(false), inside(false), fgColor(0xFFFFFFFF), + bgColor(0xFF00FF00), pic(p), picHover(pH), picDown(pD), 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) {} - Button(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; } + activated(false), clicked(false), inside(false), fgColor(0xFFFFFFFF), + bgColor(0xFF00FF00), pic(NULL), text(s), elementToTell(NULL) {} + Button(uint32 x, uint32 y, string s): Element(x, y, 0, FONT_HEIGHT), + activated(false), clicked(false), inside(false), fgColor(0xFFFFFFFF), + bgColor(0xFF00FF00), pic(NULL), text(s), elementToTell(NULL) + { extents.w = s.length() * FONT_WIDTH; } virtual void HandleKey(SDLKey key) {} virtual void HandleMouseMove(uint32 x, uint32 y); virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown); @@ -293,8 +167,8 @@ class Button: public Element protected: bool activated, clicked, inside; - uint16 fgColor, bgColor; - uint16 * pic; + uint32 fgColor, bgColor; + uint32 * pic, * picHover, * picDown; string text; Element * elementToTell; }; @@ -328,40 +202,63 @@ void Button::Draw(uint32 offsetX/*= 0*/, uint32 offsetY/*= 0*/) { uint32 addr = (extents.x + offsetX) + ((extents.y + offsetY) * pitch); - for(uint32 y=0; y 0) // Simple text button +// if (pic == NULL) { - for(uint32 x=0; x 010000 11111 10000 -> 0100 0001 1111 1111 1000 0100 -> 41 FF 84 + = (clicked && inside ? fgColor : (inside ? 0xFF84FF41 : bgColor)); + } } + + DrawString(screenBuffer, extents.x + offsetX, extents.y + offsetY, false, "%s", text.c_str()); } + else // Graphical button + { + uint32 * picToShow = pic; - if (pic != NULL) - DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, pic); + if (picHover != NULL && inside && !clicked) + picToShow = picHover; - if (text.length() > 0) - DrawString(screenBuffer, extents.x + offsetX, extents.y + offsetY, false, "%s", text.c_str()); + if (picDown != NULL && inside && clicked) + picToShow = picDown; + + DrawTransparentBitmapDeprecated(screenBuffer, extents.x + offsetX, extents.y + offsetY, picToShow); + } } +// +// PushButton class +// + 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), // 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), +// 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; } + PushButton(uint32 x, uint32 y, bool * st, string s): Element(x, y, 16, 16), 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), +/* Button(uint32 x, uint32 y, uint32 w, uint32 h, uint32 * 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), + Button(uint32 x, uint32 y, uint32 * 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]; } @@ -385,7 +282,7 @@ class PushButton: public Element bool inside; // bool activated, clicked, inside; // uint16 fgColor, bgColor; -// uint16 * pic; +// uint32 * pic; string text; // Element * elementToTell; bool internalState; @@ -427,24 +324,33 @@ void PushButton::Draw(uint32 offsetX/*= 0*/, uint32 offsetY/*= 0*/) { // Doesn't clip in y axis! !!! FIX !!! if (extents.x + x < pitch) - screenBuffer[addr + x + (y * pitch)] + screenBuffer[addr + x + (y * pitch)] = (clicked && inside ? fgColor : (inside ? 0x43F0 : bgColor)); } }*/ - DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, (*state ? pushButtonDown : pushButtonUp)); + if (*state) + DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, &pbDown); + else + DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, &pbUp); + if (text.length() > 0) - DrawString(screenBuffer, extents.x + offsetX + 12, extents.y + offsetY, false, "%s", text.c_str()); + DrawString(screenBuffer, extents.x + offsetX + 24, extents.y + offsetY, false, "%s", text.c_str()); } +// +// SlideSwitch class +// + 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), + SlideSwitch(uint32 x, uint32 y, bool * st, string s1, string s2): Element(x, y, 16, 32), state(st), inside(false), text1(s1), text2(s2) {} virtual void HandleKey(SDLKey key) {} virtual void HandleMouseMove(uint32 x, uint32 y); @@ -459,7 +365,7 @@ class SlideSwitch: public Element bool inside; // bool activated, clicked, inside; // uint16 fgColor, bgColor; -// uint16 * pic; +// uint32 * pic; string text1, text2; // Element * elementToTell; }; @@ -492,14 +398,20 @@ void SlideSwitch::HandleMouseButton(uint32 x, uint32 y, bool mouseDown) void SlideSwitch::Draw(uint32 offsetX/*= 0*/, uint32 offsetY/*= 0*/) { - DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, (*state ? slideSwitchDown : slideSwitchUp)); + DrawTransparentBitmapDeprecated(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()); + DrawString(screenBuffer, extents.x + offsetX + 24, 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()); + DrawString(screenBuffer, extents.x + offsetX + 24, extents.y + offsetY + 16, false, "%s", text2.c_str()); } +// +// Window class +// + class Window: public Element { public: @@ -508,9 +420,13 @@ class Window: public Element { close = new Button(w - 8, 1, closeBox); list.push_back(close); }*/ Window(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0, void (* f)(Element *) = NULL): Element(x, y, w, h), - /*clicked(false), inside(false),*/ fgColor(0x4FF0), bgColor(0x1E10), +// /*clicked(false), inside(false),*/ fgColor(0x4FF0), bgColor(0x1E10), +//4FF0 -> 010011 11111 10000 -> 0100 1101 1111 1111 1000 0100 -> 4D FF 84 +//1E10 -> 000111 10000 10000 -> 0001 1111 1000 0100 1000 0100 -> 1F 84 84 + /*clicked(false), inside(false),*/ fgColor(0xFF84FF4D), bgColor(0xFF84841F), handler(f) - { close = new Button(w - 8, 1, closeBox); list.push_back(close); + { close = new Button(w - (CLOSEBOX_WIDTH + 1), 1, closeBox, closeBoxHover, closeBoxDown); + list.push_back(close); close->SetNotificationElement(this); } virtual ~Window(); virtual void HandleKey(SDLKey key); @@ -523,7 +439,7 @@ class Window: public Element protected: // bool clicked, inside; - uint16 fgColor, bgColor; + uint32 fgColor, bgColor; void (* handler)(Element *); Button * close; //We have to use a list of Element *pointers* because we can't make a list that will hold @@ -604,13 +520,23 @@ void Window::Notify(Element * e) } +// +// Static text class +// + 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, uint16 fg = 0x4FF0, uint16 bg = 0xFE10): Element(x, y, 0, 0), +// fgColor(fg), bgColor(bg), text(s) {} +//4FF0 -> 010011 11111 10000 -> 0100 1101 1111 1111 1000 0100 -> 4D FF 84 +//FE10 -> 111111 10000 10000 -> 1111 1111 1000 0100 1000 0100 -> FF 84 84 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) {} + fgColor(0xFF8484FF), bgColor(0xFF84FF4D) {} + Text(uint32 x, uint32 y, string s, uint32 fg = 0xFF8484FF, uint32 bg = 0xFF84FF4D): + 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) {} @@ -618,17 +544,107 @@ class Text: public Element virtual void Notify(Element *) {} protected: - uint16 fgColor, bgColor; + uint32 fgColor, bgColor; string text; }; 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()); +} + + +// +// Static image class +// + +class Image: public Element +{ + public: + Image(uint32 x, uint32 y, const void * img): Element(x, y, 0, 0), image(img) {} + 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 *) {} + + protected: + uint32 fgColor, bgColor; + const void * image; +}; + +void Image::Draw(uint32 offsetX/*= 0*/, uint32 offsetY/*= 0*/) +{ + if (image != NULL) + DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, image); +} + + +// +// TextEdit class +// + +class TextEdit: public Element +{ + public: + TextEdit(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0): Element(x, y, w, h), + fgColor(0xFF8484FF), bgColor(0xFF84FF4D), text(""), caretPos(0), + maxScreenSize(10) {} + TextEdit(uint32 x, uint32 y, string s, uint32 mss = 10, uint32 fg = 0xFF8484FF, + uint32 bg = 0xFF84FF4D): Element(x, y, 0, 0), fgColor(fg), bgColor(bg), text(s), + caretPos(0), maxScreenSize(mss) {} + 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 *) {} + + protected: + uint32 fgColor, bgColor; + string text; + uint32 caretPos; + uint32 maxScreenSize; +}; + +//Set different filters depending on type passed in on construction, e.g., filename, amount, etc...? +void TextEdit::HandleKey(SDLKey key) +{ + if ((key >= SDLK_a && key <= SDLK_z) || (key >= SDLK_0 && key <= SDLK_9) || key == SDLK_PERIOD + || key == SDLK_SLASH) + { + //Need to handle shift key as well... + text[caretPos++] = key; + Draw(); + } + else if (key == SDLK_BACKSPACE) + { + + } + else if (key == SDLK_DELETE) + { + } +//left, right arrow +} + +void TextEdit::Draw(uint32 offsetX/*= 0*/, uint32 offsetY/*= 0*/) +{ + if (text.length() > 0) + { + FillScreenRectangle(screenBuffer, extents.x + offsetX, extents.y + offsetY, FONT_WIDTH * maxScreenSize, FONT_HEIGHT, bgColor); +// 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()); + } + + // Draw the caret (underscore? or vertical line?) } +// +// ListBox class +// + class ListBox: public Element //class ListBox: public Window { @@ -660,8 +676,8 @@ class ListBox: public Element }; ListBox::ListBox(uint32 x, uint32 y, uint32 w, uint32 h): Element(x, y, w, h), - thumbClicked(false), 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 / FONT_WIDTH) - 1), + charHeight(h / FONT_HEIGHT), elementToTell(NULL), upArrow(w - 8, 0, upArrowBox), downArrow(w - 8, h - 8, downArrowBox), upArrow2(w - 8, h - 16, upArrowBox) { upArrow.SetNotificationElement(this); @@ -752,7 +768,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()); @@ -766,13 +782,14 @@ 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... - cursor = (y - extents.y) / 8; + // I guess it's because only the Window class has offsetting implemented... !!! FIX !!! +// cursor = (y - extents.y) / 8; + cursor = (y - extents.y) / FONT_HEIGHT; } // 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) { @@ -785,10 +802,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); @@ -801,7 +823,8 @@ void ListBox::Draw(uint32 offsetX/*= 0*/, uint32 offsetY/*= 0*/) // Strip off the extension // (extension stripping should be an option, not default!) string s(item[windowPtr + i], 0, item[windowPtr + i].length() - 4); - DrawString(screenBuffer, extents.x + offsetX, extents.y + offsetY + i*8, +// DrawString(screenBuffer, extents.x + offsetX, extents.y + offsetY + i*8, + DrawString(screenBuffer, extents.x + offsetX, extents.y + offsetY + i*FONT_HEIGHT, (cursor == i ? true : false), "%-*.*s", charWidth, charWidth, s.c_str()); } @@ -819,9 +842,13 @@ 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)] = (thumbClicked ? 0x458E : 0xFFFF); +// screenBuffer[x + (y * pitch)] = (thumbClicked ? 0x458E : 0xFFFF); +//458E -> 01 0001 0 1100 0 1110 -> 0100 0101 0110 0011 0111 0011 -> 45 63 73 + screenBuffer[x + (y * pitch)] = (thumbClicked ? 0xFF736345 : 0xFFFFFFFF); else - screenBuffer[x + (y * pitch)] = 0x0200; +// screenBuffer[x + (y * pitch)] = 0x0200; +//0200 -> 000000 10000 00000 -> 00 1000 0100 00 + screenBuffer[x + (y * pitch)] = 0xFF008400; } } } @@ -877,6 +904,10 @@ string ListBox::GetSelectedItem(void) } +// +// FileList class +// + class FileList: public Window { public: @@ -902,19 +933,29 @@ FileList::FileList(uint32 x, uint32 y, uint32 w, uint32 h): Window(x, y, w, h) AddElement(load); load->SetNotificationElement(this); +#warning !!! FIX !!! Directory might not exist--this shouldn't cause VJ to crash! DIR * dp = opendir(vjs.ROMPath); dirent * de; - while ((de = readdir(dp)) != NULL) + if (dp != NULL) { - char * ext = strrchr(de->d_name, '.'); + while ((de = readdir(dp)) != NULL) + { + char * ext = strrchr(de->d_name, '.'); - if (ext != NULL) - if (stricmp(ext, ".zip") == 0 || stricmp(ext, ".jag") == 0) - files->AddItem(string(de->d_name)); - } + if (ext != NULL) + 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)); + } - closedir(dp); + closedir(dp); + } + else + { +//Give a diagnostic message here so that the (l)user can figure out what went wrong. !!! FIX !!! + } } void FileList::HandleKey(SDLKey key) @@ -939,31 +980,37 @@ 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); } +// +// Menu class & supporting structs/classes +// + struct NameAction { string name; @@ -974,7 +1021,6 @@ struct NameAction action(a), hotKey(k) {} }; - class MenuItems { public: @@ -992,9 +1038,17 @@ class MenuItems class Menu: public Element { public: - Menu(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 8, - uint16 fgc = 0x1CFF, uint16 bgc = 0x000F, uint16 fgch = 0x421F, - uint16 bgch = 0x1CFF): Element(x, y, w, h), activated(false), clicked(false), +// 1CFF -> 0 001 11 00 111 1 1111 +// 421F -> 0 100 00 10 000 1 1111 + Menu(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = FONT_HEIGHT, +/* uint16 fgc = 0x1CFF, uint16 bgc = 0x000F, uint16 fgch = 0x421F, + uint16 bgch = 0x1CFF): Element(x, y, w, h), activated(false), clicked(false),*/ +/* uint32 fgc = 0xFF3F3F00, uint32 bgc = 0x7F000000, uint32 fgch = 0xFF878700, + uint32 bgch = 0xFF3F3F00): Element(x, y, w, h), activated(false), clicked(false),*/ +/* uint32 fgc = 0xFFFF3F3F, uint32 bgc = 0xFF7F0000, uint32 fgch = 0xFFFF8787, + uint32 bgch = 0xFFFF3F3F): Element(x, y, w, h), activated(false), clicked(false),*/ + uint32 fgc = 0xFF7F0000, uint32 bgc = 0xFFFF3F3F, uint32 fgch = 0xFFFF3F3F, + uint32 bgch = 0xFFFF8787): Element(x, y, w, h), activated(false), clicked(false), inside(0), insidePopup(0), fgColor(fgc), bgColor(bgc), fgColorHL(fgch), bgColorHL(bgch), menuChosen(-1), menuItemChosen(-1) {} virtual void HandleKey(SDLKey key); @@ -1007,7 +1061,8 @@ class Menu: public Element protected: bool activated, clicked; uint32 inside, insidePopup; - uint16 fgColor, bgColor, fgColorHL, bgColorHL; +// uint16 fgColor, bgColor, fgColorHL, bgColorHL; + uint32 fgColor, bgColor, fgColorHL, bgColorHL; int menuChosen, menuItemChosen; private: @@ -1046,7 +1101,7 @@ void Menu::HandleMouseMove(uint32 x, uint32 y) for(uint32 i=0; i= xpos && x < xpos + width) { @@ -1066,7 +1121,7 @@ void Menu::HandleMouseMove(uint32 x, uint32 y) if (itemList[menuChosen].Inside(x, y) && clicked) { - insidePopup = ((y - itemList[menuChosen].extents.y) / 8) + 1; + insidePopup = ((y - itemList[menuChosen].extents.y) / FONT_HEIGHT) + 1; menuItemChosen = insidePopup - 1; } } @@ -1120,23 +1175,25 @@ void Menu::Draw(uint32 offsetX/*= 0*/, uint32 offsetY/*= 0*/) for(uint32 i=0; i> 16) & 0xFF, nGreen = (color1 >> 8) & 0xFF, nRed = color1 & 0xFF; + uint8 xorMask = (invert ? 0xFF : 0x00); + for(uint32 i=0; i> 16) & 0xFF, + eGreen = (existingColor >> 8) & 0xFF, + eRed = existingColor & 0xFF; + + uint8 trans = font2[fontAddr] ^ xorMask; + uint8 invTrans = trans ^ 0xFF; + + uint32 bRed = (eRed * invTrans + nRed * trans) / 255, + bGreen = (eGreen * invTrans + nGreen * trans) / 255, + bBlue = (eBlue * invTrans + nBlue * trans) / 255; + + *(screen + address + xx + (yy * pitch)) = 0xFF000000 | (bBlue << 16) | (bGreen << 8) | bRed; fontAddr++; } } - address += 8; + address += FONT_WIDTH; } } // // Draw text at the given x/y coordinates, using FG/BG colors. // -void DrawStringOpaque(int16 * screen, uint32 x, uint32 y, uint16 color1, uint16 color2, const char * text, ...) +void DrawStringOpaque(uint32 * screen, uint32 x, uint32 y, uint32 color1, uint32 color2, const char * text, ...) { char string[4096]; va_list arg; @@ -1249,30 +1309,41 @@ void DrawStringOpaque(int16 * screen, uint32 x, uint32 y, uint16 color1, uint16 vsprintf(string, text, arg); va_end(arg); - uint32 pitch = GetSDLScreenPitch() / 2; // Returns pitch in bytes but we need words... + uint32 pitch = sdlemuGetOverlayWidthInPixels(); uint32 length = strlen(string), address = x + (y * pitch); + uint8 eBlue = (color2 >> 16) & 0xFF, eGreen = (color2 >> 8) & 0xFF, eRed = color2 & 0xFF, + nBlue = (color1 >> 16) & 0xFF, nGreen = (color1 >> 8) & 0xFF, nRed = color1 & 0xFF; + for(uint32 i=0; i> 10) & 0x1F, - eGreen = (existingColor >> 5) & 0x1F, - eBlue = existingColor & 0x1F, + uint8 eBlue = (existingColor >> 16) & 0xFF, + eGreen = (existingColor >> 8) & 0xFF, + eRed = existingColor & 0xFF, //This could be done ahead of time, instead of on each pixel... - nRed = (color >> 10) & 0x1F, - nGreen = (color >> 5) & 0x1F, - nBlue = color & 0x1F; + nBlue = (color >> 16) & 0xFF, + nGreen = (color >> 8) & 0xFF, + nRed = color & 0xFF; //This could be sped up by using a table of 5 + 5 + 5 bits (32 levels transparency -> 32768 entries) //Here we've modified it to have 33 levels of transparency (could have any # we want!) //because dividing by 32 is faster than dividing by 31...! uint8 invTrans = 32 - trans; - uint16 bRed = (eRed * trans + nRed * invTrans) / 32; - uint16 bGreen = (eGreen * trans + nGreen * invTrans) / 32; - uint16 bBlue = (eBlue * trans + nBlue * invTrans) / 32; - uint16 blendedColor = (bRed << 10) | (bGreen << 5) | bBlue; + uint32 bRed = (eRed * trans + nRed * invTrans) / 32; + uint32 bGreen = (eGreen * trans + nGreen * invTrans) / 32; + uint32 bBlue = (eBlue * trans + nBlue * invTrans) / 32; - *(screen + address + xx + (yy * pitch)) = blendedColor; + *(screen + address + xx + (yy * pitch)) = 0xFF000000 | (bBlue << 16) | (bGreen << 8) | bRed; } fontAddr++; @@ -1326,77 +1396,375 @@ void DrawStringTrans(int16 * screen, uint32 x, uint32 y, uint16 color, uint8 tra } // -// GUI Main loop +// Draw text at the given x/y coordinates, using FG color and overlay alpha blending. // -bool GUIMain(void) +void DrawString2(uint32 * screen, uint32 x, uint32 y, uint32 color, uint8 transparency, const char * text, ...) { - extern int16 * backbuffer; - bool done = false; - SDL_Event event; - Window * mainWindow = NULL; + char string[4096]; + va_list arg; - // Set up the GUI classes... - Element::SetScreenAndPitch(backbuffer, GetSDLScreenPitch() / 2); + va_start(arg, text); + vsprintf(string, text, arg); + va_end(arg); - Menu mainMenu; - MenuItems mi; - mi.title = "File"; - 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("")); - mi.item.push_back(NameAction("Quit", Quit, SDLK_q)); - mainMenu.Add(mi); - mi.title = "Settings"; - mi.item.clear(); - mi.item.push_back(NameAction("Video...")); - mi.item.push_back(NameAction("Audio...")); - mi.item.push_back(NameAction("Misc...", MiscOptions, SDLK_m)); - mainMenu.Add(mi); - mi.title = "Info"; - mi.item.clear(); - mi.item.push_back(NameAction("About...", About)); - mainMenu.Add(mi); + uint32 pitch = sdlemuGetOverlayWidthInPixels(); + uint32 length = strlen(string), address = x + (y * pitch); - bool showMouse = true; + color &= 0x00FFFFFF; // Just in case alpha was passed in... -//This is crappy!!! !!! FIX !!! - jaguar_reset(); + for(uint32 i=0; i> 8) & 0xFF, + eBlue = (existingColor >> 16) & 0xFF, + + nRed = color & 0xFF, + nGreen = (color >> 8) & 0xFF, + nBlue = (color >> 16) & 0xFF; + + uint8 invTrans = 255 - trans; + uint32 bRed = (eRed * trans + nRed * invTrans) / 255; + uint32 bGreen = (eGreen * trans + nGreen * invTrans) / 255; + uint32 bBlue = (eBlue * trans + nBlue * invTrans) / 255; + + uint32 blendedColor = 0xFF000000 | bRed | (bGreen << 8) | (bBlue << 16); + + *(screen + address + xx + (yy * pitch)) = blendedColor; + + alpha++; + } + + bitmap++; + } + } +}*/ +void DrawTransparentBitmapDeprecated(uint32 * screen, uint32 x, uint32 y, uint32 * bitmap) +{ + uint32 width = bitmap[0], height = bitmap[1]; + bitmap += 2; + + uint32 pitch = sdlemuGetOverlayWidthInPixels();//GetSDLScreenWidthInPixels(); + uint32 address = x + (y * pitch); + + for(uint32 yy=0; yy> 24 != 0x00) // Pixel needs blending + { + uint8 trans = color >> 24; + uint8 invTrans = trans ^ 0xFF;//255 - trans; + + uint8 eRed = existingColor & 0xFF, + eGreen = (existingColor >> 8) & 0xFF, + eBlue = (existingColor >> 16) & 0xFF, + + nRed = color & 0xFF, + nGreen = (color >> 8) & 0xFF, + nBlue = (color >> 16) & 0xFF; + + uint32 bRed = (eRed * invTrans + nRed * trans) / 255; + uint32 bGreen = (eGreen * invTrans + nGreen * trans) / 255; + uint32 bBlue = (eBlue * invTrans + nBlue * trans) / 255; + + blendedColor = 0xFF000000 | bRed | (bGreen << 8) | (bBlue << 16); + } + + *(screen + address + xx + (yy * pitch)) = blendedColor; + bitmap++; + } + } +} + +void DrawTransparentBitmap(uint32 * screen, uint32 x, uint32 y, const void * bitmap) +{ + uint32 pitch = sdlemuGetOverlayWidthInPixels(); + uint32 address = x + (y * pitch); + uint32 count = 0; + + for(uint32 yy=0; yy<((Bitmap *)bitmap)->height; yy++) + { + for(uint32 xx=0; xx<((Bitmap *)bitmap)->width; xx++) + { + uint32 color = ((uint32 *)((Bitmap *)bitmap)->pixelData)[count]; + uint32 blendedColor = color; + uint32 existingColor = *(screen + address + xx + (yy * pitch)); + + if (existingColor >> 24 != 0x00) // Pixel needs blending + { + uint8 trans = color >> 24; + uint8 invTrans = trans ^ 0xFF; + + uint8 eRed = existingColor & 0xFF, + eGreen = (existingColor >> 8) & 0xFF, + eBlue = (existingColor >> 16) & 0xFF, + + nRed = color & 0xFF, + nGreen = (color >> 8) & 0xFF, + nBlue = (color >> 16) & 0xFF; + + uint32 bRed = (eRed * invTrans + nRed * trans) / 255; + uint32 bGreen = (eGreen * invTrans + nGreen * trans) / 255; + uint32 bBlue = (eBlue * invTrans + nBlue * trans) / 255; + +// Instead of $FF, should use the alpha from the destination pixel as the final alpha value... + blendedColor = 0xFF000000 | bRed | (bGreen << 8) | (bBlue << 16); + } + + *(screen + address + xx + (yy * pitch)) = blendedColor; + count++; + } + } +} + +// +// Draw a bitmap without using blending +// +void DrawBitmap(uint32 * screen, uint32 x, uint32 y, const void * bitmap) +{ + uint32 pitch = sdlemuGetOverlayWidthInPixels(); + uint32 address = x + (y * pitch); + uint32 count = 0; + + for(uint32 yy=0; yy<((Bitmap *)bitmap)->height; yy++) + { + for(uint32 xx=0; xx<((Bitmap *)bitmap)->width; xx++) + { + *(screen + address + xx + (yy * pitch)) = ((uint32 *)((Bitmap *)bitmap)->pixelData)[count]; + count++; + } + } +} + +// +// Fill a portion of the screen with the passed in color +// +void FillScreenRectangle(uint32 * screen, uint32 x, uint32 y, uint32 w, uint32 h, uint32 color) +//void ClearScreenRectangle(uint32 * screen, uint32 x, uint32 y, uint32 w, uint32 h) +{ + uint32 pitch = sdlemuGetOverlayWidthInPixels(); + uint32 address = x + (y * pitch); + + for(uint32 yy=0; yy 000100 01000 10001 -> 0001 0000 0100 0010 1000 1100 -> 10 42 8C + for(uint32 i=0; iAddElement(new Text(8, 8, "Error!")); + mainWindow->AddElement(new Text(8, 24, errText)); + } + } + +WriteLog("GUI: Entering main loop...\n"); + while (!exitGUI) + { + if (SDL_PollEvent(&event)) + { + if (event.type == SDL_USEREVENT) + { + if (event.user.code == WINDOW_CLOSE) + { + delete mainWindow; + mainWindow = NULL; + } + else if (event.user.code == MENU_ITEM_CHOSEN) + { + // Confused? Let me enlighten... What we're doing here is casting + // data1 as a pointer to a function which returns a Window pointer and + // which takes no parameters (the "(Window *(*)(void))" part), then + // derefencing it (the "*" in front of that) in order to call the + // function that it points to. Clear as mud? Yeah, I hate function + // pointers too, but what else are you gonna do? + mainWindow = (*(Window *(*)(void))event.user.data1)(); + + while (SDL_PollEvent(&event)); // Flush the event queue... + event.type = SDL_MOUSEMOTION; + int mx, my; + SDL_GetMouseState(&mx, &my); + event.motion.x = mx, event.motion.y = my; SDL_PushEvent(&event); // & update mouse position...! + oldMouseX = mouseX, oldMouseY = mouseY; mouseX = mx, mouseY = my; // This prevents "mouse flash"... - if (vjs.useOpenGL) - mouseX /= 2, mouseY /= 2; } } else if (event.type == SDL_ACTIVEEVENT) @@ -1413,11 +1781,9 @@ bool GUIMain(void) } else if (event.type == SDL_MOUSEMOTION) { + oldMouseX = mouseX, oldMouseY = mouseY; mouseX = event.motion.x, mouseY = event.motion.y; - if (vjs.useOpenGL) - mouseX /= 2, mouseY /= 2; - if (mainWindow) mainWindow->HandleMouseMove(mouseX, mouseY); else @@ -1427,9 +1793,6 @@ bool GUIMain(void) { uint32 mx = event.button.x, my = event.button.y; - if (vjs.useOpenGL) - mx /= 2, my /= 2; - if (mainWindow) mainWindow->HandleMouseButton(mx, my, true); else @@ -1439,28 +1802,71 @@ bool GUIMain(void) { uint32 mx = event.button.x, my = event.button.y; - if (vjs.useOpenGL) - mx /= 2, my /= 2; - if (mainWindow) mainWindow->HandleMouseButton(mx, my, false); else mainMenu.HandleMouseButton(mx, my, false); } +//PROBLEM: In order to use the dirty rectangle approach here, we need some way of +// handling it in mainMenu.Draw() and mainWindow->Draw(). !!! FIX !!! +//POSSIBLE SOLUTION: +// When mouse is moving and not on menu or window, can do straight dirty rect. +// When mouse is on menu, need to update screen. Same for buttons on windows... +// What the menu & windows should do is only redraw on a state change. IOW, they +// should call their own/child window's Draw() function instead of doing it top +// level. +//#define NEW_BACKSTORE_METHOD + // Draw the GUI... // The way we do things here is kinda stupid (redrawing the screen every frame), but // 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); +// memcpy(backbuffer, background, tom_getVideoModeWidth() * 256 * 4); +#ifndef NEW_BACKSTORE_METHOD + memset(sdlemuGetOverlayPixels(), 0, sdlemuGetOverlayWidthInPixels() * 480 * 4); 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(); +#endif + +/*uint32 pBGS[6 * 8 + 3] = { 6, 8, 4, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0 +};*/ +//This isn't working... Why???? +//It's because DrawTransparentBitmap does alpha blending if it detects zero in the alpha channel. +//So why do it that way? Hm. + overlayPixels = (uint32 *)sdlemuGetOverlayPixels(); + +#ifdef NEW_BACKSTORE_METHOD +// DrawTransparentBitmapDeprecated(overlayPixels, oldMouseX, oldMouseY, pointerBGSave); +// DrawTransparentBitmap(overlayPixels, oldMouseX, oldMouseY, pBGS); + for(uint32 y=0; y> 16) & 0xFF, g = (pixel >> 8) & 0xFF, r = pixel & 0xFF; + pixel = ((r + g + b) / 3) & 0x00FF; + backbuffer[i] = 0xFF000000 | (pixel << 16) | (pixel << 8); + } +return NULL;//*/ + //This is crappy... !!! FIX !!! - extern int16 * backbuffer; extern bool finished, showGUI; - uint32 nFrame = 0, nFrameskip = 0; +// uint32 nFrame = 0, nFrameskip = 0; uint32 totalFrames = 0; finished = false; bool showMessage = true; @@ -1501,18 +1941,24 @@ 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" }; + uint32 elapsedTicks = SDL_GetTicks(), frameCount = 0, framesPerSecond = 0; - while (!finished) + while (true) { // Set up new backbuffer with new pixels and data JaguarExecute(backbuffer, true); +// JaguarExecuteNew(); totalFrames++; //WriteLog("Frame #%u...\n", totalFrames); //extern bool doDSPDis; @@ -1521,6 +1967,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; @@ -1530,16 +1977,23 @@ Window * RunEmu(void) extern uint32 gpu_pc, dsp_pc; DrawString(backbuffer, 8, 8, false, "GPU PC: %08X", gpu_pc); DrawString(backbuffer, 8, 16, false, "DSP PC: %08X", dsp_pc); + DrawString(backbuffer, 8, 32, false, "%u FPS", framesPerSecond); } 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); +// FF0F -> 1111 11 11 000 0 1111 -> 3F 18 0F +// 3FE3 -> 0011 11 11 111 0 0011 -> 0F 3F 03 +/* DrawStringTrans((uint32 *)backbuffer, 8, 24*8, 0xFF0F, transparency, "Running..."); + DrawStringTrans((uint32 *)backbuffer, 8, 26*8, 0x3FE3, transparency, "%s, run address: %06X", cartTypeName[cartType], jaguarRunAddress); + DrawStringTrans((uint32 *)backbuffer, 8, 27*8, 0x3FE3, transparency, "CRC: %08X", jaguar_mainRom_crc32);//*/ +//first has wrong color. !!! FIX !!! + DrawStringTrans(backbuffer, 8, 24*8, 0xFF7F63FF, transparency, "Running..."); + DrawStringTrans(backbuffer, 8, 26*8, 0xFF1FFF3F, transparency, "%s, run address: %06X", cartTypeName[cartType], jaguarRunAddress); + DrawStringTrans(backbuffer, 8, 27*8, 0xFF1FFF3F, transparency, "CRC: %08X", jaguar_mainRom_crc32); if (showMsgFrames == 0) - { + { transparency++; if (transparency == 33) @@ -1554,467 +2008,211 @@ doGPUDis = true;//*/ showMsgFrames--; } - // Simple frameskip - if (nFrame == nFrameskip) - { - RenderBackbuffer(); - nFrame = 0; - } - else - nFrame++; + RenderBackbuffer(); + frameCount++; + + if (SDL_GetTicks() - elapsedTicks > 250) + elapsedTicks += 250, framesPerSecond = frameCount * 4, frameCount = 0; } // Reset the pitch, since it may have been changed in-game... - Element::SetScreenAndPitch(backbuffer, GetSDLScreenPitch() / 2); + Element::SetScreenAndPitch((uint32 *)backbuffer, GetSDLScreenWidthInPixels()); // 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; - word = ((r + g + b) / 3) & 0x001F; - word = (word << 5) | word; - background[i] = word; + uint32 pixel = backbuffer[i]; + uint8 b = (pixel >> 16) & 0xFF, g = (pixel >> 8) & 0xFF, r = pixel & 0xFF; + pixel = ((r + g + b) / 3) & 0x00FF; + background[i] = 0xFF000000 | (pixel << 16) | (pixel << 8); } return NULL; } -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(); - jaguar_done(); - version_done(); - memory_done(); - VideoDone(); // Free SDL components last...! - log_done(); - - exit(0); - - return NULL; // We never get here... -} - -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, 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")); - - 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 -// -void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap) -{ - uint16 width = bitmap[0], height = bitmap[1]; - bitmap += 2; - - uint32 pitch = GetSDLScreenPitch() / 2; // Returns pitch in bytes but we need words... - uint32 address = x + (y * pitch); +#else - for(int yy=0; yy fileList; - - // Read in the candidate files from the directory pointed to by "path" - - DIR * dp = opendir(path); - dirent * de; +// extern uint32 * backbuffer; + uint32 * overlayPixels = (uint32 *)sdlemuGetOverlayPixels(); + memset(overlayPixels, 0x00, 640 * 480 * 4); // Clear out overlay... - 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)); - } +//This is crappy... !!! FIX !!! +// extern bool finished, showGUI; - closedir(dp); + sdlemuDisableOverlay(); - if (fileList.size() == 0) // Any files found? - return false; // Nope. Bail! +// uint32 nFrame = 0, nFrameskip = 0; + uint32 totalFrames = 0; + finished = false; + bool showMessage = true; + uint32 showMsgFrames = 120; + uint8 transparency = 0xFF; + // Pass a message to the "joystick" code to debounce the ESC key... + debounceRunKey = true; - // Main GUI selection loop + 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; - uint32 cursor = 0, startFile = 0; + const char * cartTypeName[5] = { "2M Cartridge", "4M Cartridge", "CD BIOS", "CD Dev BIOS", "Homebrew" }; + uint32 elapsedTicks = SDL_GetTicks(), frameCount = 0, framesPerSecond = 0; - if (fileList.size() > 1) // Only go GUI if more than one possibility! + while (!finished) { - sort(fileList.begin(), fileList.end()); + // Set up new backbuffer with new pixels and data + JaguarExecuteNew(); + totalFrames++; +//WriteLog("Frame #%u...\n", totalFrames); +//extern bool doDSPDis; +//if (totalFrames == 373) +// doDSPDis = true; - bool done = false; - uint32 limit = (fileList.size() > 30 ? 30 : fileList.size()); - SDL_Event event; +//Problem: Need to do this *only* when the state changes from visible to not... +//Also, need to clear out the GUI when not on (when showMessage is active...) +if (showGUI || showMessage) + sdlemuEnableOverlay(); +else + sdlemuDisableOverlay(); - // Ensure that the GUI is drawn before any user input... - event.type = SDL_USEREVENT; - SDL_PushEvent(&event); +//Add in a new function for clearing patches of screen (ClearOverlayRect) - while (!done) + // Some QnD GUI stuff here... + if (showGUI) { - 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(); - } + FillScreenRectangle(overlayPixels, 8, 1*FONT_HEIGHT, 128, 4*FONT_HEIGHT, 0x00000000); + extern uint32 gpu_pc, dsp_pc; + DrawString(overlayPixels, 8, 1*FONT_HEIGHT, false, "GPU PC: %08X", gpu_pc); + DrawString(overlayPixels, 8, 2*FONT_HEIGHT, false, "DSP PC: %08X", dsp_pc); + DrawString(overlayPixels, 8, 4*FONT_HEIGHT, false, "%u FPS", framesPerSecond); } - } - - 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) -{ - uint32 romSize = 0; - - char * ext = strrchr(path, '.'); - if (ext != NULL) - { - WriteLog("VJ: Loading \"%s\"...", path); - - if (stricmp(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 + if (showMessage) { -/* FILE * fp = fopen(path, "rb"); + 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); - if (fp == NULL) + if (showMsgFrames == 0) { - 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);*/ + transparency--; - gzFile fp = gzopen(path, "rb"); + if (transparency == 0) +{ + showMessage = false; +/*extern bool doGPUDis; +doGPUDis = true;//*/ +} - if (fp == NULL) - { - WriteLog("Failed!\n"); - return 0; } - - romSize = gzfilelength(fp); - gzseek(fp, 0, SEEK_SET); - gzread(fp, rom, romSize); - gzclose(fp); + else + showMsgFrames--; } - WriteLog("OK (%i bytes)\n", romSize); + frameCount++; + + if (SDL_GetTicks() - elapsedTicks > 250) + elapsedTicks += 250, framesPerSecond = frameCount * 4, frameCount = 0; } - return romSize; -} + // 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; + pixel = ((r + g + b) / 3) & 0x00FF; + backbuffer[i] = 0xFF000000 | (pixel << 16) | (pixel << 8); + } -// -// Jaguar cartridge ROM loading -// -void JaguarLoadCart(uint8 * mem, char * path) -{ - jaguarRomSize = JaguarLoadROM(mem, path); + sdlemuEnableOverlay(); -// if (romSize == 0) -// { -/* char newPath[2048]; - WriteLog("VJ: Trying GUI...\n"); + return NULL; +} -//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); - } +#endif - romSize = JaguarLoadROM(mem, newPath); -*/ - 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, jaguarRomSize); - WriteLog("CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32); - eeprom_init(); +Window * Quit(void) +{ + WriteLog("GUI: Quitting due to user request.\n"); + exitGUI = true; - 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; - } + return NULL; } -/* -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 -// -int gzfilelength(gzFile gd) +Window * About(void) { - int size = 0, length = 0; - unsigned char buffer[0x10000]; + 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) +//Hardwired, bleh... !!! FIX !!! +uint32 width = 55 * FONT_WIDTH, height = 18 * FONT_HEIGHT; +uint32 xpos = (640 - width) / 2, ypos = (480 - height) / 2; +// Window * window = new Window(8, 16, 50 * FONT_WIDTH, 21 * FONT_HEIGHT); + Window * window = new Window(xpos, ypos, width, height); +// window->AddElement(new Text(8, 8, "Virtual Jaguar 1.0.8")); +// window->AddElement(new Text(8, 8, "Virtual Jaguar CVS 20050110", 0xFF3030FF, 0xFF000000)); +// window->AddElement(new Text(208, 8+0*FONT_HEIGHT, buf, 0xFF3030FF, 0xFF000000)); + window->AddElement(new Text(248, 8+4*FONT_HEIGHT+5, buf, 0xFF3030FF, 0xFF000000)); + window->AddElement(new Text(8, 8+0*FONT_HEIGHT, "Coders:")); + window->AddElement(new Text(16, 8+1*FONT_HEIGHT, "James L. Hammons (shamus)")); + window->AddElement(new Text(16, 8+2*FONT_HEIGHT, "Niels Wagenaar (nwagenaar)")); + window->AddElement(new Text(16, 8+3*FONT_HEIGHT, "Carwin Jones (Caz)")); + window->AddElement(new Text(16, 8+4*FONT_HEIGHT, "Adam Green")); + window->AddElement(new Text(8, 8+6*FONT_HEIGHT, "Testers:")); + window->AddElement(new Text(16, 8+7*FONT_HEIGHT, "Guruma")); + window->AddElement(new Text(8, 8+9*FONT_HEIGHT, "Thanks go out to:")); + window->AddElement(new Text(16, 8+10*FONT_HEIGHT, "Aaron Giles for the original CoJag")); + window->AddElement(new Text(16, 8+11*FONT_HEIGHT, "David Raingeard for the original VJ")); + window->AddElement(new Text(16, 8+12*FONT_HEIGHT, "Karl Stenerud for his Musashi 68K emu")); + window->AddElement(new Text(16, 8+13*FONT_HEIGHT, "Sam Lantinga for his amazing SDL libs")); + window->AddElement(new Text(16, 8+14*FONT_HEIGHT, "Ryan C. Gordon for VJ's web presence")); + window->AddElement(new Text(16, 8+15*FONT_HEIGHT, "Curt Vendel for various Jaguar goodies")); + window->AddElement(new Text(16, 8+16*FONT_HEIGHT, "The guys over at Atari Age ;-)")); +// window->AddElement(new Image(8, 8, &vj_title_small)); + window->AddElement(new Image(width - (vj_title_small.width + 8), 8, &vj_title_small)); - gzrewind(gd); + return window; +} - do - { - // Read in chunks until EOF - size = gzread(gd, buffer, 0x10000); +Window * MiscOptions(void) +{ + Window * window = new Window(8, 16, 304, 192); + window->AddElement(new PushButton(8, 8, &vjs.useJaguarBIOS, "BIOS")); + window->AddElement(new SlideSwitch(8, 32, &vjs.hardwareTypeNTSC, "PAL", "NTSC")); + window->AddElement(new PushButton(8, 64, &vjs.DSPEnabled, "DSP")); + window->AddElement(new SlideSwitch(24, 88, &vjs.usePipelinedDSP, "Original", "Pipelined")); + window->AddElement(new SlideSwitch(8, 120, (bool *)&vjs.glFilter, "Sharp", "Blurry")); + window->AddElement(new SlideSwitch(8, 152, (bool *)&vjs.renderType, "Normal render", "TV style")); - if (size <= 0) - break; + window->AddElement(new TextEdit(88, 8, vjs.ROMPath, 20, 0xFF8484FF, 0xFF000000)); - length += size; - } - while (!gzeof(gd)); +/*TextEdit(uint32 x, uint32 y, string s, uint32 mss = 10, uint32 fg = 0xFF8484FF, + uint32 bg = 0xFF84FF4D): Element(x, y, 0, 0), fgColor(fg), bgColor(bg), text(s), + caretPos(0), maxScreenSize(mss) {}*/ +// Missing: +// * BIOS path +// * ROM path +// * EEPROM path +// * joystick +// * joystick port +// * OpenGL? +// * GL Filter type +// * Window/fullscreen +// * Key definitions - gzrewind(gd); - return length; + return window; }