X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Fconfig.c;h=4f80c86c885f79af86aeb0a3bab0013fc0e66321;hb=388947f33d88ce3de0d9cb3e873244fbb5162a59;hp=9e7b1a7fef0cef6c05a37695ce43e22036d11916;hpb=bc0420cd98650a27f9137fcc79c5a803f635ac0e;p=libpicofe.git diff --git a/common/config.c b/common/config.c index 9e7b1a7..4f80c86 100644 --- a/common/config.c +++ b/common/config.c @@ -21,44 +21,8 @@ static char *mystrip(char *str); #include "emu.h" #include -extern menu_entry opt_entries[]; -extern menu_entry opt2_entries[]; -extern menu_entry cdopt_entries[]; -extern menu_entry ctrlopt_entries[]; -extern const int opt_entry_count; -extern const int opt2_entry_count; -extern const int cdopt_entry_count; -extern const int ctrlopt_entry_count; -#ifdef PSP -extern menu_entry opt3_entries[]; -extern const int opt3_entry_count; -#endif - -static menu_entry *cfg_opts[] = -{ - opt_entries, - opt2_entries, - cdopt_entries, - ctrlopt_entries, -#ifdef PSP - opt3_entries, -#endif -}; - -static const int *cfg_opt_counts[] = -{ - &opt_entry_count, - &opt2_entry_count, - &cdopt_entry_count, - &ctrlopt_entry_count, -#ifdef PSP - &opt3_entry_count, -#endif -}; - #define NL "\r\n" - static int seek_sect(FILE *f, const char *section) { char line[128], *tmp; @@ -82,79 +46,10 @@ static int seek_sect(FILE *f, const char *section) static void custom_write(FILE *f, const menu_entry *me, int no_def) { - char *str, str24[24]; + char str24[24]; switch (me->id) { - case MA_OPT_RENDERER: - if (no_def && !((defaultConfig.s_PicoOpt^PicoOpt)&POPT_ALT_RENDERER) && - !((defaultConfig.EmuOpt^currentConfig.EmuOpt)&0x80)) return; - if (PicoOpt&POPT_ALT_RENDERER) - str = -#ifndef PSP - "8bit " -#endif - "fast"; - else if (currentConfig.EmuOpt&0x80) - str = -#ifndef PSP - "16bit " -#endif - "accurate"; - else - str = "8bit accurate"; - fprintf(f, "Renderer = %s", str); - break; - - case MA_OPT_SCALING: - if (no_def && defaultConfig.scaling == currentConfig.scaling) return; -#ifdef __GP2X__ - switch (currentConfig.scaling) { - default: str = "OFF"; break; - case 1: str = "hw horizontal"; break; - case 2: str = "hw horiz. + vert."; break; - case 3: str = "sw horizontal"; break; - } - fprintf(f, "Scaling = %s", str); -#endif - break; - case MA_OPT_FRAMESKIP: - if (no_def && defaultConfig.Frameskip == currentConfig.Frameskip) return; - if (currentConfig.Frameskip < 0) - strcpy(str24, "Auto"); - else sprintf(str24, "%i", currentConfig.Frameskip); - fprintf(f, "Frameskip = %s", str24); - break; - case MA_OPT_SOUND_QUALITY: - if (no_def && !((defaultConfig.s_PicoOpt^PicoOpt)&POPT_EN_STEREO) && - defaultConfig.s_PsndRate == PsndRate) return; - str = (PicoOpt&POPT_EN_STEREO)?"stereo":"mono"; - fprintf(f, "Sound Quality = %i %s", PsndRate, str); - break; - case MA_OPT_REGION: - if (no_def && defaultConfig.s_PicoRegion == PicoRegionOverride && - defaultConfig.s_PicoAutoRgnOrder == PicoAutoRgnOrder) return; - strncpy(str24, me_region_name(PicoRegionOverride, PicoAutoRgnOrder), 23); str24[23] = 0; - fprintf(f, "Region = %s", mystrip(str24)); - break; - case MA_OPT_CONFIRM_STATES: - if (no_def && !((defaultConfig.EmuOpt^currentConfig.EmuOpt)&(5<<9))) return; - switch ((currentConfig.EmuOpt >> 9) & 5) { - default: str = "OFF"; break; - case 1: str = "writes"; break; - case 4: str = "loads"; break; - case 5: str = "both"; break; - } - fprintf(f, "Confirm savestate = %s", str); - break; - case MA_OPT_CPU_CLOCKS: - if (no_def && defaultConfig.CPUclock == currentConfig.CPUclock) return; -#ifdef __GP2X__ - fprintf(f, "GP2X CPU clocks = %i", currentConfig.CPUclock); -#elif defined(PSP) - fprintf(f, "PSP CPU clock = %i", currentConfig.CPUclock); -#endif - break; case MA_OPT2_GAMMA: if (no_def && defaultConfig.gamma == currentConfig.gamma) return; fprintf(f, "Gamma correction = %.3f", (double)currentConfig.gamma / 100.0); @@ -209,23 +104,13 @@ static void custom_write(FILE *f, const menu_entry *me, int no_def) } -#if PLAT_HAVE_JOY -static const char *joyKeyNames[32] = -{ - "UP", "DOWN", "LEFT", "RIGHT", "b1", "b2", "b3", "b4", - "b5", "b6", "b7", "b8", "b9", "b10", "b11", "b12", - "b13", "b14", "b15", "b16", "b17", "b19", "b19", "b20", - "b21", "b22", "b23", "b24", "b25", "b26", "b27", "b28" -}; -#endif - static void keys_write(FILE *fn, const char *bind_str, int dev_id, const int *binds, int no_defaults) { char act[48]; int key_count, t, i; const int *def_binds; - key_count = in_get_dev_bind_count(dev_id); + key_count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT); def_binds = in_get_dev_def_binds(dev_id); for (t = 0; t < key_count; t++) @@ -309,7 +194,7 @@ int config_writesect(const char *fname, const char *section) FILE *fo = NULL, *fn = NULL; // old and new int no_defaults = 0; // avoid saving defaults menu_entry *me; - int t, i, tlen, ret; + int t, tlen, ret; char line[128], *tmp; if (section != NULL) @@ -378,30 +263,34 @@ write: if (section != NULL) fprintf(fn, "[%s]" NL, section); - for (t = 0; t < sizeof(cfg_opts) / sizeof(cfg_opts[0]); t++) + me = me_list_get_first(); + while (me != NULL) { - me = cfg_opts[t]; - tlen = *(cfg_opt_counts[t]); - for (i = 0; i < tlen; i++, me++) - { - if (!me->need_to_save) continue; - if ((me->beh != MB_ONOFF && me->beh != MB_RANGE) || me->name == NULL) - custom_write(fn, me, no_defaults); - else if (me->beh == MB_ONOFF) { - if (!no_defaults || ((*(int *)me->var ^ default_var(me)) & me->mask)) - fprintf(fn, "%s = %i" NL, me->name, (*(int *)me->var & me->mask) ? 1 : 0); - } else if (me->beh == MB_RANGE) { - if (!no_defaults || (*(int *)me->var ^ default_var(me))) - fprintf(fn, "%s = %i" NL, me->name, *(int *)me->var); - } - } + int dummy; + if (!me->need_to_save) + goto next; + if (me->beh == MB_OPT_ONOFF) { + if (!no_defaults || ((*(int *)me->var ^ default_var(me)) & me->mask)) + fprintf(fn, "%s = %i" NL, me->name, (*(int *)me->var & me->mask) ? 1 : 0); + } else if (me->beh == MB_OPT_RANGE) { + if (!no_defaults || (*(int *)me->var ^ default_var(me))) + fprintf(fn, "%s = %i" NL, me->name, *(int *)me->var); + } else if (me->name != NULL && me->generate_name != NULL) { + strncpy(line, me->generate_name(0, &dummy), sizeof(line)); + line[sizeof(line) - 1] = 0; + mystrip(line); + fprintf(fn, "%s = %s" NL, me->name, line); + } else + custom_write(fn, me, no_defaults); +next: + me = me_list_get_next(); } /* input: save device names */ for (t = 0; t < IN_MAX_DEVS; t++) { const int *binds = in_get_dev_binds(t); - const char *name = in_get_dev_name(t); + const char *name = in_get_dev_name(t, 0, 0); if (binds == NULL || name == NULL) continue; @@ -412,7 +301,7 @@ write: for (t = 0; t < IN_MAX_DEVS; t++) { const int *binds = in_get_dev_binds(t); - const char *name = in_get_dev_name(t); + const char *name = in_get_dev_name(t, 0, 0); char strbind[16]; int count; @@ -422,21 +311,10 @@ write: sprintf(strbind, "bind%d", t); if (t == 0) strbind[4] = 0; - count = in_get_dev_bind_count(t); + count = in_get_dev_info(t, IN_INFO_BIND_COUNT); keys_write(fn, strbind, t, binds, no_defaults); } -#if 0 - /* old stuff */ - keys_write(fn, "bind", currentConfig.KeyBinds, defaultConfig.KeyBinds, keyNames, PLAT_MAX_KEYS, no_defaults); -#if PLAT_HAVE_JOY - keys_write(fn, "bind_joy0", currentConfig.JoyBinds[0], defaultConfig.JoyBinds[0], joyKeyNames, 32, 1); - keys_write(fn, "bind_joy1", currentConfig.JoyBinds[1], defaultConfig.JoyBinds[1], joyKeyNames, 32, 1); - keys_write(fn, "bind_joy2", currentConfig.JoyBinds[2], defaultConfig.JoyBinds[2], joyKeyNames, 32, 1); - keys_write(fn, "bind_joy3", currentConfig.JoyBinds[3], defaultConfig.JoyBinds[3], joyKeyNames, 32, 1); -#endif -#endif - #ifndef PSP if (section == NULL) fprintf(fn, "Sound Volume = %i" NL, currentConfig.volume); @@ -470,7 +348,7 @@ int config_writelrom(const char *fname) int size; FILE *f; - if (strlen(loadedRomFName) == 0) return -1; + if (strlen(rom_fname_loaded) == 0) return -1; f = fopen(fname, "r"); if (f != NULL) @@ -503,7 +381,7 @@ int config_writelrom(const char *fname) fwrite(old_data, 1, optr - old_data, f); free(old_data); } - fprintf(f, "LastUsedROM = %s" NL, loadedRomFName); + fprintf(f, "LastUsedROM = %s" NL, rom_fname_loaded); fclose(f); return 0; } @@ -534,9 +412,9 @@ int config_readlrom(const char *fname) tmp++; mystrip(tmp); - len = sizeof(loadedRomFName); - strncpy(loadedRomFName, tmp, len); - loadedRomFName[len-1] = 0; + len = sizeof(rom_fname_loaded); + strncpy(rom_fname_loaded, tmp, len); + rom_fname_loaded[len-1] = 0; ret = 0; break; } @@ -573,13 +451,13 @@ static int custom_read(menu_entry *me, const char *var, const char *val) #ifdef __GP2X__ if (strcasecmp(var, "Scaling") != 0) return 0; if (strcasecmp(val, "OFF") == 0) { - currentConfig.scaling = 0; + currentConfig.scaling = EOPT_SCALE_NONE; } else if (strcasecmp(val, "hw horizontal") == 0) { - currentConfig.scaling = 1; + currentConfig.scaling = EOPT_SCALE_HW_H; } else if (strcasecmp(val, "hw horiz. + vert.") == 0) { - currentConfig.scaling = 2; + currentConfig.scaling = EOPT_SCALE_HW_HV; } else if (strcasecmp(val, "sw horizontal") == 0) { - currentConfig.scaling = 3; + currentConfig.scaling = EOPT_SCALE_SW_H; } else return 0; return 1; @@ -660,6 +538,7 @@ static int custom_read(menu_entry *me, const char *var, const char *val) return 0; return 1; +#if 0 // TODO rm? case MA_OPT_CPU_CLOCKS: #ifdef __GP2X__ if (strcasecmp(var, "GP2X CPU clocks") != 0) return 0; @@ -668,6 +547,7 @@ static int custom_read(menu_entry *me, const char *var, const char *val) #endif currentConfig.CPUclock = atoi(val); return 1; +#endif case MA_OPT2_GAMMA: if (strcasecmp(var, "Gamma correction") != 0) return 0; @@ -771,42 +651,6 @@ static void keys_parse(const char *key, const char *val, int dev_id) } in_config_bind_key(dev_id, key, binds); -/* - for (t = 0; t < 32; t++) - { - if (names[t] && strcmp(names[t], var) == 0) break; - } - if (t == 32) - { - int len = strlen(var); - if (len == 1) t = var[0]; - else if (len >= 4 && var[0] == '\\' && var[1] == 'x') { - char *p; - t = (int)strtoul(var + 2, &p, 16); - if (*p != 0) t = max_keys; // parse failed - } - else - t = max_keys; // invalid - } - if (t < 0 || t >= max_keys) { - lprintf("unhandled bind \"%s\"\n", var); - return; - } - - // unbind old, but only when key is first encountered - if (t < 32 && binds == currentConfig.KeyBinds && !(keys_encountered & (1<= 0 && num < IN_MAX_DEVS) input_dev_map[num] = in_config_parse_dev(val); else - printf("failed to parse: %s\n", var); + lprintf("config: failed to parse: %s\n", var); return; } @@ -855,13 +699,13 @@ static void parse(const char *var, const char *val) const char *p = var + 4; int num = get_numvar_num(p); if (num < 0 || num >= IN_MAX_DEVS) { - printf("failed to parse: %s\n", var); + lprintf("config: failed to parse: %s\n", var); return; } num = input_dev_map[num]; if (num < 0 || num >= IN_MAX_DEVS) { - printf("invalid device id: %s\n", var); + lprintf("config: invalid device id: %s\n", var); return; } @@ -871,37 +715,30 @@ static void parse(const char *var, const char *val) return; } -#if 0//PLAT_HAVE_JOY - try_joy_parse(0) - try_joy_parse(1) - try_joy_parse(2) - try_joy_parse(3) -#endif - - for (t = 0; t < sizeof(cfg_opts) / sizeof(cfg_opts[0]) && ret == 0; t++) + me = me_list_get_first(); + while (me != NULL && ret == 0) { - me = cfg_opts[t]; - tlen = *(cfg_opt_counts[t]); - for (i = 0; i < tlen && ret == 0; i++, me++) - { - if (!me->need_to_save) continue; - if (me->name != NULL) { - if (strcasecmp(var, me->name) != 0) continue; // surely not this one - if (me->beh == MB_ONOFF) { - tmp = atoi(val); - if (tmp) *(int *)me->var |= me->mask; - else *(int *)me->var &= ~me->mask; - return; - } else if (me->beh == MB_RANGE) { - tmp = atoi(val); - if (tmp < me->min) tmp = me->min; - if (tmp > me->max) tmp = me->max; - *(int *)me->var = tmp; - return; - } + if (!me->need_to_save) + goto next; + if (me->name != NULL && me->name[0] != 0) { + if (strcasecmp(var, me->name) != 0) + goto next; /* surely not this one */ + if (me->beh == MB_OPT_ONOFF) { + tmp = atoi(val); + if (tmp) *(int *)me->var |= me->mask; + else *(int *)me->var &= ~me->mask; + return; + } else if (me->beh == MB_OPT_RANGE) { + tmp = atoi(val); + if (tmp < me->min) tmp = me->min; + if (tmp > me->max) tmp = me->max; + *(int *)me->var = tmp; + return; } - ret = custom_read(me, var, val); } + ret = custom_read(me, var, val); +next: + me = me_list_get_next(); } if (!ret) lprintf("config_readsect: unhandled var: \"%s\"\n", var); }