From 894b87635d4a83ad56e1ee3de09e68f870a383a2 Mon Sep 17 00:00:00 2001 From: punkrockguy318 Date: Wed, 19 Oct 2011 02:42:29 +0000 Subject: [PATCH] sdl: new hotkeys added - statestatenext savestateprev - useful for scrolling through savestates on a gamepad. mapped to pgup and pgdown by default --- changelog.txt | 1 + src/drivers/sdl/config.cpp | 4 +++- src/drivers/sdl/config.h | 7 ++++--- src/drivers/sdl/input.cpp | 8 ++++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/changelog.txt b/changelog.txt index c9c5a96a..ab33655c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,4 @@ +18-octo-2011 - prg318 - sdl: new hotkeys added - statestatenext savestateprev - useful for scrolling through savestates on a gamepad. mapped to pgup and pgdown by default 18-octo-2011 - prg318 - gtk: new video option for double buffering and ClipSides 18-octo-2011 - prg318 - sdl: GTK3 support is now functional. Set GTK3 to 1 in the SConstruct to try it out. 18-octo-2011 - prg318 - no longer use depreciated gtk2 functions diff --git a/src/drivers/sdl/config.cpp b/src/drivers/sdl/config.cpp index 849cee47..5d7de7a4 100644 --- a/src/drivers/sdl/config.cpp +++ b/src/drivers/sdl/config.cpp @@ -344,7 +344,9 @@ InitConfig() SDLK_DELETE, // frame advance lag skip SDLK_SLASH, // lag counter display SDLK_0, SDLK_1, SDLK_2, SDLK_3, SDLK_4, SDLK_5, - SDLK_6, SDLK_7, SDLK_8, SDLK_9}; + SDLK_6, SDLK_7, SDLK_8, SDLK_9, + SDLK_PAGEUP, // select state next + SDLK_PAGEDOWN}; // select state prev prefix = "SDL.Hotkeys."; for(int i=0; i < HK_MAX; i++) diff --git a/src/drivers/sdl/config.h b/src/drivers/sdl/config.h index e4e74a42..2576a254 100644 --- a/src/drivers/sdl/config.h +++ b/src/drivers/sdl/config.h @@ -19,9 +19,10 @@ enum HOTKEY { HK_CHEAT_MENU, HK_BIND_STATE, HK_LOAD_LUA, HK_TOGGLE_BG, HK_TOGGLE_INPUT_DISPLAY, HK_MOVIE_TOGGLE_RW, HK_MUTE_CAPTURE, HK_QUIT, HK_FA_LAG_SKIP, HK_LAG_COUNTER_DISPLAY, HK_SELECT_STATE_0, HK_SELECT_STATE_1, HK_SELECT_STATE_2, HK_SELECT_STATE_3, HK_SELECT_STATE_4, HK_SELECT_STATE_5, HK_SELECT_STATE_6, HK_SELECT_STATE_7, - HK_SELECT_STATE_8, HK_SELECT_STATE_9}; + HK_SELECT_STATE_8, HK_SELECT_STATE_9, + HK_SELECT_STATE_NEXT, HK_SELECT_STATE_PREV}; -const int HK_MAX = 35; +const int HK_MAX = 37; static const char* HotkeyStrings[HK_MAX] = { "CheatMenu", @@ -51,6 +52,6 @@ static const char* HotkeyStrings[HK_MAX] = { "LagCounterDisplay", "SelectState0", "SelectState1", "SelectState2", "SelectState3", "SelectState4", "SelectState5", "SelectState6", "SelectState7", - "SelectState8", "SelectState9" }; + "SelectState8", "SelectState9", "SelectStateNext", "SelectStatePrev" }; #endif diff --git a/src/drivers/sdl/input.cpp b/src/drivers/sdl/input.cpp index 02a1cc1c..ee287476 100644 --- a/src/drivers/sdl/input.cpp +++ b/src/drivers/sdl/input.cpp @@ -599,7 +599,15 @@ KeyboardCommands() #endif FCEUI_SelectState(i, 1); } + + if(_keyonly(Hotkeys[HK_SELECT_STATE_NEXT])) { + FCEUI_SelectStateNext(1); + } + if(_keyonly(Hotkeys[HK_SELECT_STATE_PREV])) { + FCEUI_SelectStateNext(-1); + } + if(_keyonly(Hotkeys[HK_BIND_STATE])) { bindSavestate ^= 1; FCEUI_DispMessage("Savestate binding to movie %sabled.",0,