extend mmap wrapper functionality
[libpicofe.git] / common / config.c
index 2f987e8..9950b13 100644 (file)
@@ -1,28 +1,34 @@
 /*
  * Human-readable config file management for PicoDrive
- * (c)
+ * (c) notaz, 2008
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#ifdef __EPOC32__
+#include <unistd.h>
+#endif
 #include "config.h"
-#include "menu.h"
-#include "emu.h"
+#include "plat.h"
+#include "input.h"
 #include "lprintf.h"
-#include <Pico/Pico.h>
 
-extern menu_entry opt_entries[];
-extern menu_entry opt2_entries[];
-extern menu_entry cdopt_entries[];
-extern const int opt_entry_count;
-extern const int opt2_entry_count;
-extern const int cdopt_entry_count;
+static char *mystrip(char *str);
 
-static menu_entry *cfg_opts[] = { opt_entries, opt2_entries, cdopt_entries };
-static const int *cfg_opt_counts[] = { &opt_entry_count, &opt2_entry_count, &cdopt_entry_count };
+#ifndef _MSC_VER
 
-#define NL "\n"
+#include "menu.h"
+#include "menu_pico.h"
+#include "emu.h"
+#include <pico/pico.h>
 
+// always output DOS endlines
+#ifdef _WIN32
+#define NL "\n"
+#else
+#define NL "\r\n"
+#endif
 
 static int seek_sect(FILE *f, const char *section)
 {
@@ -45,128 +51,151 @@ static int seek_sect(FILE *f, const char *section)
 }
 
 
-static void custom_write(FILE *f, const menu_entry *me, int no_def)
+static void keys_write(FILE *fn, const char *bind_str, int dev_id, const int *binds, int no_defaults)
 {
-       char *str, str24[24];
+       char act[48];
+       int key_count = 0, k, i;
+       const int *def_binds;
 
-       switch (me->id)
+       in_get_config(dev_id, IN_CFG_BIND_COUNT, &key_count);
+       def_binds = in_get_dev_def_binds(dev_id);
+
+       for (k = 0; k < key_count; k++)
        {
-               case MA_OPT_RENDERER:
-                       if (no_def && !((defaultConfig.s_PicoOpt^PicoOpt)&0x10) &&
-                               !((defaultConfig.EmuOpt^currentConfig.EmuOpt)&0x80)) return;
-                       if (PicoOpt&0x10)
-                               str = "8bit fast";
-                       else if (currentConfig.EmuOpt&0x80)
-                               str = "16bit accurate";
-                       else
-                               str = "8bit accurate";
-                       fprintf(f, "Renderer = %s", str);
-                       break;
-
-               case MA_OPT_SCALING:
-                       if (no_def && defaultConfig.scaling == currentConfig.scaling) return;
-                       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;
+               const char *name;
+               int t, mask;
+               act[0] = act[31] = 0;
+
+               for (t = 0; t < IN_BINDTYPE_COUNT; t++)
+                       if (binds[IN_BIND_OFFS(k, t)] != def_binds[IN_BIND_OFFS(k, t)])
+                               break;
+
+               if (no_defaults && t == IN_BINDTYPE_COUNT)
+                       continue;       /* no change from defaults */
+
+               name = in_get_key_name(dev_id, k);
+
+               for (t = 0; t < IN_BINDTYPE_COUNT; t++)
+                       if (binds[IN_BIND_OFFS(k, t)] != 0 || def_binds[IN_BIND_OFFS(k, t)] == 0)
+                               break;
+
+               if (t == IN_BINDTYPE_COUNT) {
+                       /* key has default bind removed */
+                       fprintf(fn, "%s %s =" NL, bind_str, name);
+                       continue;
+               }
+
+               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_PLAYER12)]) {
+                               strncpy(act, me_ctrl_actions[i].name, 31);
+                               fprintf(fn, "%s %s = player1 %s" NL, bind_str, name, mystrip(act));
                        }
-                       fprintf(f, "Scaling = %s", str);
-                       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)&8) &&
-                               defaultConfig.s_PsndRate == PsndRate) return;
-                       str = (PicoOpt&0x08)?"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;
-                       fprintf(f, "Region = %s", me_region_name(PicoRegionOverride, PicoAutoRgnOrder));
-                       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;
+                       mask = me_ctrl_actions[i].mask << 16;
+                       if (mask & binds[IN_BIND_OFFS(k, IN_BINDTYPE_PLAYER12)]) {
+                               strncpy(act, me_ctrl_actions[i].name, 31);
+                               fprintf(fn, "%s %s = player2 %s" NL, bind_str, name, mystrip(act));
                        }
-                       fprintf(f, "Confirm savestate = %s", str);
-                       break;
-               case MA_OPT_CPU_CLOCKS:
-                       if (no_def && defaultConfig.CPUclock == currentConfig.CPUclock) return;
-                       fprintf(f, "GP2X CPU clocks = %i", currentConfig.CPUclock);
-                       break;
-               case MA_OPT2_GAMMA:
-                       if (no_def && defaultConfig.gamma == currentConfig.gamma) return;
-                       fprintf(f, "Gamma correction = %.3f", (double)currentConfig.gamma / 100.0);
-                       break;
-               case MA_OPT2_SQUIDGEHACK:
-                       if (no_def && !((defaultConfig.EmuOpt^currentConfig.EmuOpt)&0x0010)) return;
-                       fprintf(f, "Squidgehack = %i", (currentConfig.EmuOpt&0x0010)>>4);
-                       break;
-               case MA_CDOPT_READAHEAD:
-                       if (no_def && defaultConfig.s_PicoCDBuffers == PicoCDBuffers) return;
-                       sprintf(str24, "%i", PicoCDBuffers * 2);
-                       fprintf(f, "ReadAhead buffer = %s", str24);
-                       break;
+               }
 
-               default:
-                       lprintf("unhandled custom_write: %i\n", me->id);
-                       return;
+               for (i = 0; emuctrl_actions[i].name != NULL; i++) {
+                       mask = emuctrl_actions[i].mask;
+                       if (mask & binds[IN_BIND_OFFS(k, IN_BINDTYPE_EMU)]) {
+                               strncpy(act, emuctrl_actions[i].name, 31);
+                               fprintf(fn, "%s %s = %s" NL, bind_str, name, mystrip(act));
+                       }
+               }
        }
-       fprintf(f, NL);
 }
 
+/* XXX: this should go to menu structures instead */
 static int default_var(const menu_entry *me)
 {
        switch (me->id)
        {
-               case MA_OPT_ACC_TIMING:
-               case MA_OPT_ACC_SPRITES:
-               case MA_OPT_ARM940_SOUND:
-               case MA_OPT_6BUTTON_PAD:
-               case MA_OPT2_ENABLE_Z80:
                case MA_OPT2_ENABLE_YM2612:
                case MA_OPT2_ENABLE_SN76496:
-               case MA_CDOPT_CDDA:
+               case MA_OPT2_ENABLE_Z80:
+               case MA_OPT_6BUTTON_PAD:
+               case MA_OPT_ACC_SPRITES:
+               case MA_OPT_ARM940_SOUND:
                case MA_CDOPT_PCM:
-               case MA_CDOPT_SAVERAM:
+               case MA_CDOPT_CDDA:
                case MA_CDOPT_SCALEROT_CHIP:
                case MA_CDOPT_BETTER_SYNC:
+               case MA_CDOPT_SAVERAM:
+               case MA_32XOPT_ENABLE_32X:
+               case MA_32XOPT_PWM:
+               case MA_OPT2_SVP_DYNAREC:
+               case MA_OPT2_NO_SPRITE_LIM:
+               case MA_OPT2_NO_IDLE_LOOPS:
                        return defaultConfig.s_PicoOpt;
 
+               case MA_OPT_SRAM_STATES:
                case MA_OPT_SHOW_FPS:
                case MA_OPT_ENABLE_SOUND:
-               case MA_OPT_SRAM_STATES:
-               case MA_OPT2_A_SN_GAMMA:
-               case MA_OPT2_VSYNC:
                case MA_OPT2_GZIP_STATES:
+               case MA_OPT2_SQUIDGEHACK:
                case MA_OPT2_NO_LAST_ROM:
                case MA_OPT2_RAMTIMINGS:
                case MA_CDOPT_LEDS:
+               case MA_OPT2_A_SN_GAMMA:
+               case MA_OPT2_VSYNC:
+               case MA_OPT_INTERLACED:
+               case MA_OPT2_DBLBUFF:
+               case MA_OPT2_STATUS_LINE:
+               case MA_OPT2_NO_FRAME_LIMIT:
+               case MA_OPT_TEARING_FIX:
                        return defaultConfig.EmuOpt;
 
+               case MA_CTRL_TURBO_RATE: return defaultConfig.turbo_rate;
+               case MA_OPT_SCALING:     return defaultConfig.scaling;
+               case MA_OPT_ROTATION:    return defaultConfig.rotation;
+               case MA_OPT2_GAMMA:      return defaultConfig.gamma;
+               case MA_OPT_FRAMESKIP:   return defaultConfig.Frameskip;
+               case MA_OPT_CONFIRM_STATES: return defaultConfig.confirm_save;
+               case MA_OPT_CPU_CLOCKS:  return defaultConfig.CPUclock;
+               case MA_OPT_RENDERER:    return defaultConfig.renderer;
+               case MA_32XOPT_RENDERER: return defaultConfig.renderer32x;
+
                case MA_OPT_SAVE_SLOT:
+                       return 0;
+
                default:
+                       lprintf("missing default for %d\n", me->id);
                        return 0;
        }
 }
 
+static int is_cust_val_default(const menu_entry *me)
+{
+       switch (me->id)
+       {
+               case MA_OPT_REGION:
+                       return defaultConfig.s_PicoRegion == PicoRegionOverride &&
+                               defaultConfig.s_PicoAutoRgnOrder == PicoAutoRgnOrder;
+               case MA_OPT_SOUND_QUALITY:
+                       return defaultConfig.s_PsndRate == PsndRate &&
+                               ((defaultConfig.s_PicoOpt ^ PicoOpt) & POPT_EN_STEREO) == 0;
+               case MA_CDOPT_READAHEAD:
+                       return defaultConfig.s_PicoCDBuffers == PicoCDBuffers;
+               case MA_32XOPT_MSH2_CYCLES:
+                       return p32x_msh2_multiplier == MSH2_MULTI_DEFAULT;
+               case MA_32XOPT_SSH2_CYCLES:
+                       return p32x_ssh2_multiplier == SSH2_MULTI_DEFAULT;
+               default:break;
+       }
+
+       lprintf("is_cust_val_default: unhandled id %i\n", me->id);
+       return 0;
+}
+
 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)
@@ -235,24 +264,80 @@ write:
        if (section != NULL)
                fprintf(fn, "[%s]" NL, section);
 
-       for (t = 0; t < sizeof(cfg_opts) / sizeof(cfg_opts[0]); t++)
+       for (me = me_list_get_first(); me != NULL; me = me_list_get_next())
        {
-               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)) & me->mask))
-                                       fprintf(fn, "%s = %i" NL, me->name, *(int *)me->var);
+               int dummy;
+               if (!me->need_to_save)
+                       continue;
+               if (me->name == NULL || me->name[0] == 0)
+                       continue;
+
+               if (me->beh == MB_OPT_ONOFF || me->beh == MB_OPT_CUSTONOFF) {
+                       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 || me->beh == MB_OPT_CUSTRANGE) {
+                       if (!no_defaults || (*(int *)me->var ^ default_var(me)))
+                               fprintf(fn, "%s = %i" NL, me->name, *(int *)me->var);
+               }
+               else if (me->beh == MB_OPT_ENUM && me->data != NULL) {
+                       const char **names = (const char **)me->data;
+                       for (t = 0; names[t] != NULL; t++)
+                               if (*(int *)me->var == t && (!no_defaults || (*(int *)me->var ^ default_var(me)))) {
+                                       strncpy(line, names[t], sizeof(line));
+                                       goto write_line;
+                               }
+               }
+               else if (me->generate_name != NULL) {
+                       if (!no_defaults || !is_cust_val_default(me)) {
+                               strncpy(line, me->generate_name(0, &dummy), sizeof(line));
+                               goto write_line;
                        }
                }
+               else
+                       lprintf("config: unhandled write: %i\n", me->id);
+               continue;
+
+write_line:
+               line[sizeof(line) - 1] = 0;
+               mystrip(line);
+               fprintf(fn, "%s = %s" NL, me->name, line);
        }
+
+       /* 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, 0, 0);
+               if (binds == NULL || name == NULL)
+                       continue;
+
+               fprintf(fn, "input%d = %s" NL, t, name);
+       }
+
+       /* input: save binds */
+       for (t = 0; t < IN_MAX_DEVS; t++)
+       {
+               const int *binds = in_get_dev_binds(t);
+               const char *name = in_get_dev_name(t, 0, 0);
+               char strbind[16];
+               int count = 0;
+
+               if (binds == NULL || name == NULL)
+                       continue;
+
+               sprintf(strbind, "bind%d", t);
+               if (t == 0) strbind[4] = 0;
+
+               in_get_config(t, IN_CFG_BIND_COUNT, &count);
+               keys_write(fn, strbind, t, binds, no_defaults);
+       }
+
+#ifndef PSP
+       if (section == NULL)
+               fprintf(fn, "Sound Volume = %i" NL, currentConfig.volume);
+#endif
+
        fprintf(fn, NL);
 
        if (fo != NULL)
@@ -274,21 +359,6 @@ write:
 }
 
 
-static void mystrip(char *str)
-{
-       int i, len;
-
-       len = strlen(str);
-       for (i = 0; i < len; i++)
-               if (str[i] != ' ') break;
-       if (i > 0) memmove(str, str + i, len - i + 1);
-       len = strlen(str);
-       for (i = len - 1; i >= 0; i--)
-               if (str[i] != ' ') break;
-       str[i+1] = 0;
-}
-
-
 int config_writelrom(const char *fname)
 {
        char line[128], *tmp, *optr = NULL;
@@ -296,7 +366,7 @@ int config_writelrom(const char *fname)
        int size;
        FILE *f;
 
-       if (strlen(currentConfig.lastRomFile) == 0) return 0;
+       if (strlen(rom_fname_loaded) == 0) return -1;
 
        f = fopen(fname, "r");
        if (f != NULL)
@@ -329,50 +399,54 @@ int config_writelrom(const char *fname)
                fwrite(old_data, 1, optr - old_data, f);
                free(old_data);
        }
-       fprintf(f, "LastUsedROM = %s" NL, currentConfig.lastRomFile);
+       fprintf(f, "LastUsedROM = %s" NL, rom_fname_loaded);
        fclose(f);
        return 0;
 }
 
+/* --------------------------------------------------------------------------*/
+
+int config_readlrom(const char *fname)
+{
+       char line[128], *tmp;
+       int i, len, ret = -1;
+       FILE *f;
+
+       f = fopen(fname, "r");
+       if (f == NULL) return -1;
+
+       // seek to the section needed
+       while (!feof(f))
+       {
+               tmp = fgets(line, sizeof(line), f);
+               if (tmp == NULL) break;
+
+               if (strncasecmp(line, "LastUsedROM", 11) != 0) continue;
+               len = strlen(line);
+               for (i = 0; i < len; i++)
+                       if (line[i] == '#' || line[i] == '\r' || line[i] == '\n') { line[i] = 0; break; }
+               tmp = strchr(line, '=');
+               if (tmp == NULL) break;
+               tmp++;
+               mystrip(tmp);
+
+               len = sizeof(rom_fname_loaded);
+               strncpy(rom_fname_loaded, tmp, len);
+               rom_fname_loaded[len-1] = 0;
+               ret = 0;
+               break;
+       }
+       fclose(f);
+       return ret;
+}
+
 
 static int custom_read(menu_entry *me, const char *var, const char *val)
 {
        char *tmp;
-       int tmpi;
 
        switch (me->id)
        {
-               case MA_OPT_RENDERER:
-                       if (strcasecmp(var, "Renderer") != 0) return 0;
-                       if      (strcasecmp(val, "8bit fast") == 0) {
-                               PicoOpt |=  0x10;
-                       }
-                       else if (strcasecmp(val, "16bit accurate") == 0) {
-                               PicoOpt &= ~0x10;
-                               currentConfig.EmuOpt |=  0x80;
-                       }
-                       else if (strcasecmp(val, "8bit accurate") == 0) {
-                               PicoOpt &= ~0x10;
-                               currentConfig.EmuOpt &= ~0x80;
-                       }
-                       else
-                               return 0;
-                       return 1;
-
-               case MA_OPT_SCALING:
-                       if (strcasecmp(var, "Scaling") != 0) return 0;
-                       if        (strcasecmp(val, "OFF") == 0) {
-                               currentConfig.scaling = 0;
-                       } else if (strcasecmp(val, "hw horizontal") == 0) {
-                               currentConfig.scaling = 1;
-                       } else if (strcasecmp(val, "hw horiz. + vert.") == 0) {
-                               currentConfig.scaling = 2;
-                       } else if (strcasecmp(val, "sw horizontal") == 0) {
-                               currentConfig.scaling = 3;
-                       } else
-                               return 0;
-                       return 1;
-
                case MA_OPT_FRAMESKIP:
                        if (strcasecmp(var, "Frameskip") != 0) return 0;
                        if (strcasecmp(val, "Auto") == 0)
@@ -385,11 +459,13 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
                        PsndRate = strtoul(val, &tmp, 10);
                        if (PsndRate < 8000 || PsndRate > 44100)
                                PsndRate = 22050;
+                       if (*tmp == 'H' || *tmp == 'h') tmp++;
+                       if (*tmp == 'Z' || *tmp == 'z') tmp++;
                        while (*tmp == ' ') tmp++;
                        if        (strcasecmp(tmp, "stereo") == 0) {
-                               PicoOpt |=  8;
+                               PicoOpt |=  POPT_EN_STEREO;
                        } else if (strcasecmp(tmp, "mono") == 0) {
-                               PicoOpt &= ~8;
+                               PicoOpt &= ~POPT_EN_STEREO;
                        } else
                                return 0;
                        return 1;
@@ -429,100 +505,245 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
                                return 0;
                        return 1;
 
-               case MA_OPT_CONFIRM_STATES:
-                       if (strcasecmp(var, "Confirm savestate") != 0) return 0;
-                       if        (strcasecmp(val, "OFF") == 0) {
-                               currentConfig.EmuOpt &= 5<<9;
-                       } else if (strcasecmp(val, "writes") == 0) {
-                               currentConfig.EmuOpt &= 5<<9;
-                               currentConfig.EmuOpt |= 1<<9;
-                       } else if (strcasecmp(val, "loads") == 0) {
-                               currentConfig.EmuOpt &= 5<<9;
-                               currentConfig.EmuOpt |= 4<<9;
-                       } else if (strcasecmp(val, "both") == 0) {
-                               currentConfig.EmuOpt &= 5<<9;
-                               currentConfig.EmuOpt |= 5<<9;
-                       } else
-                               return 0;
-                       return 1;
-
-               case MA_OPT_CPU_CLOCKS:
-                       if (strcasecmp(var, "GP2X CPU clocks") != 0) return 0;
-                       currentConfig.CPUclock = atoi(val);
-                       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_OPT2_SQUIDGEHACK:
-                       if (strcasecmp(var, "Squidgehack") != 0) return 0;
-                       tmpi = atoi(val);
-                       if (tmpi) *(int *)me->var |=  me->mask;
-                       else      *(int *)me->var &= ~me->mask;
-                       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:
+               case MA_32XOPT_SSH2_CYCLES: {
+                       int *mul = (me->id == MA_32XOPT_MSH2_CYCLES) ? &p32x_msh2_multiplier : &p32x_ssh2_multiplier;
+                       *mul = ((unsigned int)atoi(val) << SH2_MULTI_SHIFT) / 7670;
+                       return 1;
+               }
+
+               /* PSP */
+               case MA_OPT3_SCALE:
+                       if (strcasecmp(var, "Scale factor") != 0) return 0;
+                       currentConfig.scale = atof(val);
+                       return 1;
+               case MA_OPT3_HSCALE32:
+                       if (strcasecmp(var, "Hor. scale (for low res. games)") != 0) return 0;
+                       currentConfig.hscale32 = atof(val);
+                       return 1;
+               case MA_OPT3_HSCALE40:
+                       if (strcasecmp(var, "Hor. scale (for hi res. games)") != 0) return 0;
+                       currentConfig.hscale40 = atof(val);
+                       return 1;
+               case MA_OPT3_VSYNC:
+                       // XXX: use enum
+                       if (strcasecmp(var, "Wait for vsync") != 0) return 0;
+                       if        (strcasecmp(val, "never") == 0) {
+                               currentConfig.EmuOpt &= ~0x12000;
+                       } else if (strcasecmp(val, "sometimes") == 0) {
+                               currentConfig.EmuOpt |=  0x12000;
+                       } else if (strcasecmp(val, "always") == 0) {
+                               currentConfig.EmuOpt &= ~0x12000;
+                               currentConfig.EmuOpt |=  0x02000;
+                       } else
+                               return 0;
+                       return 1;
+
                default:
-                       if (strcasecmp(var, "LastUsedROM") == 0) {
-                               tmpi = sizeof(currentConfig.lastRomFile);
-                               strncpy(currentConfig.lastRomFile, val, tmpi);
-                               currentConfig.lastRomFile[tmpi-1] = 0;
-                               return 1;
-                       }
-                       lprintf("unhandled custom_read: %i\n", me->id);
+                       lprintf("unhandled custom_read %i: %s\n", me->id, var);
                        return 0;
        }
 }
 
 
+static unsigned int keys_encountered = 0;
+
+static int parse_bind_val(const char *val, int *type)
+{
+       int i;
+
+       *type = IN_BINDTYPE_NONE;
+       if (val[0] == 0)
+               return 0;
+       
+       if (strncasecmp(val, "player", 6) == 0)
+       {
+               int player, shift = 0;
+               player = atoi(val + 6) - 1;
+
+               if (player > 1)
+                       return -1;
+               if (player == 1)
+                       shift = 16;
+
+               *type = IN_BINDTYPE_PLAYER12;
+               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;
+               }
+       }
+       for (i = 0; emuctrl_actions[i].name != NULL; i++) {
+               if (strncasecmp(emuctrl_actions[i].name, val, strlen(val)) == 0) {
+                       *type = IN_BINDTYPE_EMU;
+                       return emuctrl_actions[i].mask;
+               }
+       }
+
+       return -1;
+}
+
+static void keys_parse(const char *key, const char *val, int dev_id)
+{
+       int acts, type;
+
+       acts = parse_bind_val(val, &type);
+       if (acts == -1) {
+               lprintf("config: unhandled action \"%s\"\n", val);
+               return;
+       }
+
+       in_config_bind_key(dev_id, key, acts, type);
+}
+
+static int get_numvar_num(const char *var)
+{
+       char *p = NULL;
+       int num;
+       
+       if (var[0] == ' ')
+               return 0;
+
+       num = strtoul(var, &p, 10);
+       if (*p == 0 || *p == ' ')
+               return num;
+
+       return -1;
+}
+
+/* map dev number in confing to input dev number */
+static unsigned char input_dev_map[IN_MAX_DEVS];
+
 static void parse(const char *var, const char *val)
 {
        menu_entry *me;
-       int t, i, tlen, tmp, ret = 0;
+       int tmp;
 
-       for (t = 0; t < sizeof(cfg_opts) / sizeof(cfg_opts[0]) && ret == 0; t++)
+       if (strcasecmp(var, "LastUsedROM") == 0)
+               return; /* handled elsewhere */
+
+       if (strcasecmp(var, "Sound Volume") == 0) {
+               currentConfig.volume = atoi(val);
+               return;
+       }
+
+       /* input: device name */
+       if (strncasecmp(var, "input", 5) == 0) {
+               int num = get_numvar_num(var + 5);
+               if (num >= 0 && num < IN_MAX_DEVS)
+                       input_dev_map[num] = in_config_parse_dev(val);
+               else
+                       lprintf("config: failed to parse: %s\n", var);
+               return;
+       }
+
+       // key binds
+       if (strncasecmp(var, "bind", 4) == 0) {
+               const char *p = var + 4;
+               int num = get_numvar_num(p);
+               if (num < 0 || num >= IN_MAX_DEVS) {
+                       lprintf("config: failed to parse: %s\n", var);
+                       return;
+               }
+
+               num = input_dev_map[num];
+               if (num < 0 || num >= IN_MAX_DEVS) {
+                       lprintf("config: invalid device id: %s\n", var);
+                       return;
+               }
+
+               while (*p && *p != ' ') p++;
+               while (*p && *p == ' ') p++;
+               keys_parse(p, val, num);
+               return;
+       }
+
+       for (me = me_list_get_first(); me != NULL; me = me_list_get_next())
        {
-               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;
+               char *p;
+
+               if (!me->need_to_save)
+                       continue;
+               if (me->name == NULL || strcasecmp(var, me->name) != 0)
+                       continue;
+
+               if (me->beh == MB_OPT_ONOFF) {
+                       tmp = strtol(val, &p, 0);
+                       if (*p != 0)
+                               goto bad_val;
+                       if (tmp) *(int *)me->var |=  me->mask;
+                       else     *(int *)me->var &= ~me->mask;
+                       return;
+               }
+               else if (me->beh == MB_OPT_RANGE) {
+                       tmp = strtol(val, &p, 0);
+                       if (*p != 0)
+                               goto bad_val;
+                       if (tmp < me->min) tmp = me->min;
+                       if (tmp > me->max) tmp = me->max;
+                       *(int *)me->var = tmp;
+                       return;
+               }
+               else if (me->beh == MB_OPT_ENUM) {
+                       const char **names, *p1;
+                       int i;
+
+                       names = (const char **)me->data;
+                       if (names == NULL)
+                               goto bad_val;
+                       for (i = 0; names[i] != NULL; i++) {
+                               for (p1 = names[i]; *p1 == ' '; p1++)
+                                       ;
+                               if (strcasecmp(p1, val) == 0) {
+                                       *(int *)me->var = i;
                                        return;
                                }
                        }
-                       ret = custom_read(me, var, val);
+                       goto bad_val;
                }
+               else if (custom_read(me, var, val))
+                       return;
        }
-       if (!ret) lprintf("config_readsect: unhandled var: %s\n", var);
+
+       lprintf("config_readsect: unhandled var: \"%s\"\n", var);
+       return;
+
+bad_val:
+       lprintf("config_readsect: unhandled val for \"%s\": %s\n", var, val);
 }
 
 
-int config_readsect(const char *fname, const char *section)
+int config_havesect(const char *fname, const char *section)
 {
-       char line[128], *var, *val, *tmp;
-       FILE *f = fopen(fname, "r");
-       int len, i, ret;
+       FILE *f;
+       int ret;
 
+       f = fopen(fname, "r");
        if (f == NULL) return 0;
 
+       ret = seek_sect(f, section);
+       fclose(f);
+       return ret;
+}
+
+int config_readsect(const char *fname, const char *section)
+{
+       char line[128], *var, *val;
+       FILE *f;
+       int ret;
+
+       f = fopen(fname, "r");
+       if (f == NULL) return -1;
+
        if (section != NULL)
        {
                ret = seek_sect(f, section);
@@ -533,37 +754,14 @@ int config_readsect(const char *fname, const char *section)
                }
        }
 
+       keys_encountered = 0;
+       memset(input_dev_map, 0xff, sizeof(input_dev_map));
+
        while (!feof(f))
        {
-               tmp = fgets(line, sizeof(line), f);
-               if (tmp == NULL) break;
-
-               if (line[0] == '[') break; // other section
-
-               // strip comments, linefeed, spaces..
-               len = strlen(line);
-               for (i = 0; i < len; i++)
-                       if (line[i] == '#' || line[i] == '\r' || line[i] == '\n') { line[i] = 0; break; }
-               mystrip(line);
-               len = strlen(line);
-               if (len <= 0) continue;
-
-               // get var and val
-               for (i = 0; i < len; i++)
-                       if (line[i] == '=') break;
-               if (i >= len || strchr(&line[i+1], '=') != NULL) {
-                       lprintf("config_readsect: can't parse: %s\n", line);
-                       continue;
-               }
-               line[i] = 0;
-               var = line;
-               val = &line[i+1];
-               mystrip(var);
-               mystrip(val);
-               if (strlen(var) == 0 || strlen(val) == 0) {
-                       lprintf("config_readsect: something's empty: \"%s\" = \"%s\"\n", var, val);
-                       continue;
-               }
+               ret = config_get_var_val(f, line, sizeof(line), &var, &val);
+               if (ret ==  0) break;
+               if (ret == -1) continue;
 
                parse(var, val);
        }
@@ -572,3 +770,71 @@ int config_readsect(const char *fname, const char *section)
        return 0;
 }
 
+#endif // _MSC_VER
+
+static char *mystrip(char *str)
+{
+       int i, len;
+
+       len = strlen(str);
+       for (i = 0; i < len; i++)
+               if (str[i] != ' ') break;
+       if (i > 0) memmove(str, str + i, len - i + 1);
+
+       len = strlen(str);
+       for (i = len - 1; i >= 0; i--)
+               if (str[i] != ' ') break;
+       str[i+1] = 0;
+
+       return str;
+}
+
+/* returns:
+ *  0 - EOF, end
+ *  1 - parsed ok
+ * -1 - failed to parse line
+ */
+int config_get_var_val(void *file, char *line, int lsize, char **rvar, char **rval)
+{
+       char *var, *val, *tmp;
+       FILE *f = file;
+       int len, i;
+
+       tmp = fgets(line, lsize, f);
+       if (tmp == NULL) return 0;
+
+       if (line[0] == '[') return 0; // other section
+
+       // strip comments, linefeed, spaces..
+       len = strlen(line);
+       for (i = 0; i < len; i++)
+               if (line[i] == '#' || line[i] == '\r' || line[i] == '\n') { line[i] = 0; break; }
+       mystrip(line);
+       len = strlen(line);
+       if (len <= 0) return -1;;
+
+       // get var and val
+       for (i = 0; i < len; i++)
+               if (line[i] == '=') break;
+       if (i >= len || strchr(&line[i+1], '=') != NULL) {
+               lprintf("config_readsect: can't parse: %s\n", line);
+               return -1;
+       }
+       line[i] = 0;
+       var = line;
+       val = &line[i+1];
+       mystrip(var);
+       mystrip(val);
+
+#ifndef _MSC_VER
+       if (strlen(var) == 0 || (strlen(val) == 0 && strncasecmp(var, "bind", 4) != 0)) {
+               lprintf("config_readsect: something's empty: \"%s\" = \"%s\"\n", var, val);
+               return -1;;
+       }
+#endif
+
+       *rvar = var;
+       *rval = val;
+       return 1;
+}
+