diff options
Diffstat (limited to 'sway/desktop/output.c')
-rw-r--r-- | sway/desktop/output.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index debda396..3e7d8509 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -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(swayc_t *view, void *data) { | 148 | static void output_frame_view(struct sway_container *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; |
@@ -218,16 +218,16 @@ static void output_frame_notify(struct wl_listener *listener, void *data) { | |||
218 | &soutput->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]); | 218 | &soutput->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]); |
219 | 219 | ||
220 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 220 | struct sway_seat *seat = input_manager_current_seat(input_manager); |
221 | swayc_t *focus = sway_seat_get_focus_inactive(seat, soutput->swayc); | 221 | struct sway_container *focus = sway_seat_get_focus_inactive(seat, soutput->swayc); |
222 | swayc_t *workspace = (focus->type == C_WORKSPACE ? | 222 | struct sway_container *workspace = (focus->type == C_WORKSPACE ? |
223 | focus : | 223 | focus : |
224 | swayc_parent_by_type(focus, C_WORKSPACE)); | 224 | sway_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 | swayc_descendants_of_type(workspace, C_VIEW, output_frame_view, &rdata); | 230 | sway_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,7 +258,7 @@ 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 | destroy_output(output->swayc); | 261 | sway_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) { |
@@ -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 = new_output(output); | 289 | output->swayc = sway_container_output_create(output); |
290 | if (!output->swayc) { | 290 | if (!output->swayc) { |
291 | free(output); | 291 | free(output); |
292 | return; | 292 | return; |