X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=34b6e362b0ce1116618a43ceea59e7f0bd0c2398;hp=0469868abffac4f9278e22826bf5373561e496a9;hb=de38f20e0863e33a2a824380da5aa46b1dc39631;hpb=fba064572196c69de43e3c69245369d94d3be929 diff --git a/frontend/menu.c b/frontend/menu.c index 0469868a..34b6e362 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -1,5 +1,5 @@ /* - * (C) Gražvydas "notaz" Ignotas, 2010 + * (C) Gražvydas "notaz" Ignotas, 2010-2011 * * This work is licensed under the terms of any of these licenses * (at your option): @@ -12,13 +12,15 @@ #include #include #include +#include +#include "main.h" #include "menu.h" #include "config.h" +#include "plugin.h" #include "plugin_lib.h" #include "omap.h" #include "common/plat.h" -#include "../gui/Linux.h" #include "../libpcsxcore/misc.h" #include "../libpcsxcore/new_dynarec/new_dynarec.h" #include "revision.h" @@ -56,9 +58,8 @@ enum { SCALE_CUSTOM, }; -extern int ready_to_go; static int last_psx_w, last_psx_h, last_psx_bpp; -static int scaling, filter, state_slot, cpu_clock; +static int scaling, filter, state_slot, cpu_clock, cpu_clock_st; static char rom_fname_reload[MAXPATHLEN]; static char last_selected_fname[MAXPATHLEN]; int g_opts; @@ -100,40 +101,34 @@ void emu_make_path(char *buff, const char *end, int size) static int emu_check_save_file(int slot) { - char *fname; + char fname[MAXPATHLEN]; int ret; - fname = get_state_filename(slot); - if (fname == NULL) + ret = get_state_filename(fname, sizeof(fname), slot); + if (ret != 0) return 0; ret = CheckState(fname); - free(fname); return ret == 0 ? 1 : 0; } static int emu_save_load_game(int load, int sram) { - char *fname; + char fname[MAXPATHLEN]; int ret; - fname = get_state_filename(state_slot); - if (fname == NULL) + ret = get_state_filename(fname, sizeof(fname), state_slot); + if (ret != 0) return 0; if (load) ret = LoadState(fname); else ret = SaveState(fname); - free(fname); return ret; } -static void draw_savestate_bg(int slot) -{ -} - static void menu_set_defconfig(void) { scaling = SCALE_4_3; @@ -391,11 +386,80 @@ static unsigned short fname2color(const char *fname) return 0xffff; } +static void draw_savestate_bg(int slot); + #define MENU_ALIGN_LEFT #define menu_init menu_init_common #include "common/menu.c" #undef menu_init +// a bit of black magic here +static void draw_savestate_bg(int slot) +{ + extern void bgr555_to_rgb565(void *dst, void *src, int bytes); + static const int psx_widths[8] = { 256, 368, 320, 384, 512, 512, 640, 640 }; + int x, y, w, h; + char fname[MAXPATHLEN]; + GPUFreeze_t *gpu; + u16 *s, *d; + gzFile f; + int ret; + u32 tmp; + + ret = get_state_filename(fname, sizeof(fname), slot); + if (ret != 0) + return; + + f = gzopen(fname, "rb"); + if (f == NULL) + return; + + if (gzseek(f, 0x29933d, SEEK_SET) != 0x29933d) { + fprintf(stderr, "gzseek failed\n"); + gzclose(f); + return; + } + + gpu = malloc(sizeof(*gpu)); + if (gpu == NULL) { + gzclose(f); + return; + } + + ret = gzread(f, gpu, sizeof(*gpu)); + gzclose(f); + if (ret != sizeof(*gpu)) { + fprintf(stderr, "gzread failed\n"); + goto out; + } + + memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2); + + if ((gpu->ulStatus & 0x800000) || (gpu->ulStatus & 0x200000)) + goto out; // disabled || 24bpp (NYET) + + x = gpu->ulControl[5] & 0x3ff; + y = (gpu->ulControl[5] >> 10) & 0x1ff; + s = (u16 *)gpu->psxVRam + y * 1024 + (x & ~3); + w = psx_widths[(gpu->ulStatus >> 16) & 7]; + tmp = gpu->ulControl[7]; + h = ((tmp >> 10) & 0x3ff) - (tmp & 0x3ff); + if (gpu->ulStatus & 0x80000) // doubleheight + h *= 2; + + x = max(0, g_menuscreen_w - w) & ~3; + y = max(0, g_menuscreen_h / 2 - h / 2); + w = min(g_menuscreen_w, w); + h = min(g_menuscreen_h, h); + d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x; + + for (; h > 0; h--, d += g_menuscreen_w, s += 1024) + bgr555_to_rgb565(d, s, w * 2); + +out: + free(gpu); +} + // ---------- pandora specific ----------- static const char pnd_script_base[] = "sudo -n /usr/pandora/scripts"; @@ -455,7 +519,7 @@ static void pnd_menu_init(void) char buff[64], *p; DIR *dir; - cpu_clock = get_cpu_clock(); + cpu_clock_st = cpu_clock = get_cpu_clock(); dir = opendir("/etc/pandora/conf/dss_fir"); if (dir == NULL) { @@ -508,6 +572,12 @@ static void pnd_menu_init(void) pnd_filter_list = mfilters; } +void menu_finish(void) +{ + cpu_clock = cpu_clock_st; + apply_cpu_clock(); +} + // -------------- key config -------------- me_bind_action me_ctrl_actions[] = @@ -634,13 +704,13 @@ static int menu_loop_cscaler(int id, int keys) scaling = SCALE_CUSTOM; omap_enable_layer(1); - //pnd_restore_layer_data(); for (;;) { menu_draw_begin(0); - memset(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2); - text_out16(2, 480 - 18, "%dx%d | d-pad to resize, R+d-pad to move", g_layer_w, g_layer_h); + memset(g_menuscreen_ptr, 4, g_menuscreen_w * g_menuscreen_h * 2); + text_out16(2, 2, "%d,%d", g_layer_x, g_layer_y); + text_out16(2, 480 - 18, "%dx%d | d-pad: resize, R+d-pad: move", g_layer_w, g_layer_h); menu_draw_end(); inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_R|PBTN_MOK|PBTN_MBACK, 40); @@ -895,9 +965,11 @@ const char *plat_get_credits(void) "(C) 2009-2010 PCSX-Reloaded Team\n\n" "GPU and SPU code by Pete Bernert\n" " and the P.E.Op.S. team\n" - "ARM recompiler (C) 2009-2010 Ari64\n\n" + "ARM recompiler (C) 2009-2010 Ari64\n" + "PCSX4ALL plugins by PCSX4ALL team\n" + " Chui, Franxis, Unai\n\n" "integration, optimization and\n" - " frontend (C) 2010 notaz\n"; + " frontend (C) 2010-2011 notaz\n"; } static int run_cd_image(const char *fname) @@ -914,6 +986,7 @@ static int run_cd_image(const char *fname) me_update_msg("failed to open plugins"); return -1; } + plugin_call_rearmed_cbs(); if (CheckCdrom() == -1) { // Only check the CD if we are starting the console with a CD @@ -1217,7 +1290,6 @@ void menu_prepare_emu(void) } if (GPU_open != NULL) { - extern unsigned long gpuDisp; int ret = GPU_open(&gpuDisp, "PCSX", NULL); if (ret) fprintf(stderr, "Warning: GPU_open returned %d\n", ret);