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/xwayland.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/xwayland.c')
-rw-r--r-- | sway/desktop/xwayland.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 96edab51..fa1054f2 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c | |||
@@ -49,11 +49,11 @@ static void set_position(struct sway_view *view, double ox, double oy) { | |||
49 | if (!assert_xwayland(view)) { | 49 | if (!assert_xwayland(view)) { |
50 | return; | 50 | return; |
51 | } | 51 | } |
52 | struct sway_container *output = sway_container_parent(view->swayc, C_OUTPUT); | 52 | struct sway_container *output = container_parent(view->swayc, C_OUTPUT); |
53 | if (!sway_assert(output, "view must be within tree to set position")) { | 53 | if (!sway_assert(output, "view must be within tree to set position")) { |
54 | return; | 54 | return; |
55 | } | 55 | } |
56 | struct sway_container *root = sway_container_parent(output, C_ROOT); | 56 | struct sway_container *root = container_parent(output, C_ROOT); |
57 | if (!sway_assert(root, "output must be within tree to set position")) { | 57 | if (!sway_assert(root, "output must be within tree to set position")) { |
58 | return; | 58 | return; |
59 | } | 59 | } |
@@ -114,9 +114,9 @@ static void handle_destroy(struct wl_listener *listener, void *data) { | |||
114 | } | 114 | } |
115 | } | 115 | } |
116 | 116 | ||
117 | struct sway_container *parent = sway_container_view_destroy(sway_surface->view->swayc); | 117 | struct sway_container *parent = container_view_destroy(sway_surface->view->swayc); |
118 | if (parent) { | 118 | if (parent) { |
119 | arrange_windows(parent, -1, -1); | 119 | container_arrange_windows(parent, -1, -1); |
120 | } | 120 | } |
121 | 121 | ||
122 | free(sway_surface->view); | 122 | free(sway_surface->view); |
@@ -132,9 +132,9 @@ static void handle_unmap_notify(struct wl_listener *listener, void *data) { | |||
132 | } | 132 | } |
133 | 133 | ||
134 | // take it out of the tree | 134 | // take it out of the tree |
135 | struct sway_container *parent = sway_container_view_destroy(sway_surface->view->swayc); | 135 | struct sway_container *parent = container_view_destroy(sway_surface->view->swayc); |
136 | if (parent) { | 136 | if (parent) { |
137 | arrange_windows(parent, -1, -1); | 137 | container_arrange_windows(parent, -1, -1); |
138 | } | 138 | } |
139 | 139 | ||
140 | sway_surface->view->swayc = NULL; | 140 | sway_surface->view->swayc = NULL; |
@@ -155,15 +155,15 @@ static void handle_map_notify(struct wl_listener *listener, void *data) { | |||
155 | &sway_surface->view->unmanaged_view_link); | 155 | &sway_surface->view->unmanaged_view_link); |
156 | } else { | 156 | } else { |
157 | struct sway_view *view = sway_surface->view; | 157 | struct sway_view *view = sway_surface->view; |
158 | sway_container_view_destroy(view->swayc); | 158 | container_view_destroy(view->swayc); |
159 | 159 | ||
160 | struct sway_container *parent = root_container.children->items[0]; | 160 | struct sway_container *parent = root_container.children->items[0]; |
161 | parent = parent->children->items[0]; // workspace | 161 | parent = parent->children->items[0]; // workspace |
162 | 162 | ||
163 | struct sway_container *cont = sway_container_view_create(parent, view); | 163 | struct sway_container *cont = container_view_create(parent, view); |
164 | view->swayc = cont; | 164 | view->swayc = cont; |
165 | 165 | ||
166 | arrange_windows(cont->parent, -1, -1); | 166 | container_arrange_windows(cont->parent, -1, -1); |
167 | sway_input_manager_set_focus(input_manager, cont); | 167 | sway_input_manager_set_focus(input_manager, cont); |
168 | } | 168 | } |
169 | } | 169 | } |
@@ -239,9 +239,9 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) { | |||
239 | 239 | ||
240 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 240 | struct sway_seat *seat = input_manager_current_seat(input_manager); |
241 | struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container); | 241 | struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container); |
242 | struct sway_container *cont = sway_container_view_create(focus, sway_view); | 242 | struct sway_container *cont = container_view_create(focus, sway_view); |
243 | sway_view->swayc = cont; | 243 | sway_view->swayc = cont; |
244 | 244 | ||
245 | arrange_windows(cont->parent, -1, -1); | 245 | container_arrange_windows(cont->parent, -1, -1); |
246 | sway_input_manager_set_focus(input_manager, cont); | 246 | sway_input_manager_set_focus(input_manager, cont); |
247 | } | 247 | } |