Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-06-16 21:29:31 +00:00
Code Issues Projects Releases Wiki Activity

Joystick: support redefined button0/1 keys when not using keyboard for joystick

Browse Source
This commit is contained in:
tomcw 2020-01-09 22:04:26 +00:00
parent 29c0f1e4f0
commit 40522204ad
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/Joystick.cpp
View File

@ -310,7 +310,7 @@ void JoySwapButton0and1(bool swap)
g_swapButton0and1 = swap;
}
static UINT g_buttonVirtKey[2] = { VK_MENU, VK_MENU | KF_EXTENDED };
static UINT g_buttonVirtKey[2] = { VK_MENU, VK_MENU | KF_EXTENDED }; // VK_MENU == ALT Key
void JoySetButtonVirtualKey(UINT button, UINT virtKey)
{
@ -333,10 +333,12 @@ BOOL JoyProcessKey(int virtkey, bool extended, bool down, bool autorep)
UINT32 Down:1;
} CursorKeys = {0};
const UINT virtKeyWithExtended = ((UINT)virtkey) | (extended ? KF_EXTENDED : 0);
if ( (joyinfo[joytype[0]] != DEVICE_KEYBOARD) &&
(joyinfo[joytype[1]] != DEVICE_KEYBOARD) &&
(virtkey != VK_MENU) // VK_MENU == ALT Key
)
(virtKeyWithExtended != g_buttonVirtKey[0]) &&
(virtKeyWithExtended != g_buttonVirtKey[1]) )
{
return 0;
}
@ -348,7 +350,6 @@ BOOL JoyProcessKey(int virtkey, bool extended, bool down, bool autorep)
BOOL keychange = 0;
bool bIsCursorKey = false;
UINT virtKeyWithExtended = ((UINT)virtkey) | (extended ? KF_EXTENDED : 0);
if (virtKeyWithExtended == g_buttonVirtKey[!g_swapButton0and1 ? 0 : 1])
{