// by James L. Hammons
//
+#include <stdarg.h>
+#include <sys/types.h> // For MacOS <dirent.h> dependency
#include <dirent.h>
#include <SDL.h>
#include <string>
#include <vector>
#include <algorithm>
-#include <ctype.h> // For toupper()
-#include "types.h"
+#include <ctype.h> // 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 "sdlemu_opengl.h"
#include "gui.h"
using namespace std; // For STL stuff
class Window; // Forward declaration...
-void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap, uint8 * alpha = NULL);
-void DrawStringTrans(int16 * screen, uint32 x, uint32 y, uint16 color, uint8 opacity, const char * text, ...);
-void DrawStringOpaque(int16 * screen, uint32 x, uint32 y, uint16 color1, uint16 color2, const char * text, ...);
+//void 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 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, ...);
Window * LoadROM(void);
Window * ResetJaguar(void);
+Window * ResetJaguarCD(void);
Window * RunEmu(void);
Window * Quit(void);
Window * About(void);
// External variables
extern uint8 * jaguar_mainRam;
-extern uint8 * jaguar_bootRom;
extern uint8 * jaguar_mainRom;
+extern uint8 * jaguar_bootRom;
+extern uint8 * jaguar_CDBootROM;
+extern bool BIOSLoaded;
+extern bool CDBIOSLoaded;
// Local global variables
-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, 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 // ........
-};*/
+bool exitGUI = false; // GUI (emulator) done variable
+int mouseX = 0, mouseY = 0;
+uint32 background[1280 * 256]; // GUI background buffer
char separator[] = "--------------------------------------------------------";
-uint16 background[1280 * 240];
-
//
// Case insensitive string compare function
// Taken straight out of Thinking In C++ by Bruce Eckel. Thanks Bruce!
// Select the first element of each string:
string::const_iterator p1 = s1.begin(), p2 = s2.begin();
- while (p1 != s1.end() && p2 != s2.end()) // Don\92t run past the end
+ while (p1 != s1.end() && p2 != s2.end()) // Don\92t 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++;
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;
//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)
{
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);
protected:
bool activated, clicked, inside;
- uint16 fgColor, bgColor;
- uint16 * pic;
+ uint32 fgColor, bgColor;
+ uint32 * pic, * picHover, * picDown;
string text;
Element * elementToTell;
};
{
uint32 addr = (extents.x + offsetX) + ((extents.y + offsetY) * pitch);
- for(uint32 y=0; y<extents.h; y++)
+ if (text.length() > 0) // Simple text button
+// if (pic == NULL)
{
- for(uint32 x=0; x<extents.w; x++)
+ for(uint32 y=0; y<extents.h; y++)
{
- // Doesn't clip in y axis! !!! FIX !!!
- if (extents.x + x < pitch)
- screenBuffer[addr + x + (y * pitch)]
- = (clicked && inside ? fgColor : (inside ? 0x43F0 : bgColor));
+ for(uint32 x=0; x<extents.w; x++)
+ {
+ // Doesn't clip in y axis! !!! FIX !!!
+ if (extents.x + x < pitch)
+ screenBuffer[addr + x + (y * pitch)]
+// = (clicked && inside ? fgColor : (inside ? 0x43F0 : bgColor));
+//43F0 -> 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);
+ }
}
{
// 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]; }
bool inside;
// bool activated, clicked, inside;
// uint16 fgColor, bgColor;
-// uint16 * pic;
+// uint32 * pic;
string text;
// Element * elementToTell;
bool internalState;
}
}*/
-// DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, (*state ? pushButtonDown : pushButtonUp));
- DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, (*state ? pushButtonDown : pushButtonUp), (*state ? pbdAlpha : pbuAlpha));
+ 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());
}
{
// 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);
bool inside;
// bool activated, clicked, inside;
// uint16 fgColor, bgColor;
-// uint16 * pic;
+// uint32 * pic;
string text1, text2;
// Element * elementToTell;
};
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());
}
{ 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);
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
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) {}
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());
}
};
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);
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 (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);
// 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());
}
for(uint32 x=extents.x+offsetX+extents.w; x<extents.x+offsetX+extents.w+8; x++)
{
if (y >= 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;
}
}
}
AddElement(load);
load->SetNotificationElement(this);
+//!!! 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, '.');
-
- if (ext != NULL)
- 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));
+ while ((de = readdir(dp)) != NULL)
+ {
+ char * ext = strrchr(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);
+ }
+ else
+ {
+//Give a diagnostic message here so that the (l)user can figure out what went wrong. !!! FIX !!!
}
-
- closedir(dp);
}
void FileList::HandleKey(SDLKey key)
// 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
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);
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:
for(uint32 i=0; i<itemList.size(); i++)
{
- uint32 width = (itemList[i].title.length() + 2) * 8;
+ uint32 width = (itemList[i].title.length() + 2) * FONT_WIDTH;
if (x >= xpos && x < xpos + width)
{
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;
}
}
for(uint32 i=0; i<itemList.size(); i++)
{
- uint16 color1 = fgColor, color2 = bgColor;
+// uint16 color1 = fgColor, color2 = bgColor;
+ uint32 color1 = fgColor, color2 = bgColor;
if (inside == (i + 1) || (menuChosen != -1 && (uint32)menuChosen == i))
color1 = fgColorHL, color2 = bgColorHL;
DrawStringOpaque(screenBuffer, xpos, extents.y + offsetY, color1, color2,
" %s ", itemList[i].title.c_str());
- xpos += (itemList[i].title.length() + 2) * 8;
+ xpos += (itemList[i].title.length() + 2) * FONT_WIDTH;
}
// Draw sub menu (but only if active)
if (clicked)
{
- uint32 ypos = extents.y + 9;
+ uint32 ypos = extents.y + FONT_HEIGHT + 1;
for(uint32 i=0; i<itemList[menuChosen].item.size(); i++)
{
- uint16 color1 = fgColor, color2 = bgColor;
+// uint16 color1 = fgColor, color2 = bgColor;
+ uint32 color1 = fgColor, color2 = bgColor;
if (insidePopup == i + 1)
color1 = fgColorHL, color2 = bgColorHL, menuItemChosen = i;
DrawStringOpaque(screenBuffer, itemList[menuChosen].extents.x, ypos,
fgColor, bgColor, "%.*s", itemList[menuChosen].charLength + 2, separator);
- ypos += 8;
+ ypos += FONT_HEIGHT;
}
}
}
mi.charLength = mi.item[i].name.length();
// Set extents here as well...
- mi.extents.x = extents.x + extents.w, mi.extents.y = extents.y + 9;
- mi.extents.w = (mi.charLength + 2) * 8, mi.extents.h = mi.item.size() * 8;
+ mi.extents.x = extents.x + extents.w, mi.extents.y = extents.y + FONT_HEIGHT + 1;
+ mi.extents.w = (mi.charLength + 2) * FONT_WIDTH, mi.extents.h = mi.item.size() * FONT_HEIGHT;
itemList.push_back(mi);
- extents.w += (mi.title.length() + 2) * 8;
+ extents.w += (mi.title.length() + 2) * FONT_WIDTH;
}
//Do we even *need* this?
-class RootWindow: public Window
+//Doesn't seem like it...
+/*class RootWindow: public Window
{
public:
RootWindow(Menu * m, Window * w = NULL): menu(m), window(w) {}
Menu * menu;
Window * window;
int16 * rootImage[1280 * 240 * 2];
-};
+};//*/
-
-//
-// GUI stuff--it's not crunchy, it's GUI! ;-)
-//
-
-void InitGUI(void)
-{
- SDL_ShowCursor(SDL_DISABLE);
- SDL_GetMouseState(&mouseX, &mouseY);
-}
-
-void GUIDone(void)
-{
-}
-
//
// Draw text at the given x/y coordinates. Can invert text as well.
//
-void DrawString(int16 * screen, uint32 x, uint32 y, bool invert, const char * text, ...)
+void DrawString(uint32 * screen, uint32 x, uint32 y, bool invert, const char * text, ...)
{
char string[4096];
va_list arg;
vsprintf(string, text, arg);
va_end(arg);
- uint32 pitch = GetSDLScreenPitch() / 2; // Returns pitch in bytes but we need words...
+ uint32 pitch = sdlemuGetOverlayWidthInPixels();//GetSDLScreenWidthInPixels();
uint32 length = strlen(string), address = x + (y * pitch);
+ uint32 color1 = 0x0080FF;
+ uint8 nBlue = (color1 >> 16) & 0xFF, nGreen = (color1 >> 8) & 0xFF, nRed = color1 & 0xFF;
+ uint8 xorMask = (invert ? 0xFF : 0x00);
+
for(uint32 i=0; i<length; i++)
{
- uint32 fontAddr = (uint32)string[i] * 64;
+ uint8 c = string[i];
+ uint32 fontAddr = (uint32)(c < 32 ? 0 : c - 32) * FONT_WIDTH * FONT_HEIGHT;
- for(uint32 yy=0; yy<8; yy++)
+ for(uint32 yy=0; yy<FONT_HEIGHT; yy++)
{
- for(uint32 xx=0; xx<8; xx++)
+ for(uint32 xx=0; xx<FONT_WIDTH; xx++)
{
- if ((font1[fontAddr] && !invert) || (!font1[fontAddr] && invert))
- *(screen + address + xx + (yy * pitch)) = 0xFE00;
+ uint32 existingColor = *(screen + address + xx + (yy * pitch));
+
+ uint8 eBlue = (existingColor >> 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;
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<length; i++)
{
- uint32 fontAddr = (uint32)string[i] * 64;
+ uint8 c = string[i];
+ c = (c < 32 ? 0 : c - 32);
+ uint32 fontAddr = (uint32)c * FONT_WIDTH * FONT_HEIGHT;
- for(uint32 yy=0; yy<8; yy++)
+ for(uint32 yy=0; yy<FONT_HEIGHT; yy++)
{
- for(uint32 xx=0; xx<8; xx++)
+ for(uint32 xx=0; xx<FONT_WIDTH; xx++)
{
- *(screen + address + xx + (yy * pitch)) = (font1[fontAddr] ? color1 : color2);
- fontAddr++;
+ uint8 trans = font2[fontAddr++];
+ uint8 invTrans = trans ^ 0xFF;
+
+ uint32 bRed = (eRed * invTrans + nRed * trans) / 255;
+ uint32 bGreen = (eGreen * invTrans + nGreen * trans) / 255;
+ uint32 bBlue = (eBlue * invTrans + nBlue * trans) / 255;
+
+ *(screen + address + xx + (yy * pitch)) = 0xFF000000 | (bBlue << 16) | (bGreen << 8) | bRed;
}
}
- address += 8;
+ address += FONT_WIDTH;
}
}
//
// 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, ...)
+void DrawStringTrans(uint32 * screen, uint32 x, uint32 y, uint32 color, uint8 trans, const char * text, ...)
{
char string[4096];
va_list arg;
vsprintf(string, text, arg);
va_end(arg);
- uint32 pitch = GetSDLScreenPitch() / 2; // Returns pitch in bytes but we need words...
+ uint32 pitch = sdlemuGetOverlayWidthInPixels();//GetSDLScreenWidthInPixels();
uint32 length = strlen(string), address = x + (y * pitch);
for(uint32 i=0; i<length; i++)
{
if (font1[fontAddr])
{
- uint16 existingColor = *(screen + address + xx + (yy * pitch));
+ uint32 existingColor = *(screen + address + xx + (yy * pitch));
- uint8 eRed = (existingColor >> 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++;
}
//
-// GUI Main loop
+// Draw "picture"
+// Uses zero as transparent color
+// Can also use an optional alpha channel
+// Alpha channel is now mandatory! ;-)
//
-bool GUIMain(void)
+//void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap, uint8 * alpha/*=NULL*/)
+/*void DrawTransparentBitmap(uint32 * screen, uint32 x, uint32 y, uint32 * bitmap, uint8 * alpha)
{
-// 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;
+ uint32 width = bitmap[0], height = bitmap[1];
+ bitmap += 2;
+
+// uint32 pitch = GetSDLScreenPitch() / 2; // Returns pitch in bytes but we need words...
+ uint32 pitch = sdlemuGetOverlayWidthInPixels();//GetSDLScreenWidthInPixels();
+ uint32 address = x + (y * pitch);
+
+ for(uint32 yy=0; yy<height; yy++)
+ {
+ for(uint32 xx=0; xx<width; xx++)
+ {
+ if (alpha == NULL)
+ {
+ if (*bitmap && x + xx < pitch) // NOTE: Still doesn't clip the Y val...
+ *(screen + address + xx + (yy * pitch)) = *bitmap;
+ }
+ else
+ {
+ uint8 trans = *alpha;
+ uint32 color = *bitmap;
+ uint32 existingColor = *(screen + address + xx + (yy * pitch));
+
+ uint8 eRed = existingColor & 0xFF,
+ eGreen = (existingColor >> 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<height; yy++)
+ {
+ for(uint32 xx=0; xx<width; xx++)
+ {
+ uint32 color = *bitmap;
+ 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;//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;
+
+ blendedColor = 0xFF000000 | bRed | (bGreen << 8) | (bBlue << 16);
+ }
+
+ *(screen + address + xx + (yy * pitch)) = blendedColor;
+ count++;
+ }
+ }
+}
+
+//
+// GUI stuff--it's not crunchy, it's GUI! ;-)
+//
+
+void InitGUI(void)
+{
+ SDL_ShowCursor(SDL_DISABLE);
+ SDL_GetMouseState(&mouseX, &mouseY);
+}
+
+void GUIDone(void)
+{
+}
+
+//
+// GUI main loop
+//
+//bool GUIMain(void)
+bool GUIMain(char * filename)
+{
+WriteLog("GUI: Inside GUIMain...\n");
+
+ uint32 pointerBGSave[6 * 8 + 2];
+ pointerBGSave[0] = 6;
+ pointerBGSave[1] = 8;
+
+// Need to set things up so that it loads and runs a file if given on the command line. !!! FIX !!! [DONE]
+ extern uint32 * backbuffer;
+// bool done = false;
SDL_Event event;
Window * mainWindow = NULL;
// Set up the GUI classes...
- Element::SetScreenAndPitch(backbuffer, GetSDLScreenPitch() / 2);
+// Element::SetScreenAndPitch(backbuffer, GetSDLScreenWidthInPixels());
+ Element::SetScreenAndPitch((uint32 *)sdlemuGetOverlayPixels(), sdlemuGetOverlayWidthInPixels());
+ sdlemuEnableOverlay();
Menu mainMenu;
MenuItems mi;
- mi.title = "File";
+ mi.title = "Jaguar";
mi.item.push_back(NameAction("Load...", LoadROM, SDLK_l));
- mi.item.push_back(NameAction("Reset", ResetJaguar));
+ mi.item.push_back(NameAction("Reset", ResetJaguar, SDLK_r));
+ if (CDBIOSLoaded)
+ mi.item.push_back(NameAction("Reset CD", ResetJaguarCD, SDLK_c));
mi.item.push_back(NameAction("Run", RunEmu, SDLK_ESCAPE));
mi.item.push_back(NameAction(""));
mi.item.push_back(NameAction("Quit", Quit, SDLK_q));
bool showMouse = true;
+ // Grab the BG where the mouse will be painted (prime the backstore)
+
+/*
+DISNOWOK
+Bitmap ptr = { 6, 8, 4,
+""//"000011112222333344445555"
+//"000011112222333344445555"
+//"000011112222333344445555"
+//"000011112222333344445555"
+//"000011112222333344445555"
+//"000011112222333344445555"
+//"000011112222333344445555"
+//"000011112222333344445555"
+};//*/
+ uint32 * overlayPixels = (uint32 *)sdlemuGetOverlayPixels();
+ uint32 count = 2;
+
+ for(uint32 y=0; y<pointerBGSave[1]; y++)
+ for(uint32 x=0; x<pointerBGSave[0]; x++)
+ pointerBGSave[count++] = overlayPixels[((mouseY + y) * sdlemuGetOverlayWidthInPixels()) + (mouseX + x)];
+
+ uint32 oldMouseX = mouseX, oldMouseY = mouseY;
+
//This is crappy!!! !!! FIX !!!
+//Is this even needed any more? Hmm. Maybe. Dunno.
+WriteLog("GUI: Resetting Jaguar...\n");
jaguar_reset();
+WriteLog("GUI: Clearing BG save...\n");
// Set up our background save...
- memset(background, 0x11, tom_getVideoModeWidth() * 240 * 2);
+// memset(background, 0x11, tom_getVideoModeWidth() * 240 * 2);
+//1111 -> 000100 01000 10001 -> 0001 0000 0100 0010 1000 1100 -> 10 42 8C
+ for(uint32 i=0; i<tom_getVideoModeWidth()*240; i++)
+// background[i] = 0xFF8C4210;
+ backbuffer[i] = 0xFF8C4210;
+
+/* uint32 * overlayPix = (uint32 *)sdlemuGetOverlayPixels();
+ for(uint32 i=0; i<sdlemuGetOverlayWidthInPixels()*480; i++)
+ overlayPix[i] = 0x00000000;*/
- while (!done)
+ // Handle loading file passed in on the command line...! [DONE]
+
+ if (filename)
{
- while (SDL_PollEvent(&event))
+ if (JaguarLoadFile(filename))
+ {
+// event.type = SDL_USEREVENT, event.user.code = MENU_ITEM_CHOSEN;
+// event.user.data1 = (void *)ResetJaguar;
+// SDL_PushEvent(&event);
+ // Make it so that if passed in on the command line, we quit right
+ // away when pressing ESC
+WriteLog("GUI: Bypassing GUI since ROM passed in on command line...\n");
+ ResetJaguar();
+ return true;
+ }
+ else
+ {
+ // Create error dialog...
+ char errText[1024];
+ sprintf(errText, "The file %40s could not be loaded.", filename);
+
+ mainWindow = new Window(8, 16, 304, 160);
+ mainWindow->AddElement(new Text(8, 8, "Error!"));
+ mainWindow->AddElement(new Text(8, 24, errText));
+ }
+ }
+
+WriteLog("GUI: Entering main loop...\n");
+ while (!exitGUI)
+ {
+ if (SDL_PollEvent(&event))
{
if (event.type == SDL_USEREVENT)
{
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)
}
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
{
uint32 mx = event.button.x, my = event.button.y;
- if (vjs.useOpenGL)
- mx /= 2, my /= 2;
-
if (mainWindow)
mainWindow->HandleMouseButton(mx, my, true);
else
{
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<pointerBGSave[1]; y++)
+ for(uint32 x=0; x<pointerBGSave[0]; x++)
+ overlayPixels[((oldMouseY + y) * sdlemuGetOverlayWidthInPixels()) + (oldMouseX + x)] = 0x00000000;
+
+ count = 2;
+
+ for(uint32 y=0; y<pointerBGSave[1]; y++)
+ for(uint32 x=0; x<pointerBGSave[0]; x++)
+ pointerBGSave[count++] = overlayPixels[((mouseY + y) * sdlemuGetOverlayWidthInPixels()) + (mouseX + x)];
+#endif
if (showMouse)
- DrawTransparentBitmap(backbuffer, mouseX, mouseY, mousePic);
+// DrawTransparentBitmapDeprecated(backbuffer, mouseX, mouseY, mousePic);
+ DrawTransparentBitmapDeprecated(overlayPixels, mouseX, mouseY, mousePic);
RenderBackbuffer();
}
//
// GUI "action" functions
//
+
Window * LoadROM(void)
{
- FileList * fileList = new FileList(8, 16, 304, 216);
+ FileList * fileList = new FileList(20, 20, 600, 440);
return (Window *)fileList;
}
Window * ResetJaguar(void)
{
jaguar_reset();
+
+ return RunEmu();
+}
+
+Window * ResetJaguarCD(void)
+{
+ memcpy(jaguar_mainRom, jaguar_CDBootROM, 0x40000);
+ jaguarRunAddress = 0x802000;
+ jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, 0x40000);
+ jaguar_reset();
+//This is a quick kludge to get the CDBIOS to boot properly...
+//Wild speculation: It could be that this memory location is wired into the CD unit
+//somehow, which lets it know whether or not a cart is present in the unit...
+ jaguar_mainRom[0x0040B] = 0x03;
+
return RunEmu();
}
bool debounceRunKey = true;
Window * RunEmu(void)
{
+ extern uint32 * backbuffer;
+//Temporary, to test the new timer based code...
+sdlemuDisableOverlay();
+JaguarExecuteNew();
+sdlemuEnableOverlay();
+ // 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<tom_getVideoModeWidth() * 256; i++)
+ {
+ uint32 pixel = backbuffer[i];
+ uint8 b = (pixel >> 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;
// 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;
//This sucks... !!! FIX !!!
joystick_exec();
+//This is done here so that the crud below doesn't get on our GUI background...
if (finished)
break;
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)
{
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(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<tom_getVideoModeWidth() * 240; i++)
+ for(uint32 i=0; i<tom_getVideoModeWidth() * 256; i++)
{
- uint16 word = backbuffer[i];
- uint8 r = (word >> 10) & 0x1F, g = (word >> 5) & 0x1F, b = word & 0x1F;
- word = ((r + g + b) / 3) & 0x001F;
- word = (word << 5) | word;
- background[i] = word;
+// uint32 word = backbuffer[i];
+// uint8 r = (word >> 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");
+ exitGUI = true;
-// log_done();
- jaguar_done();
- version_done();
- memory_done();
- VideoDone(); // Free SDL components last...!
- log_done();
-
- exit(0);
-
- return NULL; // We never get here...
+ return NULL;
}
Window * About(void)
{
- Window * window = new Window(8, 16, 304, 160);
- window->AddElement(new Text(8, 8, "Virtual Jaguar 1.0.7"));
- window->AddElement(new Text(8, 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"));
+ char buf[512];
+ sprintf(buf, "Virtual Jaguar CVS %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)
+ Window * window = new Window(8, 16, 40 * FONT_WIDTH, 19 * FONT_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(8, 8, buf, 0xFF3030FF, 0xFF000000));
+ window->AddElement(new Text(8, 8+2*FONT_HEIGHT, "Coders:"));
+ window->AddElement(new Text(16, 8+3*FONT_HEIGHT, "James L. Hammons (shamus)"));
+ window->AddElement(new Text(16, 8+4*FONT_HEIGHT, "Niels Wagenaar (nwagenaar)"));
+ window->AddElement(new Text(16, 8+5*FONT_HEIGHT, "Carwin Jones (Caz)"));
+ window->AddElement(new Text(16, 8+6*FONT_HEIGHT, "Adam Green"));
+ window->AddElement(new Text(8, 8+8*FONT_HEIGHT, "Testers:"));
+ window->AddElement(new Text(16, 8+9*FONT_HEIGHT, "Guruma"));
+ window->AddElement(new Text(8, 8+11*FONT_HEIGHT, "Thanks go out to:"));
+ window->AddElement(new Text(16, 8+12*FONT_HEIGHT, "Aaron Giles for the original CoJag"));
+ window->AddElement(new Text(16, 8+13*FONT_HEIGHT, "David Raingeard for the original VJ"));
+ window->AddElement(new Text(16, 8+14*FONT_HEIGHT, "Karl Stenerud for his Musashi 68K emu"));
+ window->AddElement(new Text(16, 8+15*FONT_HEIGHT, "Sam Lantinga for his amazing SDL libs"));
+ window->AddElement(new Text(16, 8+16*FONT_HEIGHT, "Ryan C. Gordon for VJ's web presence"));
+ window->AddElement(new Text(16, 8+17*FONT_HEIGHT, "Curt Vendel for various Jaguar goodies"));
+ window->AddElement(new Text(16, 8+18*FONT_HEIGHT, "The guys over at Atari Age ;-)"));
return window;
}
Window * MiscOptions(void)
{
- Window * window = new Window(8, 16, 304, 160);
+ Window * window = new Window(8, 16, 304, 192);
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"));
+ 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"));
// Missing:
// * BIOS path
}
-//
-// Draw "picture"
-// Uses zero as transparent color
-// Can also use an optional alpha channel
-//
-void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap, uint8 * alpha/*=NULL*/)
-{
- uint16 width = bitmap[0], height = bitmap[1];
- bitmap += 2;
-
- uint32 pitch = GetSDLScreenPitch() / 2; // Returns pitch in bytes but we need words...
- uint32 address = x + (y * pitch);
-
- for(int yy=0; yy<height; yy++)
- {
- for(int xx=0; xx<width; xx++)
- {
- if (alpha == NULL)
- {
- if (*bitmap && x + xx < pitch) // NOTE: Still doesn't clip the Y val...
- *(screen + address + xx + (yy * pitch)) = *bitmap;
- }
- else
- {
- uint8 trans = *alpha;
- uint16 color = *bitmap;
- uint16 existingColor = *(screen + address + xx + (yy * pitch));
-
- uint8 eRed = (existingColor >> 10) & 0x1F,
- eGreen = (existingColor >> 5) & 0x1F,
- eBlue = existingColor & 0x1F,
-
- nRed = (color >> 10) & 0x1F,
- nGreen = (color >> 5) & 0x1F,
- nBlue = color & 0x1F;
-
- uint8 invTrans = 255 - trans;
- uint16 bRed = (eRed * trans + nRed * invTrans) / 255;
- uint16 bGreen = (eGreen * trans + nGreen * invTrans) / 255;
- uint16 bBlue = (eBlue * trans + nBlue * invTrans) / 255;
-
- uint16 blendedColor = (bRed << 10) | (bGreen << 5) | bBlue;
-
- *(screen + address + xx + (yy * pitch)) = blendedColor;
-
- alpha++;
- }
-
- bitmap++;
- }
- }
-}
-
-//
-// Very very crude GUI file selector
-//
-/*bool UserSelectFile(char * path, char * filename)
-{
-//Testing...
-GUIMain();
-
- extern int16 * backbuffer;
- vector<string> fileList;
-
- // Read in the candidate files from the directory pointed to by "path"
-
- DIR * dp = opendir(path);
- dirent * de;
-
- while ((de = readdir(dp)) != NULL)
- {
- char * ext = strrchr(de->d_name, '.');
-
- if (ext != NULL)
- if (stricmp(ext, ".zip") == 0 || stricmp(ext, ".jag") == 0)
- fileList.push_back(string(de->d_name));
- }
-
- closedir(dp);
-
- if (fileList.size() == 0) // Any files found?
- return false; // Nope. Bail!
-
- // Main GUI selection loop
-
- uint32 cursor = 0, startFile = 0;
-
- if (fileList.size() > 1) // Only go GUI if more than one possibility!
- {
- sort(fileList.begin(), fileList.end());
-
- bool done = false;
- uint32 limit = (fileList.size() > 30 ? 30 : fileList.size());
- SDL_Event event;
-
- // Ensure that the GUI is drawn before any user input...
- event.type = SDL_USEREVENT;
- SDL_PushEvent(&event);
-
- while (!done)
- {
- while (SDL_PollEvent(&event))
- {
- if (event.type == SDL_KEYDOWN)
- {
- SDLKey key = event.key.keysym.sym;
-
- if (key == SDLK_DOWN)
- {
- if (cursor != limit - 1) // Cursor is within its window
- cursor++;
- else // Otherwise, scroll the window...
- {
- if (cursor + startFile != fileList.size() - 1)
- startFile++;
- }
- }
- if (key == SDLK_UP)
- {
- if (cursor != 0)
- cursor--;
- else
- {
- if (startFile != 0)
- startFile--;
- }
- }
- if (key == SDLK_PAGEDOWN)
- {
- if (cursor != limit - 1)
- cursor = limit - 1;
- else
- {
- startFile += limit;
- if (startFile > fileList.size() - limit)
- startFile = fileList.size() - limit;
- }
- }
- if (key == SDLK_PAGEUP)
- {
- if (cursor != 0)
- cursor = 0;
- else
- {
- if (startFile < limit)
- startFile = 0;
- else
- startFile -= limit;
- }
- }
- if (key == SDLK_RETURN)
- done = true;
- if (key == SDLK_ESCAPE)
- {
- WriteLog("GUI: Aborting VJ by user request.\n");
- return false; // Bail out!
- }
- if (key >= SDLK_a && key <= SDLK_z)
- {
- // Advance cursor to filename with first letter pressed...
- uint8 which = (key - SDLK_a) + 65; // Convert key to A-Z char
-
- for(uint32 i=0; i<fileList.size(); i++)
- {
- if ((fileList[i][0] & 0xDF) == which)
- {
- cursor = i - startFile;
- if (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<limit; i++)
- {
- // Clip our strings to guarantee that they fit on the screen...
- // (and strip off the extension too)
- string s(fileList[startFile + i], 0, fileList[startFile + i].length() - 4);
- if (s.length() > 38)
- s[38] = 0;
- DrawString(backbuffer, 0, i*8, (cursor == i ? true : false), " %s ", s.c_str());
- }
-
- DrawTransparentBitmap(backbuffer, mouseX, mouseY, mousePic);
-
- RenderBackbuffer();
- }
- }
- }
-
- strcpy(filename, path);
-
- if (strlen(path) > 0)
- if (path[strlen(path) - 1] != '/')
- strcat(filename, "/");
-
- strcat(filename, fileList[startFile + cursor].c_str());
-
- return true;
-}*/
-
//
// Generic ROM loading
//
// a buffer overflow... !!! FIX !!!
uint32 romSize = 0;
+WriteLog("JaguarLoadROM: Attempting to load file '%s'...", path);
char * ext = strrchr(path, '.');
+if (ext == NULL)
+ WriteLog("FAILED!\n");
+else
+ WriteLog("Succeeded in finding extension (%s)!\n", ext);
+
if (ext != NULL)
{
WriteLog("VJ: Loading \"%s\"...", path);
- if (stricmp(ext, ".zip") == 0)
+ if (strcasecmp(ext, ".zip") == 0)
{
// Handle ZIP file loading here...
WriteLog("(ZIPped)...");
fread(rom, 1, romSize, fp);
fclose(fp);*/
+ // Handle gzipped files transparently [Adam Green]...
+
gzFile fp = gzopen(path, "rb");
if (fp == NULL)
//
// Jaguar file loading
//
-//void JaguarLoadCart(uint8 * mem, char * path)
bool JaguarLoadFile(char * path)
{
// jaguarRomSize = JaguarLoadROM(mem, path);
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)
+ if (strcasecmp(ext, ".rom") == 0)
{
// File extension ".ROM": Alpine image that loads/runs at $802000
WriteLog("GUI: Setting up homebrew (ROM)... Run address: 00802000, length: %08X\n", jaguarRomSize);
memset(jaguar_mainRam, 0x00, 0x400000);*/
/*
+Stubulator ROM vectors...
handler 001 at $00E00008
handler 002 at $00E008DE
handler 003 at $00E008E2
SET32(jaguar_mainRam, 0x10, 0x00001000);
SET16(jaguar_mainRam, 0x1000, 0x60FE); // Here: bra Here
}
- else if (stricmp(ext, ".abs") == 0)
+ else if (strcasecmp(ext, ".abs") == 0)
{
// File extension ".ABS": Atari linker output file with header (w/o is useless to us here)
return false;
}
}
- else if (stricmp(ext, ".jag") == 0)
+ else if (strcasecmp(ext, ".jag") == 0)
{
// File extension ".JAG": Atari server file with header
//NOTE: The bytes 'JAGR' should also be at position $1C...
projects / virtualjaguar / blobdiff