Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-12-16 20:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure we read other events even if we cannot read wayland ones

Browse Source
This commit is contained in:
Doug Binks 2025-11-26 11:57:29 +00:00
parent 162896e5b9
commit 6d26adc612
1 changed files with 65 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/wl_window.c
View File

@ -1356,6 +1356,7 @@ static void handleEvents(double* timeout)
#endif #endif
GLFWbool event = GLFW_FALSE; GLFWbool event = GLFW_FALSE;
GLFWbool wlcanread = GLFW_FALSE;
enum { DISPLAY_FD, KEYREPEAT_FD, CURSOR_FD, LIBDECOR_FD }; enum { DISPLAY_FD, KEYREPEAT_FD, CURSOR_FD, LIBDECOR_FD };
struct pollfd fds[] = struct pollfd fds[] =
{ {
@ -1370,42 +1371,75 @@ static void handleEvents(double* timeout)
while (!event) while (!event)
{ {
while (wl_display_prepare_read(_glfw.wl.display) != 0) while (!wlcanread && !event)
{ {
if (wl_display_dispatch_pending(_glfw.wl.display) > 0) if (wl_display_prepare_read(_glfw.wl.display) == 0)
return; {
wlcanread = GLFW_TRUE;
}
else if (wl_display_dispatch_pending(_glfw.wl.display) > 0)
{
event = GLFW_TRUE;
break;
}
} }
// If an error other than EAGAIN happens, we have likely been disconnected if (wlcanread)
// from the Wayland session; try to handle that the best we can. {
if (!flushDisplay()) // If an error other than EAGAIN happens, we have likely been disconnected
{ // from the Wayland session; try to handle that the best we can.
wl_display_cancel_read(_glfw.wl.display); if (!flushDisplay())
{
wl_display_cancel_read(_glfw.wl.display);
_GLFWwindow* window = _glfw.windowListHead; _GLFWwindow* window = _glfw.windowListHead;
while (window) while (window)
{ {
_glfwInputWindowCloseRequest(window); _glfwInputWindowCloseRequest(window);
window = window->next; window = window->next;
} }
return; return;
} }
if (!_glfwPollPOSIX(fds, sizeof(fds) / sizeof(fds[0]), timeout)) if (!_glfwPollPOSIX(fds, sizeof(fds) / sizeof(fds[0]), timeout))
{ {
wl_display_cancel_read(_glfw.wl.display); wl_display_cancel_read(_glfw.wl.display);
return; return;
} }
if (fds[DISPLAY_FD].revents & POLLIN) if (fds[DISPLAY_FD].revents & POLLIN)
{ {
wl_display_read_events(_glfw.wl.display); wl_display_read_events(_glfw.wl.display);
if (wl_display_dispatch_pending(_glfw.wl.display) > 0) if (wl_display_dispatch_pending(_glfw.wl.display) > 0)
event = GLFW_TRUE; event = GLFW_TRUE;
} }
else else
wl_display_cancel_read(_glfw.wl.display); wl_display_cancel_read(_glfw.wl.display);
}
else
{
if (!flushDisplay())
{
_GLFWwindow* window = _glfw.windowListHead;
while (window)
{
_glfwInputWindowCloseRequest(window);
window = window->next;
}
return;
}
fds[DISPLAY_FD].fd = -1; // ignore wl events
fds[LIBDECOR_FD].fd = -1;
//fds[CURSOR_FD].fd = -1;
double notimeout = 0.0;
if (!_glfwPollPOSIX(fds, sizeof(fds) / sizeof(fds[0]), &notimeout))
{
return;
}
}
if (fds[KEYREPEAT_FD].revents & POLLIN) if (fds[KEYREPEAT_FD].revents & POLLIN)
{ {
@ -1431,7 +1465,7 @@ static void handleEvents(double* timeout)
} }
} }
if (fds[CURSOR_FD].revents & POLLIN) if ((fds[CURSOR_FD].fd > 0 ) && (fds[CURSOR_FD].revents & POLLIN))
{ {
uint64_t repeats; uint64_t repeats;
@ -1439,7 +1473,7 @@ static void handleEvents(double* timeout)
incrementCursorImage(_glfw.wl.pointerFocus); incrementCursorImage(_glfw.wl.pointerFocus);
} }
if (fds[LIBDECOR_FD].revents & POLLIN) if ((fds[LIBDECOR_FD].fd > 0 ) && (fds[LIBDECOR_FD].revents & POLLIN))
{ {
if (libdecor_dispatch(_glfw.wl.libdecor.context, 0) > 0) if (libdecor_dispatch(_glfw.wl.libdecor.context, 0) > 0)
event = GLFW_TRUE; event = GLFW_TRUE;