diff options
Diffstat (limited to 'sway/desktop/xdg_shell_v6.c')
-rw-r--r-- | sway/desktop/xdg_shell_v6.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 18e7d399..25c0cbca 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c | |||
@@ -3,10 +3,10 @@ | |||
3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
4 | #include <wayland-server.h> | 4 | #include <wayland-server.h> |
5 | #include <wlr/types/wlr_xdg_shell_v6.h> | 5 | #include <wlr/types/wlr_xdg_shell_v6.h> |
6 | #include "sway/container.h" | 6 | #include "sway/tree/container.h" |
7 | #include "sway/layout.h" | 7 | #include "sway/tree/layout.h" |
8 | #include "sway/server.h" | 8 | #include "sway/server.h" |
9 | #include "sway/view.h" | 9 | #include "sway/tree/view.h" |
10 | #include "sway/input/seat.h" | 10 | #include "sway/input/seat.h" |
11 | #include "sway/input/input-manager.h" | 11 | #include "sway/input/input-manager.h" |
12 | #include "log.h" | 12 | #include "log.h" |
@@ -83,7 +83,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) { | |||
83 | wl_container_of(listener, sway_xdg_surface, destroy); | 83 | wl_container_of(listener, sway_xdg_surface, destroy); |
84 | wl_list_remove(&sway_xdg_surface->commit.link); | 84 | wl_list_remove(&sway_xdg_surface->commit.link); |
85 | wl_list_remove(&sway_xdg_surface->destroy.link); | 85 | wl_list_remove(&sway_xdg_surface->destroy.link); |
86 | swayc_t *parent = destroy_view(sway_xdg_surface->view->swayc); | 86 | struct sway_container *parent = container_view_destroy(sway_xdg_surface->view->swayc); |
87 | free(sway_xdg_surface->view); | 87 | free(sway_xdg_surface->view); |
88 | free(sway_xdg_surface); | 88 | free(sway_xdg_surface); |
89 | arrange_windows(parent, -1, -1); | 89 | arrange_windows(parent, -1, -1); |
@@ -137,8 +137,8 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) { | |||
137 | wl_signal_add(&xdg_surface->events.destroy, &sway_surface->destroy); | 137 | wl_signal_add(&xdg_surface->events.destroy, &sway_surface->destroy); |
138 | 138 | ||
139 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 139 | struct sway_seat *seat = input_manager_current_seat(input_manager); |
140 | swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container); | 140 | struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container); |
141 | swayc_t *cont = new_view(focus, sway_view); | 141 | struct sway_container *cont = container_view_create(focus, sway_view); |
142 | sway_view->swayc = cont; | 142 | sway_view->swayc = cont; |
143 | 143 | ||
144 | arrange_windows(cont->parent, -1, -1); | 144 | arrange_windows(cont->parent, -1, -1); |