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

glfw/x11_window/selection: timeout if no answer for two seconds

Browse Source 
This prevents kitty to hang forever if a bad client does not give selection
This commit is contained in:
Dominique Martinet 2018-10-02 16:03:48 +09:00
parent 019e6efeda
commit d8a74e8a3c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glfw/x11_window.c vendored
View File

@ -873,6 +873,7 @@ static const char* getSelectionString(Atom selection)
Atom actualType; Atom actualType;
int actualFormat; int actualFormat;
unsigned long itemCount, bytesAfter; unsigned long itemCount, bytesAfter;
double start = glfwGetTime();
XEvent notification, dummy; XEvent notification, dummy;
XConvertSelection(_glfw.x11.display, XConvertSelection(_glfw.x11.display,
@ -887,7 +888,10 @@ static const char* getSelectionString(Atom selection)
SelectionNotify, SelectionNotify,
&notification)) &notification))
{ {
waitForX11Event(-1); double time = glfwGetTime();
if (time - start > 2)
return "";
waitForX11Event(2.0 - (time - start));
} }
if (notification.xselection.property == None) if (notification.xselection.property == None)
@ -918,12 +922,16 @@ static const char* getSelectionString(Atom selection)
for (;;) for (;;)
{ {
start = glfwGetTime();
while (!XCheckIfEvent(_glfw.x11.display, while (!XCheckIfEvent(_glfw.x11.display,
&dummy, &dummy,
isSelPropNewValueNotify, isSelPropNewValueNotify,
(XPointer) &notification)) (XPointer) &notification))
{ {
waitForX11Event(-1); double time = glfwGetTime();
if (time - start > 2)
return "";
waitForX11Event(2.0 - (time - start));
} }
XFree(data); XFree(data);