chase: output-layout takes wl_display in constructor

https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4310
This commit is contained in:
Consolatis 2024-03-18 23:55:37 +01:00 committed by Johan Malm
parent d37309008c
commit 50047db8b2
3 changed files with 2 additions and 4 deletions

View file

@ -431,7 +431,7 @@ output_init(struct server *server)
* Create an output layout, which is a wlroots utility for working with * Create an output layout, which is a wlroots utility for working with
* an arrangement of screens in a physical layout. * an arrangement of screens in a physical layout.
*/ */
server->output_layout = wlr_output_layout_create(); server->output_layout = wlr_output_layout_create(server->wl_display);
if (!server->output_layout) { if (!server->output_layout) {
wlr_log(WLR_ERROR, "unable to create output layout"); wlr_log(WLR_ERROR, "unable to create output layout");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);

View file

@ -542,8 +542,6 @@ server_finish(struct server *server)
wl_display_destroy_clients(server->wl_display); wl_display_destroy_clients(server->wl_display);
seat_finish(server); seat_finish(server);
wlr_output_layout_destroy(server->output_layout);
wl_display_destroy(server->wl_display); wl_display_destroy(server->wl_display);
/* TODO: clean up various scene_tree nodes */ /* TODO: clean up various scene_tree nodes */

View file

@ -1,6 +1,6 @@
[wrap-git] [wrap-git]
url = https://gitlab.freedesktop.org/wlroots/wlroots.git url = https://gitlab.freedesktop.org/wlroots/wlroots.git
revision = f1762f428b0ef2989c81f57ea9e810403d34d946 revision = d61ec694b352c0f21c06958c5ef0417f3e424e3c
[provide] [provide]
dependency_names = wlroots dependency_names = wlroots