giz menu works

[libpicofe.git] / gp2x / emu.c

diff --git a/gp2x/emu.c b/gp2x/emu.c
index cb924c3..adb10a3 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -18,7 +18,8 @@
 #include "gp2x.h"\r
 #include "usbjoy.h"\r
 #include "menu.h"\r
-#include "asmutils.h"\r
+#include "../common/arm_utils.h"\r
+#include "../common/fonts.h"\r
 #include "cpuctrl.h"\r
 \r
 #include <Pico/PicoInt.h>\r
@@ -51,7 +52,7 @@ static int combo_keys = 0, combo_acts = 0;    // keys and actions which need button
 static int gp2x_old_gamma = 100;\r
 static unsigned char *movie_data = NULL;\r
 static int movie_size = 0;\r
-unsigned char *framebuff = 0;  // temporary buffer for alt renderer\r
+unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer\r
 int state_slot = 0;\r
 int reset_timing = 0;\r
 int config_slot = 0, config_slot_current = 0;\r
@@ -277,7 +278,7 @@ int emu_ReloadRom(void)
                // bios_help() ?\r
                return 0;\r
        } else {\r
-               if (PicoMCD & 1) PicoExitMCD();\r
+               if (PicoMCD & 1) Stop_CD();\r
                PicoMCD &= ~1;\r
        }\r
 \r
@@ -287,6 +288,8 @@ int emu_ReloadRom(void)
                return 0;\r
        }\r
 \r
+       menu_romload_prepare(used_rom_name);\r
+\r
        if(rom_data) {\r
                free(rom_data);\r
                rom_data = 0;\r
@@ -297,9 +300,11 @@ int emu_ReloadRom(void)
                sprintf(menuErrorMsg, "PicoCartLoad() failed.");\r
                printf("%s\n", menuErrorMsg);\r
                pm_close(rom);\r
+               menu_romload_end();\r
                return 0;\r
        }\r
        pm_close(rom);\r
+       menu_romload_end();\r
 \r
        // detect wrong files (Pico crashes on very small files), also see if ROM EP is good\r
        if(rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 ||\r
@@ -384,10 +389,10 @@ static void emu_msg_tray_open(void);
 void emu_Init(void)\r
 {\r
        // make temp buffer for alt renderer\r
-       framebuff = malloc((8+320)*(8+240+8));\r
-       if (!framebuff)\r
+       PicoDraw2FB = malloc((8+320)*(8+240+8));\r
+       if (!PicoDraw2FB)\r
        {\r
-               printf("framebuff == 0\n");\r
+               printf("PicoDraw2FB == 0\n");\r
        }\r
 \r
        // make dirs for saves, cfgs, etc.\r
@@ -621,7 +626,7 @@ void emu_Deinit(void)
                }\r
        }\r
 \r
-       free(framebuff);\r
+       free(PicoDraw2FB);\r
 \r
        PicoExit();\r
 \r
@@ -630,6 +635,53 @@ void emu_Deinit(void)
                set_gamma(100, 0);\r
 }\r
 \r
+static void text_out8_builtin(int x, int y, const char *text)\r
+{\r
+       int i,l,len=strlen(text);\r
+       unsigned char *screen = (unsigned char *)gp2x_screen + x + y*320;\r
+\r
+       /* always using built-in font */\r
+       for (i = 0; i < len; i++)\r
+       {\r
+               for (l=0;l<8;l++)\r
+               {\r
+                       unsigned char fd = fontdata8x8[((text[i])*8)+l];\r
+                       if (fd&0x80) screen[l*320+0]=0xf0;\r
+                       if (fd&0x40) screen[l*320+1]=0xf0;\r
+                       if (fd&0x20) screen[l*320+2]=0xf0;\r
+                       if (fd&0x10) screen[l*320+3]=0xf0;\r
+                       if (fd&0x08) screen[l*320+4]=0xf0;\r
+                       if (fd&0x04) screen[l*320+5]=0xf0;\r
+                       if (fd&0x02) screen[l*320+6]=0xf0;\r
+                       if (fd&0x01) screen[l*320+7]=0xf0;\r
+               }\r
+               screen += 8;\r
+       }\r
+}\r
+\r
+static void text_out16_builtin(int x, int y, const char *text)\r
+{\r
+       int i,l,len=strlen(text);\r
+       unsigned short *screen = (unsigned short *)gp2x_screen + x + y*320;\r
+\r
+       for (i = 0; i < len; i++)\r
+       {\r
+               for (l=0;l<8;l++)\r
+               {\r
+                       unsigned char fd = fontdata8x8[((text[i])*8)+l];\r
+                       if(fd&0x80) screen[l*320+0]=0xffff;\r
+                       if(fd&0x40) screen[l*320+1]=0xffff;\r
+                       if(fd&0x20) screen[l*320+2]=0xffff;\r
+                       if(fd&0x10) screen[l*320+3]=0xffff;\r
+                       if(fd&0x08) screen[l*320+4]=0xffff;\r
+                       if(fd&0x04) screen[l*320+5]=0xffff;\r
+                       if(fd&0x02) screen[l*320+6]=0xffff;\r
+                       if(fd&0x01) screen[l*320+7]=0xffff;\r
+               }\r
+               screen += 8;\r
+       }\r
+}\r
+\r
 \r
 void osd_text(int x, int y, const char *text)\r
 {\r
@@ -643,7 +695,7 @@ void osd_text(int x, int y, const char *text)
                        p = (int *) ((unsigned char *) gp2x_screen+x+320*(y+h));\r
                        for (i = len; i; i--, p++) *p = 0xe0e0e0e0;\r
                }\r
-               gp2x_text_out8_2(x, y, text, 0xf0);\r
+               text_out8_builtin(x, y, text);\r
        } else {\r
                int *p, i, h;\r
                x &= ~1; // align x\r
@@ -652,7 +704,7 @@ void osd_text(int x, int y, const char *text)
                        p = (int *) ((unsigned short *) gp2x_screen+x+320*(y+h));\r
                        for (i = len; i; i--, p++) *p = (*p>>2)&0x39e7;\r
                }\r
-               gp2x_text_out15(x, y, text);\r
+               text_out16_builtin(x, y, text);\r
        }\r
 }\r
 \r
@@ -716,7 +768,7 @@ static void blit(const char *fps, const char *notice)
                        // feed new palette to our device\r
                        gp2x_video_setpalette(localPal, 0x40);\r
                }\r
-               vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);\r
+               vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8);\r
        } else if (!(emu_opt&0x80)) {\r
                // 8bit accurate renderer\r
                if (Pico.m.dirtyPal) {\r
@@ -790,7 +842,7 @@ static void vidResetMode(void)
        if (PicoOpt&0x10) {\r
                gp2x_video_changemode(8);\r
        } else if (currentConfig.EmuOpt&0x80) {\r
-               gp2x_video_changemode(15);\r
+               gp2x_video_changemode(16);\r
                PicoDrawSetColorFormat(1);\r
                PicoScan = EmuScan16;\r
                PicoScan(0, 0);\r
@@ -1041,20 +1093,31 @@ static void SkipFrame(int do_audio)
 void emu_forced_frame(void)\r
 {\r
        int po_old = PicoOpt;\r
+       int eo_old = currentConfig.EmuOpt;\r
+\r
+       PicoOpt &= ~0x0010;\r
+       PicoOpt |=  0x4080; // soft_scale | acc_sprites\r
+       currentConfig.EmuOpt |= 0x80;\r
 \r
-       PicoOpt |= 0x10;\r
-       PicoFrameFull();\r
+       //vidResetMode();\r
+       PicoDrawSetColorFormat(1);\r
+       PicoScan = EmuScan16;\r
+       PicoScan(0, 0);\r
+       Pico.m.dirtyPal = 1;\r
+       PicoFrameDrawOnly();\r
 \r
+/*\r
        if (!(Pico.video.reg[12]&1)) {\r
                vidCpyM2 = vidCpyM2_32col;\r
                clearArea(1);\r
        } else  vidCpyM2 = vidCpyM2_40col;\r
 \r
-       vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);\r
+       vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8);\r
        vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
        gp2x_video_setpalette(localPal, 0x40);\r
-\r
+*/\r
        PicoOpt = po_old;\r
+       currentConfig.EmuOpt = eo_old;\r
 }\r
 \r
 static void simpleWait(int thissec, int lim_time)\r
@@ -1371,12 +1434,9 @@ if (Pico.m.frame_count == 31563) {
                SRam.changed = 0;\r
        }\r
 \r
-       // if in 16bit mode, generate 8it image for menu background\r
-       if (!(PicoOpt&0x10) && (currentConfig.EmuOpt&0x80))\r
+       // if in 8bit mode, generate 16bit image for menu background\r
+       if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80))\r
                emu_forced_frame();\r
-\r
-       // for menu bg\r
-       gp2x_memcpy_buffers((1<<2), gp2x_screen, 0, 320*240*2);\r
 }\r
 \r
 \r