diff options
Diffstat (limited to 'sway/desktop/output.c')
-rw-r--r-- | sway/desktop/output.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index ba778f4c..b8253ace 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -11,14 +11,14 @@ | |||
11 | #include <wlr/types/wlr_surface.h> | 11 | #include <wlr/types/wlr_surface.h> |
12 | #include <wlr/types/wlr_wl_shell.h> | 12 | #include <wlr/types/wlr_wl_shell.h> |
13 | #include "log.h" | 13 | #include "log.h" |
14 | #include "sway/tree/container.h" | 14 | #include "sway/container.h" |
15 | #include "sway/input/input-manager.h" | 15 | #include "sway/input/input-manager.h" |
16 | #include "sway/input/seat.h" | 16 | #include "sway/input/seat.h" |
17 | #include "sway/layers.h" | 17 | #include "sway/layers.h" |
18 | #include "sway/tree/layout.h" | 18 | #include "sway/layout.h" |
19 | #include "sway/output.h" | 19 | #include "sway/output.h" |
20 | #include "sway/server.h" | 20 | #include "sway/server.h" |
21 | #include "sway/tree/view.h" | 21 | #include "sway/view.h" |
22 | 22 | ||
23 | /** | 23 | /** |
24 | * Rotate a child's position relative to a parent. The parent size is (pw, ph), | 24 | * Rotate a child's position relative to a parent. The parent size is (pw, ph), |
@@ -145,7 +145,7 @@ struct render_data { | |||
145 | struct timespec *now; | 145 | struct timespec *now; |
146 | }; | 146 | }; |
147 | 147 | ||
148 | static void output_frame_view(struct sway_container *view, void *data) { | 148 | static void output_frame_view(swayc_t *view, void *data) { |
149 | struct render_data *rdata = data; | 149 | struct render_data *rdata = data; |
150 | struct sway_output *output = rdata->output; | 150 | struct sway_output *output = rdata->output; |
151 | struct timespec *now = rdata->now; | 151 | struct timespec *now = rdata->now; |
@@ -219,16 +219,16 @@ static void output_frame_notify(struct wl_listener *listener, void *data) { | |||
219 | &soutput->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]); | 219 | &soutput->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]); |
220 | 220 | ||
221 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 221 | struct sway_seat *seat = input_manager_current_seat(input_manager); |
222 | struct sway_container *focus = sway_seat_get_focus_inactive(seat, soutput->swayc); | 222 | swayc_t *focus = sway_seat_get_focus_inactive(seat, soutput->swayc); |
223 | struct sway_container *workspace = (focus->type == C_WORKSPACE ? | 223 | swayc_t *workspace = (focus->type == C_WORKSPACE ? |
224 | focus : | 224 | focus : |
225 | container_parent(focus, C_WORKSPACE)); | 225 | swayc_parent_by_type(focus, C_WORKSPACE)); |
226 | 226 | ||
227 | struct render_data rdata = { | 227 | struct render_data rdata = { |
228 | .output = soutput, | 228 | .output = soutput, |
229 | .now = &now, | 229 | .now = &now, |
230 | }; | 230 | }; |
231 | container_descendents(workspace, C_VIEW, output_frame_view, &rdata); | 231 | swayc_descendants_of_type(workspace, C_VIEW, output_frame_view, &rdata); |
232 | 232 | ||
233 | // render unmanaged views on top | 233 | // render unmanaged views on top |
234 | struct sway_view *view; | 234 | struct sway_view *view; |
@@ -259,7 +259,7 @@ static void handle_output_destroy(struct wl_listener *listener, void *data) { | |||
259 | struct wlr_output *wlr_output = data; | 259 | struct wlr_output *wlr_output = data; |
260 | wlr_log(L_DEBUG, "Output %p %s removed", wlr_output, wlr_output->name); | 260 | wlr_log(L_DEBUG, "Output %p %s removed", wlr_output, wlr_output->name); |
261 | 261 | ||
262 | container_output_destroy(output->swayc); | 262 | destroy_output(output->swayc); |
263 | } | 263 | } |
264 | 264 | ||
265 | static void handle_output_mode(struct wl_listener *listener, void *data) { | 265 | static void handle_output_mode(struct wl_listener *listener, void *data) { |
@@ -287,7 +287,7 @@ void handle_new_output(struct wl_listener *listener, void *data) { | |||
287 | wlr_output_set_mode(wlr_output, mode); | 287 | wlr_output_set_mode(wlr_output, mode); |
288 | } | 288 | } |
289 | 289 | ||
290 | output->swayc = container_output_create(output); | 290 | output->swayc = new_output(output); |
291 | if (!output->swayc) { | 291 | if (!output->swayc) { |
292 | free(output); | 292 | free(output); |
293 | return; | 293 | return; |