X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=3ebe9f5d16a6e60b85bc9c41955eeef4f163406e;hp=989c6ec95c02cb6c4f757da75ea5acad37092458;hb=33344895eb142f2529c9d7333f14d1ac83102837;hpb=6469a8c407ff23af8b7a6218f759b368eec7c339 diff --git a/frontend/menu.c b/frontend/menu.c index 989c6ec9..3ebe9f5d 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -84,7 +84,7 @@ enum { }; static int last_psx_w, last_psx_h, last_psx_bpp; -static int scaling, filter, cpu_clock, cpu_clock_st, volume_boost, frameskip; +static int scaling, cpu_clock, cpu_clock_st, volume_boost, frameskip; static char rom_fname_reload[MAXPATHLEN]; static char last_selected_fname[MAXPATHLEN]; static int warned_about_bios, region, in_type_sel1, in_type_sel2; @@ -92,6 +92,7 @@ static int psx_clock; static int memcard1_sel, memcard2_sel; int g_opts; int soft_scaling, analog_deadzone; // for Caanoo +int filter; #ifdef __ARM_ARCH_7A__ #define DEFAULT_PSX_CLOCK 57 @@ -105,8 +106,6 @@ int soft_scaling, analog_deadzone; // for Caanoo extern int iUseReverb; extern int iUseInterpolation; extern int iXAPitch; -extern int iSPUIRQWait; -extern int iUseTimer; extern int iVolume; static const char *bioses[24]; @@ -307,8 +306,6 @@ static const struct { CE_INTVAL_V(iUseReverb, 3), CE_INTVAL_V(iXAPitch, 3), CE_INTVAL_V(iUseInterpolation, 3), - CE_INTVAL_V(iSPUIRQWait, 3), - CE_INTVAL_V(iUseTimer, 3), CE_INTVAL(warned_about_bios), CE_INTVAL(in_evdev_allow_abs_only), CE_INTVAL(volume_boost), @@ -489,6 +486,10 @@ fail: menu_sync_config(); + // caanoo old config compat hack + if (strcmp(Config.Gpu, "gpuPCSX4ALL.so") == 0) + strcpy(Config.Gpu, "gpu_unai.so"); + // sync plugins for (i = bios_sel = 0; bioses[i] != NULL; i++) if (strcmp(Config.Bios, bioses[i]) == 0) @@ -607,136 +608,16 @@ static void draw_savestate_bg(int slot) bgr888_to_rgb565(d, s, w * 3); else bgr555_to_rgb565(d, s, w * 2); -#ifndef __ARM_ARCH_7A__ - // better darken this on small screens - menu_darken_bg(d, d, w * 2, 0); -#endif + + // darken this so that menu text is visible + if (g_menuscreen_w - w < 320) + menu_darken_bg(d, d, w * 2, 0); } out: free(gpu); } -// ---------- XXX: pandora specific ----------- - -static const char pnd_script_base[] = "sudo -n /usr/pandora/scripts"; -static char **pnd_filter_list; - -static void apply_filter(int which) -{ - static int old = -1; - char buf[128]; - int i; - - if (pnd_filter_list == NULL || which == old) - return; - - for (i = 0; i < which; i++) - if (pnd_filter_list[i] == NULL) - return; - - if (pnd_filter_list[i] == NULL) - return; - - snprintf(buf, sizeof(buf), "%s/op_videofir.sh %s", pnd_script_base, pnd_filter_list[i]); - system(buf); - old = which; -} - -static void apply_lcdrate(int pal) -{ - static int old = -1; - char buf[128]; - - if (pal == old) - return; - - snprintf(buf, sizeof(buf), "%s/op_lcdrate.sh %d", - pnd_script_base, pal ? 50 : 60); - system(buf); - old = pal; -} - -static menu_entry e_menu_gfx_options[]; - -static void pnd_menu_init(void) -{ - struct dirent *ent; - int i, count = 0; - char **mfilters; - char buff[64]; - DIR *dir; - - cpu_clock_st = cpu_clock = plat_cpu_clock_get(); - - dir = opendir("/etc/pandora/conf/dss_fir"); - if (dir == NULL) { - perror("filter opendir"); - return; - } - - while (1) { - errno = 0; - ent = readdir(dir); - if (ent == NULL) { - if (errno != 0) - perror("readdir"); - break; - } - - if (ent->d_type != DT_REG && ent->d_type != DT_LNK) - continue; - - count++; - } - - if (count == 0) - return; - - mfilters = calloc(count + 1, sizeof(mfilters[0])); - if (mfilters == NULL) - return; - - rewinddir(dir); - for (i = 0; (ent = readdir(dir)); ) { - size_t len; - - if (ent->d_type != DT_REG && ent->d_type != DT_LNK) - continue; - - len = strlen(ent->d_name); - - // skip pre-HF5 extra files - if (len >= 3 && strcmp(ent->d_name + len - 3, "_v3") == 0) - continue; - if (len >= 3 && strcmp(ent->d_name + len - 3, "_v5") == 0) - continue; - - // have to cut "_up_h" for pre-HF5 - if (len > 5 && strcmp(ent->d_name + len - 5, "_up_h") == 0) - len -= 5; - - if (len > sizeof(buff) - 1) - continue; - - strncpy(buff, ent->d_name, len); - buff[len] = 0; - mfilters[i] = strdup(buff); - if (mfilters[i] != NULL) - i++; - } - closedir(dir); - - i = me_id2offset(e_menu_gfx_options, MA_OPT_FILTERING); - e_menu_gfx_options[i].data = (void *)mfilters; - pnd_filter_list = mfilters; -} - -void menu_finish(void) -{ - plat_cpu_clock_apply(cpu_clock_st); -} - // -------------- key config -------------- me_bind_action me_ctrl_actions[] = @@ -1146,7 +1027,7 @@ static int menu_loop_cscaler(int id, int keys) scaling = SCALE_CUSTOM; - plat_gvideo_open(); + plat_gvideo_open(Config.PsxType); for (;;) { @@ -1182,7 +1063,7 @@ static int menu_loop_cscaler(int id, int keys) if (g_layer_y + g_layer_h > 480) g_layer_h = 480 - g_layer_y; // resize the layer - plat_gvideo_open(); + plat_gvideo_open(Config.PsxType); } } @@ -1210,6 +1091,16 @@ static int menu_loop_gfx_options(int id, int keys) return 0; } +// XXX +void menu_set_filter_list(void *filters) +{ + int i; + + i = me_id2offset(e_menu_gfx_options, MA_OPT_FILTERING); + e_menu_gfx_options[i].data = filters; + me_enable(e_menu_gfx_options, MA_OPT_FILTERING, filters != NULL); +} + // ------------ bios/plugins ------------ #ifdef __ARM_NEON__ @@ -1320,8 +1211,6 @@ static int menu_loop_plugin_gpu_peopsgl(int id, int keys) static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL }; static const char h_spu_volboost[] = "Large values cause distortion"; -static const char h_spu_irq_wait[] = "Wait for CPU (recommended set to ON)"; -static const char h_spu_thread[] = "Run sound emulation in main thread (recommended)"; static menu_entry e_menu_plugin_spu[] = { @@ -1329,8 +1218,6 @@ static menu_entry e_menu_plugin_spu[] = mee_onoff ("Reverb", 0, iUseReverb, 2), mee_enum ("Interpolation", 0, iUseInterpolation, men_spu_interp), mee_onoff ("Adjust XA pitch", 0, iXAPitch, 1), - mee_onoff_h ("SPU IRQ Wait", 0, iSPUIRQWait, 1, h_spu_irq_wait), - mee_onoff_h ("Sound in main thread", 0, iUseTimer, 2, h_spu_thread), mee_end, }; @@ -1504,7 +1391,7 @@ static int menu_loop_options(int id, int keys) int i; i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS); - e_menu_options[i].enabled = cpu_clock_st != 0 ? 1 : 0; + e_menu_options[i].enabled = cpu_clock_st > 0 ? 1 : 0; me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, ready_to_go && CdromId[0]); me_loop(e_menu_options, &sel); @@ -1557,8 +1444,8 @@ static void debug_menu_loop(void) if (inp & PBTN_MBACK) break; else if (inp & PBTN_UP) { if (df_y > 0) df_y--; } else if (inp & PBTN_DOWN) { if (df_y < 512 - g_menuscreen_h) df_y++; } - else if (inp & PBTN_LEFT) { if (df_x > 0) df_x--; } - else if (inp & PBTN_RIGHT) { if (df_x < 1024 - g_menuscreen_w) df_x++; } + else if (inp & PBTN_LEFT) { if (df_x > 0) df_x -= 2; } + else if (inp & PBTN_RIGHT) { if (df_x < 1024 - g_menuscreen_w) df_x += 2; } } free(gpuf); @@ -1694,11 +1581,14 @@ static void menu_bios_warn(void) "The file is usually named SCPH1001.BIN,\n" "but other not compressed files can be\n" "used too.\n\n" - "Press (B) or (X) to continue"; + "Press %s or %s to continue"; + char tmp_msg[sizeof(msg) + 64]; + snprintf(tmp_msg, sizeof(tmp_msg), msg, + in_get_key_name(-1, -PBTN_MOK), in_get_key_name(-1, -PBTN_MBACK)); while (1) { - draw_menu_message(msg, NULL); + draw_menu_message(tmp_msg, NULL); inp = in_menu_wait(PBTN_MOK|PBTN_MBACK, 70); if (inp & (PBTN_MBACK|PBTN_MOK)) @@ -1714,8 +1604,10 @@ static void draw_frame_main(void) { struct tm *tmp; time_t ltime; + int capacity; char ltime_s[16]; char buff[64]; + char *out; if (CdromId[0] != 0) { snprintf(buff, sizeof(buff), "%.32s/%.9s (running as %s, with %s)", @@ -1725,11 +1617,17 @@ static void draw_frame_main(void) } if (ready_to_go) { + capacity = plat_get_bat_capacity(); ltime = time(NULL); tmp = localtime(<ime); strftime(ltime_s, sizeof(ltime_s), "%H:%M", tmp); - snprintf(buff, sizeof(buff), "%s %3d%%", ltime_s, plat_get_bat_capacity()); - smalltext_out16(4, 1 + me_sfont_h, buff, 0x105f); + if (capacity >= 0) { + snprintf(buff, sizeof(buff), "%s %3d%%", ltime_s, capacity); + out = buff; + } + else + out = ltime_s; + smalltext_out16(4, 1 + me_sfont_h, out, 0x105f); } } @@ -2230,8 +2128,9 @@ void menu_init(void) strcpy(last_selected_fname, "/media"); + cpu_clock_st = cpu_clock = plat_cpu_clock_get(); + scan_bios_plugins(); - pnd_menu_init(); menu_init_common(); menu_set_defconfig(); @@ -2241,8 +2140,12 @@ void menu_init(void) last_psx_bpp = 16; g_menubg_src_ptr = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1); - if (g_menubg_src_ptr == NULL) + g_menubg_ptr = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1); + if (g_menubg_src_ptr == NULL || g_menubg_ptr == NULL) { + fprintf(stderr, "OOM\n"); exit(1); + } + emu_make_path(buff, "skin/background.png", sizeof(buff)); readpng(g_menubg_src_ptr, buff, READPNG_BG, g_menuscreen_w, g_menuscreen_h); @@ -2258,7 +2161,6 @@ void menu_init(void) #endif } -// XXX: should really menu code cotrol the layer size? void menu_notify_mode_change(int w, int h, int bpp) { float mult; @@ -2268,6 +2170,7 @@ void menu_notify_mode_change(int w, int h, int bpp) last_psx_h = h; last_psx_bpp = bpp; + // XXX: should really menu code cotrol the layer size? switch (scaling) { case SCALE_1_1: g_layer_w = w; g_layer_h = h; @@ -2325,16 +2228,24 @@ static void menu_leave_emu(void) plat_video_menu_enter(ready_to_go); memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2); - if (pl_vout_buf != NULL && ready_to_go && last_psx_bpp == 16) { + if (pl_vout_buf != NULL && ready_to_go) { int x = max(0, g_menuscreen_w - last_psx_w); int y = max(0, g_menuscreen_h / 2 - last_psx_h / 2); int w = min(g_menuscreen_w, last_psx_w); int h = min(g_menuscreen_h, last_psx_h); u16 *d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x; - u16 *s = pl_vout_buf; + char *s = pl_vout_buf; - for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w) - menu_darken_bg(d, s, w, 0); + if (last_psx_bpp == 16) { + for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w * 2) + menu_darken_bg(d, s, w, 0); + } + else { + for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w * 3) { + bgr888_to_rgb565(d, s, w * 3); + menu_darken_bg(d, d, w, 0); + } + } } if (ready_to_go) @@ -2360,9 +2271,8 @@ void menu_prepare_emu(void) CDR_stop(); menu_sync_config(); - apply_lcdrate(Config.PsxType); - apply_filter(filter); - plat_cpu_clock_apply(cpu_clock); + if (cpu_clock > 0) + plat_cpu_clock_apply(cpu_clock); // push config to GPU plugin plugin_call_rearmed_cbs(); @@ -2385,3 +2295,7 @@ void me_update_msg(const char *msg) lprintf("msg: %s\n", menu_error_msg); } +void menu_finish(void) +{ + plat_cpu_clock_apply(cpu_clock_st); +}