alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

swaybar: don't wl_display_roundtrip on each frame

Browse source 
This was the source of numerous bugs, from hotplug events not being
received to segfaults because wl_display_roundtrip was making the
bar process unplug events while blocking in an iteration over all
outputs.
This commit is contained in:
emersion 2018-09-20 19:31:03 +02:00
parent 82f1393cbb
commit 8a5ff5a4db
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
swaybar/bar.c
View file

@ -558,6 +558,7 @@ void bar_run(struct swaybar *bar) {
} }
while (1) { while (1) {
event_loop_poll(); event_loop_poll();
wl_display_flush(bar->display);
} }
} }

2
swaybar/render.c
View file

@ -510,7 +510,6 @@ void render_frame(struct swaybar *bar, struct swaybar_output *output) {
// TODO: this could infinite loop if the compositor assigns us a // TODO: this could infinite loop if the compositor assigns us a
// different height than what we asked for // different height than what we asked for
wl_surface_commit(output->surface); wl_surface_commit(output->surface);
wl_display_roundtrip(bar->display);
} else if (height > 0) { } else if (height > 0) {
// Replay recording into shm and send it off // Replay recording into shm and send it off
output->current_buffer = get_next_buffer(bar->shm, output->current_buffer = get_next_buffer(bar->shm,
@ -536,7 +535,6 @@ void render_frame(struct swaybar *bar, struct swaybar_output *output) {
wl_surface_damage(output->surface, 0, 0, wl_surface_damage(output->surface, 0, 0,
output->width, output->height); output->width, output->height);
wl_surface_commit(output->surface); wl_surface_commit(output->surface);
wl_display_roundtrip(bar->display);
} }
cairo_surface_destroy(recorder); cairo_surface_destroy(recorder);
cairo_destroy(cairo); cairo_destroy(cairo);