]> Shamusworld >> Repos - virtualjaguar/blobdiff - src/vj.cpp
Added new GUI ROM selection routines :-)
[virtualjaguar] / src / vj.cpp
index 376c3e2a1e73aa4ba66585d36579b8474ba46501..21d8ffbf8a6dbbde130c8bc1d30755caf5b5bd04 100644 (file)
 #include <unistd.h>
 #endif // __GCCUNIX__
 
+#include <dirent.h>                                    // POSIX, but should compile with linux & mingw...
 #include <time.h>
 #include <SDL.h>
-//#include "SDLptc.h"                  // Ick! Aargh! Bleah!
 #include "jaguar.h"
 #include "crc32.h"
 #include "unzip.h"
+#include "gui.h"
 
 // Uncomment this for speed control
 //#define SPEED_CONTROL
@@ -49,28 +50,40 @@ SDL_Surface * surface, * mainSurface;
 SDL_Joystick * joystick;
 Uint32 mainSurfaceFlags = SDL_SWSURFACE;
 
-//Console console;
-//Surface * surface;
-//Format format(16, 0x007C00, 0x00003E0, 0x0000001F);
 bool finished = false;
 bool fullscreen = false;
 bool hardwareTypeNTSC = true;                  // Set to false for PAL
 
 bool useJoystick = false;
+bool showGUI = false;
 
+int16 * backbuffer = NULL;
 
 // Added/changed by SDLEMU http://sdlemu.ngemu.com
 
 uint32 totalFrames;//so we can grab this from elsewhere...
 int main(int argc, char * argv[])
 {
+
+/*DIR * dp = opendir("../../ROMs/");
+if (dp == NULL)
+       printf("Could not open directory!\n");
+else
+{
+       dirent * de;
+       while ((de = readdir(dp)) != NULL)
+       {
+               char * ext = strrchr(de->d_name, '.');
+               if (strcmpi(ext, ".zip") == 0 || strcmpi(ext, ".jag") == 0)
+                       printf("--> %s\n", de->d_name);
+       }
+
+       closedir(dp);
+}*/
+
        uint32 startTime;//, totalFrames;//, endTime;//, w, h;
-//     int32 * vs;
        uint32 nNormalLast = 0;
        int32 nNormalFrac = 0; 
-//     int32 i = 0;
-//unused       int32 nTime = 0;
-//unused       int32 nCount = 0;
     int32 nFrameskip = 0;                                                              // Default: Show every frame
     int32 nFrame = 0;                                                                  // No. of Frame
     int32 nJoyport = 0;                                                                        // Joystick port
@@ -81,8 +94,6 @@ int main(int argc, char * argv[])
        printf("Portions massaged by James L. Hammons (WIN32)\n");
        printf("Contact: http://sdlemu.ngemu.com/ | sdlemu@ngemu.com\n");
 
-//    console.option("windowed output");
-
        // BIOS is now ON by default--use the -nobios switch to turn it off!
        jaguar_use_bios = true;
        bool haveCart = false;                                                                  // Assume there is no cartridge...!
@@ -96,10 +107,7 @@ int main(int argc, char * argv[])
                        haveCart = true;                                                                // It looks like we have a cartridge!
 
                if (!strcmp(argv[i], "-fullscreen")) 
-//             {
                        fullscreen = true;
-//                     console.option("fullscreen output");
-//             }
 
 //We *don't* need this option!
 /*             if (!strcmp(argv[i], "-window")) 
@@ -107,7 +115,6 @@ int main(int argc, char * argv[])
                        fullscreen = false;*/
 
                if (!strcmp(argv[i], "-joystick")) 
-//                     console.option("joystick enabled");
                        useJoystick = true;
 
                if (!strcmp(argv[i], "-joyport"))
@@ -167,15 +174,12 @@ int main(int argc, char * argv[])
 
        SET32(jaguar_mainRam, 0, 0x00200000);                   // Set top of stack...
 
-       // Get the cartridge ROM (if passed in)
-       if (haveCart)
-               JaguarLoadCart(jaguar_mainRom, argv[1]);
-
        jaguar_reset();
-       
+
        // Set up the backbuffer
-       int16 * backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16));
-       memset(backbuffer, 0xAA, tom_getVideoModeWidth() * tom_getVideoModeHeight() * sizeof(int16));
+//     int16 * backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16));
+       backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16));
+       memset(backbuffer, 0x22, tom_getVideoModeWidth() * tom_getVideoModeHeight() * sizeof(int16));
 
        // Set up SDL library
        if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE) < 0)
@@ -184,12 +188,12 @@ int main(int argc, char * argv[])
                exit(1);
        }
 
-       // Let's get proper info about the platform we're running on.
+       // Let's get proper info about the platform we're running on...
        const SDL_VideoInfo * info = SDL_GetVideoInfo();
 
        if (!info)
        {
-               WriteLog("VJ: SDL is unable to get the video query: %s\n", SDL_GetError());
+               WriteLog("VJ: SDL is unable to get the video info: %s\n", SDL_GetError());
                exit(1);
        }
 
@@ -203,7 +207,7 @@ int main(int argc, char * argv[])
                mainSurfaceFlags |= SDL_FULLSCREEN;
 
        // Note: mainSurface is *never* used again!
-       //Not true--had to look at what's what here...
+       //Not true--had to look at what's what here... It's the primary surface...
        mainSurface = SDL_SetVideoMode(tom_getVideoModeWidth(), tom_getVideoModeHeight(), 16, mainSurfaceFlags);
 
        if (mainSurface == NULL)
@@ -215,43 +219,45 @@ int main(int argc, char * argv[])
        SDL_WM_SetCaption("Virtual Jaguar", "Virtual Jaguar");
 
        // Create the primary SDL display (16 BPP, 5/5/5 RGB format)
-//     surface = new Surface(tom_getVideoModeWidth(), tom_getVideoModeHeight(), format);
-//Format format(16, 0x007C00, 0x00003E0, 0x0000001F);
        surface = SDL_CreateRGBSurface(SDL_SWSURFACE, tom_getVideoModeWidth(),
                tom_getVideoModeHeight(), 16, 0x7C00, 0x03E0, 0x001F, 0);
+
        if (surface == NULL)
        {
-               WriteLog("VJ: Could not create primary SDL surface: %s", SDL_GetError());
+               WriteLog("VJ: Could not create primary SDL surface: %s\n", SDL_GetError());
                exit(1);
        }
 
        // Initialize Joystick support under SDL
-//     if (console.JoyEnabled() == 1)
        if (useJoystick)
        {
                if (SDL_NumJoysticks() <= 0)
                {
-//             console.option("joystick disabled");
                        useJoystick = false;
-                       printf("No joystick(s) or joypad(s) detected on your system. Using keyboard...\n");
+                       printf("VJ: No joystick(s) or joypad(s) detected on your system. Using keyboard...\n");
                }
                else
                {
-//                     if ((console.joystick = SDL_JoystickOpen(nJoyport)) == 0)
                        if ((joystick = SDL_JoystickOpen(nJoyport)) == 0)
                        {
-//                             console.option("joystick disabled");
                                useJoystick = false;
-                               printf("Unable to open a Joystick on port: %d\n", (int)nJoyport);
+                               printf("VJ: Unable to open a Joystick on port: %d\n", (int)nJoyport);
                        }
                        else
-                               printf("Using: %s\n", SDL_JoystickName(nJoyport));
+                               printf("VJ: Using: %s\n", SDL_JoystickName(nJoyport));
                }
        }
 
-       // Open the display and start emulating some 3l337 Atari Jaguar games :P
-//     console.open("Virtual Jaguar", tom_getVideoModeWidth(), tom_getVideoModeHeight(), format);
+       // Get the cartridge ROM (if passed in)
+//     if (haveCart)
+//             JaguarLoadCart(jaguar_mainRom, argv[1]);
+       // Now with crunchy GUI goodness!
+       JaguarLoadCart(jaguar_mainRom, (haveCart ? argv[1] : (char *)"."));
 
+//Do this again??? Hmm... This is not very nice.
+//Maybe it's not necessary??? Seems to be, at least for PD ROMs... !!! FIX !!!
+       jaguar_reset();
+       
        totalFrames = 0;
        startTime = clock();
        nNormalLast = 0;                                                                        // Last value of timeGetTime()
@@ -286,34 +292,36 @@ int main(int argc, char * argv[])
                                jaguar_exec(backbuffer, false);
 #endif
             // Setting up new backbuffer with new pixels and data
-//                     jaguar_exec(backbuffer, true);
                        JaguarExecute(backbuffer, true);
                        totalFrames++;
 
+                       // GUI stuff here...
+                       if (showGUI)
+                       {
+                               extern uint32 gpu_pc;
+                               extern uint32 dsp_pc;
+                               DrawText(backbuffer, 8, 0, true, "Friendly GUI brought to you by JLH ;-)");
+                               DrawText(backbuffer, 8, 8, false, "GPU PC: %08X", gpu_pc);
+                               DrawText(backbuffer, 8, 16, false, "DSP PC: %08X", dsp_pc);
+                       }
+
                        // Simple frameskip
                        if (nFrame == nFrameskip)
                        {
-//                             int32 * vs = (int32 *)surface->lock();
                                if (SDL_MUSTLOCK(surface))
                                        while (SDL_LockSurface(surface) < 0)
                                                SDL_Delay(10);
-//                             uint8 * vs = (Uint8 *)surface->pixels;
-//                             memcpy(vs, backbuffer, tom_width * tom_height * 2);
+
                                memcpy(surface->pixels, backbuffer, tom_width * tom_height * 2);
-//                             surface->unlock();
+
                                if (SDL_MUSTLOCK(surface))
                                        SDL_UnlockSurface(surface);
-//                             surface->copy(console);
+
                                SDL_Rect srcrect, dstrect;
                                srcrect.x = srcrect.y = 0, srcrect.w = surface->w, srcrect.h = surface->h;
                                dstrect.x = dstrect.y = 0, dstrect.w = surface->w, dstrect.h = surface->h;
-//                             SDL_LowerBlit(surface, &srcrect, dst.surface, &dstrect);
                                SDL_BlitSurface(surface, &srcrect, mainSurface, &dstrect);
-//                             dst.updates[dst.nupdates++] = dstrect;
-//                             console.update();
                            SDL_Flip(mainSurface);      
-//                             nupdates = 0;
-
                                nFrame = 0;
                        }
                        else
@@ -328,13 +336,13 @@ int main(int argc, char * argv[])
 
        int elapsedTime = clock() - startTime;
        int fps = (1000 * totalFrames) / elapsedTime;
-       fprintf(log_get(), "Statistics: %i FPS\n", fps);
+       fprintf(log_get(), "VJ: Ran at an average of %i FPS.\n", fps);
 
        jaguar_done();
        version_done();
        memory_done();
        log_done();     
-//     console.close();                                                                        // Close SDL items as last!
+
        SDL_JoystickClose(joystick);
        SDL_FreeSurface(surface);
        SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER);
@@ -344,46 +352,186 @@ int main(int argc, char * argv[])
 }
 
 //
-// Generic ROM loading
+// Very very crude GUI file selector
 //
-uint32 JaguarLoadROM(uint8 * rom, char * path)
+uint32 DoROMFind(uint8 * mem, char * path)
 {
-       uint32 romSize;
+       char cartName[2048];    // Really, should be MAX_PATH or something like it
+       uint32 numFiles = 0;
+       DIR * dp = opendir(path);
+
+       if (dp == NULL)
+       {
+               WriteLog("VJ: Could not open directory \"%s\"!\nAborting!\n", path);
+               log_done();
+               exit(0);
+       }
+       else
+       {
+               dirent * de;
+               while ((de = readdir(dp)) != NULL)
+               {
+                       char * ext = strrchr(de->d_name, '.');
+                       if (ext != NULL)
+                               if (strcmpi(ext, ".zip") == 0 || strcmpi(ext, ".jag") == 0)
+                                       numFiles++;
+               }
+               closedir(dp);
+       }
 
-       WriteLog("JagEm: Loading %s...", path);
+       if (numFiles == 0)
+       {
+               WriteLog("Found no ROM files!\nAborting!\n");
+               log_done();
+               exit(0);
+       }
 
-       char * ext = strrchr(path, '.');
-       if (strcmpi(ext, ".zip") == 0)
+       char * names = (char *)malloc(numFiles * 2048);
+       if (names == NULL)
        {
-               // Handle ZIP file loading here...
-               WriteLog("(ZIPped)...");
+               WriteLog("Could not allocate memory for %u files!\nAborting!\n", numFiles);
+               log_done();
+               exit(0);
+       }
+
+       int i = 0;
+       dp = opendir(path);
+       dirent * de;
+       while ((de = readdir(dp)) != NULL)
+       {
+               char * ext = strrchr(de->d_name, '.');
+               if (ext != NULL)
+                       if (strcmpi(ext, ".zip") == 0 || strcmpi(ext, ".jag") == 0)
+                               strcpy(&names[i++ * 2048], de->d_name);
+       }
+       closedir(dp);
+
+       // Main GUI selection loop
+
+       uint32 cursor = 0;
+
+       if (numFiles > 1)       // Only go GUI if more than one possibility!
+       {
+       bool done = false;
+       uint32 limit = (numFiles > 24 ? 24 : numFiles);
+       SDL_Event event;
+       while (!done)
+       
+       while (SDL_PollEvent(&event))
+       {
+               // Draw the GUI...
+               memset(backbuffer, 0x11, tom_getVideoModeWidth() * tom_getVideoModeHeight() * 2);
+               uint32 startFile = (cursor >= limit ? cursor - limit + 1 : 0);
+               for(uint32 i=0; i<limit; i++)
+               {
+                       bool invert = (cursor == startFile + i ? true : false);
+                       char buf[41];
+                       // Guarantee that we clip our strings to fit in the screen...
+                       memcpy(buf, &names[(startFile + i) * 2048], 38);
+                       buf[38] = 0;
+                       DrawText(backbuffer, 0, i*8, invert, " %s ", buf);
+               }
 
-               if (load_zipped_file(0, 0, path, NULL, &rom, &romSize) == -1)
+
+                               if (SDL_MUSTLOCK(surface))
+                                       while (SDL_LockSurface(surface) < 0)
+                                               SDL_Delay(10);
+
+//                             memcpy(surface->pixels, backbuffer, tom_width * tom_height * 2);
+                               memcpy(surface->pixels, backbuffer, tom_getVideoModeWidth() * tom_getVideoModeHeight() * 2);
+
+                               if (SDL_MUSTLOCK(surface))
+                                       SDL_UnlockSurface(surface);
+
+                               SDL_Rect srcrect, dstrect;
+                               srcrect.x = srcrect.y = 0, srcrect.w = surface->w, srcrect.h = surface->h;
+                               dstrect.x = dstrect.y = 0, dstrect.w = surface->w, dstrect.h = surface->h;
+                               SDL_BlitSurface(surface, &srcrect, mainSurface, &dstrect);
+                           SDL_Flip(mainSurface);      
+
+
+               if (event.type == SDL_KEYDOWN)
                {
-                       WriteLog("Failed!\n");
-                       log_done();
-                       exit(0);
+                       switch (event.key.keysym.sym)
+                       {
+                       case SDLK_UP:
+                               if (cursor != 0)
+                                       cursor--;
+                               break;
+                       case SDLK_DOWN:
+                               if (cursor != numFiles - 1)
+                                       cursor++;
+                               break;
+                       case SDLK_RETURN:
+                               done = true;
+                               break;
+                       }
                }
        }
-       else
+       }
+
+       strcpy(cartName, path);
+       if (path[strlen(path) - 1] != '/')
+               strcat(cartName, "/");
+       strcat(cartName, &names[cursor * 2048]);
+       free(names);
+
+       uint32 romSize = JaguarLoadROM(mem, cartName);
+       if (romSize == 0)
+       {
+               log_done();
+               exit(0);
+       }
+       return romSize;
+}
+
+//
+// Generic ROM loading
+//
+uint32 JaguarLoadROM(uint8 * rom, char * path)
+{
+       uint32 romSize = 0;
+
+       char * ext = strrchr(path, '.');
+       if (ext != NULL)
        {
-               FILE * fp = fopen(path, "rb");
+               WriteLog("VJ: Loading %s...", path);
+
+               if (strcmpi(ext, ".zip") == 0)
+               {
+                       // Handle ZIP file loading here...
+                       WriteLog("(ZIPped)...");
 
-               if (fp == NULL)
+                       if (load_zipped_file(0, 0, path, NULL, &rom, &romSize) == -1)
+                       {
+                               WriteLog("Failed!\n");
+//                             log_done();
+//                             exit(0);
+                               return 0;
+                       }
+               }
+               else
                {
-                       WriteLog("Failed!\n");
-                       log_done();
-                       exit(0);
+                       FILE * fp = fopen(path, "rb");
+
+                       if (fp == NULL)
+                       {
+                               WriteLog("Failed!\n");
+//                             log_done();
+//                             exit(0);
+                               return 0;
+                       }
+
+                       fseek(fp, 0, SEEK_END);
+                       romSize = ftell(fp);
+                       fseek(fp, 0, SEEK_SET);
+                       fread(rom, 1, romSize, fp);
+                       fclose(fp);
                }
 
-               fseek(fp, 0, SEEK_END);
-               romSize = ftell(fp);
-               fseek(fp, 0, SEEK_SET);
-               fread(rom, 1, romSize, fp);
-               fclose(fp);
+               WriteLog("OK (%i bytes)\n", romSize);
        }
 
-       WriteLog("OK (%i bytes)\n", romSize);
        return romSize;
 }
 
@@ -392,8 +540,15 @@ uint32 JaguarLoadROM(uint8 * rom, char * path)
 //
 void JaguarLoadCart(uint8 * mem, char * path)
 {
-       uint32 romsize = JaguarLoadROM(mem, path);
-       jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, romsize);
+       uint32 romSize = JaguarLoadROM(mem, path);
+
+       if (romSize == 0)
+       {
+               WriteLog("VJ: Trying GUI...\n");
+               romSize = DoROMFind(mem, path);
+       }
+
+       jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, romSize);
        WriteLog( "CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32);
        eeprom_init();
 }