Compare commits
2 commits
master
...
bugfix/uni
Author | SHA1 | Date | |
---|---|---|---|
![]() |
4a12244aab | ||
![]() |
f037c2775b |
|
@ -247,6 +247,8 @@ namespace
|
||||||
case XK_Control_L: return sf::Keyboard::LControl;
|
case XK_Control_L: return sf::Keyboard::LControl;
|
||||||
case XK_Control_R: return sf::Keyboard::RControl;
|
case XK_Control_R: return sf::Keyboard::RControl;
|
||||||
case XK_Alt_L: return sf::Keyboard::LAlt;
|
case XK_Alt_L: return sf::Keyboard::LAlt;
|
||||||
|
case XK_ISO_Level3_Shift:
|
||||||
|
case XK_Mode_switch:
|
||||||
case XK_Alt_R: return sf::Keyboard::RAlt;
|
case XK_Alt_R: return sf::Keyboard::RAlt;
|
||||||
case XK_Super_L: return sf::Keyboard::LSystem;
|
case XK_Super_L: return sf::Keyboard::LSystem;
|
||||||
case XK_Super_R: return sf::Keyboard::RSystem;
|
case XK_Super_R: return sf::Keyboard::RSystem;
|
||||||
|
@ -1757,17 +1759,23 @@ bool WindowImplX11::processEvent(XEvent windowEvent)
|
||||||
// Key down event
|
// Key down event
|
||||||
case KeyPress:
|
case KeyPress:
|
||||||
{
|
{
|
||||||
// Get the keysym of the key that has been pressed
|
Keyboard::Key key = Keyboard::Unknown;
|
||||||
static XComposeStatus keyboard;
|
|
||||||
char buffer[32];
|
// Try each KeySym index (modifier group) until we get a match
|
||||||
KeySym symbol;
|
for (int i = 0; i < 4; ++i)
|
||||||
XLookupString(&windowEvent.xkey, buffer, sizeof(buffer), &symbol, &keyboard);
|
{
|
||||||
|
// Get the SFML keyboard code from the keysym of the key that has been pressed
|
||||||
|
key = keysymToSF(XLookupKeysym(&windowEvent.xkey, i));
|
||||||
|
|
||||||
|
if (key != Keyboard::Unknown)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
// 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 event;
|
Event event;
|
||||||
event.type = Event::KeyPressed;
|
event.type = Event::KeyPressed;
|
||||||
event.key.code = keysymToSF(symbol);
|
event.key.code = key;
|
||||||
event.key.alt = windowEvent.xkey.state & Mod1Mask;
|
event.key.alt = windowEvent.xkey.state & Mod1Mask;
|
||||||
event.key.control = windowEvent.xkey.state & ControlMask;
|
event.key.control = windowEvent.xkey.state & ControlMask;
|
||||||
event.key.shift = windowEvent.xkey.state & ShiftMask;
|
event.key.shift = windowEvent.xkey.state & ShiftMask;
|
||||||
|
@ -1826,15 +1834,22 @@ bool WindowImplX11::processEvent(XEvent windowEvent)
|
||||||
// Key up event
|
// Key up event
|
||||||
case KeyRelease:
|
case KeyRelease:
|
||||||
{
|
{
|
||||||
// Get the keysym of the key that has been pressed
|
Keyboard::Key key = Keyboard::Unknown;
|
||||||
char buffer[32];
|
|
||||||
KeySym symbol;
|
// Try each KeySym index (modifier group) until we get a match
|
||||||
XLookupString(&windowEvent.xkey, buffer, 32, &symbol, NULL);
|
for (int i = 0; i < 4; ++i)
|
||||||
|
{
|
||||||
|
// Get the SFML keyboard code from the keysym of the key that has been released
|
||||||
|
key = keysymToSF(XLookupKeysym(&windowEvent.xkey, i));
|
||||||
|
|
||||||
|
if (key != Keyboard::Unknown)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
// Fill the event parameters
|
// Fill the event parameters
|
||||||
Event event;
|
Event event;
|
||||||
event.type = Event::KeyReleased;
|
event.type = Event::KeyReleased;
|
||||||
event.key.code = keysymToSF(symbol);
|
event.key.code = key;
|
||||||
event.key.alt = windowEvent.xkey.state & Mod1Mask;
|
event.key.alt = windowEvent.xkey.state & Mod1Mask;
|
||||||
event.key.control = windowEvent.xkey.state & ControlMask;
|
event.key.control = windowEvent.xkey.state & ControlMask;
|
||||||
event.key.shift = windowEvent.xkey.state & ShiftMask;
|
event.key.shift = windowEvent.xkey.state & ShiftMask;
|
||||||
|
|
Loading…
Reference in a new issue