X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=platform%2Fcommon%2Fconfig_file.c;h=1b5c51725e5fb30e4821531914c8dd16e3684547;hb=HEAD;hp=f058fbd8dd052ca60c6b5dc67bf5b31c4d749a26;hpb=ed4402a7dfd12dbbf34c547b438a671ae8114197;p=picodrive.git diff --git a/platform/common/config_file.c b/platform/common/config_file.c index f058fbd8..25286516 100644 --- a/platform/common/config_file.c +++ b/platform/common/config_file.c @@ -24,7 +24,7 @@ static char *mystrip(char *str); #include "menu_pico.h" #include "emu.h" -#include +#include // always output DOS endlines #ifdef _WIN32 @@ -35,7 +35,7 @@ static char *mystrip(char *str); static int seek_sect(FILE *f, const char *section) { - char line[128], *tmp; + char line[640], *tmp; int len; len = strlen(section); @@ -53,7 +53,7 @@ static int seek_sect(FILE *f, const char *section) return 0; } -static void keys_write(FILE *fn, int dev_id, const int *binds) +static void keys_write(FILE *fn, int dev_id, const int *binds, const int *kbd_binds) { char act[48]; int key_count = 0, k, i; @@ -67,6 +67,8 @@ static void keys_write(FILE *fn, int dev_id, const int *binds) act[0] = act[31] = 0; name = in_get_key_name(dev_id, k); + if (strcmp(name, "#") == 0) name = "\\x23"; // replace comment sign + if (strcmp(name, "=") == 0) name = "\\x3d"; // replace assignment sign for (i = 0; me_ctrl_actions[i].name != NULL; i++) { mask = me_ctrl_actions[i].mask; @@ -81,6 +83,19 @@ static void keys_write(FILE *fn, int dev_id, const int *binds) } } + for (i = 0; me_ctrl_actions[i].name != NULL; i++) { + mask = me_ctrl_actions[i].mask; + if (mask & binds[IN_BIND_OFFS(k, IN_BINDTYPE_PLAYER34)]) { + strncpy(act, me_ctrl_actions[i].name, 31); + fprintf(fn, "bind %s = player3 %s" NL, name, mystrip(act)); + } + mask = me_ctrl_actions[i].mask << 16; + if (mask & binds[IN_BIND_OFFS(k, IN_BINDTYPE_PLAYER34)]) { + strncpy(act, me_ctrl_actions[i].name, 31); + fprintf(fn, "bind %s = player4 %s" NL, name, mystrip(act)); + } + } + for (i = 0; emuctrl_actions[i].name != NULL; i++) { mask = emuctrl_actions[i].mask; if (mask & binds[IN_BIND_OFFS(k, IN_BINDTYPE_EMU)]) { @@ -89,6 +104,14 @@ static void keys_write(FILE *fn, int dev_id, const int *binds) } } } + + for (k = 0; k < key_count; k++) { + const char *name = in_get_key_name(dev_id, k); + if (strcmp(name, "#") == 0) name = "\\x23"; // replace comment sign + if (strcmp(name, "=") == 0) name = "\\x3d"; // replace assignment sign + if (kbd_binds[k]) + fprintf(fn, "bind %s = key%02x" NL, name, kbd_binds[k]); + } } int config_write(const char *fname) @@ -96,7 +119,7 @@ int config_write(const char *fname) FILE *fn = NULL; menu_entry *me; int t; - char line[128]; + char line[640]; fn = fopen(fname, "w"); if (fn == NULL) @@ -105,7 +128,7 @@ int config_write(const char *fname) for (me = me_list_get_first(); me != NULL; me = me_list_get_next()) { int dummy; - if (!me->need_to_save || !me->enabled) + if (!me->need_to_save) continue; if (me->name == NULL || me->name[0] == 0) continue; @@ -116,21 +139,26 @@ int config_write(const char *fname) else if (me->beh == MB_OPT_RANGE || me->beh == MB_OPT_CUSTRANGE) { fprintf(fn, "%s = %i" NL, me->name, *(int *)me->var); } - else if (me->beh == MB_OPT_ENUM && me->data != NULL) { + else if (me->beh == MB_OPT_ENUM) { const char **names = (const char **)me->data; + if (names == NULL) + continue; for (t = 0; names[t] != NULL; t++) { if (*(int *)me->var == t) { - strncpy(line, names[t], sizeof(line)); + strncpy(line, names[t], sizeof(line)-1); + line[sizeof(line)-1] = '\0'; goto write_line; } } } else if (me->generate_name != NULL) { - strncpy(line, me->generate_name(0, &dummy), sizeof(line)); + strncpy(line, me->generate_name(me->id, &dummy), sizeof(line)-1); + line[sizeof(line)-1] = '\0'; goto write_line; } else - lprintf("config: unhandled write: %i\n", me->id); + lprintf("config: unhandled write: '%s' id %d behavior %d\n", + me->name, me->id, me->beh); continue; write_line: @@ -152,7 +180,7 @@ write_line: fprintf(fn, "binddev = %s" NL, name); in_get_config(t, IN_CFG_BIND_COUNT, &count); - keys_write(fn, t, binds); + keys_write(fn, t, binds, in_get_dev_kbd_binds(t)); } fprintf(fn, "Sound Volume = %i" NL, currentConfig.volume); @@ -165,7 +193,7 @@ write_line: int config_writelrom(const char *fname) { - char line[128], *tmp, *optr = NULL; + char line[640], *tmp, *optr = NULL; char *old_data = NULL; int size; FILE *f; @@ -212,7 +240,7 @@ int config_writelrom(const char *fname) int config_readlrom(const char *fname) { - char line[128], *tmp; + char line[640], *tmp; int i, len, ret = -1; FILE *f; @@ -234,9 +262,9 @@ int config_readlrom(const char *fname) tmp++; mystrip(tmp); - len = sizeof(rom_fname_loaded); + len = sizeof(rom_fname_loaded)-1; strncpy(rom_fname_loaded, tmp, len); - rom_fname_loaded[len-1] = 0; + rom_fname_loaded[len] = 0; ret = 0; break; } @@ -259,65 +287,65 @@ static int custom_read(menu_entry *me, const char *var, const char *val) case MA_OPT_SOUND_QUALITY: if (strcasecmp(var, "Sound Quality") != 0) return 0; - PsndRate = strtoul(val, &tmp, 10); - if (PsndRate < 8000 || PsndRate > 44100) - PsndRate = 22050; + PicoIn.sndRate = strtoul(val, &tmp, 10); + if (PicoIn.sndRate < 8000 || PicoIn.sndRate > 54000) { + if (strncasecmp(tmp, "native", 6) == 0) { + tmp += 6; + PicoIn.sndRate = 53000; + } else + PicoIn.sndRate = 22050; + } if (*tmp == 'H' || *tmp == 'h') tmp++; if (*tmp == 'Z' || *tmp == 'z') tmp++; while (*tmp == ' ') tmp++; if (strcasecmp(tmp, "stereo") == 0) { - PicoOpt |= POPT_EN_STEREO; + PicoIn.opt |= POPT_EN_STEREO; } else if (strcasecmp(tmp, "mono") == 0) { - PicoOpt &= ~POPT_EN_STEREO; + PicoIn.opt &= ~POPT_EN_STEREO; } else return 0; return 1; + case MA_OPT_SOUND_ALPHA: + if (strcasecmp(var, "Filter strength") != 0) return 0; + PicoIn.sndFilterAlpha = 0x10000 * atof(val); + return 1; + case MA_OPT_REGION: if (strcasecmp(var, "Region") != 0) return 0; if (strncasecmp(val, "Auto: ", 6) == 0) { const char *p = val + 5, *end = val + strlen(val); int i; - PicoRegionOverride = PicoAutoRgnOrder = 0; + PicoIn.regionOverride = PicoIn.autoRgnOrder = 0; for (i = 0; p < end && i < 3; i++) { while (*p == ' ') p++; if (p[0] == 'J' && p[1] == 'P') { - PicoAutoRgnOrder |= 1 << (i*4); + PicoIn.autoRgnOrder |= 1 << (i*4); } else if (p[0] == 'U' && p[1] == 'S') { - PicoAutoRgnOrder |= 4 << (i*4); + PicoIn.autoRgnOrder |= 4 << (i*4); } else if (p[0] == 'E' && p[1] == 'U') { - PicoAutoRgnOrder |= 8 << (i*4); + PicoIn.autoRgnOrder |= 8 << (i*4); } while (*p != ' ' && *p != 0) p++; if (*p == 0) break; } } else if (strcasecmp(val, "Auto") == 0) { - PicoRegionOverride = 0; + PicoIn.regionOverride = 0; } else if (strcasecmp(val, "Japan NTSC") == 0) { - PicoRegionOverride = 1; + PicoIn.regionOverride = 1; } else if (strcasecmp(val, "Japan PAL") == 0) { - PicoRegionOverride = 2; + PicoIn.regionOverride = 2; } else if (strcasecmp(val, "USA") == 0) { - PicoRegionOverride = 4; + PicoIn.regionOverride = 4; } else if (strcasecmp(val, "Europe") == 0) { - PicoRegionOverride = 8; + PicoIn.regionOverride = 8; } else return 0; return 1; - case MA_OPT2_GAMMA: - if (strcasecmp(var, "Gamma correction") != 0) return 0; - currentConfig.gamma = (int) (atof(val) * 100.0); - return 1; - - case MA_CDOPT_READAHEAD: - if (strcasecmp(var, "ReadAhead buffer") != 0) return 0; - PicoCDBuffers = atoi(val) / 2; - return 1; - case MA_32XOPT_MSH2_CYCLES: currentConfig.msh2_khz = atoi(val); Pico32xSetClocks(currentConfig.msh2_khz * 1000, 0); @@ -328,29 +356,33 @@ static int custom_read(menu_entry *me, const char *var, const char *val) Pico32xSetClocks(0, currentConfig.ssh2_khz * 1000); return 1; - /* PSP */ - case MA_OPT3_SCALE: - if (strcasecmp(var, "Scale factor") != 0) return 0; - currentConfig.scale = atof(val); + case MA_OPT2_GAMMA: + currentConfig.gamma = atoi(val); return 1; - case MA_OPT3_HSCALE32: - if (strcasecmp(var, "Hor. scale (for low res. games)") != 0) return 0; - currentConfig.hscale32 = atof(val); + + case MA_OPT2_MAX_FRAMESKIP: + currentConfig.max_skip = atoi(val); return 1; - case MA_OPT3_HSCALE40: - if (strcasecmp(var, "Hor. scale (for hi res. games)") != 0) return 0; - currentConfig.hscale40 = atof(val); + + case MA_CTRL_KEYBOARD: + currentConfig.keyboard = 0; + if (strcasecmp(val, "physical") == 0) + currentConfig.keyboard = 2; + else if (strcasecmp(val, "virtual") == 0) + currentConfig.keyboard = 1; return 1; + + /* PSP */ case MA_OPT3_VSYNC: // XXX: use enum if (strcasecmp(var, "Wait for vsync") != 0) return 0; if (strcasecmp(val, "never") == 0) { - currentConfig.EmuOpt &= ~0x12000; + currentConfig.EmuOpt &= ~(EOPT_VSYNC|EOPT_VSYNC_MODE); } else if (strcasecmp(val, "sometimes") == 0) { - currentConfig.EmuOpt |= 0x12000; + currentConfig.EmuOpt |= (EOPT_VSYNC|EOPT_VSYNC_MODE); } else if (strcasecmp(val, "always") == 0) { - currentConfig.EmuOpt &= ~0x12000; - currentConfig.EmuOpt |= 0x02000; + currentConfig.EmuOpt &= ~EOPT_VSYNC_MODE; + currentConfig.EmuOpt |= EOPT_VSYNC; } else return 0; return 1; @@ -369,17 +401,23 @@ static int parse_bind_val(const char *val, int *type) if (val[0] == 0) return 0; + if (strncasecmp(val, "key", 3) == 0) + { + *type = IN_BINDTYPE_KEYBOARD; + return strtol(val + 3, NULL, 16); + } + if (strncasecmp(val, "player", 6) == 0) { int player, shift = 0; player = atoi(val + 6) - 1; - if (player > 1) + if (player > 3) return -1; - if (player == 1) + if (player & 1) shift = 16; - *type = IN_BINDTYPE_PLAYER12; + *type = IN_BINDTYPE_PLAYER12 + (player >> 1); for (i = 0; me_ctrl_actions[i].name != NULL; i++) { if (strncasecmp(me_ctrl_actions[i].name, val + 8, strlen(val + 8)) == 0) return me_ctrl_actions[i].mask << shift; @@ -397,7 +435,7 @@ static int parse_bind_val(const char *val, int *type) static void keys_parse_all(FILE *f) { - char line[256], *var, *val; + char line[640], *var, *val; int dev_id = -1; int acts, type; int ret; @@ -423,12 +461,16 @@ static void keys_parse_all(FILE *f) acts = parse_bind_val(val, &type); if (acts == -1) { lprintf("config: unhandled action \"%s\"\n", val); - return; + continue; } mystrip(var + 5); - in_config_bind_key(dev_id, var + 5, acts, type); + if (type == IN_BINDTYPE_KEYBOARD) + in_config_bind_kbd_key(dev_id, var + 5, acts); + else + in_config_bind_key(dev_id, var + 5, acts, type); } + in_clean_binds(); } static void parse(const char *var, const char *val, int *keys_encountered) @@ -505,7 +547,7 @@ bad_val: int config_readsect(const char *fname, const char *section) { - char line[128], *var, *val; + char line[640], *var, *val; int keys_encountered = 0; FILE *f; int ret;