mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-27 18:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

swaynag: coalesce surface redraw operations

Browse source 
This avoids exhausting the buffer pool when multiple events that would
trigger redraws occur rapidly (for example: scrolling, resizing output).
This commit is contained in:
Manuel Stoeckl 2024-11-08 21:45:51 -05:00
parent 131026b190
commit 49464d233e
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/swaynag/swaynag.h
View file

@ -90,6 +90,7 @@ struct swaynag {
struct wp_cursor_shape_manager_v1 *cursor_shape_manager; struct wp_cursor_shape_manager_v1 *cursor_shape_manager;
struct wl_surface *surface; struct wl_surface *surface;
bool needs_redraw;
uint32_t width; uint32_t width;
uint32_t height; uint32_t height;
int32_t scale; int32_t scale;

1
swaynag/render.c
View file

@ -250,6 +250,7 @@ void render_frame(struct swaynag *swaynag) {
if (!swaynag->run_display) { if (!swaynag->run_display) {
return; return;
} }
swaynag->needs_redraw = false;
cairo_surface_t *recorder = cairo_recording_surface_create( cairo_surface_t *recorder = cairo_recording_surface_create(
CAIRO_CONTENT_COLOR_ALPHA, NULL); CAIRO_CONTENT_COLOR_ALPHA, NULL);

22
swaynag/swaynag.c
View file

@ -47,7 +47,7 @@ static void swaynag_button_execute(struct swaynag *swaynag,
swaynag->run_display = false; swaynag->run_display = false;
} else if (button->type == SWAYNAG_ACTION_EXPAND) { } else if (button->type == SWAYNAG_ACTION_EXPAND) {
swaynag->details.visible = !swaynag->details.visible; swaynag->details.visible = !swaynag->details.visible;
render_frame(swaynag); swaynag->needs_redraw = true;
} else { } else {
pid_t pid = fork(); pid_t pid = fork();
if (pid < 0) { if (pid < 0) {
@ -98,7 +98,7 @@ static void layer_surface_configure(void *data,
swaynag->width = width; swaynag->width = width;
swaynag->height = height; swaynag->height = height;
zwlr_layer_surface_v1_ack_configure(surface, serial); zwlr_layer_surface_v1_ack_configure(surface, serial);
render_frame(swaynag); swaynag->needs_redraw = true;
} }
static void layer_surface_closed(void *data, static void layer_surface_closed(void *data,
@ -122,7 +122,7 @@ static void surface_enter(void *data, struct wl_surface *surface,
swaynag_output->name); swaynag_output->name);
swaynag->output = swaynag_output; swaynag->output = swaynag_output;
swaynag->scale = swaynag->output->scale; swaynag->scale = swaynag->output->scale;
render_frame(swaynag); swaynag->needs_redraw = true;
break; break;
} }
}; };
@ -244,7 +244,7 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
&& y < button_up.y + button_up.height && y < button_up.y + button_up.height
&& swaynag->details.offset > 0) { && swaynag->details.offset > 0) {
swaynag->details.offset--; swaynag->details.offset--;
render_frame(swaynag); swaynag->needs_redraw = true;
return; return;
} }
@ -257,7 +257,7 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer,
&& y < button_down.y + button_down.height && y < button_down.y + button_down.height
&& swaynag->details.offset < bot) { && swaynag->details.offset < bot) {
swaynag->details.offset++; swaynag->details.offset++;
render_frame(swaynag); swaynag->needs_redraw = true;
return; return;
} }
} }
@ -284,7 +284,7 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
swaynag->details.offset++; swaynag->details.offset++;
} }
render_frame(swaynag); swaynag->needs_redraw = true;
} }
static const struct wl_pointer_listener pointer_listener = { static const struct wl_pointer_listener pointer_listener = {
@ -327,7 +327,7 @@ static void output_scale(void *data, struct wl_output *output,
if (!swaynag_output->swaynag->cursor_shape_manager) { if (!swaynag_output->swaynag->cursor_shape_manager) {
update_all_cursors(swaynag_output->swaynag); update_all_cursors(swaynag_output->swaynag);
} }
render_frame(swaynag_output->swaynag); swaynag_output->swaynag->needs_redraw = true;
} }
} }
@ -503,9 +503,11 @@ void swaynag_setup(struct swaynag *swaynag) {
void swaynag_run(struct swaynag *swaynag) { void swaynag_run(struct swaynag *swaynag) {
swaynag->run_display = true; swaynag->run_display = true;
render_frame(swaynag); render_frame(swaynag);
while (swaynag->run_display while (wl_display_dispatch(swaynag->display) != -1
&& wl_display_dispatch(swaynag->display) != -1) { && swaynag->run_display) {
// This is intentionally left blank if (swaynag->needs_redraw) {
render_frame(swaynag);
}
} }
} }