From 00c10ad600b221754f99c7504563f8c1e8459789 Mon Sep 17 00:00:00 2001 From: Elias Daler Date: Wed, 16 May 2018 09:30:16 +0300 Subject: [PATCH] Code review small fixes --- src/SFML/Window/Unix/KeySymToUnicodeMapping.cpp | 2 +- src/SFML/Window/Unix/KeyboardImpl.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SFML/Window/Unix/KeySymToUnicodeMapping.cpp b/src/SFML/Window/Unix/KeySymToUnicodeMapping.cpp index 0f122cc6..d6e0eeb6 100644 --- a/src/SFML/Window/Unix/KeySymToUnicodeMapping.cpp +++ b/src/SFML/Window/Unix/KeySymToUnicodeMapping.cpp @@ -1396,4 +1396,4 @@ Uint32 keysymToUnicode(KeySym keysym) } // namespace priv -} // namespace sf \ No newline at end of file +} // namespace sf diff --git a/src/SFML/Window/Unix/KeyboardImpl.cpp b/src/SFML/Window/Unix/KeyboardImpl.cpp index 9f5178fc..0dc827e2 100644 --- a/src/SFML/Window/Unix/KeyboardImpl.cpp +++ b/src/SFML/Window/Unix/KeyboardImpl.cpp @@ -40,15 +40,15 @@ namespace { const KeyCode NullKeyCode = 0; -KeyCode scancodeToKeycode[sf::Keyboard::ScanCodeCount]; ///< Mapping of SFML scancode to X11 KeyCode -sf::Keyboard::Scancode keycodeToScancode[256]; ///< Mapping of X11 KeyCode to SFML scancode +KeyCode scancodeToKeycode[sf::Keyboard::ScanCodeCount]; ///< Mapping of SFML scancode to X11 KeyCode +sf::Keyboard::Scancode keycodeToScancode[256]; ///< Mapping of X11 KeyCode to SFML scancode bool isMappingInitialized = false; //////////////////////////////////////////////////////////// bool isValidKeycode(KeyCode keycode) { // Valid key code range is [8,255], according to the Xlib manual - return keycode >= 8 || keycode <= 255; + return (keycode >= 8) || (keycode <= 255); } @@ -241,7 +241,7 @@ void initMapping() std::memcpy(name, desc->names->keys[keycode].name, XkbKeyNameLength); name[XkbKeyNameLength] = '\0'; - if (strcmp(name, "TLDE") == 0) sc = sf::Keyboard::ScanGraveAccent; + if (strcmp(name, "TLDE") == 0) sc = sf::Keyboard::ScanGraveAccent; else if (strcmp(name, "AE01") == 0) sc = sf::Keyboard::ScanNum1; else if (strcmp(name, "AE02") == 0) sc = sf::Keyboard::ScanNum2; else if (strcmp(name, "AE03") == 0) sc = sf::Keyboard::ScanNum3; @@ -254,7 +254,7 @@ void initMapping() else if (strcmp(name, "AE10") == 0) sc = sf::Keyboard::ScanNum0; else if (strcmp(name, "AE11") == 0) sc = sf::Keyboard::ScanDash; else if (strcmp(name, "AE12") == 0) sc = sf::Keyboard::ScanEquals; - else if (strcmp(name, "TAB") == 0) sc = sf::Keyboard::ScanTab; + else if (strcmp(name, "TAB" ) == 0) sc = sf::Keyboard::ScanTab; else if (strcmp(name, "AD01") == 0) sc = sf::Keyboard::ScanQ; else if (strcmp(name, "AD02") == 0) sc = sf::Keyboard::ScanW; else if (strcmp(name, "AD03") == 0) sc = sf::Keyboard::ScanE;