X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui.cpp;h=13ea5b20c08024cd2dd81ebc15635812e5e4f7be;hb=4b32affecce8cf8f557feb96daa76ba1692c3afe;hp=c9621175297bfdf7a7238b70e32a8de6e311a75b;hpb=eec42b43c8befbc06fbf8172aa9ca7d178494e96;p=virtualjaguar

diff --git a/src/gui.cpp b/src/gui.cpp
index c962117..13ea5b2 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -5,13 +5,14 @@
 // 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"
@@ -30,8 +31,10 @@ 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 DrawString(int16 * 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);
@@ -42,12 +45,17 @@ int gzfilelength(gzFile gd);
 // 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
 
+bool exitGUI = false;								// GUI (emulator) done variable
 int mouseX, mouseY;
+uint16 background[1280 * 256];						// GUI background buffer
 
 uint16 mousePic[] = {
 	6, 8,
@@ -220,8 +228,6 @@ uint16 slideSwitchDown[] = {
 
 char separator[] = "--------------------------------------------------------";
 
-uint16 background[1280 * 240];
-
 //
 // Case insensitive string compare function
 // Taken straight out of Thinking In C++ by Bruce Eckel. Thanks Bruce!
@@ -232,9 +238,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++;
@@ -256,7 +262,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;
@@ -275,6 +281,7 @@ class Element
 		static uint32 pitch;
 };
 
+// Initialize class variables (Element)
 int16 * Element::screenBuffer = NULL;
 uint32 Element::pitch = 0;
 
@@ -373,6 +380,9 @@ 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),
@@ -465,6 +475,7 @@ 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),
@@ -632,8 +643,8 @@ 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): Element(x, y, 0, 0),
-			fgColor(0x4FF0), bgColor(0xFE10), text(s) {}
+		Text(uint32 x, uint32 y, string s, uint16 fg = 0x4FF0, uint16 bg = 0xFE10): 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) {}
@@ -648,7 +659,8 @@ class Text: public Element
 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());
 }
 
 
@@ -789,7 +801,7 @@ 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...
+		// I guess it's because only the Window class has offsetting implemented... !!! FIX !!!
 		cursor = (y - extents.y) / 8;
 	}
 
@@ -808,10 +820,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);
@@ -925,6 +942,7 @@ FileList::FileList(uint32 x, uint32 y, uint32 w, uint32 h): Window(x, y, w, h)
 	AddElement(load);
 	load->SetNotificationElement(this);
 
+//!!! FIX !!! Directory might not exist--this shouldn't cause VJ to crash!
 	DIR * dp = opendir(vjs.ROMPath);
 	dirent * de;
 
@@ -933,9 +951,9 @@ FileList::FileList(uint32 x, uint32 y, uint32 w, uint32 h): Window(x, y, w, h)
 		char * ext = strrchr(de->d_name, '.');
 
 		if (ext != NULL)
-			if (stricmp(ext, ".zip") == 0 || stricmp(ext, ".j64") == 0
-				|| stricmp(ext, ".abs") == 0 || stricmp(ext, ".jag") == 0
-				|| stricmp(ext, ".rom") == 0)
+			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));
 	}
 
@@ -983,6 +1001,7 @@ void FileList::Notify(Element * e)
 
 			// 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
@@ -1196,7 +1215,8 @@ void Menu::Add(MenuItems mi)
 
 
 //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) {}
@@ -1212,23 +1232,8 @@ class RootWindow: public Window
 		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.
@@ -1352,13 +1357,83 @@ void DrawStringTrans(int16 * screen, uint32 x, uint32 y, uint16 color, uint8 tra
 }
 
 //
-// GUI Main loop
+// 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++;
+		}
+	}
+}
+
+
+//
+// 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(void)
+bool GUIMain(char * filename)
 {
+WriteLog("GUI: Inside GUIMain...\n");
 // 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;
+//	bool done = false;
 	SDL_Event event;
 	Window * mainWindow = NULL;
 
@@ -1367,9 +1442,11 @@ bool GUIMain(void)
 
 	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));
@@ -1388,14 +1465,40 @@ bool GUIMain(void)
 	bool showMouse = true;
 
 //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);
 
-	while (!done)
+	// Handle loading file passed in on the command line...!
+
+	if (filename)
+	{
+		if (JaguarLoadFile(filename))
+		{
+			event.type = SDL_USEREVENT, event.user.code = MENU_ITEM_CHOSEN;
+			event.user.data1 = (void *)ResetJaguar;
+	    	SDL_PushEvent(&event);
+		}
+		else
+		{
+			// Create error dialog...
+			char errText[1024];
+			sprintf(errText, "The file %40s could no 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)
 	{
-		while (SDL_PollEvent(&event))
+		if (SDL_PollEvent(&event))
 		{
 			if (event.type == SDL_USEREVENT)
 			{
@@ -1480,9 +1583,11 @@ bool GUIMain(void)
 // 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);
 
 			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();
 
@@ -1499,6 +1604,7 @@ bool GUIMain(void)
 //
 // GUI "action" functions
 //
+
 Window * LoadROM(void)
 {
 	FileList * fileList = new FileList(8, 16, 304, 216);
@@ -1509,6 +1615,21 @@ Window * LoadROM(void)
 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();
 }
 
@@ -1528,15 +1649,20 @@ 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" };
 
-	while (!finished)
+//	while (!finished)
+	while (true)
 	{
 		// Set up new backbuffer with new pixels and data
 		JaguarExecute(backbuffer, true);
@@ -1548,6 +1674,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;
 
@@ -1597,7 +1724,7 @@ doGPUDis = true;//*/
 	// 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;
@@ -1611,30 +1738,31 @@ doGPUDis = true;//*/
 
 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, 8, "Virtual Jaguar CVS 20040417"));
 	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"));
+	window->AddElement(new Text(8, 72, "Testers:"));
+	window->AddElement(new Text(16, 80, "Guruma"));
+	window->AddElement(new Text(8, 96, "Thanks go out to:"));
+	window->AddElement(new Text(16, 104, "Aaron Giles (original CoJag)"));
+	window->AddElement(new Text(16, 112, "David Raingeard (original VJ)"));
+	window->AddElement(new Text(16, 120, "Karl Stenerud (Musashi 68K emu)"));
+	window->AddElement(new Text(16, 128, "Sam Lantinga (amazing SDL libs)"));
+	window->AddElement(new Text(16, 136, "Ryan C. Gordon (VJ's web presence)"));
+	window->AddElement(new Text(16, 144, "The guys over at Atari Age ;-)"));
 
 	return window;
 }
@@ -1662,230 +1790,6 @@ Window * MiscOptions(void)
 }
 
 
-//
-// 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
 //
@@ -1900,7 +1804,7 @@ uint32 JaguarLoadROM(uint8 * rom, char * path)
 	{
 		WriteLog("VJ: Loading \"%s\"...", path);
 
-		if (stricmp(ext, ".zip") == 0)
+		if (strcasecmp(ext, ".zip") == 0)
 		{
 			// Handle ZIP file loading here...
 			WriteLog("(ZIPped)...");
@@ -1927,6 +1831,8 @@ uint32 JaguarLoadROM(uint8 * rom, char * path)
 			fread(rom, 1, romSize, fp);
 			fclose(fp);*/
 
+			// Handle gzipped files transparently [Adam Green]...
+
 			gzFile fp = gzopen(path, "rb");
 
 			if (fp == NULL)
@@ -1950,7 +1856,6 @@ uint32 JaguarLoadROM(uint8 * rom, char * path)
 //
 // Jaguar file loading
 //
-//void JaguarLoadCart(uint8 * mem, char * path)
 bool JaguarLoadFile(char * path)
 {
 //	jaguarRomSize = JaguarLoadROM(mem, path);
@@ -1984,7 +1889,7 @@ bool JaguarLoadFile(char * 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);
@@ -1999,6 +1904,7 @@ bool JaguarLoadFile(char * path)
 		memset(jaguar_mainRam, 0x00, 0x400000);*/
 
 /*
+Stubulator ROM vectors...
 handler 001 at $00E00008
 handler 002 at $00E008DE
 handler 003 at $00E008E2
@@ -2044,7 +1950,7 @@ Let's try setting up the illegal instruction vector for a stubulated jaguar...
 		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)
 
@@ -2140,7 +2046,7 @@ Start of Data Segment = 0x00803dd0
 			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...