X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fgp2x%2Fmenu.c;h=e4b3488e1c5abb4882451e0ba85289c1ac8b1404;hb=9b4514550544ca3d0a451ba0a08eeb502961ec1c;hp=b23837adbf10e585c61667e04f38d7fcea639f62;hpb=6f6bc6fa47b2888c4420eeb323d96be0982150de;p=fceu.git diff --git a/drivers/gp2x/menu.c b/drivers/gp2x/menu.c index b23837a..e4b3488 100644 --- a/drivers/gp2x/menu.c +++ b/drivers/gp2x/menu.c @@ -21,6 +21,7 @@ #include "../../input.h" #include "../../state.h" #include "../../palette.h" +#include "readpng.h" #ifndef _DIRENT_HAVE_D_TYPE #error "need d_type for file browser @@ -44,13 +45,67 @@ static char *gp2xKeyNames[] = { static char path_buffer[PATH_MAX]; +static unsigned short *menu_bg = 0; +static int txt_xmin, txt_xmax, txt_ymin, txt_ymax; char menuErrorMsg[40] = {0, }; -// TODO -void gp2x_fceu_copy_bg(void) +static void gp2x_fceu_darken_reset(void) { - memset(gp2x_screen, 0, 320*240*2); + txt_xmin = 320; txt_xmax = 0; + txt_ymin = 240; txt_ymax = 0; +} + +static void gp2x_fceu_copy_bg(void) +{ + if (menu_bg) + memcpy(gp2x_screen, menu_bg, 320*240*2); + else memset(gp2x_screen, 0, 320*240*2); + gp2x_fceu_darken_reset(); +} + +static void gp2x_fceu_darken_text_bg(void) +{ + int x, y, xmin, xmax, ymax; + unsigned short *screen = gp2x_screen; + + xmin = txt_xmin - 3; + if (xmin < 0) xmin = 0; + xmax = txt_xmax + 2; + if (xmax > 319) xmax = 319; + + y = txt_ymin - 3; + if (y < 0) y = 0; + ymax = txt_ymax + 2; + if (ymax > 239) ymax = 239; + + for (x = xmin; x <= xmax; x++) + screen[y*320+x] = 0xa514; + for (y++; y < ymax; y++) + { + screen[y*320+xmin] = 0xffff; + for (x = xmin+1; x < xmax; x++) + { + unsigned int p = screen[y*320+x]; + if (p != 0xffff) + screen[y*320+x] = ((p&0xf79e)>>1) - ((p&0xc618)>>3); + } + screen[y*320+xmax] = 0xffff; + } + for (x = xmin; x <= xmax; x++) + screen[y*320+x] = 0xffff; +} + +static void gp2x_fceu_darken_all(void) +{ + unsigned int *screen = gp2x_screen; + int count = 320*240/2; + + while (count--) + { + unsigned int p = screen[count]; + screen[count] = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3); + } } // draws white text to current bbp15 screen @@ -76,6 +131,10 @@ static void gp2x_text_out15_(int x, int y, const char *text) } screen += 8; } + if (x < txt_xmin) txt_xmin = x; + if (x+i*8 > txt_xmax) txt_xmax = x+i*8; + if (y < txt_ymin) txt_ymin = y; + if (y+8 > txt_ymax) txt_ymax = y+8; } void gp2x_text_out15(int x, int y, const char *texto, ...) @@ -135,7 +194,7 @@ static void gp2x_smalltext16(int x, int y, const char *texto) } } -static void gp2x_smalltext8_lim(int x, int y, const char *texto, int max) +static void gp2x_smalltext16_lim(int x, int y, const char *texto, int max) { char buffer[320/6+1]; @@ -243,20 +302,20 @@ 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); gp2x_fceu_copy_bg(); + gp2x_fceu_darken_all(); if(start - 2 >= 0) - gp2x_smalltext8_lim(14, (start - 2)*10, curdir, 53-2); + gp2x_smalltext16_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_smalltext8_lim(14, pos*10, "/", 1); - gp2x_smalltext8_lim(14+6, pos*10, namelist[i+1]->d_name, 53-3); + gp2x_smalltext16_lim(14, pos*10, "/", 1); + gp2x_smalltext16_lim(14+6, pos*10, namelist[i+1]->d_name, 53-3); } else { - gp2x_smalltext8_lim(14, pos*10, namelist[i+1]->d_name, 53-2); + gp2x_smalltext16_lim(14, pos*10, namelist[i+1]->d_name, 53-2); } } gp2x_text_out15(5, 120, ">"); @@ -369,7 +428,7 @@ static char *filesel_loop(char *curr_path, char *final_dest) } else { strcpy(newdir, curr_path); p = newdir + strlen(newdir) - 1; - while (*p == '/' && p >= newdir) *p-- = 0; + while (p >= newdir && *p == '/') *p-- = 0; strcat(newdir, "/"); strcat(newdir, namelist[sel+1]->d_name); } @@ -409,47 +468,69 @@ static char *filesel_loop(char *curr_path, char *final_dest) // ------------ patch/gg menu ------------ -#if 0 // TODO? -static void draw_patchlist(int sel) +extern void *cheats; +static int cheat_count = 0, cheat_start, cheat_pos; + +static int countcallb(char *name, uint32 a, uint8 v, int compare, int s, int type, void *data) { - int start, i, pos; + cheat_count++; + return 1; +} - start = 12 - sel; +static int clistcallb(char *name, uint32 a, uint8 v, int compare, int s, int type, void *data) +{ + int pos; + + pos = cheat_start + cheat_pos; + cheat_pos++; + if (pos < 0) return 1; + if (pos > 23) return 0; + + gp2x_smalltext16_lim(14, pos*10, s ? "ON " : "OFF", 3); + gp2x_smalltext16_lim(14+6*4, pos*10, type ? "S" : "R", 1); + gp2x_smalltext16_lim(14+6*6, pos*10, name, 53-8); + + return 1; +} + +static void draw_patchlist(int sel) +{ + int pos; gp2x_fceu_copy_bg(); + gp2x_fceu_darken_all(); - 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); + cheat_start = 12 - sel; + cheat_pos = 0; + FCEUI_ListCheats(clistcallb,0); + + pos = cheat_start + cheat_pos; + if (pos < 24) gp2x_smalltext16_lim(14, pos*10, "done", 4); gp2x_text_out15(5, 120, ">"); gp2x_video_flip(); } - void patches_menu_loop(void) { int menu_sel = 0; unsigned long inp = 0; + cheat_count = 0; + FCEUI_ListCheats(countcallb,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_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = cheat_count; } + if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > cheat_count) 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_RIGHT|GP2X_R)) { menu_sel+=10; if (menu_sel > cheat_count) menu_sel = cheat_count; } if(inp & GP2X_B) { // action - if (menu_sel < PicoPatchCount) - PicoPatches[menu_sel].active = !PicoPatches[menu_sel].active; - else return; + if (menu_sel < cheat_count) + FCEUI_ToggleCheat(menu_sel); + else return; } if(inp & GP2X_X) return; } @@ -458,6 +539,7 @@ void patches_menu_loop(void) // ------------ savestate loader ------------ +#if 0 static void menu_prepare_bg(void); static int state_slot_flags = 0; @@ -689,6 +771,9 @@ static void draw_key_config(const bind_action_t *opts, int opt_cnt, int player_i // draw cursor gp2x_text_out15(x - 16, tl_y + sel*10, ">"); + gp2x_fceu_darken_text_bg(); + gp2x_fceu_darken_reset(); + if (sel < opt_cnt) { gp2x_text_out15(30, 190, "Press a button to bind/unbind"); gp2x_text_out15(30, 200, "Use VOL+ to clear"); @@ -699,6 +784,7 @@ static void draw_key_config(const bind_action_t *opts, int opt_cnt, int player_i gp2x_text_out15(30, 210, "to save controls"); gp2x_text_out15(30, 220, "Press B or X to exit"); } + gp2x_fceu_darken_text_bg(); gp2x_video_flip(); } @@ -778,6 +864,7 @@ static void draw_kc_sel(int menu_sel) gp2x_text_out15(tl_x, (y+=10), "none"); } + gp2x_fceu_darken_text_bg(); gp2x_video_flip(); } @@ -878,22 +965,27 @@ static void draw_fcemenu_options(int menu_sel) gp2x_text_out15(tl_x, (y+=10), "Last visible line (PAL) %i", erendlinev[1]); gp2x_text_out15(tl_x, (y+=10), "Clip 8 left/right columns %s", (eoptions&EO_CLIPSIDES)?"ON":"OFF"); gp2x_text_out15(tl_x, (y+=10), "Disable 8 sprite limit %s", (eoptions&EO_NO8LIM)?"ON":"OFF"); - gp2x_text_out15(tl_x, (y+=10), "Done"); // 10 + gp2x_text_out15(tl_x, (y+=10), "Enable authentic GameGenie %s", (eoptions&EO_GG)?"ON":"OFF"); + gp2x_text_out15(tl_x, (y+=10), "Done"); // 11 + + // draw cursor + gp2x_text_out15(tl_x - 16, tl_y + menu_sel*10, ">"); if (menu_sel == 0) { + gp2x_fceu_darken_text_bg(); + gp2x_fceu_darken_reset(); + gp2x_text_out15(30, 210, "Press B to browse,"); gp2x_text_out15(30, 220, "START to use default"); } - // draw cursor - gp2x_text_out15(tl_x - 16, tl_y + menu_sel*10, ">"); - + gp2x_fceu_darken_text_bg(); gp2x_video_flip(); } static void fcemenu_loop_options(void) { - int menu_sel = 0, menu_sel_max = 10, i; + int menu_sel = 0, menu_sel_max = 11, i; unsigned long inp = 0; FCEUI_GetNTSCTH(&ntsctint, &ntschue); @@ -909,7 +1001,8 @@ static void fcemenu_loop_options(void) case 1: ntsccol = !ntsccol; break; case 8: eoptions^=EO_CLIPSIDES; break; case 9: eoptions^=EO_NO8LIM; break; - case 10: return; + case 10: eoptions^=EO_GG; break; + case 11: return; } } if(inp & (GP2X_X|GP2X_A)) { @@ -921,6 +1014,7 @@ static void fcemenu_loop_options(void) FCEUI_SetNTSCTH(ntsccol, ntsctint, ntschue); FCEUI_SetRenderedLines(srendlinev[0],erendlinev[0],srendlinev[1],erendlinev[1]); FCEUI_DisableSpriteLimitation(eoptions&EO_NO8LIM); + FCEUI_SetGameGenie(eoptions&EO_GG); if (cpalette) LoadCPalette(); else FCEUI_SetPaletteArray(0); // set to default FCEU_ResetPalette(); @@ -1006,6 +1100,7 @@ static void draw_menu_options(int menu_sel) // draw cursor gp2x_text_out15(tl_x - 16, tl_y + menu_sel*10, ">"); + gp2x_fceu_darken_text_bg(); gp2x_video_flip(); } @@ -1032,7 +1127,7 @@ static void config_commit(void) static int menu_loop_options(void) { static int menu_sel = 0; - int menu_sel_max = 15; + int menu_sel_max = 14; unsigned long inp = 0; if (fceugi) menu_sel_max++; @@ -1121,6 +1216,7 @@ static void draw_menu_credits(void) gp2x_text_out15(20, 180, " cpuctrl, gamma libs"); gp2x_text_out15(20, 190, "Squidge: squidgehack"); + gp2x_fceu_darken_text_bg(); gp2x_video_flip(); } @@ -1129,7 +1225,7 @@ static void draw_menu_credits(void) static void draw_menu_root(int menu_sel) { - int tl_x = 30, tl_y = 128, y; + int tl_x = 30, tl_y = 126, y; gp2x_fceu_copy_bg(); y = tl_y; @@ -1146,19 +1242,24 @@ static void draw_menu_root(int menu_sel) gp2x_text_out15(tl_x, (y+=10), "Controls"); gp2x_text_out15(tl_x, (y+=10), "Credits"); gp2x_text_out15(tl_x, (y+=10), "Exit"); -// TODO -// if (PicoPatches) -// gp2x_text_out15(tl_x, (y+=10), "Patches / GameGenie"); + + if (cheats) + gp2x_text_out15(tl_x, (y+=10), "Cheats"); // draw cursor gp2x_text_out15(tl_x - 16, tl_y + menu_sel*10, ">"); - // error - if (menuErrorMsg[0]) gp2x_text_out15(1, 230, menuErrorMsg); + + gp2x_fceu_darken_text_bg(); + gp2x_fceu_darken_reset(); + + // error / version + if (menuErrorMsg[0]) gp2x_text_out15(1, 229, menuErrorMsg); else { char vstr[16]; sprintf(vstr, "v" GP2X_PORT_VERSION " r%i", GP2X_PORT_REV); - gp2x_text_out15(320-strlen(vstr)*8-1, 230, vstr); + gp2x_text_out15(320-strlen(vstr)*8-1, 228, vstr); } + gp2x_fceu_darken_text_bg(); gp2x_video_flip(); } @@ -1170,7 +1271,7 @@ static int menu_loop_root(void) unsigned long inp = 0; if (fceugi) menu_sel_min = 0; -// TODO if (PicoPatches) menu_sel_max = 9; + if (cheats) menu_sel_max = 9; if (menu_sel < menu_sel_min || menu_sel > menu_sel_max) menu_sel = menu_sel_min; @@ -1266,6 +1367,7 @@ static int menu_loop_root(void) case 8: // exit return 1; case 9: // patches/gg + patches_menu_loop(); break; } } @@ -1274,9 +1376,26 @@ static int menu_loop_root(void) } +extern unsigned short gp2x_palette16[256]; + static void menu_prepare_bg(void) { - // TODO... + menu_bg = malloc(320*240*2); + if (menu_bg == NULL) return; + + if (fceugi) + { + /* raw emu frame should now be at gp2x_screen */ + soft_scale((char *)gp2x_screen + 32, gp2x_palette16, srendline, erendline-srendline); + if (srendline) + memset32((int *)((char *)gp2x_screen + 32), 0, srendline*320*2/4); + memcpy(menu_bg, gp2x_screen + 32, 320*240*2); + } + else + { + memset32((int *)menu_bg, 0, 320*240*2/4); + readpng(menu_bg, "background.png"); + } } static void menu_gfx_prepare(void) @@ -1299,6 +1418,8 @@ int gp2x_menu_do(void) ret = menu_loop_root(); + if (menu_bg) free(menu_bg); + menu_bg = NULL; menuErrorMsg[0] = 0; return ret;