diff options
-rw-r--r-- | include/sway/tree/root.h | 2 | ||||
-rw-r--r-- | sway/config/output.c | 6 | ||||
-rw-r--r-- | sway/desktop/output.c | 2 | ||||
-rw-r--r-- | sway/ipc-server.c | 2 | ||||
-rw-r--r-- | sway/tree/root.c | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/include/sway/tree/root.h b/include/sway/tree/root.h index ee4bd836..f9d83874 100644 --- a/include/sway/tree/root.h +++ b/include/sway/tree/root.h | |||
@@ -21,7 +21,7 @@ struct sway_root { | |||
21 | 21 | ||
22 | struct wlr_texture *debug_tree; | 22 | struct wlr_texture *debug_tree; |
23 | 23 | ||
24 | struct wl_list outputs; // sway_output::link | 24 | struct wl_list all_outputs; // sway_output::link |
25 | 25 | ||
26 | list_t *scratchpad; // struct sway_container | 26 | list_t *scratchpad; // struct sway_container |
27 | list_t *saved_workspaces; // For when there's no connected outputs | 27 | list_t *saved_workspaces; // For when there's no connected outputs |
diff --git a/sway/config/output.c b/sway/config/output.c index 7f9b1007..d939eea6 100644 --- a/sway/config/output.c +++ b/sway/config/output.c | |||
@@ -288,7 +288,8 @@ void apply_output_config_to_outputs(struct output_config *oc) { | |||
288 | bool wildcard = strcmp(oc->name, "*") == 0; | 288 | bool wildcard = strcmp(oc->name, "*") == 0; |
289 | char id[128]; | 289 | char id[128]; |
290 | struct sway_output *sway_output; | 290 | struct sway_output *sway_output; |
291 | wl_list_for_each(sway_output, &root_container.sway_root->outputs, link) { | 291 | wl_list_for_each(sway_output, |
292 | &root_container.sway_root->all_outputs, link) { | ||
292 | char *name = sway_output->wlr_output->name; | 293 | char *name = sway_output->wlr_output->name; |
293 | output_get_identifier(id, sizeof(id), sway_output); | 294 | output_get_identifier(id, sizeof(id), sway_output); |
294 | if (wildcard || !strcmp(name, oc->name) || !strcmp(id, oc->name)) { | 295 | if (wildcard || !strcmp(name, oc->name) || !strcmp(id, oc->name)) { |
@@ -348,7 +349,8 @@ static void default_output_config(struct output_config *oc, | |||
348 | 349 | ||
349 | void create_default_output_configs(void) { | 350 | void create_default_output_configs(void) { |
350 | struct sway_output *sway_output; | 351 | struct sway_output *sway_output; |
351 | wl_list_for_each(sway_output, &root_container.sway_root->outputs, link) { | 352 | wl_list_for_each(sway_output, |
353 | &root_container.sway_root->all_outputs, link) { | ||
352 | char *name = sway_output->wlr_output->name; | 354 | char *name = sway_output->wlr_output->name; |
353 | struct output_config *oc = new_output_config(name); | 355 | struct output_config *oc = new_output_config(name); |
354 | default_output_config(oc, sway_output->wlr_output); | 356 | default_output_config(oc, sway_output->wlr_output); |
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 401d3c44..f95d9965 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -556,7 +556,7 @@ void handle_new_output(struct wl_listener *listener, void *data) { | |||
556 | wl_signal_add(&wlr_output->events.destroy, &output->destroy); | 556 | wl_signal_add(&wlr_output->events.destroy, &output->destroy); |
557 | output->destroy.notify = handle_destroy; | 557 | output->destroy.notify = handle_destroy; |
558 | 558 | ||
559 | wl_list_insert(&root_container.sway_root->outputs, &output->link); | 559 | wl_list_insert(&root_container.sway_root->all_outputs, &output->link); |
560 | 560 | ||
561 | if (!wl_list_empty(&wlr_output->modes)) { | 561 | if (!wl_list_empty(&wlr_output->modes)) { |
562 | struct wlr_output_mode *mode = | 562 | struct wlr_output_mode *mode = |
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 34e940ad..49342f47 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c | |||
@@ -615,7 +615,7 @@ void ipc_client_handle_command(struct ipc_client *client) { | |||
615 | } | 615 | } |
616 | } | 616 | } |
617 | struct sway_output *output; | 617 | struct sway_output *output; |
618 | wl_list_for_each(output, &root_container.sway_root->outputs, link) { | 618 | wl_list_for_each(output, &root_container.sway_root->all_outputs, link) { |
619 | if (!output->swayc) { | 619 | if (!output->swayc) { |
620 | json_object_array_add(outputs, | 620 | json_object_array_add(outputs, |
621 | ipc_json_describe_disabled_output(output)); | 621 | ipc_json_describe_disabled_output(output)); |
diff --git a/sway/tree/root.c b/sway/tree/root.c index 5602f0a0..2dd8f9f2 100644 --- a/sway/tree/root.c +++ b/sway/tree/root.c | |||
@@ -32,7 +32,7 @@ void root_create(void) { | |||
32 | 32 | ||
33 | root_container.sway_root = calloc(1, sizeof(*root_container.sway_root)); | 33 | root_container.sway_root = calloc(1, sizeof(*root_container.sway_root)); |
34 | root_container.sway_root->output_layout = wlr_output_layout_create(); | 34 | root_container.sway_root->output_layout = wlr_output_layout_create(); |
35 | wl_list_init(&root_container.sway_root->outputs); | 35 | wl_list_init(&root_container.sway_root->all_outputs); |
36 | #ifdef HAVE_XWAYLAND | 36 | #ifdef HAVE_XWAYLAND |
37 | wl_list_init(&root_container.sway_root->xwayland_unmanaged); | 37 | wl_list_init(&root_container.sway_root->xwayland_unmanaged); |
38 | #endif | 38 | #endif |