Skip to content

output-layout: Move output request state handler from render-manager to output-layout #2781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 23, 2025
+25 −11
Merged

output-layout: Move output request state handler from render-manager to output-layout #2781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion src/core/output-layout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ struct output_layout_output_t
int current_bit_depth = RENDER_BIT_DEPTH_DEFAULT;

std::unique_ptr<wf::output_impl_t> output;
wl_listener_wrapper on_destroy, on_commit;
wl_listener_wrapper on_destroy, on_commit, on_request_state;

std::shared_ptr<wf::config::section_t> config_section;
wf::option_wrapper_t<wf::output_config::mode_t> mode_opt;
Expand Down Expand Up @@ -365,6 +365,7 @@ struct output_layout_output_t
{
this->handle = handle;
on_destroy.connect(&handle->events.destroy);
on_request_state.connect(&handle->events.request_state);
initialize_config_options();

is_nested_compositor = wlr_output_is_wl(handle);
Expand Down Expand Up @@ -1292,6 +1293,29 @@ class output_layout_t::impl
remove_output(output);
});

lo->on_request_state.set_callback([=] (void *data)
{
auto ev = static_cast<wlr_output_event_request_state*>(data);
wlr_output_commit_state(ev->output, ev->state);
if (!lo->output)
{
return;
}

send_wlr_configuration();
for (auto& output : outputs)
{
output.second->emit_configuration_changed(
wf::OUTPUT_POSITION_CHANGE | wf::OUTPUT_MODE_CHANGE);
}

output_layout_configuration_changed_signal signal;
wf::get_core().output_layout->emit(&signal);

lo->output->render->damage_whole();
lo->output->render->schedule_redraw();
});

reconfigure_from_config();
}

Expand Down
10 changes: 0 additions & 10 deletions src/output/render-manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ struct swapchain_damage_manager_t

wf::wl_listener_wrapper on_needs_frame;
wf::wl_listener_wrapper on_damage;
wf::wl_listener_wrapper on_request_state;
wf::wl_listener_wrapper on_gamma_changed;

wf::region_t frame_damage;
Expand Down Expand Up @@ -125,14 +124,6 @@ struct swapchain_damage_manager_t
damage_buffer(rotated, true);
});

on_request_state.set_callback([=] (void *data)
{
auto ev = static_cast<wlr_output_event_request_state*>(data);
wlr_output_commit_state(output->handle, ev->state);
damage_whole();
schedule_repaint();
});

on_gamma_changed.set_callback([=] (void *data)
{
auto event = (const wlr_gamma_control_manager_v1_set_gamma_event*)data;
Expand All @@ -145,7 +136,6 @@ struct swapchain_damage_manager_t

on_needs_frame.connect(&output->handle->events.needs_frame);
on_damage.connect(&output->handle->events.damage);
on_request_state.connect(&output->handle->events.request_state);
on_gamma_changed.connect(&wf::get_core().protocols.gamma_v1->events.set_gamma);
}

Expand Down