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

Refactor configure/ack configure/commit flow

Browse source
This commit is contained in:
Drew DeVault 2018-03-27 23:08:51 -04:00
parent e9922ec524
commit 653853062f
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
swaybg/main.c
View file

@ -134,10 +134,6 @@ static void render_image(struct swaybg_state *state) {
} }
static void render_frame(struct swaybg_state *state) { static void render_frame(struct swaybg_state *state) {
if (!state->run_display) {
return;
}
state->current_buffer = get_next_buffer(state->shm, state->current_buffer = get_next_buffer(state->shm,
state->buffers, state->width, state->height); state->buffers, state->width, state->height);
cairo_t *cairo = state->current_buffer->cairo; cairo_t *cairo = state->current_buffer->cairo;
@ -198,8 +194,8 @@ static void layer_surface_configure(void *data,
struct swaybg_state *state = data; struct swaybg_state *state = data;
state->width = width; state->width = width;
state->height = height; state->height = height;
render_frame(state);
zwlr_layer_surface_v1_ack_configure(surface, serial); zwlr_layer_surface_v1_ack_configure(surface, serial);
render_frame(state);
} }
static void layer_surface_closed(void *data, static void layer_surface_closed(void *data,
@ -280,6 +276,10 @@ int main(int argc, const char **argv) {
return 1; return 1;
} }
if (!prepare_context(&state)) {
return 1;
}
state.display = wl_display_connect(NULL); state.display = wl_display_connect(NULL);
if (!state.display) { if (!state.display) {
wlr_log(L_ERROR, "Failed to create display\n"); wlr_log(L_ERROR, "Failed to create display\n");
@ -323,12 +323,7 @@ int main(int argc, const char **argv) {
wl_surface_commit(state.surface); wl_surface_commit(state.surface);
wl_display_roundtrip(state.display); wl_display_roundtrip(state.display);
if (!prepare_context(&state)) {
return 1;
}
state.run_display = true; state.run_display = true;
render_frame(&state);
while (wl_display_dispatch(state.display) != -1 && state.run_display) { while (wl_display_dispatch(state.display) != -1 && state.run_display) {
// This space intentionally left blank // This space intentionally left blank
} }