diff options
| author | iCatButler <i.am.catbutler@gmail.com> | 2016-03-30 15:07:35 +0100 |
|---|---|---|
| committer | iCatButler <i.am.catbutler@gmail.com> | 2016-03-30 15:07:35 +0100 |
| commit | 8b4350fee747708ffd376744ef5dc1e239a87ba6 (patch) | |
| tree | a9ab6e2f25e06edc7c668353f8000856704f7fa3 /plugins/dfinput | |
| parent | e3df273095a5800e3dcdcb63bd66e269c0c2d3a8 (diff) | |
Bring up to date with PCSX-R master (97809)
Diffstat (limited to 'plugins/dfinput')
| -rwxr-xr-x | plugins/dfinput/cfg-gtk.c | 4 | ||||
| -rwxr-xr-x | plugins/dfinput/cfg.c | 20 | ||||
| -rwxr-xr-x | plugins/dfinput/pad.h | 2 |
3 files changed, 25 insertions, 1 deletions
diff --git a/plugins/dfinput/cfg-gtk.c b/plugins/dfinput/cfg-gtk.c index eba56d8a..5f26040f 100755 --- a/plugins/dfinput/cfg-gtk.c +++ b/plugins/dfinput/cfg-gtk.c @@ -61,7 +61,9 @@ const char *EmuKeyText[EMU_TOTAL] = { N_("Save state"), N_("Screenshot"), N_("Escape"), - N_("Rewind") + N_("Rewind"), + N_("Alt Speed 1"), + N_("Alt Speed 2") }; const char *DPadText[DKEY_TOTAL] = { diff --git a/plugins/dfinput/cfg.c b/plugins/dfinput/cfg.c index 2757bd74..f1d16673 100755 --- a/plugins/dfinput/cfg.c +++ b/plugins/dfinput/cfg.c @@ -126,6 +126,8 @@ static void SetDefaultConfig() { g.cfg.E.EmuDef[EMU_SCREENSHOT].EmuKeyEvent = XK_F8; g.cfg.E.EmuDef[EMU_ESCAPE].EmuKeyEvent = XK_Escape; g.cfg.E.EmuDef[EMU_REWIND].EmuKeyEvent = XK_BackSpace; + g.cfg.E.EmuDef[EMU_ALTSPEED1].EmuKeyEvent = XK_bracketleft; + g.cfg.E.EmuDef[EMU_ALTSPEED2].EmuKeyEvent = XK_bracketright; } void LoadPADConfig() { @@ -199,6 +201,16 @@ void LoadPADConfig() { g.cfg.E.EmuDef[EMU_REWIND].Mapping.Key = a; g.cfg.E.EmuDef[EMU_REWIND].Mapping.JoyEvType = b; g.cfg.E.EmuDef[EMU_REWIND].Mapping.J.d = c; + } else if (strncmp(buf, "EMU_ALTSPEED1=", 14) == 0) { + sscanf(buf, "EMU_ALTSPEED1=%d,%d,%d", &a, &b, &c); + g.cfg.E.EmuDef[EMU_ALTSPEED1].Mapping.Key = a; + g.cfg.E.EmuDef[EMU_ALTSPEED1].Mapping.JoyEvType = b; + g.cfg.E.EmuDef[EMU_ALTSPEED1].Mapping.J.d = c; + } else if (strncmp(buf, "EMU_ALTSPEED2=", 14) == 0) { + sscanf(buf, "EMU_ALTSPEED2=%d,%d,%d", &a, &b, &c); + g.cfg.E.EmuDef[EMU_ALTSPEED2].Mapping.Key = a; + g.cfg.E.EmuDef[EMU_ALTSPEED2].Mapping.JoyEvType = b; + g.cfg.E.EmuDef[EMU_ALTSPEED2].Mapping.J.d = c; } else if (strncmp(buf, "Select=", 7) == 0) { sscanf(buf, "Select=%d,%d,%d", &a, &b, &c); g.cfg.PadDef[current].KeyDef[DKEY_SELECT].Key = a; @@ -437,5 +449,13 @@ void SavePADConfig() { fprintf(fp, "EMU_REWIND=%d,%d,%d\n", g.cfg.E.EmuDef[EMU_REWIND].Mapping.Key, g.cfg.E.EmuDef[EMU_REWIND].Mapping.JoyEvType, g.cfg.E.EmuDef[EMU_REWIND].Mapping.J.d); + fprintf(fp, "EMU_ALTSPEED1=%d,%d,%d\n", + g.cfg.E.EmuDef[EMU_ALTSPEED1].Mapping.Key, + g.cfg.E.EmuDef[EMU_ALTSPEED1].Mapping.JoyEvType, + g.cfg.E.EmuDef[EMU_ALTSPEED1].Mapping.J.d); + fprintf(fp, "EMU_ALTSPEED2=%d,%d,%d\n", + g.cfg.E.EmuDef[EMU_ALTSPEED2].Mapping.Key, + g.cfg.E.EmuDef[EMU_ALTSPEED2].Mapping.JoyEvType, + g.cfg.E.EmuDef[EMU_ALTSPEED2].Mapping.J.d); fclose(fp); } diff --git a/plugins/dfinput/pad.h b/plugins/dfinput/pad.h index fb5ca718..7cd8eefe 100755 --- a/plugins/dfinput/pad.h +++ b/plugins/dfinput/pad.h @@ -121,6 +121,8 @@ enum { EMU_SCREENSHOT, EMU_ESCAPE, EMU_REWIND, + EMU_ALTSPEED1, + EMU_ALTSPEED2, EMU_TOTAL }; |