mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-24 20:31:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add CapsLock, NumLock and ScrollLock support for Events

Browse Source
This commit is contained in:
Lukas Dürrenberger 2024-09-19 22:06:38 +02:00
parent 053ef0b483
commit e2456574f9
6 changed files with 111 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/SFML/Window/Event.hpp
View File

@ -94,12 +94,15 @@ public:
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
struct KeyPressed struct KeyPressed
{ {
Keyboard::Key code{}; //!< Code of the key that has been pressed Keyboard::Key code{}; //!< Code of the key that has been pressed
Keyboard::Scancode scancode{}; //!< Physical code of the key that has been pressed Keyboard::Scancode scancode{}; //!< Physical code of the key that has been pressed
bool alt{}; //!< Is the Alt key pressed? bool alt{}; //!< Is the Alt key pressed?
bool control{}; //!< Is the Control key pressed? bool control{}; //!< Is the Control key pressed?
bool shift{}; //!< Is the Shift key pressed? bool shift{}; //!< Is the Shift key pressed?
bool system{}; //!< Is the System key pressed? bool system{}; //!< Is the System key pressed?
bool capsLock{}; //!< Is the CapsLock key toggled?
bool numLock{}; //!< Is the NumLock key toggled? (Not supported on macOS)
bool scrollLock{}; //!< Is the ScrollLock key toggled?
}; };
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@ -108,12 +111,15 @@ public:
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
struct KeyReleased struct KeyReleased
{ {
Keyboard::Key code{}; //!< Code of the key that has been released Keyboard::Key code{}; //!< Code of the key that has been released
Keyboard::Scancode scancode{}; //!< Physical code of the key that has been released Keyboard::Scancode scancode{}; //!< Physical code of the key that has been released
bool alt{}; //!< Is the Alt key pressed? bool alt{}; //!< Is the Alt key pressed?
bool control{}; //!< Is the Control key pressed? bool control{}; //!< Is the Control key pressed?
bool shift{}; //!< Is the Shift key pressed? bool shift{}; //!< Is the Shift key pressed?
bool system{}; //!< Is the System key pressed? bool system{}; //!< Is the System key pressed?
bool capsLock{}; //!< Is the CapsLock key toggled?
bool numLock{}; //!< Is the NumLock key toggled? (Not supported on macOS)
bool scrollLock{}; //!< Is the ScrollLock key toggled?
}; };
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

10
src/SFML/Window/Android/WindowImplAndroid.cpp
View File

@ -416,9 +416,13 @@ int WindowImplAndroid::processKeyEvent(AInputEvent* inputEvent, ActivityStates&
const auto forwardKeyEvent = [&](auto keyEvent) const auto forwardKeyEvent = [&](auto keyEvent)
{ {
keyEvent.code = androidKeyToSF(key); keyEvent.code = androidKeyToSF(key);
keyEvent.alt = metakey & AMETA_ALT_ON; keyEvent.alt = metakey & AMETA_ALT_ON;
keyEvent.shift = metakey & AMETA_SHIFT_ON; keyEvent.shift = metakey & AMETA_SHIFT_ON;
keyEvent.system = metakey & AMETA_SYM_ON;
keyEvent.capsLock = metakey & AMETA_CAPS_LOCK_ON;
keyEvent.numLock = metakey & AMETA_NUM_LOCK_ON;
keyEvent.scrollLock = metakey & AMETA_SCROLL_LOCK_ON;
forwardEvent(keyEvent); forwardEvent(keyEvent);
}; };

27
src/SFML/Window/DRM/InputImpl.cpp
View File

@ -90,6 +90,18 @@ bool systemDown()
{ {
return keyMap[sf::Keyboard::Key::LSystem] || keyMap[sf::Keyboard::Key::RSystem]; return keyMap[sf::Keyboard::Key::LSystem] || keyMap[sf::Keyboard::Key::RSystem];
} }
bool capsLockDown()
{
return false; // TODO: To be implemented, potentially with scancode support
}
bool numLockDown()
{
return false; // TODO: To be implemented, potentially with scancode support
}
bool scrollLockDown()
{
return false; // TODO: To be implemented, potentially with scancode support
}
void uninitFileDescriptors() void uninitFileDescriptors()
{ {
@ -407,12 +419,15 @@ std::optional<sf::Event> eventProcess()
const auto makeKeyEvent = [&](auto keyEvent) const auto makeKeyEvent = [&](auto keyEvent)
{ {
keyEvent.code = kb; keyEvent.code = kb;
keyEvent.scancode = sf::Keyboard::Scan::Unknown; // TODO: not implemented keyEvent.scancode = sf::Keyboard::Scan::Unknown; // TODO: not implemented
keyEvent.alt = altDown(); keyEvent.alt = altDown();
keyEvent.control = controlDown(); keyEvent.control = controlDown();
keyEvent.shift = shiftDown(); keyEvent.shift = shiftDown();
keyEvent.system = systemDown(); keyEvent.system = systemDown();
keyEvent.capsLock = capsLockDown();
keyEvent.numLock = numLockDown();
keyEvent.scrollLock = scrollLockDown();
return keyEvent; return keyEvent;
}; };

30
src/SFML/Window/Unix/WindowImplX11.cpp
View File

@ -1808,12 +1808,15 @@ bool WindowImplX11::processEvent(XEvent& windowEvent)
// Fill the event parameters // Fill the event parameters
// TODO: if modifiers are wrong, use XGetModifierMapping to retrieve the actual modifiers mapping // TODO: if modifiers are wrong, use XGetModifierMapping to retrieve the actual modifiers mapping
Event::KeyPressed event; Event::KeyPressed event;
event.code = KeyboardImpl::getKeyFromEvent(windowEvent.xkey); event.code = KeyboardImpl::getKeyFromEvent(windowEvent.xkey);
event.scancode = KeyboardImpl::getScancodeFromEvent(windowEvent.xkey); event.scancode = KeyboardImpl::getScancodeFromEvent(windowEvent.xkey);
event.alt = windowEvent.xkey.state & Mod1Mask; event.alt = windowEvent.xkey.state & Mod1Mask;
event.control = windowEvent.xkey.state & ControlMask; event.control = windowEvent.xkey.state & ControlMask;
event.shift = windowEvent.xkey.state & ShiftMask; event.shift = windowEvent.xkey.state & ShiftMask;
event.system = windowEvent.xkey.state & Mod4Mask; event.system = windowEvent.xkey.state & Mod4Mask;
event.capsLock = windowEvent.xkey.state & LockMask;
event.numLock = windowEvent.xkey.state & Mod2Mask;
event.scrollLock = windowEvent.xkey.state & Mod3Mask;
const bool filtered = XFilterEvent(&windowEvent, None); const bool filtered = XFilterEvent(&windowEvent, None);
@ -1889,12 +1892,15 @@ bool WindowImplX11::processEvent(XEvent& windowEvent)
{ {
// Fill the event parameters // Fill the event parameters
Event::KeyReleased event; Event::KeyReleased event;
event.code = KeyboardImpl::getKeyFromEvent(windowEvent.xkey); event.code = KeyboardImpl::getKeyFromEvent(windowEvent.xkey);
event.scancode = KeyboardImpl::getScancodeFromEvent(windowEvent.xkey); event.scancode = KeyboardImpl::getScancodeFromEvent(windowEvent.xkey);
event.alt = windowEvent.xkey.state & Mod1Mask; event.alt = windowEvent.xkey.state & Mod1Mask;
event.control = windowEvent.xkey.state & ControlMask; event.control = windowEvent.xkey.state & ControlMask;
event.shift = windowEvent.xkey.state & ShiftMask; event.shift = windowEvent.xkey.state & ShiftMask;
event.system = windowEvent.xkey.state & Mod4Mask; event.system = windowEvent.xkey.state & Mod4Mask;
event.capsLock = windowEvent.xkey.state & LockMask;
event.numLock = windowEvent.xkey.state & Mod2Mask;
event.scrollLock = windowEvent.xkey.state & Mod3Mask;
pushEvent(event); pushEvent(event);
break; break;

30
src/SFML/Window/Win32/WindowImplWin32.cpp
View File

@ -886,12 +886,15 @@ void WindowImplWin32::processEvent(UINT message, WPARAM wParam, LPARAM lParam)
if (m_keyRepeatEnabled || ((HIWORD(lParam) & KF_REPEAT) == 0)) if (m_keyRepeatEnabled || ((HIWORD(lParam) & KF_REPEAT) == 0))
{ {
Event::KeyPressed event; Event::KeyPressed event;
event.alt = HIWORD(GetKeyState(VK_MENU)) != 0; event.alt = GetKeyState(VK_MENU) & 0x8000;
event.control = HIWORD(GetKeyState(VK_CONTROL)) != 0; event.control = GetKeyState(VK_CONTROL) & 0x8000;
event.shift = HIWORD(GetKeyState(VK_SHIFT)) != 0; event.shift = GetKeyState(VK_SHIFT) & 0x8000;
event.system = HIWORD(GetKeyState(VK_LWIN)) || HIWORD(GetKeyState(VK_RWIN)); event.system = GetKeyState(VK_LWIN) & 0x8000 || GetKeyState(VK_RWIN) & 0x8000;
event.code = virtualKeyCodeToSF(wParam, lParam); event.capsLock = GetKeyState(VK_CAPITAL) & 0x0001;
event.scancode = toScancode(wParam, lParam); event.numLock = GetKeyState(VK_NUMLOCK) & 0x0001;
event.scrollLock = GetKeyState(VK_SCROLL) & 0x0001;
event.code = virtualKeyCodeToSF(wParam, lParam);
event.scancode = toScancode(wParam, lParam);
pushEvent(event); pushEvent(event);
} }
break; break;
@ -902,12 +905,15 @@ void WindowImplWin32::processEvent(UINT message, WPARAM wParam, LPARAM lParam)
case WM_SYSKEYUP: case WM_SYSKEYUP:
{ {
Event::KeyReleased event; Event::KeyReleased event;
event.alt = HIWORD(GetKeyState(VK_MENU)) != 0; event.alt = GetKeyState(VK_MENU) & 0x8000;
event.control = HIWORD(GetKeyState(VK_CONTROL)) != 0; event.control = GetKeyState(VK_CONTROL) & 0x8000;
event.shift = HIWORD(GetKeyState(VK_SHIFT)) != 0; event.shift = GetKeyState(VK_SHIFT) & 0x8000;
event.system = HIWORD(GetKeyState(VK_LWIN)) || HIWORD(GetKeyState(VK_RWIN)); event.system = GetKeyState(VK_LWIN) & 0x8000 || GetKeyState(VK_RWIN) & 0x8000;
event.code = virtualKeyCodeToSF(wParam, lParam); event.capsLock = GetKeyState(VK_CAPITAL) & 0x0001;
event.scancode = toScancode(wParam, lParam); event.numLock = GetKeyState(VK_NUMLOCK) & 0x0001;
event.scrollLock = GetKeyState(VK_SCROLL) & 0x0001;
event.code = virtualKeyCodeToSF(wParam, lParam);
event.scancode = toScancode(wParam, lParam);
pushEvent(event); pushEvent(event);
break; break;
} }

42
src/SFML/Window/macOS/SFKeyboardModifiersHelper.mm
View File

@ -63,6 +63,7 @@ struct ModifiersState
BOOL leftControlWasDown{}; BOOL leftControlWasDown{};
BOOL rightControlWasDown{}; BOOL rightControlWasDown{};
BOOL capsLockWasOn{}; BOOL capsLockWasOn{};
BOOL numLockWasOn{};
}; };
@ -151,7 +152,8 @@ void initialiseKeyboardHelper()
state.rightAlternateWasDown = isKeyMaskActive(modifiers, NSRightAlternateKeyMask); state.rightAlternateWasDown = isKeyMaskActive(modifiers, NSRightAlternateKeyMask);
state.leftControlWasDown = isKeyMaskActive(modifiers, NSLeftControlKeyMask); state.leftControlWasDown = isKeyMaskActive(modifiers, NSLeftControlKeyMask);
state.rightControlWasDown = isKeyMaskActive(modifiers, NSRightControlKeyMask); state.rightControlWasDown = isKeyMaskActive(modifiers, NSRightControlKeyMask);
state.capsLockWasOn = isKeyMaskActive(modifiers, NSEventModifierFlagCapsLock); state.capsLockWasOn = isKeyMaskActive(modifiers, NSAlphaShiftKeyMask);
state.numLockWasOn = isKeyMaskActive(modifiers, NSNumericPadKeyMask);
isStateInitialized = YES; isStateInitialized = YES;
} }
@ -161,12 +163,15 @@ void initialiseKeyboardHelper()
sf::Event::KeyPressed keyPressedEventWithModifiers(NSUInteger modifiers, sf::Keyboard::Key key, sf::Keyboard::Scancode code) sf::Event::KeyPressed keyPressedEventWithModifiers(NSUInteger modifiers, sf::Keyboard::Key key, sf::Keyboard::Scancode code)
{ {
sf::Event::KeyPressed event; sf::Event::KeyPressed event;
event.code = key; event.code = key;
event.scancode = code; event.scancode = code;
event.alt = modifiers & NSAlternateKeyMask; event.alt = modifiers & NSAlternateKeyMask;
event.control = modifiers & NSControlKeyMask; event.control = modifiers & NSControlKeyMask;
event.shift = modifiers & NSShiftKeyMask; event.shift = modifiers & NSShiftKeyMask;
event.system = modifiers & NSCommandKeyMask; event.system = modifiers & NSCommandKeyMask;
event.capsLock = modifiers & NSAlphaShiftKeyMask;
event.numLock = modifiers & NSNumericPadKeyMask;
event.scrollLock = false; // Doesn't exist on macOS
return event; return event;
} }
@ -175,12 +180,15 @@ sf::Event::KeyPressed keyPressedEventWithModifiers(NSUInteger modifiers, sf::Key
sf::Event::KeyReleased keyReleasedEventWithModifiers(NSUInteger modifiers, sf::Keyboard::Key key, sf::Keyboard::Scancode code) sf::Event::KeyReleased keyReleasedEventWithModifiers(NSUInteger modifiers, sf::Keyboard::Key key, sf::Keyboard::Scancode code)
{ {
sf::Event::KeyReleased event; sf::Event::KeyReleased event;
event.code = key; event.code = key;
event.scancode = code; event.scancode = code;
event.alt = modifiers & NSAlternateKeyMask; event.alt = modifiers & NSAlternateKeyMask;
event.control = modifiers & NSControlKeyMask; event.control = modifiers & NSControlKeyMask;
event.shift = modifiers & NSShiftKeyMask; event.shift = modifiers & NSShiftKeyMask;
event.system = modifiers & NSCommandKeyMask; event.system = modifiers & NSCommandKeyMask;
event.capsLock = modifiers & NSAlphaShiftKeyMask;
event.numLock = modifiers & NSNumericPadKeyMask;
event.scrollLock = false; // Doesn't exist on macOS
return event; return event;
} }
@ -243,4 +251,12 @@ void handleModifiersChanged(NSUInteger modifiers, sf::priv::WindowImplCocoa& req
sf::Keyboard::Key::Unknown, sf::Keyboard::Key::Unknown,
sf::Keyboard::Scan::CapsLock, sf::Keyboard::Scan::CapsLock,
requester); requester);
// Handle num lock
processOneModifier(modifiers,
NSEventModifierFlagNumericPad,
state.numLockWasOn,
sf::Keyboard::Key::Unknown,
sf::Keyboard::Scan::NumLock,
requester);
} }