open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(detect): fix bug that caused espanso to consume 100% on some occasions. Fix #737 Fix #125

Browse Source
This commit is contained in:
Federico Terzi 2021-08-24 19:20:08 +02:00
parent 6c68a9d51d
commit eb7474763b
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
espanso-detect/src/x11/native.cpp
View File

@ -273,12 +273,23 @@ int32_t detect_eventloop(void *_context, EventCallback _callback)
timeval timeout; timeval timeout;
timeout.tv_sec = 2; timeout.tv_sec = 2;
timeout.tv_usec = 0; timeout.tv_usec = 0;
select(max(ctrl_fd, data_fd) + 1, int ret = select(max(ctrl_fd, data_fd) + 1,
&fds, NULL, NULL, &timeout); &fds, NULL, NULL, &timeout);
if (ret < 0) {
return -2;
}
if (FD_ISSET(data_fd, &fds)) if (FD_ISSET(data_fd, &fds))
{ {
XRecordProcessReplies(context->data_disp); XRecordProcessReplies(context->data_disp);
// On certain occasions (such as when a pointer remap occurs), some
// events might get stuck in the queue. If we don't handle them,
// this loop could get out of control, consuming 100% CPU.
while (XEventsQueued(context->data_disp, QueuedAlready) > 0) {
XEvent event;
XNextEvent(context->data_disp, &event);
}
} }
if (FD_ISSET(ctrl_fd, &fds)) if (FD_ISSET(ctrl_fd, &fds))
{ {