diff options
author | Tony Crisci <tony@dubstepdish.com> | 2018-03-29 17:06:29 -0400 |
---|---|---|
committer | Tony Crisci <tony@dubstepdish.com> | 2018-03-29 17:06:29 -0400 |
commit | eca029f218fbb54ddf7316845be5d296e834358e (patch) | |
tree | 76bf346c980ad94c68797cefbd2ec4a9302dd53f /sway/desktop/output.c | |
parent | rename container functions (diff) | |
download | sway-eca029f218fbb54ddf7316845be5d296e834358e.tar.gz sway-eca029f218fbb54ddf7316845be5d296e834358e.tar.zst sway-eca029f218fbb54ddf7316845be5d296e834358e.zip |
more renaming things
Diffstat (limited to 'sway/desktop/output.c')
-rw-r--r-- | sway/desktop/output.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 3e7d8509..fa1b0680 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -221,13 +221,13 @@ static void output_frame_notify(struct wl_listener *listener, void *data) { | |||
221 | struct sway_container *focus = sway_seat_get_focus_inactive(seat, soutput->swayc); | 221 | struct sway_container *focus = sway_seat_get_focus_inactive(seat, soutput->swayc); |
222 | struct sway_container *workspace = (focus->type == C_WORKSPACE ? | 222 | struct sway_container *workspace = (focus->type == C_WORKSPACE ? |
223 | focus : | 223 | focus : |
224 | sway_container_parent(focus, C_WORKSPACE)); | 224 | container_parent(focus, C_WORKSPACE)); |
225 | 225 | ||
226 | struct render_data rdata = { | 226 | struct render_data rdata = { |
227 | .output = soutput, | 227 | .output = soutput, |
228 | .now = &now, | 228 | .now = &now, |
229 | }; | 229 | }; |
230 | sway_container_descendents(workspace, C_VIEW, output_frame_view, &rdata); | 230 | container_descendents(workspace, C_VIEW, output_frame_view, &rdata); |
231 | 231 | ||
232 | // render unmanaged views on top | 232 | // render unmanaged views on top |
233 | struct sway_view *view; | 233 | struct sway_view *view; |
@@ -258,13 +258,13 @@ static void handle_output_destroy(struct wl_listener *listener, void *data) { | |||
258 | struct wlr_output *wlr_output = data; | 258 | struct wlr_output *wlr_output = data; |
259 | wlr_log(L_DEBUG, "Output %p %s removed", wlr_output, wlr_output->name); | 259 | wlr_log(L_DEBUG, "Output %p %s removed", wlr_output, wlr_output->name); |
260 | 260 | ||
261 | sway_container_output_destroy(output->swayc); | 261 | container_output_destroy(output->swayc); |
262 | } | 262 | } |
263 | 263 | ||
264 | static void handle_output_mode(struct wl_listener *listener, void *data) { | 264 | static void handle_output_mode(struct wl_listener *listener, void *data) { |
265 | struct sway_output *output = wl_container_of(listener, output, mode); | 265 | struct sway_output *output = wl_container_of(listener, output, mode); |
266 | arrange_layers(output); | 266 | arrange_layers(output); |
267 | arrange_windows(output->swayc, -1, -1); | 267 | container_arrange_windows(output->swayc, -1, -1); |
268 | } | 268 | } |
269 | 269 | ||
270 | void handle_new_output(struct wl_listener *listener, void *data) { | 270 | void handle_new_output(struct wl_listener *listener, void *data) { |
@@ -286,7 +286,7 @@ void handle_new_output(struct wl_listener *listener, void *data) { | |||
286 | wlr_output_set_mode(wlr_output, mode); | 286 | wlr_output_set_mode(wlr_output, mode); |
287 | } | 287 | } |
288 | 288 | ||
289 | output->swayc = sway_container_output_create(output); | 289 | output->swayc = container_output_create(output); |
290 | if (!output->swayc) { | 290 | if (!output->swayc) { |
291 | free(output); | 291 | free(output); |
292 | return; | 292 | return; |
@@ -307,5 +307,5 @@ void handle_new_output(struct wl_listener *listener, void *data) { | |||
307 | output->mode.notify = handle_output_mode; | 307 | output->mode.notify = handle_output_mode; |
308 | 308 | ||
309 | arrange_layers(output); | 309 | arrange_layers(output); |
310 | arrange_windows(&root_container, -1, -1); | 310 | container_arrange_windows(&root_container, -1, -1); |
311 | } | 311 | } |