KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

X11 backend: Improve performance when handling consecutive XkbKeyMap events

Browse Source 
Only recompile the keymap when actually needed, greatly improving
performance when the X server sends multiple consecutive key map events.
Fixes #1606
This commit is contained in:
Kovid Goyal 2019-05-11 13:39:05 +05:30
parent f4294b83fb
commit a3f9835b7b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glfw/x11_window.c vendored
View File

@ -1078,6 +1078,8 @@ static void onConfigChange()
static void processEvent(XEvent *event) static void processEvent(XEvent *event)
{ {
_GLFWwindow* window = NULL; _GLFWwindow* window = NULL;
static GLFWbool keymap_dirty = GLFW_FALSE;
#define UPDATE_KEYMAP_IF_NEEDED if (keymap_dirty) { keymap_dirty = GLFW_FALSE; glfw_xkb_compile_keymap(&_glfw.x11.xkb, NULL); }
if (_glfw.x11.randr.available) if (_glfw.x11.randr.available)
{ {
@ -1153,11 +1155,12 @@ static void processEvent(XEvent *event)
/* fallthrough */ /* fallthrough */
case XkbMapNotify: case XkbMapNotify:
{ {
glfw_xkb_compile_keymap(&_glfw.x11.xkb, NULL); keymap_dirty = GLFW_TRUE;
return; return;
} }
case XkbStateNotify: case XkbStateNotify:
{ {
UPDATE_KEYMAP_IF_NEEDED;
XkbStateNotifyEvent *state_event = (XkbStateNotifyEvent*)kb_event; XkbStateNotifyEvent *state_event = (XkbStateNotifyEvent*)kb_event;
glfw_xkb_update_modifiers( glfw_xkb_update_modifiers(
&_glfw.x11.xkb, state_event->base_mods, state_event->latched_mods, &_glfw.x11.xkb, state_event->base_mods, state_event->latched_mods,
@ -1182,12 +1185,14 @@ static void processEvent(XEvent *event)
{ {
case KeyPress: case KeyPress:
{ {
UPDATE_KEYMAP_IF_NEEDED;
glfw_xkb_handle_key_event(window, &_glfw.x11.xkb, event->xkey.keycode, GLFW_PRESS); glfw_xkb_handle_key_event(window, &_glfw.x11.xkb, event->xkey.keycode, GLFW_PRESS);
return; return;
} }
case KeyRelease: case KeyRelease:
{ {
UPDATE_KEYMAP_IF_NEEDED;
if (!_glfw.x11.xkb.detectable) if (!_glfw.x11.xkb.detectable)
{ {
// HACK: Key repeat events will arrive as KeyRelease/KeyPress // HACK: Key repeat events will arrive as KeyRelease/KeyPress