From a1b5b93d299bfe129f2b3409a7f642049fcce1d6 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Tue, 5 Jun 2018 17:56:32 -0400 Subject: Store sway_outputs so that they can be reenabled --- sway/tree/container.c | 2 +- sway/tree/layout.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'sway/tree') diff --git a/sway/tree/container.c b/sway/tree/container.c index d0d26631..af965857 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -255,7 +255,6 @@ static struct sway_container *container_output_destroy( } } - wl_list_remove(&output->sway_output->destroy.link); wl_list_remove(&output->sway_output->mode.link); wl_list_remove(&output->sway_output->transform.link); wl_list_remove(&output->sway_output->scale.link); @@ -265,6 +264,7 @@ static struct sway_container *container_output_destroy( // clear the wlr_output reference to this container output->sway_output->wlr_output->data = NULL; + output->sway_output->swayc = NULL; wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name); _container_destroy(output); diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 82502e1b..ce53a515 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c @@ -35,6 +35,7 @@ void layout_init(void) { root_container.sway_root = calloc(1, sizeof(*root_container.sway_root)); root_container.sway_root->output_layout = wlr_output_layout_create(); + root_container.sway_root->outputs = create_list(); wl_list_init(&root_container.sway_root->xwayland_unmanaged); wl_signal_init(&root_container.sway_root->events.new_container); -- cgit v1.2.3 From a0bbe67076b8e32b47a272bc1e96be853006c65d Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Wed, 6 Jun 2018 17:12:02 -0400 Subject: Address emersions comments on output re-enabling --- sway/tree/container.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'sway/tree') diff --git a/sway/tree/container.c b/sway/tree/container.c index af965857..ca993c41 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -262,8 +262,6 @@ static struct sway_container *container_output_destroy( wl_list_remove(&output->sway_output->damage_destroy.link); wl_list_remove(&output->sway_output->damage_frame.link); - // clear the wlr_output reference to this container - output->sway_output->wlr_output->data = NULL; output->sway_output->swayc = NULL; wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name); -- cgit v1.2.3 From e072fbc6d98784e5610aa88251a15f64e30bbcae Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Wed, 6 Jun 2018 20:10:42 -0400 Subject: Switch output storing from list_t to wl_list --- sway/tree/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sway/tree') diff --git a/sway/tree/layout.c b/sway/tree/layout.c index ce53a515..b54dc2fe 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c @@ -35,7 +35,7 @@ void layout_init(void) { root_container.sway_root = calloc(1, sizeof(*root_container.sway_root)); root_container.sway_root->output_layout = wlr_output_layout_create(); - root_container.sway_root->outputs = create_list(); + wl_list_init(&root_container.sway_root->outputs); wl_list_init(&root_container.sway_root->xwayland_unmanaged); wl_signal_init(&root_container.sway_root->events.new_container); -- cgit v1.2.3