pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 5 Pull requests Projects Releases 7 Packages Wiki Activity Actions

don't use wl_dispatch_pending_timeout appearently debian still doesn't ship with it
All checks were successful
pyrite-dev/milsko/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
IoI_xD 2026-03-19 17:32:36 -07:00
commit 3eeace0963
1 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/backend/wayland.c
View file

@ -4,6 +4,7 @@
#include <poll.h> #include <poll.h>
#include <sched.h> #include <sched.h>
#include <signal.h> #include <signal.h>
#include <sys/poll.h>
#include <wayland-client-core.h> #include <wayland-client-core.h>
#include <wayland-client-protocol.h> #include <wayland-client-protocol.h>
@ -1070,15 +1071,17 @@ static int event_loop(MwLL handle) {
} }
wl_display_prepare_read(handle->wayland.display); wl_display_prepare_read(handle->wayland.display);
wl_display_read_events(wayland->display); /* Condition where no events are being sent. */
if((res = wl_display_dispatch_timeout(wayland->display, &timeout)) <= 0) { if(!poll(&fd, 1, timeout.tv_nsec)) {
if(res < 0) { wl_display_cancel_read(wayland->display);
wl_display_cancel_read(handle->wayland.display);
}
wl_surface_commit(wayland->framebuffer.surface); wl_surface_commit(wayland->framebuffer.surface);
return 0; return 0;
} }
wl_display_read_events(wayland->display);
if(wl_display_dispatch_pending(wayland->display) < 0) {
wl_display_cancel_read(wayland->display);
}
return 1; return 1;
} }
@ -1615,13 +1618,26 @@ static void MwLLFreeColorImpl(MwLLColor color) {
} }
static int MwLLPendingImpl(MwLL handle) { static int MwLLPendingImpl(MwLL handle) {
MwBool pending = MwFALSE;
struct timespec timeout; struct timespec timeout;
timeout.tv_nsec = 1; struct pollfd fd;
timeout.tv_sec = 0; int pending = 0;
int i;
pending = wl_display_dispatch_timeout(handle->wayland.display, &timeout); timeout.tv_nsec = 100;
timeout.tv_sec = 0;
fd.fd = wl_display_get_fd(handle->wayland.display);
fd.events = POLLOUT;
wl_display_prepare_read(handle->wayland.display);
if(!poll(&fd, 1, timeout.tv_nsec)) {
wl_display_cancel_read(handle->wayland.display);
} else {
wl_display_read_events(handle->wayland.display);
if((pending = wl_display_dispatch_pending(handle->wayland.display)) < 0) {
wl_display_cancel_read(handle->wayland.display);
}
}
wl_surface_commit(handle->wayland.framebuffer.surface);
if(handle->wayland.always_render) { if(handle->wayland.always_render) {
event_loop(handle); event_loop(handle);