mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-06 12:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

x11/skia: Support Space bar as a modifier

Browse Source
This commit is contained in:
David Capello 2018-08-09 11:19:32 -03:00
parent e60c20d5a4
commit f8b193545e
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/she/x11/window.cpp
View File

@ -40,6 +40,8 @@ Cursor empty_xcursor = None;
// into our own user data pointer (X11Window instance) is using a map.
std::map<::Window, X11Window*> g_activeWindows;
bool g_spaceBarIsPressed = false;
KeyModifiers get_modifiers_from_x(int state)
{
int modifiers = kKeyNoneModifier;
@ -61,6 +63,10 @@ KeyModifiers get_modifiers_from_x(int state)
modifiers |= kKeyWinModifier;
KEY_TRACE("+WIN\n");
}
if (g_spaceBarIsPressed) {
modifiers |= kKeySpaceModifier;
KEY_TRACE("+SPACE\n");
}
return (KeyModifiers)modifiers;
}
@ -502,6 +508,31 @@ void X11Window::processX11Event(XEvent& event)
int modifiers = (int)get_modifiers_from_x(event.xkey.state);
switch (keysym) {
case XK_space: {
switch (event.type) {
case KeyPress:
g_spaceBarIsPressed = true;
break;
case KeyRelease:
g_spaceBarIsPressed = false;
// If the next event after a KeyRelease is a KeyPress of
// the same keycode (the space bar in this case), it
// means that this KeyRelease is just a repetition of a
// the same keycode.
if (XEventsQueued(m_display, QueuedAfterReading)) {
XEvent nextEvent;
XPeekEvent(m_display, &nextEvent);
if (nextEvent.type == KeyPress &&
nextEvent.xkey.time == event.xkey.time &&
nextEvent.xkey.keycode == event.xkey.keycode) {
g_spaceBarIsPressed = true;
}
}
break;
}
break;
}
case XK_Shift_L:
case XK_Shift_R:
modifiers |= kKeyShiftModifier;
@ -571,6 +602,8 @@ void X11Window::processX11Event(XEvent& event)
case EnterNotify:
case LeaveNotify:
g_spaceBarIsPressed = false;
// "mode" can be NotifyGrab or NotifyUngrab when middle mouse
// button is pressed/released. We must not generated
// MouseEnter/Leave events on those cases, only on NotifyNormal