Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-26 08:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

code style and comments style

Browse source
This commit is contained in:
SophiaHadash 2021-07-07 14:31:32 +02:00
parent 6c165a4ca0
commit e24c92effe
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
es-core/src/InputManager.cpp
View file

@ -28,7 +28,7 @@
int SDL_USER_CECBUTTONDOWN = -1; int SDL_USER_CECBUTTONDOWN = -1;
int SDL_USER_CECBUTTONUP = -1; int SDL_USER_CECBUTTONUP = -1;
// save button states for combo-button exit support and predefine exit option-function map // Save button states for combo-button exit support and predefine exit option-function map.
static bool altDown = false; static bool altDown = false;
static bool lguiDown = false; static bool lguiDown = false;
@ -436,15 +436,11 @@ bool InputManager::parseEvent(const SDL_Event& event, Window* window)
} }
case SDL_KEYDOWN: { case SDL_KEYDOWN: {
// save button states for alt and command // Save button states for alt and command.
if (event.key.keysym.sym == SDLK_LALT) if (event.key.keysym.sym == SDLK_LALT)
{
altDown = true; altDown = true;
}
if (event.key.keysym.sym == SDLK_LGUI) if (event.key.keysym.sym == SDLK_LGUI)
{
lguiDown = true; lguiDown = true;
}
if (event.key.keysym.sym == SDLK_BACKSPACE && SDL_IsTextInputActive()) if (event.key.keysym.sym == SDLK_BACKSPACE && SDL_IsTextInputActive())
window->textInput("\b"); window->textInput("\b");
@ -452,18 +448,17 @@ bool InputManager::parseEvent(const SDL_Event& event, Window* window)
if (event.key.repeat) if (event.key.repeat)
return false; return false;
// handle application exit // Handle application exit.
bool exitState; bool exitState;
std::string exitOption = Settings::getInstance()->getString("ExitButtonCombo"); std::string exitOption = Settings::getInstance()->getString("ExitButtonCombo");
if (exitOption == "AltF4"){ if (exitOption == "AltF4")
exitState = event.key.keysym.sym == SDLK_F4 && altDown; exitState = event.key.keysym.sym == SDLK_F4 && altDown;
}else if (exitOption == "CmdQ"){ else if (exitOption == "CmdQ")
exitState = event.key.keysym.sym == SDLK_q && lguiDown; exitState = event.key.keysym.sym == SDLK_q && lguiDown;
}else if (exitOption == "AltQ"){ else if (exitOption == "AltQ")
exitState = event.key.keysym.sym == SDLK_q && altDown; exitState = event.key.keysym.sym == SDLK_q && altDown;
}else{ else
exitState = event.key.keysym.sym == SDLK_F4; exitState = event.key.keysym.sym == SDLK_F4;
}
if (exitState) { if (exitState) {
SDL_Event quit; SDL_Event quit;
quit.type = SDL_QUIT; quit.type = SDL_QUIT;
@ -477,15 +472,11 @@ bool InputManager::parseEvent(const SDL_Event& event, Window* window)
} }
case SDL_KEYUP: { case SDL_KEYUP: {
// release button states // Release button states.
if (event.key.keysym.sym == SDLK_LALT) if (event.key.keysym.sym == SDLK_LALT)
{
altDown = false; altDown = false;
}
if (event.key.keysym.sym == SDLK_LGUI) if (event.key.keysym.sym == SDLK_LGUI)
{
lguiDown = false; lguiDown = false;
}
window->input(getInputConfigByDevice(DEVICE_KEYBOARD), Input(DEVICE_KEYBOARD, window->input(getInputConfigByDevice(DEVICE_KEYBOARD), Input(DEVICE_KEYBOARD,
TYPE_KEY, event.key.keysym.sym, 0, false)); TYPE_KEY, event.key.keysym.sym, 0, false));