diff options
| author | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-05-04 11:18:01 +0000 |
|---|---|---|
| committer | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-05-04 11:18:01 +0000 |
| commit | 3a363f15f918902ee89420fc2120d3f38c8120f5 (patch) | |
| tree | f80e66137ef73cee66f37f2a1de145f1ae7366fa /plugins/dfinput | |
| parent | 128b7778da9535e34edabc6b9bdb7def3b7f7b61 (diff) | |
| download | pcsxr-3a363f15f918902ee89420fc2120d3f38c8120f5.tar.gz | |
Patch 14419 (0KgaSChgRDOPtzXyC);
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@84398 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins/dfinput')
| -rwxr-xr-x | plugins/dfinput/cfg-gtk.c | 3 | ||||
| -rwxr-xr-x | plugins/dfinput/cfg.c | 9 | ||||
| -rwxr-xr-x | plugins/dfinput/pad.h | 1 |
3 files changed, 12 insertions, 1 deletions
diff --git a/plugins/dfinput/cfg-gtk.c b/plugins/dfinput/cfg-gtk.c index eae6e8dd..d52d929d 100755 --- a/plugins/dfinput/cfg-gtk.c +++ b/plugins/dfinput/cfg-gtk.c @@ -59,7 +59,8 @@ const char *EmuKeyText[EMU_TOTAL] = { N_("Fast-forwards"), N_("Load state"), N_("Save state"), - N_("Screenshot") + N_("Screenshot"), + N_("Escape") }; const char *DPadText[DKEY_TOTAL] = { diff --git a/plugins/dfinput/cfg.c b/plugins/dfinput/cfg.c index 1c3ef34d..c8158300 100755 --- a/plugins/dfinput/cfg.c +++ b/plugins/dfinput/cfg.c @@ -123,6 +123,7 @@ static void SetDefaultConfig() { g.cfg.E.EmuDef[EMU_LOADSTATE].EmuKeyEvent = XK_F3; g.cfg.E.EmuDef[EMU_INCREMENTSTATE].EmuKeyEvent = XK_F2; g.cfg.E.EmuDef[EMU_SCREENSHOT].EmuKeyEvent = XK_F8; + g.cfg.E.EmuDef[EMU_ESCAPE].EmuKeyEvent = XK_Escape; } void LoadPADConfig() { @@ -184,6 +185,11 @@ void LoadPADConfig() { g.cfg.E.EmuDef[EMU_INCREMENTSTATE].Mapping.Key = a; g.cfg.E.EmuDef[EMU_INCREMENTSTATE].Mapping.JoyEvType = b; g.cfg.E.EmuDef[EMU_INCREMENTSTATE].Mapping.J.d = c; + } else if (strncmp(buf, "EMU_ESCAPE=", 11) == 0) { + sscanf(buf, "EMU_ESCAPE=%d,%d,%d", &a, &b, &c); + g.cfg.E.EmuDef[EMU_ESCAPE].Mapping.Key = a; + g.cfg.E.EmuDef[EMU_ESCAPE].Mapping.JoyEvType = b; + g.cfg.E.EmuDef[EMU_ESCAPE].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; @@ -415,5 +421,8 @@ void SavePADConfig() { fprintf(fp, "EMU_SCREENSHOT=%d,%d,%d\n", g.cfg.E.EmuDef[EMU_SCREENSHOT].Mapping.Key, g.cfg.E.EmuDef[EMU_SCREENSHOT].Mapping.JoyEvType, g.cfg.E.EmuDef[EMU_SCREENSHOT].Mapping.J.d); + fprintf(fp, "EMU_ESCAPE=%d,%d,%d\n", g.cfg.E.EmuDef[EMU_ESCAPE].Mapping.Key, + g.cfg.E.EmuDef[EMU_ESCAPE].Mapping.JoyEvType, + g.cfg.E.EmuDef[EMU_ESCAPE].Mapping.J.d); fclose(fp); } diff --git a/plugins/dfinput/pad.h b/plugins/dfinput/pad.h index 2b69f111..671edf18 100755 --- a/plugins/dfinput/pad.h +++ b/plugins/dfinput/pad.h @@ -118,6 +118,7 @@ enum { EMU_LOADSTATE, EMU_SAVESTATE, EMU_SCREENSHOT, + EMU_ESCAPE, EMU_TOTAL }; |