X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=bb2a893544d8787662f5439b6ce4da8816495101;hp=75c51e835afd263e2945524b2132ed219e891e98;hb=cd6e8d0f6f7596fc25c30b352d4785e74af3edf6;hpb=bd6267e616cc4966fadf971019fe15db2469e97d

diff --git a/frontend/menu.c b/frontend/menu.c
index 75c51e83..bb2a8935 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -59,7 +59,6 @@ extern int ready_to_go;
 static int game_config_loaded;
 static int last_psx_w, last_psx_h, last_psx_bpp;
 static int scaling, filter, state_slot, cpu_clock;
-static int state_slot;
 static char rom_fname_reload[MAXPATHLEN];
 static char last_selected_fname[MAXPATHLEN];
 int g_opts;
@@ -144,14 +143,214 @@ static void menu_set_defconfig(void)
 	iUseTimer = 2;
 }
 
+#define CE_CONFIG_STR(val) \
+	{ #val, 0, Config.val }
+
+#define CE_CONFIG_VAL(val) \
+	{ #val, sizeof(Config.val), &Config.val }
+
+#define CE_STR(val) \
+	{ #val, 0, val }
+
+#define CE_INTVAL(val) \
+	{ #val, sizeof(val), &val }
+
+static const struct {
+	const char *name;
+	size_t len;
+	void *val;
+} config_data[] = {
+	CE_CONFIG_STR(Bios),
+	CE_CONFIG_STR(Gpu),
+	CE_CONFIG_STR(Spu),
+	CE_CONFIG_STR(Cdr),
+	CE_CONFIG_VAL(Xa),
+	CE_CONFIG_VAL(Sio),
+	CE_CONFIG_VAL(Mdec),
+	CE_CONFIG_VAL(PsxAuto),
+	CE_CONFIG_VAL(Cdda),
+	CE_CONFIG_VAL(Debug),
+	CE_CONFIG_VAL(PsxOut),
+	CE_CONFIG_VAL(SpuIrq),
+	CE_CONFIG_VAL(RCntFix),
+	CE_CONFIG_VAL(VSyncWA),
+	CE_CONFIG_VAL(Cpu),
+	CE_CONFIG_VAL(PsxType),
+	CE_INTVAL(scaling),
+	CE_INTVAL(g_layer_x),
+	CE_INTVAL(g_layer_y),
+	CE_INTVAL(g_layer_w),
+	CE_INTVAL(g_layer_h),
+	CE_INTVAL(filter),
+	CE_INTVAL(state_slot),
+	CE_INTVAL(cpu_clock),
+	CE_INTVAL(g_opts),
+	CE_INTVAL(iUseDither),
+	CE_INTVAL(UseFrameSkip),
+	CE_INTVAL(dwActFixes),
+	CE_INTVAL(iUseReverb),
+	CE_INTVAL(iUseInterpolation),
+	CE_INTVAL(iXAPitch),
+	CE_INTVAL(iSPUIRQWait),
+	CE_INTVAL(iUseTimer),
+};
+
+static void make_cfg_fname(char *buf, size_t size, int is_game)
+{
+	char trimlabel[33];
+	int j;
+
+	strncpy(trimlabel, CdromLabel, 32);
+	trimlabel[32] = 0;
+	for (j = 31; j >= 0; j--)
+		if (trimlabel[j] == ' ')
+			trimlabel[j] = 0;
+
+	if (is_game)
+		snprintf(cfgfile, sizeof(cfgfile), "." PCSX_DOT_DIR "cfg/%.32s-%.9s.cfg", trimlabel, CdromId);
+	else
+		snprintf(cfgfile, sizeof(cfgfile), "." PCSX_DOT_DIR "%s", cfgfile_basename);
+}
+
 static int menu_write_config(int is_game)
 {
-	return -1;
+	char cfgfile[MAXPATHLEN];
+	FILE *f;
+	int i;
+
+	make_cfg_fname(cfgfile, sizeof(cfgfile), is_game);
+	f = fopen(cfgfile, "w");
+	if (f == NULL) {
+		printf("failed to open: %s\n", cfgfile);
+		return -1;
+	}
+
+	for (i = 0; i < ARRAY_SIZE(config_data); i++) {
+		fprintf(f, "%s = ", config_data[i].name);
+		switch (config_data[i].len) {
+		case 0:
+			fprintf(f, "%s\n", (char *)config_data[i].val);
+			break;
+		case 1:
+			fprintf(f, "%x\n", *(u8 *)config_data[i].val);
+			break;
+		case 2:
+			fprintf(f, "%x\n", *(u16 *)config_data[i].val);
+			break;
+		case 4:
+			fprintf(f, "%x\n", *(u32 *)config_data[i].val);
+			break;
+		default:
+			printf("menu_write_config: unhandled len %d for %s\n",
+				 config_data[i].len, config_data[i].name);
+			break;
+		}
+	}
+
+	if (!is_game)
+		fprintf(f, "lastcdimg = %s\n", last_selected_fname);
+
+	fclose(f);
+	return 0;
+}
+
+static void parse_str_val(char *cval, const char *src)
+{
+	char *tmp;
+	strncpy(cval, src, MAXPATHLEN);
+	cval[MAXPATHLEN - 1] = 0;
+	tmp = strchr(cval, '\n');
+	if (tmp == NULL)
+		tmp = strchr(cval, '\r');
+	if (tmp != NULL)
+		*tmp = 0;
 }
 
 static int menu_load_config(int is_game)
 {
-	return 0;
+	char cfgfile[MAXPATHLEN];
+	int i, ret = -1;
+	long size;
+	char *cfg;
+	FILE *f;
+
+	make_cfg_fname(cfgfile, sizeof(cfgfile), is_game);
+	f = fopen(cfgfile, "r");
+	if (f == NULL) {
+		printf("failed to open: %s\n", cfgfile);
+		return -1;
+	}
+
+	fseek(f, 0, SEEK_END);
+	size = ftell(f);
+	if (size <= 0) {
+		printf("bad size %ld: %s\n", size, cfgfile);
+		goto fail;
+	}
+
+	cfg = malloc(size + 1);
+	if (cfg == NULL)
+		goto fail;
+
+	fseek(f, 0, SEEK_SET);
+	if (fread(cfg, 1, size, f) != size) {
+		printf("failed to read: %s\n", cfgfile);
+		goto fail_read;
+	}
+	cfg[size] = 0;
+
+	for (i = 0; i < ARRAY_SIZE(config_data); i++) {
+		char *tmp, *tmp2;
+		u32 val;
+
+		tmp = strstr(cfg, config_data[i].name);
+		if (tmp == NULL)
+			continue;
+		tmp += strlen(config_data[i].name);
+		if (strncmp(tmp, " = ", 3) != 0)
+			continue;
+		tmp += 3;
+
+		if (config_data[i].len == 0) {
+			parse_str_val(config_data[i].val, tmp);
+			continue;
+		}
+
+		tmp2 = NULL;
+		val = strtoul(tmp, &tmp2, 16);
+		if (tmp2 == NULL || tmp == tmp2)
+			continue; // parse failed
+
+		switch (config_data[i].len) {
+		case 1:
+			*(u8 *)config_data[i].val = val;
+			break;
+		case 2:
+			*(u16 *)config_data[i].val = val;
+			break;
+		case 4:
+			*(u32 *)config_data[i].val = val;
+			break;
+		default:
+			printf("menu_load_config: unhandled len %d for %s\n",
+				 config_data[i].len, config_data[i].name);
+			break;
+		}
+	}
+
+	if (!is_game) {
+		char *tmp = strstr(cfg, "lastcdimg = ");
+		if (tmp != NULL) {
+			tmp += 12;
+			parse_str_val(last_selected_fname, tmp);
+		}
+	}
+
+fail_read:
+	free(cfg);
+fail:
+	fclose(f);
+	return ret;
 }
 
 // rrrr rggg gggb bbbb
@@ -208,10 +407,11 @@ static void apply_cpu_clock(void)
 
 static void apply_filter(int which)
 {
+	static int old = -1;
 	char buf[128];
 	int i;
 
-	if (pnd_filter_list == NULL)
+	if (pnd_filter_list == NULL || which == old)
 		return;
 
 	for (i = 0; i < which; i++)
@@ -223,6 +423,7 @@ static void apply_filter(int which)
 
 	snprintf(buf, sizeof(buf), "%s/op_videofir.sh %s", pnd_script_base, pnd_filter_list[i]);
 	system(buf);
+	old = which;
 }
 
 static menu_entry e_menu_gfx_options[];
@@ -297,7 +498,7 @@ me_bind_action me_ctrl_actions[] =
 	{ "LEFT    ", 1 << DKEY_LEFT },
 	{ "RIGHT   ", 1 << DKEY_RIGHT },
 	{ "TRIANGLE", 1 << DKEY_TRIANGLE },
-	{ "CIRCLE  ", 1 << DKEY_SQUARE },
+	{ "CIRCLE  ", 1 << DKEY_CIRCLE },
 	{ "CROSS   ", 1 << DKEY_CROSS },
 	{ "SQUARE  ", 1 << DKEY_SQUARE },
 	{ "L1      ", 1 << DKEY_L1 },
@@ -362,19 +563,12 @@ static const char *mgn_saveloadcfg(int id, int *offs)
 	return "";
 }
 
-static int mh_saveloadcfg(int id, int keys)
+static int mh_savecfg(int id, int keys)
 {
-	switch (id) {
-	case MA_OPT_SAVECFG:
-	case MA_OPT_SAVECFG_GAME:
-		if (menu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0) == 0)
-			me_update_msg("config saved");
-		else
-			me_update_msg("failed to write config");
-		break;
-	default:
-		return 0;
-	}
+	if (menu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0) == 0)
+		me_update_msg("config saved");
+	else
+		me_update_msg("failed to write config");
 
 	return 1;
 }
@@ -384,8 +578,8 @@ static menu_entry e_menu_keyconfig[] =
 	mee_handler_id("Player 1",          MA_CTRL_PLAYER1,    key_config_loop_wrap),
 	mee_handler_id("Player 2",          MA_CTRL_PLAYER2,    key_config_loop_wrap),
 	mee_handler_id("Emulator controls", MA_CTRL_EMU,        key_config_loop_wrap),
-	mee_cust_nosave("Save global config",       MA_OPT_SAVECFG, mh_saveloadcfg, mgn_saveloadcfg),
-	mee_cust_nosave("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_saveloadcfg, mgn_saveloadcfg),
+//	mee_cust_nosave("Save global config",       MA_OPT_SAVECFG, mh_savecfg, mgn_saveloadcfg),
+//	mee_cust_nosave("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_savecfg, mgn_saveloadcfg),
 	mee_label     (""),
 	mee_label     ("Input devices:"),
 	mee_label_mk  (MA_CTRL_DEV_FIRST, mgn_dev_name),
@@ -402,7 +596,7 @@ static int menu_loop_keyconfig(int id, int keys)
 {
 	static int sel = 0;
 
-	me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, ready_to_go);
+//	me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, ready_to_go);
 	me_loop(e_menu_keyconfig, &sel, NULL);
 	return 0;
 }
@@ -615,8 +809,8 @@ static menu_entry e_menu_options[] =
 	mee_handler   ("[Display]",                menu_loop_gfx_options),
 	mee_handler   ("[BIOS/Plugins]",           menu_loop_plugin_options),
 	mee_handler   ("[Advanced]",               menu_loop_adv_options),
-//	mee_cust_nosave("Save global config",      MA_OPT_SAVECFG,      mh_saveloadcfg, mgn_saveloadcfg),
-//	mee_cust_nosave("Save cfg for loaded game",MA_OPT_SAVECFG_GAME, mh_saveloadcfg, mgn_saveloadcfg),
+	mee_cust_nosave("Save global config",      MA_OPT_SAVECFG,      mh_savecfg, mgn_saveloadcfg),
+	mee_cust_nosave("Save cfg for loaded game",MA_OPT_SAVECFG_GAME, mh_savecfg, mgn_saveloadcfg),
 	mee_handler_h ("Restore default config",   mh_restore_defaults, h_restore_def),
 	mee_end,
 };
@@ -797,7 +991,7 @@ void menu_loop(void)
 	me_enable(e_menu_main, MA_MAIN_LOAD_STATE,  ready_to_go);
 	me_enable(e_menu_main, MA_MAIN_RESET_GAME,  ready_to_go);
 
-	menu_enter(ready_to_go);
+//	menu_enter(ready_to_go);
 	in_set_config_int(0, IN_CFG_BLOCKING, 1);
 
 	do {
@@ -817,16 +1011,24 @@ void menu_loop(void)
 
 void menu_init(void)
 {
+	char buff[MAXPATHLEN];
+
+	strcpy(last_selected_fname, "/media");
+
+	pnd_menu_init();
+	menu_init_common();
+
 	menu_set_defconfig();
 	menu_load_config(0);
-	menu_init_common();
-	pnd_menu_init();
 	last_psx_w = 320;
 	last_psx_h = 240;
 	last_psx_bpp = 16;
 
-	strcpy(last_selected_fname, "/media");
-	//strcpy(last_selected_fname, "/mnt/ntz/stuff/psx");
+	g_menubg_src_ptr = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1);
+	if (g_menubg_src_ptr == NULL)
+		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);
 }
 
 void menu_notify_mode_change(int w, int h, int bpp)
@@ -838,24 +1040,28 @@ void menu_notify_mode_change(int w, int h, int bpp)
 	if (scaling == SCALE_1_1) {
 		g_layer_x = 800/2 - w/2;  g_layer_y = 480/2 - h/2;
 		g_layer_w = w; g_layer_h = h;
-		omap_enable_layer(1);
 	}
 }
 
 static void menu_leave_emu(void)
 {
-	omap_enable_layer(0);
+	if (GPU_close != NULL) {
+		int ret = GPU_close();
+		if (ret)
+			fprintf(stderr, "Warning: GPU_close returned %d\n", ret);
+	}
 
+	memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2);
 	if (ready_to_go && last_psx_bpp == 16) {
 		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_src_ptr + g_menuscreen_w * y + x;
+		u16 *d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x;
 		u16 *s = pl_fbdev_buf;
 
 		for (; h > 0; h--, d += g_menuscreen_w, s += last_psx_w)
-			memcpy(d, s, w * 2);
+			menu_darken_bg(d, s, w, 0);
 	}
 }
 
@@ -882,7 +1088,6 @@ void menu_prepare_emu(void)
 	case SCALE_CUSTOM:
 		break;
 	}
-	omap_enable_layer(1);
 	apply_filter(filter);
 	apply_cpu_clock();
 	stop = 0;
@@ -891,6 +1096,13 @@ void menu_prepare_emu(void)
 	// so handle them manually here
 	if (Config.Cdda)
 		CDR_stop();
+
+	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);
+	}
 }
 
 void me_update_msg(const char *msg)