zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-14 00:21:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

- InputState: Exclude volume keys from setting AnyKeyStatus to true.

Browse source
This commit is contained in:
Mitchell Richters 2020-08-27 17:29:40 +10:00 committed by Christoph Oelckers
parent a2b51edcdb
commit 8bb13bc4c2
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/common/console/keydef.h
View file

@ -53,6 +53,9 @@ enum EKeyCodes
KEY_PGUP = 0xc9, // DIK_PRIOR KEY_PGUP = 0xc9, // DIK_PRIOR
KEY_PGDN = 0xd1, // DIK_NEXT KEY_PGDN = 0xd1, // DIK_NEXT
KEY_VOLUMEDOWN = 0xAE, // DIK_VOLUMEDOWN
KEY_VOLUMEUP = 0xB0, // DIK_VOLUMEUP
KEY_FIRSTMOUSEBUTTON = 0x100, KEY_FIRSTMOUSEBUTTON = 0x100,
KEY_MOUSE1 = 0x100, KEY_MOUSE1 = 0x100,
KEY_MOUSE2 = 0x101, KEY_MOUSE2 = 0x101,

20
source/core/inputstate.cpp
View file

@ -86,14 +86,32 @@ void InputState::GetMouseDelta(ControlInfo * info)
// //
//========================================================================== //==========================================================================
static int exclKeys[] = { KEY_VOLUMEDOWN, KEY_VOLUMEUP };
void InputState::AddEvent(const event_t *ev) void InputState::AddEvent(const event_t *ev)
{ {
if (ev->type == EV_KeyDown || ev->type == EV_KeyUp) if (ev->type == EV_KeyDown || ev->type == EV_KeyUp)
{ {
int key = ev->data1; int key = ev->data1;
bool state = ev->type == EV_KeyDown; bool state = ev->type == EV_KeyDown;
bool ignore = false;
KeyStatus[key] = (uint8_t)state; KeyStatus[key] = (uint8_t)state;
if (state && !(key > KEY_LASTJOYBUTTON && key < KEY_PAD_LTHUMB_RIGHT))
// Check if key is to be excluded from setting AnyKeyStatus.
for (int i = 0; i < 2; i++)
{
if (exclKeys[i] == key)
{
ignore = true;
break;
}
}
if (key > KEY_LASTJOYBUTTON && key < KEY_PAD_LTHUMB_RIGHT)
{
ignore = true;
}
if (state && !ignore)
AnyKeyStatus = true; AnyKeyStatus = true;
} }
} }