diff options
Diffstat (limited to 'sway/tree/container.c')
-rw-r--r-- | sway/tree/container.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index c5574275..31ec2ce5 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -92,11 +92,11 @@ swayc_t *new_output(struct sway_output *sway_output) { | |||
92 | 92 | ||
93 | if (strcasecmp(name, cur->name) == 0 || | 93 | if (strcasecmp(name, cur->name) == 0 || |
94 | strcasecmp(identifier, cur->name) == 0) { | 94 | strcasecmp(identifier, cur->name) == 0) { |
95 | sway_log(L_DEBUG, "Matched output config for %s", name); | 95 | wlr_log(L_DEBUG, "Matched output config for %s", name); |
96 | oc = cur; | 96 | oc = cur; |
97 | } | 97 | } |
98 | if (strcasecmp("*", cur->name) == 0) { | 98 | if (strcasecmp("*", cur->name) == 0) { |
99 | sway_log(L_DEBUG, "Matched wildcard output config for %s", name); | 99 | wlr_log(L_DEBUG, "Matched wildcard output config for %s", name); |
100 | all = cur; | 100 | all = cur; |
101 | } | 101 | } |
102 | 102 | ||
@@ -126,7 +126,7 @@ swayc_t *new_output(struct sway_output *sway_output) { | |||
126 | 126 | ||
127 | // Create workspace | 127 | // Create workspace |
128 | char *ws_name = workspace_next_name(output->name); | 128 | char *ws_name = workspace_next_name(output->name); |
129 | sway_log(L_DEBUG, "Creating default workspace %s", ws_name); | 129 | wlr_log(L_DEBUG, "Creating default workspace %s", ws_name); |
130 | new_workspace(output, ws_name); | 130 | new_workspace(output, ws_name); |
131 | free(ws_name); | 131 | free(ws_name); |
132 | return output; | 132 | return output; |
@@ -136,7 +136,7 @@ swayc_t *new_workspace(swayc_t *output, const char *name) { | |||
136 | if (!sway_assert(output, "new_workspace called with null output")) { | 136 | if (!sway_assert(output, "new_workspace called with null output")) { |
137 | return NULL; | 137 | return NULL; |
138 | } | 138 | } |
139 | sway_log(L_DEBUG, "Added workspace %s for output %s", name, output->name); | 139 | wlr_log(L_DEBUG, "Added workspace %s for output %s", name, output->name); |
140 | swayc_t *workspace = new_swayc(C_WORKSPACE); | 140 | swayc_t *workspace = new_swayc(C_WORKSPACE); |
141 | 141 | ||
142 | workspace->x = output->x; | 142 | workspace->x = output->x; |
@@ -159,7 +159,7 @@ swayc_t *new_view(swayc_t *sibling, struct sway_view *sway_view) { | |||
159 | } | 159 | } |
160 | const char *title = sway_view->iface.get_prop(sway_view, VIEW_PROP_TITLE); | 160 | const char *title = sway_view->iface.get_prop(sway_view, VIEW_PROP_TITLE); |
161 | swayc_t *swayc = new_swayc(C_VIEW); | 161 | swayc_t *swayc = new_swayc(C_VIEW); |
162 | sway_log(L_DEBUG, "Adding new view %p:%s to container %p %d", | 162 | wlr_log(L_DEBUG, "Adding new view %p:%s to container %p %d", |
163 | swayc, title, sibling, sibling ? sibling->type : 0); | 163 | swayc, title, sibling, sibling ? sibling->type : 0); |
164 | // Setup values | 164 | // Setup values |
165 | swayc->sway_view = sway_view; | 165 | swayc->sway_view = sway_view; |
@@ -200,7 +200,7 @@ swayc_t *destroy_output(swayc_t *output) { | |||
200 | } | 200 | } |
201 | } | 201 | } |
202 | 202 | ||
203 | sway_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name); | 203 | wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name); |
204 | free_swayc(output); | 204 | free_swayc(output); |
205 | 205 | ||
206 | return &root_container; | 206 | return &root_container; |
@@ -210,7 +210,7 @@ swayc_t *destroy_view(swayc_t *view) { | |||
210 | if (!sway_assert(view, "null view passed to destroy_view")) { | 210 | if (!sway_assert(view, "null view passed to destroy_view")) { |
211 | return NULL; | 211 | return NULL; |
212 | } | 212 | } |
213 | sway_log(L_DEBUG, "Destroying view '%s'", view->name); | 213 | wlr_log(L_DEBUG, "Destroying view '%s'", view->name); |
214 | swayc_t *parent = view->parent; | 214 | swayc_t *parent = view->parent; |
215 | free_swayc(view); | 215 | free_swayc(view); |
216 | 216 | ||