libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-12-13 11:38:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1868 from unknownbrackets/key-fix

Browse Source 
Switch back tab key behavior
This commit is contained in:
Henrik Rydgård 2013-05-20 07:49:37 -07:00
commit 9d12698e99
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/Core.cpp
View File

@ -118,10 +118,6 @@ void Core_RunLoop()
input_state.pad_lstick_y = 0;
input_state.pad_rstick_x = 0;
input_state.pad_rstick_y = 0;
// Temporary hack.
if (GetAsyncKeyState(VK_ESCAPE)) {
input_state.pad_buttons |= PAD_BUTTON_MENU;
}
host->PollControllers(input_state);
UpdateInputState(&input_state);
#endif

7
Windows/KeyboardDevice.cpp
View File

@ -17,7 +17,7 @@ unsigned int key_pad_map[] = {
VK_SPACE, PAD_BUTTON_START,
'Q', PAD_BUTTON_LBUMPER,
'W', PAD_BUTTON_RBUMPER,
VK_TAB, PAD_BUTTON_LEFT_THUMB, // Turbo
VK_F3, PAD_BUTTON_LEFT_THUMB, // Toggle Turbo
VK_PAUSE, PAD_BUTTON_RIGHT_THUMB, // Open PauseScreen
VK_UP, PAD_BUTTON_UP,
VK_DOWN, PAD_BUTTON_DOWN,
@ -40,6 +40,11 @@ int KeyboardDevice::UpdateState(InputState &input_state) {
static u32 alternator = 0;
bool doAlternate = alternate && (alternator++ % 10) < 5;
// This button isn't customizable. Also, if alt is held, we ignore it (alt-tab is common.)
if (GetAsyncKeyState(VK_TAB) && !GetAsyncKeyState(VK_MENU)) {
input_state.pad_buttons |= PAD_BUTTON_UNTHROTTLE;
}
for (int i = 0; i < sizeof(key_pad_map)/sizeof(key_pad_map[0]); i += 2) {
if (!GetAsyncKeyState(key_pad_map[i])) {
continue;