maelstrom/milsko
1
0
Fork 0
forked from pyrite-dev/milsko
Code Pull requests Activity

wayland: don't do draw dispatch on forceRender anymore, merely update the buffer

Browse source
This commit is contained in:
IoIxD 2026-03-22 16:32:36 -07:00
commit c3d25e6b7d
2 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/backend/wayland.c
View file

@ -1861,31 +1861,37 @@ static int MwLLPendingImpl(MwLL handle) {
fd.fd = wl_display_get_fd(handle->wayland.display); fd.fd = wl_display_get_fd(handle->wayland.display);
fd.events = POLLOUT; fd.events = POLLOUT;
wl_display_prepare_read(handle->wayland.display); if(!handle->wayland.always_render) wl_display_prepare_read(handle->wayland.display);
if(!poll(&fd, 1, timeout.tv_nsec)) { if(!poll(&fd, 1, timeout.tv_nsec)) {
wl_display_cancel_read(handle->wayland.display); wl_display_cancel_read(handle->wayland.display);
} else { } else {
wl_display_read_events(handle->wayland.display); if(!handle->wayland.always_render) wl_display_read_events(handle->wayland.display);
if((pending = wl_display_dispatch_pending(handle->wayland.display)) < 0) { if((pending = wl_display_dispatch_pending(handle->wayland.display)) < 0) {
wl_display_cancel_read(handle->wayland.display); wl_display_cancel_read(handle->wayland.display);
} }
} }
if(handle->wayland.always_render) {
// handle->wayland.did_event_loop_early = MwTRUE;
// event_loop(handle);
return pending;
}
wl_surface_commit(handle->wayland.framebuffer.surface); wl_surface_commit(handle->wayland.framebuffer.surface);
if(handle->wayland.type == MWLL_WAYLAND_TOPLEVEL) { if(handle->wayland.type == MWLL_WAYLAND_TOPLEVEL) {
wl_surface_commit(handle->wayland.backbuffer.surface); wl_surface_commit(handle->wayland.backbuffer.surface);
} }
if(handle->wayland.always_render) { if(handle->wayland.events_pending) {
handle->wayland.did_event_loop_early = MwTRUE;
event_loop(handle); event_loop(handle);
return 0;
} else if(handle->wayland.force_render) {
MwLLDispatch(handle, draw, NULL);
return 1; return 1;
} }
if(handle->wayland.events_pending || handle->wayland.force_render) {
handle->wayland.did_event_loop_early = MwTRUE; // if(handle->wayland.force_render) {
return event_loop(handle);
} // return 1;
// }
return pending; return pending;
} }
@ -1902,6 +1908,7 @@ static void MwLLNextEventImpl(MwLL handle) {
handle->wayland.events_pending = 0; handle->wayland.events_pending = 0;
} }
if(handle->wayland.force_render) { if(handle->wayland.force_render) {
// MwLLDispatch(handle, draw, NULL);
if(handle->wayland.configured) update_buffer(&handle->wayland.framebuffer); if(handle->wayland.configured) update_buffer(&handle->wayland.framebuffer);
handle->wayland.force_render = 0; handle->wayland.force_render = 0;
} }
@ -1960,7 +1967,7 @@ static void MwLLDestroyPixmapImpl(MwLLPixmap pixmap) {
static void MwLLDrawPixmapImpl(MwLL handle, MwRect* rect, MwLLPixmap pixmap) { static void MwLLDrawPixmapImpl(MwLL handle, MwRect* rect, MwLLPixmap pixmap) {
cairo_t* c; cairo_t* c;
cairo_surface_t* cs; cairo_surface_t* cs;
cairo_t * selected_cairo = handle->wayland.selected_cairo ? handle->wayland.selected_cairo : handle->wayland.front_cairo; cairo_t* selected_cairo = handle->wayland.selected_cairo ? handle->wayland.selected_cairo : handle->wayland.front_cairo;
cs = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, rect->width, rect->height); cs = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, rect->width, rect->height);
c = cairo_create(cs); c = cairo_create(cs);

7
src/widget/opengl.c
View file

@ -165,9 +165,10 @@ static int create(MwWidget handle) {
1, 1,
EGL_NONE}; EGL_NONE};
EGLDisplay display; EGLDisplay display;
waylandopengl_t* o = r = malloc(sizeof(*o)); waylandopengl_t* o = r = malloc(sizeof(*o));
MwLL topmost_parent = handle->lowlevel->wayland.parent; MwLL topmost_parent = handle->lowlevel->wayland.parent;
topmost_parent->wayland.always_render = MwTRUE; handle->lowlevel->wayland.always_render = MwTRUE;
topmost_parent->wayland.always_render = MwTRUE;
while(topmost_parent->wayland.parent != NULL) { while(topmost_parent->wayland.parent != NULL) {
topmost_parent = topmost_parent->wayland.parent; topmost_parent = topmost_parent->wayland.parent;