mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-04-05 20:07:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 7a50d03d3b into a25645a5a6

Browse source
This commit is contained in:
Kenny Levinsen 2025-04-01 13:18:01 +02:00 • committed by GitHub
commit 32711091f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 59 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

59
sway/desktop/output.c
View file

@ -297,7 +297,7 @@ static int output_repaint_timer_handler(void *data) {
} }
if (!wlr_output_commit_state(output->wlr_output, &pending)) { if (!wlr_output_commit_state(output->wlr_output, &pending)) {
sway_log(SWAY_ERROR, "Page-flip failed on output %s", output->wlr_output->name); // sway_log(SWAY_ERROR, "Page-flip failed on output %s", output->wlr_output->name);
} }
wlr_output_state_finish(&pending); wlr_output_state_finish(&pending);
return 0; return 0;
@ -392,15 +392,72 @@ void update_output_manager_config(struct sway_server *server) {
ipc_event_output(); ipc_event_output();
} }
// Placeholder while all render tasks clear up
static void handle_frame_nop(struct wl_listener *listener, void *user_data) {}
static void handle_frame_clear(struct wl_listener *listener, void *user_data) {
struct sway_output *output = wl_container_of(listener, output, frame);
output->frame.notify = handle_frame_nop;
sway_log(SWAY_DEBUG, "Render task for %s cleared", output->wlr_output->name);
wl_list_for_each(output, &root->all_outputs, link) {
if (output == root->fallback_output) {
continue;
}
if (output->frame.notify != handle_frame_nop) {
return;
}
}
// All done!
sway_log(SWAY_DEBUG, "All render tasks cleared, modestting");
wl_list_for_each(output, &root->all_outputs, link) {
if (output == root->fallback_output) {
continue;
}
output->frame.notify = handle_frame;
}
apply_stored_output_configs();
}
static int timer_modeset_handle(void *data) { static int timer_modeset_handle(void *data) {
struct sway_server *server = data; struct sway_server *server = data;
wl_event_source_remove(server->delayed_modeset); wl_event_source_remove(server->delayed_modeset);
server->delayed_modeset = NULL; server->delayed_modeset = NULL;
bool wait = false;
struct sway_output *output;
wl_list_for_each(output, &root->all_outputs, link) {
if (output == root->fallback_output) {
continue;
}
if (output->wlr_output->frame_pending) {
output->frame.notify = handle_frame_clear;
wait = true;
sway_log(SWAY_DEBUG, "Awaiting render task on %s", output->wlr_output->name);
} else {
output->frame.notify = handle_frame_nop;
}
}
if (!wait) {
// Nothing to wait for, go ahead
sway_log(SWAY_DEBUG, "No render tasks to wait for, modesetting");
wl_list_for_each(output, &root->all_outputs, link) {
if (output == root->fallback_output) {
continue;
}
output->frame.notify = handle_frame;
}
apply_stored_output_configs(); apply_stored_output_configs();
return 0; return 0;
} }
return 0;
}
void request_modeset(void) { void request_modeset(void) {
if (server.delayed_modeset == NULL) { if (server.delayed_modeset == NULL) {
server.delayed_modeset = wl_event_loop_add_timer(server.wl_event_loop, server.delayed_modeset = wl_event_loop_add_timer(server.wl_event_loop,