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

Small refactorings

Browse source
This commit is contained in:
Elias Daler 2018-03-31 13:48:32 +03:00 committed by Lukas Dürrenberger
parent 56457d922a
commit 6cef8046dd
1 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,15 +42,13 @@ namespace priv
namespace { namespace {
KeyCode scancodeToKeycode[sf::Keyboard::ScanCodeCount]; ///< Mapping of SFML scancode to X11 KeyCode KeyCode scancodeToKeycode[sf::Keyboard::ScanCodeCount] = { 0 }; ///< Mapping of SFML scancode to X11 KeyCode
sf::Keyboard::Scancode keycodeToScancode[256]; ///< 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;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
sf::Keyboard::Scancode translateKeyCode(Display* display, KeyCode keycode) sf::Keyboard::Scancode translateKeyCode(Display* display, KeyCode keycode)
{ {
KeySym keySym;
// Valid key code range is [8,255], according to the Xlib manual // Valid key code range is [8,255], according to the Xlib manual
if (keycode < 8 || keycode > 255) if (keycode < 8 || keycode > 255)
return sf::Keyboard::ScanUnknown; return sf::Keyboard::ScanUnknown;
@ -59,7 +57,7 @@ sf::Keyboard::Scancode translateKeyCode(Display* display, KeyCode keycode)
// Note: This way we always force "NumLock = ON", which is intentional // Note: This way we always force "NumLock = ON", which is intentional
// since the returned key code should correspond to a physical // since the returned key code should correspond to a physical
// location. // location.
keySym = XkbKeycodeToKeysym(display, keycode, 0, 1); KeySym keySym = XkbKeycodeToKeysym(display, keycode, 0, 1);
switch (keySym) switch (keySym)
{ {
case XK_KP_0: return sf::Keyboard::ScanNumpad0; case XK_KP_0: return sf::Keyboard::ScanNumpad0;
@ -226,16 +224,6 @@ sf::Keyboard::Scancode translateKeyCode(Display* display, KeyCode keycode)
void initMapping() void initMapping()
{ {
for (int i = 0; i < sf::Keyboard::ScanCodeCount; ++i)
{
scancodeToKeycode[i] = 0;
}
for (int i = 0; i < 256; ++i)
{
keycodeToScancode[i] = sf::Keyboard::ScanUnknown;
}
Display* display = OpenDisplay(); Display* display = OpenDisplay();
// Find the X11 key code -> SFML key code mapping // Find the X11 key code -> SFML key code mapping
@ -366,14 +354,18 @@ KeySym SFScancodeToKeySym(sf::Keyboard::Scancode code)
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool isKeyPressedImpl(Display* display, KeyCode keycode) bool isKeyPressedImpl(KeyCode keycode)
{ {
if (keycode != 0) if (keycode != 0)
{ {
Display* display = OpenDisplay();
// Get the whole keyboard state // Get the whole keyboard state
char keys[32]; char keys[32];
XQueryKeymap(display, keys); XQueryKeymap(display, keys);
CloseDisplay(display);
// Check our keycode // Check our keycode
return (keys[keycode / 8] & (1 << (keycode % 8))) != 0; return (keys[keycode / 8] & (1 << (keycode % 8))) != 0;
} }
@ -385,20 +377,16 @@ bool isKeyPressedImpl(Display* display, KeyCode keycode)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool KeyboardImpl::isKeyPressed(sf::Keyboard::Key key) bool KeyboardImpl::isKeyPressed(sf::Keyboard::Key key)
{ {
Display* display = OpenDisplay(); KeyCode keycode = SFKeyToKeyCode(key);
bool pressed = isKeyPressedImpl(display, SFKeyToKeyCode(key)); return isKeyPressedImpl(keycode);
CloseDisplay(display);
return pressed;
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool KeyboardImpl::isKeyPressed(sf::Keyboard::Scancode code) bool KeyboardImpl::isKeyPressed(sf::Keyboard::Scancode code)
{ {
Display* display = OpenDisplay(); KeyCode keycode = SFScancodeToKeyCode(code);
bool pressed = isKeyPressedImpl(display, SFScancodeToKeyCode(code)); return isKeyPressedImpl(keycode);
CloseDisplay(display);
return pressed;
} }
@ -530,7 +518,7 @@ sf::String KeyboardImpl::getDescription(Keyboard::Scancode code)
case sf::Keyboard::ScanRSystem: return "Meta (Right)"; case sf::Keyboard::ScanRSystem: return "Meta (Right)";
} }
return sf::String("Unknown Scancode"); // no guess good enough possible. return "Unknown Scancode"; // no guess good enough possible.
} }