lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Added NullKeyCode constant for readability

Browse source
This commit is contained in:
Elias Daler 2018-04-02 22:39:47 +03:00 committed by Lukas Dürrenberger
parent e40063ab6f
commit e430aa3106
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/SFML/Window/Unix/KeyboardImpl.cpp
View file

@ -37,7 +37,8 @@
namespace { namespace {
KeyCode scancodeToKeycode[sf::Keyboard::ScanCodeCount] = { 0 }; ///< Mapping of SFML scancode to X11 KeyCode const KeyCode NullKeyCode = 0;
KeyCode scancodeToKeycode[sf::Keyboard::ScanCodeCount] = { NullKeyCode }; ///< Mapping of SFML scancode to X11 KeyCode
sf::Keyboard::Scancode keycodeToScancode[256] = { sf::Keyboard::ScanUnknown}; ///< Mapping of X11 KeyCode to SFML scancode sf::Keyboard::Scancode keycodeToScancode[256] = { sf::Keyboard::ScanUnknown}; ///< Mapping of X11 KeyCode to SFML scancode
bool isMappingInitialized = false; bool isMappingInitialized = false;
@ -348,7 +349,7 @@ KeyCode SFKeyToKeyCode(sf::Keyboard::Key key)
sf::priv::CloseDisplay(display); sf::priv::CloseDisplay(display);
return keycode; return keycode;
} }
return 0; return NullKeyCode;
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@ -357,7 +358,7 @@ KeySym SFScancodeToKeySym(sf::Keyboard::Scancode code)
Display* display = sf::priv::OpenDisplay(); Display* display = sf::priv::OpenDisplay();
KeySym keysym = NoSymbol; KeySym keysym = NoSymbol;
KeyCode keycode = SFScancodeToKeyCode(code); KeyCode keycode = SFScancodeToKeyCode(code);
if (keycode != 0) // ensure that this Scancode is mapped to keycode if (keycode != NullKeyCode) // ensure that this Scancode is mapped to keycode
keysym = XkbKeycodeToKeysym(display, keycode, 0, 0); keysym = XkbKeycodeToKeysym(display, keycode, 0, 0);
sf::priv::CloseDisplay(display); sf::priv::CloseDisplay(display);
return keysym; return keysym;
@ -366,7 +367,7 @@ KeySym SFScancodeToKeySym(sf::Keyboard::Scancode code)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool isKeyPressedImpl(KeyCode keycode) bool isKeyPressedImpl(KeyCode keycode)
{ {
if (keycode != 0) if (keycode != NullKeyCode)
{ {
Display* display = sf::priv::OpenDisplay(); Display* display = sf::priv::OpenDisplay();