X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Fmenu.c;h=d29d6d080365e1cb15ac834b1f3eb820624aba21;hb=3158eb9e7677fdf0ac7c05ce0afb73456da699f2;hp=24337421f136bc540ad0301ae6086d965238ab17;hpb=4f265db77684ec33f9533e7c76734498df03bba4;p=picodrive.git diff --git a/platform/gp2x/menu.c b/platform/gp2x/menu.c index 2433742..d29d6d0 100644 --- a/platform/gp2x/menu.c +++ b/platform/gp2x/menu.c @@ -13,10 +13,13 @@ #include "gp2x.h" #include "emu.h" #include "menu.h" +#include "fonts.h" #include "usbjoy.h" #include "version.h" -#include "Pico/PicoInt.h" +#include +#include +#include #ifndef _DIRENT_HAVE_D_TYPE #error "need d_type for file browser @@ -38,75 +41,7 @@ static char *gp2xKeyNames[] = { char menuErrorMsg[40] = {0, }; -static unsigned char fontdata8x8[] = -{ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x3C,0x42,0x99,0xBD,0xBD,0x99,0x42,0x3C,0x3C,0x42,0x81,0x81,0x81,0x81,0x42,0x3C, - 0xFE,0x82,0x8A,0xD2,0xA2,0x82,0xFE,0x00,0xFE,0x82,0x82,0x82,0x82,0x82,0xFE,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x64,0x74,0x7C,0x38,0x00,0x00, - 0x80,0xC0,0xF0,0xFC,0xF0,0xC0,0x80,0x00,0x01,0x03,0x0F,0x3F,0x0F,0x03,0x01,0x00, - 0x18,0x3C,0x7E,0x18,0x7E,0x3C,0x18,0x00,0xEE,0xEE,0xEE,0xCC,0x00,0xCC,0xCC,0x00, - 0x00,0x00,0x30,0x68,0x78,0x30,0x00,0x00,0x00,0x38,0x64,0x74,0x7C,0x38,0x00,0x00, - 0x3C,0x66,0x7A,0x7A,0x7E,0x7E,0x3C,0x00,0x0E,0x3E,0x3A,0x22,0x26,0x6E,0xE4,0x40, - 0x18,0x3C,0x7E,0x3C,0x3C,0x3C,0x3C,0x00,0x3C,0x3C,0x3C,0x3C,0x7E,0x3C,0x18,0x00, - 0x08,0x7C,0x7E,0x7E,0x7C,0x08,0x00,0x00,0x10,0x3E,0x7E,0x7E,0x3E,0x10,0x00,0x00, - 0x58,0x2A,0xDC,0xC8,0xDC,0x2A,0x58,0x00,0x24,0x66,0xFF,0xFF,0x66,0x24,0x00,0x00, - 0x00,0x10,0x10,0x38,0x38,0x7C,0xFE,0x00,0xFE,0x7C,0x38,0x38,0x10,0x10,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x1C,0x1C,0x18,0x00,0x18,0x18,0x00, - 0x6C,0x6C,0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x28,0x7C,0x28,0x7C,0x28,0x00,0x00, - 0x10,0x38,0x60,0x38,0x0C,0x78,0x10,0x00,0x40,0xA4,0x48,0x10,0x24,0x4A,0x04,0x00, - 0x18,0x34,0x18,0x3A,0x6C,0x66,0x3A,0x00,0x18,0x18,0x20,0x00,0x00,0x00,0x00,0x00, - 0x30,0x60,0x60,0x60,0x60,0x60,0x30,0x00,0x0C,0x06,0x06,0x06,0x06,0x06,0x0C,0x00, - 0x10,0x54,0x38,0x7C,0x38,0x54,0x10,0x00,0x00,0x18,0x18,0x7E,0x18,0x18,0x00,0x00, - 0x00,0x00,0x00,0x00,0x18,0x18,0x30,0x00,0x00,0x00,0x00,0x00,0x3E,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x18,0x18,0x00,0x00,0x00,0x04,0x08,0x10,0x20,0x40,0x00,0x00, - 0x38,0x4C,0xC6,0xC6,0xC6,0x64,0x38,0x00,0x18,0x38,0x18,0x18,0x18,0x18,0x7E,0x00, - 0x7C,0xC6,0x0E,0x3C,0x78,0xE0,0xFE,0x00,0x7E,0x0C,0x18,0x3C,0x06,0xC6,0x7C,0x00, - 0x1C,0x3C,0x6C,0xCC,0xFE,0x0C,0x0C,0x00,0xFC,0xC0,0xFC,0x06,0x06,0xC6,0x7C,0x00, - 0x3C,0x60,0xC0,0xFC,0xC6,0xC6,0x7C,0x00,0xFE,0xC6,0x0C,0x18,0x30,0x30,0x30,0x00, - 0x78,0xC4,0xE4,0x78,0x86,0x86,0x7C,0x00,0x7C,0xC6,0xC6,0x7E,0x06,0x0C,0x78,0x00, - 0x00,0x00,0x18,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x18,0x18,0x30, - 0x1C,0x38,0x70,0xE0,0x70,0x38,0x1C,0x00,0x00,0x7C,0x00,0x00,0x7C,0x00,0x00,0x00, - 0x70,0x38,0x1C,0x0E,0x1C,0x38,0x70,0x00,0x7C,0xC6,0xC6,0x1C,0x18,0x00,0x18,0x00, - 0x3C,0x42,0x99,0xA1,0xA5,0x99,0x42,0x3C,0x38,0x6C,0xC6,0xC6,0xFE,0xC6,0xC6,0x00, - 0xFC,0xC6,0xC6,0xFC,0xC6,0xC6,0xFC,0x00,0x3C,0x66,0xC0,0xC0,0xC0,0x66,0x3C,0x00, - 0xF8,0xCC,0xC6,0xC6,0xC6,0xCC,0xF8,0x00,0xFE,0xC0,0xC0,0xFC,0xC0,0xC0,0xFE,0x00, - 0xFE,0xC0,0xC0,0xFC,0xC0,0xC0,0xC0,0x00,0x3E,0x60,0xC0,0xCE,0xC6,0x66,0x3E,0x00, - 0xC6,0xC6,0xC6,0xFE,0xC6,0xC6,0xC6,0x00,0x7E,0x18,0x18,0x18,0x18,0x18,0x7E,0x00, - 0x06,0x06,0x06,0x06,0xC6,0xC6,0x7C,0x00,0xC6,0xCC,0xD8,0xF0,0xF8,0xDC,0xCE,0x00, - 0x60,0x60,0x60,0x60,0x60,0x60,0x7E,0x00,0xC6,0xEE,0xFE,0xFE,0xD6,0xC6,0xC6,0x00, - 0xC6,0xE6,0xF6,0xFE,0xDE,0xCE,0xC6,0x00,0x7C,0xC6,0xC6,0xC6,0xC6,0xC6,0x7C,0x00, - 0xFC,0xC6,0xC6,0xC6,0xFC,0xC0,0xC0,0x00,0x7C,0xC6,0xC6,0xC6,0xDE,0xCC,0x7A,0x00, - 0xFC,0xC6,0xC6,0xCE,0xF8,0xDC,0xCE,0x00,0x78,0xCC,0xC0,0x7C,0x06,0xC6,0x7C,0x00, - 0x7E,0x18,0x18,0x18,0x18,0x18,0x18,0x00,0xC6,0xC6,0xC6,0xC6,0xC6,0xC6,0x7C,0x00, - 0xC6,0xC6,0xC6,0xEE,0x7C,0x38,0x10,0x00,0xC6,0xC6,0xD6,0xFE,0xFE,0xEE,0xC6,0x00, - 0xC6,0xEE,0x3C,0x38,0x7C,0xEE,0xC6,0x00,0x66,0x66,0x66,0x3C,0x18,0x18,0x18,0x00, - 0xFE,0x0E,0x1C,0x38,0x70,0xE0,0xFE,0x00,0x3C,0x30,0x30,0x30,0x30,0x30,0x3C,0x00, - 0x60,0x60,0x30,0x18,0x0C,0x06,0x06,0x00,0x3C,0x0C,0x0C,0x0C,0x0C,0x0C,0x3C,0x00, - 0x18,0x3C,0x66,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF, - 0x30,0x30,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x3C,0x06,0x3E,0x66,0x66,0x3C,0x00, - 0x60,0x7C,0x66,0x66,0x66,0x66,0x7C,0x00,0x00,0x3C,0x66,0x60,0x60,0x66,0x3C,0x00, - 0x06,0x3E,0x66,0x66,0x66,0x66,0x3E,0x00,0x00,0x3C,0x66,0x66,0x7E,0x60,0x3C,0x00, - 0x1C,0x30,0x78,0x30,0x30,0x30,0x30,0x00,0x00,0x3E,0x66,0x66,0x66,0x3E,0x06,0x3C, - 0x60,0x7C,0x76,0x66,0x66,0x66,0x66,0x00,0x18,0x00,0x38,0x18,0x18,0x18,0x18,0x00, - 0x0C,0x00,0x1C,0x0C,0x0C,0x0C,0x0C,0x38,0x60,0x60,0x66,0x6C,0x78,0x6C,0x66,0x00, - 0x38,0x18,0x18,0x18,0x18,0x18,0x18,0x00,0x00,0xEC,0xFE,0xFE,0xFE,0xD6,0xC6,0x00, - 0x00,0x7C,0x76,0x66,0x66,0x66,0x66,0x00,0x00,0x3C,0x66,0x66,0x66,0x66,0x3C,0x00, - 0x00,0x7C,0x66,0x66,0x66,0x7C,0x60,0x60,0x00,0x3E,0x66,0x66,0x66,0x3E,0x06,0x06, - 0x00,0x7E,0x70,0x60,0x60,0x60,0x60,0x00,0x00,0x3C,0x60,0x3C,0x06,0x66,0x3C,0x00, - 0x30,0x78,0x30,0x30,0x30,0x30,0x1C,0x00,0x00,0x66,0x66,0x66,0x66,0x6E,0x3E,0x00, - 0x00,0x66,0x66,0x66,0x66,0x3C,0x18,0x00,0x00,0xC6,0xD6,0xFE,0xFE,0x7C,0x6C,0x00, - 0x00,0x66,0x3C,0x18,0x3C,0x66,0x66,0x00,0x00,0x66,0x66,0x66,0x66,0x3E,0x06,0x3C, - 0x00,0x7E,0x0C,0x18,0x30,0x60,0x7E,0x00,0x0E,0x18,0x0C,0x38,0x0C,0x18,0x0E,0x00, - 0x18,0x18,0x18,0x00,0x18,0x18,0x18,0x00,0x70,0x18,0x30,0x1C,0x30,0x18,0x70,0x00, - 0x00,0x00,0x76,0xDC,0x00,0x00,0x00,0x00,0x10,0x28,0x10,0x54,0xAA,0x44,0x00,0x00, -}; - -static void gp2x_text(unsigned char *screen, int x, int y, char *text, int color) +static void gp2x_text(unsigned char *screen, int x, int y, const char *text, int color) { int i,l; @@ -130,7 +65,7 @@ static void gp2x_text(unsigned char *screen, int x, int y, char *text, int color } // draws white text to current bbp15 screen -void gp2x_text_out15(int x, int y, char *text) +void gp2x_text_out15(int x, int y, const char *text) { int i,l; unsigned short *screen = gp2x_screen; @@ -155,7 +90,7 @@ void gp2x_text_out15(int x, int y, char *text) } -void gp2x_text_out8(int x, int y, char *texto, ...) +void gp2x_text_out8(int x, int y, const char *texto, ...) { va_list args; char buffer[512]; @@ -164,16 +99,16 @@ void gp2x_text_out8(int x, int y, char *texto, ...) vsprintf(buffer,texto,args); va_end(args); - gp2x_text(gp2x_screen,x,y,buffer,1); + gp2x_text(gp2x_screen,x,y,buffer,0xf0); } -void gp2x_text_out8_2(int x, int y, char *texto, int color) +void gp2x_text_out8_2(int x, int y, const char *texto, int color) { gp2x_text(gp2x_screen, x, y, texto, color); } -void gp2x_text_out8_lim(int x, int y, char *texto, int max) +void gp2x_text_out8_lim(int x, int y, const char *texto, int max) { char buffer[320/8+1]; @@ -182,7 +117,50 @@ void gp2x_text_out8_lim(int x, int y, char *texto, int max) if (max < 0) max = 0; buffer[max] = 0; - gp2x_text(gp2x_screen,x,y,buffer,1); + gp2x_text(gp2x_screen,x,y,buffer,0xf0); +} + +static void gp2x_smalltext8(int x, int y, const char *texto) +{ + int i; + unsigned char *src, *dst; + + for (i = 0;; i++, x += 6) + { + unsigned char c = (unsigned char) texto[i]; + int h = 8; + + if (!c) break; + + src = fontdata6x8[c]; + dst = (unsigned char *)gp2x_screen + x + y*320; + + while (h--) + { + int w = 0x20; + while (w) + { + if( *src & w ) *dst = 0xf0; + dst++; + w>>=1; + } + src++; + + dst += 320-6; + } + } +} + +static void gp2x_smalltext8_lim(int x, int y, const char *texto, int max) +{ + char buffer[320/6+1]; + + strncpy(buffer, texto, 320/6); + if (max > 320/6) max = 320/6; + if (max < 0) max = 0; + buffer[max] = 0; + + gp2x_smalltext8(x, y, buffer); } @@ -279,23 +257,24 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel) start = 12 - sel; n--; // exclude current dir (".") - memset(gp2x_screen, 0, 320*240); + //memset(gp2x_screen, 0, 320*240); + gp2x_pd_clone_buffer2(); if(start - 2 >= 0) - gp2x_text_out8_lim(14, (start - 2)*10, curdir, 38); + gp2x_smalltext8_lim(14, (start - 2)*10, curdir, 53-2); for (i = 0; i < n; i++) { pos = start + i; if (pos < 0) continue; if (pos > 23) break; if (namelist[i+1]->d_type == DT_DIR) { - gp2x_text_out8_lim(14, pos*10, "/", 1); - gp2x_text_out8_lim(14+8, pos*10, namelist[i+1]->d_name, 37); + gp2x_smalltext8_lim(14, pos*10, "/", 1); + gp2x_smalltext8_lim(14+6, pos*10, namelist[i+1]->d_name, 53-3); } else { - gp2x_text_out8_lim(14, pos*10, namelist[i+1]->d_name, 38); + gp2x_smalltext8_lim(14, pos*10, namelist[i+1]->d_name, 53-2); } } gp2x_text_out8(5, 120, ">"); - gp2x_video_flip(); + gp2x_video_flip2(); } static int scandir_cmp(const void *p1, const void *p2) @@ -307,6 +286,25 @@ static int scandir_cmp(const void *p1, const void *p2) return alphasort(d1, d2); } +static char *filter_exts[] = { ".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html", ".jpg", ".gpe" }; + +static int scandir_filter(const struct dirent *ent) +{ + const char *p; + int i; + + if (ent == NULL || ent->d_name == NULL) return 0; + if (strlen(ent->d_name) < 5) return 1; + + p = ent->d_name + strlen(ent->d_name) - 4; + + for (i = 0; i < sizeof(filter_exts)/sizeof(filter_exts[0]); i++) + { + if (strcmp(p, filter_exts[i]) == 0) return 0; + } + + return 1; +} static char *romsel_loop(char *curr_path) { @@ -326,10 +324,10 @@ static char *romsel_loop(char *curr_path) fname = p+1; } - n = scandir(curr_path, &namelist, 0, scandir_cmp); + n = scandir(curr_path, &namelist, scandir_filter, scandir_cmp); if (n < 0) { // try root - n = scandir(curr_path, &namelist, 0, scandir_cmp); + n = scandir("/", &namelist, scandir_filter, scandir_cmp); if (n < 0) { // oops, we failed printf("dir: "); printf(curr_path); printf("\n"); @@ -413,6 +411,187 @@ static char *romsel_loop(char *curr_path) return ret; } +// ------------ patch/gg menu ------------ + +static void draw_patchlist(int sel) +{ + int start, i, pos; + + start = 12 - sel; + + gp2x_pd_clone_buffer2(); + + for (i = 0; i < PicoPatchCount; i++) { + pos = start + i; + if (pos < 0) continue; + if (pos > 23) break; + gp2x_smalltext8_lim(14, pos*10, PicoPatches[i].active ? "ON " : "OFF", 3); + gp2x_smalltext8_lim(14+6*4, pos*10, PicoPatches[i].name, 53-6); + } + pos = start + i; + if (pos < 24) gp2x_smalltext8_lim(14, pos*10, "done", 4); + + gp2x_text_out8(5, 120, ">"); + gp2x_video_flip2(); +} + + +void patches_menu_loop(void) +{ + int menu_sel = 0; + unsigned long inp = 0; + + for(;;) + { + draw_patchlist(menu_sel); + inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_L|GP2X_R|GP2X_B|GP2X_X); + if(inp & GP2X_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = PicoPatchCount; } + if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > PicoPatchCount) menu_sel = 0; } + if(inp &(GP2X_LEFT|GP2X_L)) { menu_sel-=10; if (menu_sel < 0) menu_sel = 0; } + if(inp &(GP2X_RIGHT|GP2X_R)) { menu_sel+=10; if (menu_sel > PicoPatchCount) menu_sel = PicoPatchCount; } + if(inp & GP2X_B) { // action + if (menu_sel < PicoPatchCount) + PicoPatches[menu_sel].active = !PicoPatches[menu_sel].active; + else return; + } + if(inp & GP2X_X) return; + } + +} + +// ------------ savestate loader ------------ + +static void menu_prepare_bg(void); + +static int state_slot_flags = 0; + +static void state_check_slots(void) +{ + int slot; + + state_slot_flags = 0; + + for (slot = 0; slot < 10; slot++) + { + if (emu_check_save_file(slot)) + { + state_slot_flags |= 1 << slot; + } + } +} + +static void draw_savestate_bg(int slot) +{ + struct PicoVideo tmp_pv; + unsigned short tmp_cram[0x40]; + unsigned short tmp_vsram[0x40]; + void *tmp_vram, *file; + char *fname; + + fname = emu_GetSaveFName(1, 0, slot); + if (!fname) return; + + tmp_vram = malloc(sizeof(Pico.vram)); + if (tmp_vram == NULL) return; + + memcpy(tmp_vram, Pico.vram, sizeof(Pico.vram)); + memcpy(tmp_cram, Pico.cram, sizeof(Pico.cram)); + memcpy(tmp_vsram, Pico.vsram, sizeof(Pico.vsram)); + memcpy(&tmp_pv, &Pico.video, sizeof(Pico.video)); + + if (strcmp(fname + strlen(fname) - 3, ".gz") == 0) { + file = gzopen(fname, "rb"); + emu_set_save_cbs(1); + } else { + file = fopen(fname, "rb"); + emu_set_save_cbs(0); + } + + if (file) { + if (PicoMCD & 1) { + PicoCdLoadStateGfx(file); + } else { + areaSeek(file, 0x10020, SEEK_SET); // skip header and RAM in state file + areaRead(Pico.vram, 1, sizeof(Pico.vram), file); + areaSeek(file, 0x2000, SEEK_CUR); + areaRead(Pico.cram, 1, sizeof(Pico.cram), file); + areaRead(Pico.vsram, 1, sizeof(Pico.vsram), file); + areaSeek(file, 0x221a0, SEEK_SET); + areaRead(&Pico.video, 1, sizeof(Pico.video), file); + } + areaClose(file); + } + + emu_forced_frame(); + gp2x_memcpy_buffers((1<<2), gp2x_screen, 0, 320*240*2); + menu_prepare_bg(); + + memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram)); + memcpy(Pico.cram, tmp_cram, sizeof(Pico.cram)); + memcpy(Pico.vsram, tmp_vsram, sizeof(Pico.vsram)); + memcpy(&Pico.video, &tmp_pv, sizeof(Pico.video)); + free(tmp_vram); +} + +static void draw_savestate_menu(int menu_sel, int is_loading) +{ + int tl_x = 25, tl_y = 60, y, i; + + if (state_slot_flags & (1 << menu_sel)) + draw_savestate_bg(menu_sel); + gp2x_pd_clone_buffer2(); + + gp2x_text_out8(tl_x, 30, is_loading ? "Load state" : "Save state"); + + /* draw all 10 slots */ + y = tl_y; + for (i = 0; i < 10; i++, y+=10) + { + gp2x_text_out8(tl_x, y, "SLOT %i (%s)", i, (state_slot_flags & (1 << i)) ? "USED" : "free"); + } + gp2x_text_out8(tl_x, y, "back"); + + // draw cursor + gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">"); + + gp2x_video_flip2(); +} + +static int savestate_menu_loop(int is_loading) +{ + int menu_sel = 10, menu_sel_max = 10; + unsigned long inp = 0; + + state_check_slots(); + + for(;;) + { + draw_savestate_menu(menu_sel, is_loading); + inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X); + if(inp & GP2X_UP ) { + do { + menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; + } while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading); + } + if(inp & GP2X_DOWN) { + do { + menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; + } while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading); + } + if(inp & GP2X_B) { // save/load + if (menu_sel < 10) { + state_slot = menu_sel; + if (emu_SaveLoadGame(is_loading, 0)) { + strcpy(menuErrorMsg, is_loading ? "Load failed" : "Save failed"); + return 1; + } + return 0; + } else return 1; + } + if(inp & GP2X_X) return 1; + } +} + // -------------- key config -------------- static char *usb_joy_key_name(int joy, int num) @@ -460,7 +639,8 @@ static void draw_key_config(int curr_act, int is_p2) } } - memset(gp2x_screen, 0, 320*240); + //memset(gp2x_screen, 0, 320*240); + gp2x_pd_clone_buffer2(); gp2x_text_out8(60, 40, "Action: %s", actionNames[curr_act]); gp2x_text_out8(60, 60, "Keys: %s", strkeys); @@ -468,7 +648,7 @@ static void draw_key_config(int curr_act, int is_p2) gp2x_text_out8(30, 190, "Press a key to bind/unbind"); gp2x_text_out8(30, 200, "Select \"Done\" action and"); gp2x_text_out8(30, 210, " press any key to finish"); - gp2x_video_flip(); + gp2x_video_flip2(); } static void key_config_loop(int is_p2) @@ -515,7 +695,8 @@ static void draw_kc_sel(int menu_sel) char joyname[36]; y = tl_y; - memset(gp2x_screen, 0, 320*240); + //memset(gp2x_screen, 0, 320*240); + gp2x_pd_clone_buffer2(); gp2x_text_out8(tl_x, y, "Player 1"); gp2x_text_out8(tl_x, (y+=10), "Player 2"); gp2x_text_out8(tl_x, (y+=10), "Done"); @@ -535,7 +716,7 @@ static void draw_kc_sel(int menu_sel) } - gp2x_video_flip(); + gp2x_video_flip2(); } static void kc_sel_loop(void) @@ -567,15 +748,24 @@ static void kc_sel_loop(void) static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_jp) { int tl_x = 25, tl_y = 60, y; + char ra_buff[16]; + + if (PicoCDBuffers > 1) sprintf(ra_buff, "%5iK", PicoCDBuffers * 2); + else strcpy(ra_buff, " OFF"); y = tl_y; - memset(gp2x_screen, 0, 320*240); + //memset(gp2x_screen, 0, 320*240); + gp2x_pd_clone_buffer2(); + gp2x_text_out8(tl_x, y, "USA BIOS: %s", b_us); // 0 gp2x_text_out8(tl_x, (y+=10), "EUR BIOS: %s", b_eu); // 1 gp2x_text_out8(tl_x, (y+=10), "JAP BIOS: %s", b_jp); // 2 - gp2x_text_out8(tl_x, (y+=10), "CD LEDs %s", (currentConfig.EmuOpt &0x400)?"ON":"OFF"); // 3 - gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s) %s", (currentConfig.PicoOpt&0x800)?"ON":"OFF"); // 4 - gp2x_text_out8(tl_x, (y+=10), "PCM audio %s", (currentConfig.PicoOpt&0x400)?"ON":"OFF"); // 5 + gp2x_text_out8(tl_x, (y+=10), "CD LEDs %s", (currentConfig.EmuOpt &0x0400)?"ON":"OFF"); // 3 + gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s) %s", (currentConfig.PicoOpt&0x0800)?"ON":"OFF"); // 4 + gp2x_text_out8(tl_x, (y+=10), "PCM audio %s", (currentConfig.PicoOpt&0x0400)?"ON":"OFF"); // 5 + gp2x_text_out8(tl_x, (y+=10), "ReadAhead buffer %s", ra_buff); // 6 + gp2x_text_out8(tl_x, (y+=10), "Scale/Rot. fx (slow) %s", (currentConfig.PicoOpt&0x1000)?"ON":"OFF"); // 7 + gp2x_text_out8(tl_x, (y+=10), "Better sync (slow) %s", (currentConfig.PicoOpt&0x2000)?"ON":"OFF"); // 8 gp2x_text_out8(tl_x, (y+=10), "Done"); // draw cursor @@ -586,12 +776,12 @@ static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_j (menu_sel == 2 && strcmp(b_jp, "NOT FOUND"))) gp2x_text_out8(tl_x, 220, "Press start to test selected BIOS"); - gp2x_video_flip(); + gp2x_video_flip2(); } static void cd_menu_loop_options(void) { - int menu_sel = 0, menu_sel_max = 6; + int menu_sel = 0, menu_sel_max = 9; unsigned long inp = 0; char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p; @@ -618,10 +808,22 @@ static void cd_menu_loop_options(void) if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; } if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options switch (menu_sel) { - case 3: currentConfig.EmuOpt ^=0x400; break; - case 4: currentConfig.PicoOpt^=0x800; break; - case 5: currentConfig.PicoOpt^=0x400; break; - case 6: return; + case 3: currentConfig.EmuOpt ^=0x0400; break; + case 4: currentConfig.PicoOpt^=0x0800; break; + case 5: currentConfig.PicoOpt^=0x0400; break; + case 6: + if (inp & GP2X_LEFT) { + PicoCDBuffers >>= 1; + if (PicoCDBuffers < 64) PicoCDBuffers = 0; + } else { + if (PicoCDBuffers < 64) PicoCDBuffers = 64; + else PicoCDBuffers <<= 1; + if (PicoCDBuffers > 8*1024) PicoCDBuffers = 8*1024; // 16M + } + break; + case 7: currentConfig.PicoOpt^=0x1000; break; + case 8: currentConfig.PicoOpt^=0x2000; break; + case 9: return; } } if(inp & (GP2X_X|GP2X_A)) return; @@ -659,7 +861,9 @@ static void draw_amenu_options(int menu_sel) char *mms = mmuhack_status ? "active) " : "inactive)"; y = tl_y; - memset(gp2x_screen, 0, 320*240); + //memset(gp2x_screen, 0, 320*240); + gp2x_pd_clone_buffer2(); + gp2x_text_out8(tl_x, y, "Scale 32 column mode %s", (currentConfig.PicoOpt&0x100)?"ON":"OFF"); // 0 gp2x_text_out8(tl_x, (y+=10), "Gamma correction %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); // 1 gp2x_text_out8(tl_x, (y+=10), "Emulate Z80 %s", (currentConfig.PicoOpt&0x004)?"ON":"OFF"); // 2 @@ -675,7 +879,7 @@ static void draw_amenu_options(int menu_sel) // draw cursor gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">"); - gp2x_video_flip(); + gp2x_video_flip2(); } static void amenu_loop_options(void) @@ -761,7 +965,9 @@ static void draw_menu_options(int menu_sel) } y = tl_y; - memset(gp2x_screen, 0, 320*240); + //memset(gp2x_screen, 0, 320*240); + gp2x_pd_clone_buffer2(); + gp2x_text_out8(tl_x, y, "Renderer: %s", strrend); // 0 gp2x_text_out8(tl_x, (y+=10), "Accurate timing (slower) %s", (currentConfig.PicoOpt&0x040)?"ON":"OFF"); // 1 gp2x_text_out8(tl_x, (y+=10), "Accurate sprites (slower) %s", (currentConfig.PicoOpt&0x080)?"ON":"OFF"); // 2 @@ -785,7 +991,7 @@ static void draw_menu_options(int menu_sel) // draw cursor gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">"); - gp2x_video_flip(); + gp2x_video_flip2(); } static int sndrate_prevnext(int rate, int dir) @@ -937,7 +1143,8 @@ static int menu_loop_options(void) static void draw_menu_credits(void) { int tl_x = 15, tl_y = 70, y; - memset(gp2x_screen, 0, 320*240); + //memset(gp2x_screen, 0, 320*240); + gp2x_pd_clone_buffer2(); gp2x_text_out8(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006,2007"); y = tl_y; @@ -956,7 +1163,7 @@ static void draw_menu_credits(void) gp2x_text_out8(tl_x, (y+=10), "GnoStiC / Puck2099: USB joystick"); gp2x_text_out8(tl_x, (y+=10), "craigix: GP2X hardware"); - gp2x_video_flip(); + gp2x_video_flip2(); } @@ -965,7 +1172,8 @@ static void draw_menu_credits(void) static void draw_menu_root(int menu_sel) { int tl_x = 70, tl_y = 70, y; - memset(gp2x_screen, 0, 320*240); + //memset(gp2x_screen, 0, 320*240); + gp2x_pd_clone_buffer2(); gp2x_text_out8(tl_x, 20, "PicoDrive v" VERSION); @@ -983,12 +1191,14 @@ static void draw_menu_root(int menu_sel) gp2x_text_out8(tl_x, (y+=10), "Configure controls"); gp2x_text_out8(tl_x, (y+=10), "Credits"); gp2x_text_out8(tl_x, (y+=10), "Exit"); + if (PicoPatches) + gp2x_text_out8(tl_x, (y+=10), "Patches / GameGenie"); // draw cursor gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">"); // error if (menuErrorMsg[0]) gp2x_text_out8(5, 226, menuErrorMsg); - gp2x_video_flip(); + gp2x_video_flip2(); } @@ -1010,6 +1220,7 @@ static void menu_loop_root(void) } if (rom_data) menu_sel = menu_sel_min = 0; + if (PicoPatches) menu_sel_max = 9; for(;;) { @@ -1031,20 +1242,16 @@ static void menu_loop_root(void) break; case 1: // save state if (rom_data) { - if(emu_SaveLoadGame(0, 0)) { - strcpy(menuErrorMsg, "save failed"); + if(savestate_menu_loop(0)) continue; - } engineState = PGS_Running; return; } break; case 2: // load state if (rom_data) { - if(emu_SaveLoadGame(1, 0)) { - strcpy(menuErrorMsg, "load failed"); + if(savestate_menu_loop(1)) continue; - } engineState = PGS_Running; return; } @@ -1080,6 +1287,14 @@ static void menu_loop_root(void) case 8: // exit engineState = PGS_Quit; return; + case 9: // patches/gg + if (rom_data && PicoPatches) { + patches_menu_loop(); + PicoPatchApply(); + strcpy(menuErrorMsg, "Patches applied"); + continue; + } + break; } } menuErrorMsg[0] = 0; // clear error msg @@ -1087,17 +1302,36 @@ static void menu_loop_root(void) } -void menu_loop(void) +static void menu_prepare_bg(void) { - int pal[2]; + extern int localPal[0x100]; + int c, i; + + // don't clear old palette just for fun (but make it dark) + for (i = 0x100-1; i >= 0; i--) { + c = localPal[i]; + localPal[i] = ((c >> 1) & 0x007f7f7f) - ((c >> 3) & 0x001f1f1f); + } + localPal[0xe0] = 0x00000000; // reserved pixels for OSD + localPal[0xf0] = 0x00ffffff; + + gp2x_video_setpalette(localPal, 0x100); +} + +static void menu_gfx_prepare(void) +{ + menu_prepare_bg(); // switch to 8bpp - gp2x_video_changemode(8); + gp2x_video_changemode2(8); gp2x_video_RGB_setscaling(320, 240); - // set pal - pal[0] = 0; - pal[1] = 0x00ffffff; - gp2x_video_setpalette(pal, 2); + gp2x_video_flip2(); +} + + +void menu_loop(void) +{ + menu_gfx_prepare(); menu_loop_root();