Merge pull request #2513 from RyanDwyer/rename-root-outputs

Rename sway_root.outputs to sway_root.all_outputs

4 files changed, 7 insertions, 5 deletions

diff --git a/sway/config/output.c b/sway/config/output.c
index 199267bf..16ec9339 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -289,7 +289,8 @@ void apply_output_config_to_outputs(struct output_config *oc) {
         bool wildcard = strcmp(oc->name, "*") == 0;
         char id[128];
         struct sway_output *sway_output;
-        wl_list_for_each(sway_output, &root_container.sway_root->outputs, link) {
+        wl_list_for_each(sway_output,
+                        &root_container.sway_root->all_outputs, link) {
                 char *name = sway_output->wlr_output->name;
                 output_get_identifier(id, sizeof(id), sway_output);
                 if (wildcard || !strcmp(name, oc->name) || !strcmp(id, oc->name)) {
@@ -349,7 +350,8 @@ static void default_output_config(struct output_config *oc,
 
 void create_default_output_configs(void) {
         struct sway_output *sway_output;
-        wl_list_for_each(sway_output, &root_container.sway_root->outputs, link) {
+        wl_list_for_each(sway_output,
+                        &root_container.sway_root->all_outputs, link) {
                 char *name = sway_output->wlr_output->name;
                 struct output_config *oc = new_output_config(name);
                 default_output_config(oc, sway_output->wlr_output);
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 35fce1a6..bbebe453 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) {
         wl_signal_add(&wlr_output->events.destroy, &output->destroy);
         output->destroy.notify = handle_destroy;
 
-        wl_list_insert(&root_container.sway_root->outputs, &output->link);
+        wl_list_insert(&root_container.sway_root->all_outputs, &output->link);
 
         if (!wl_list_empty(&wlr_output->modes)) {
                 struct wlr_output_mode *mode =
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 1ac0521e..ed710be5 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -616,7 +616,7 @@ void ipc_client_handle_command(struct ipc_client *client) {
                         }
                 }
                 struct sway_output *output;
-                wl_list_for_each(output, &root_container.sway_root->outputs, link) {
+                wl_list_for_each(output, &root_container.sway_root->all_outputs, link) {
                         if (!output->swayc) {
                                 json_object_array_add(outputs,
                                                 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) {
 
         root_container.sway_root = calloc(1, sizeof(*root_container.sway_root));
         root_container.sway_root->output_layout = wlr_output_layout_create();
-        wl_list_init(&root_container.sway_root->outputs);
+        wl_list_init(&root_container.sway_root->all_outputs);
 #ifdef HAVE_XWAYLAND
         wl_list_init(&root_container.sway_root->xwayland_unmanaged);
 #endif