diff options
-rw-r--r-- | include/sway/output.h | 4 | ||||
-rw-r--r-- | sway/desktop/output.c | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/include/sway/output.h b/include/sway/output.h index 70f631a0..6283db68 100644 --- a/include/sway/output.h +++ b/include/sway/output.h | |||
@@ -67,10 +67,6 @@ struct sway_container *output_get_active_workspace(struct sway_output *output); | |||
67 | void output_render(struct sway_output *output, struct timespec *when, | 67 | void output_render(struct sway_output *output, struct timespec *when, |
68 | pixman_region32_t *damage); | 68 | pixman_region32_t *damage); |
69 | 69 | ||
70 | void output_surface_for_each_surface2(struct sway_output *output, | ||
71 | struct wlr_surface *surface, double ox, double oy, float rotation, | ||
72 | sway_surface_iterator_func_t iterator, void *user_data); | ||
73 | |||
74 | void output_view_for_each_surface(struct sway_output *output, | 70 | void output_view_for_each_surface(struct sway_output *output, |
75 | struct sway_view *view, sway_surface_iterator_func_t iterator, | 71 | struct sway_view *view, sway_surface_iterator_func_t iterator, |
76 | void *user_data); | 72 | void *user_data); |
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index e1d85b10..8272b35b 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -119,8 +119,8 @@ void output_surface_for_each_surface_iterator(struct wlr_surface *surface, | |||
119 | data->user_data); | 119 | data->user_data); |
120 | } | 120 | } |
121 | 121 | ||
122 | void output_surface_for_each_surface(struct sway_output *output, | 122 | static void output_surface_for_each_surface(struct sway_output *output, |
123 | struct wlr_surface *surface, double ox, double oy, float rotation, | 123 | struct wlr_surface *surface, double ox, double oy, |
124 | sway_surface_iterator_func_t iterator, void *user_data) { | 124 | sway_surface_iterator_func_t iterator, void *user_data) { |
125 | struct surface_iterator_data data = { | 125 | struct surface_iterator_data data = { |
126 | .user_iterator = iterator, | 126 | .user_iterator = iterator, |
@@ -130,7 +130,7 @@ void output_surface_for_each_surface(struct sway_output *output, | |||
130 | .oy = oy, | 130 | .oy = oy, |
131 | .width = surface->current.width, | 131 | .width = surface->current.width, |
132 | .height = surface->current.height, | 132 | .height = surface->current.height, |
133 | .rotation = rotation, | 133 | .rotation = 0, |
134 | }; | 134 | }; |
135 | 135 | ||
136 | wlr_surface_for_each_surface(surface, | 136 | wlr_surface_for_each_surface(surface, |
@@ -163,7 +163,7 @@ void output_layer_for_each_surface(struct sway_output *output, | |||
163 | struct wlr_layer_surface *wlr_layer_surface = | 163 | struct wlr_layer_surface *wlr_layer_surface = |
164 | layer_surface->layer_surface; | 164 | layer_surface->layer_surface; |
165 | output_surface_for_each_surface(output, wlr_layer_surface->surface, | 165 | output_surface_for_each_surface(output, wlr_layer_surface->surface, |
166 | layer_surface->geo.x, layer_surface->geo.y, 0, iterator, | 166 | layer_surface->geo.x, layer_surface->geo.y, iterator, |
167 | user_data); | 167 | user_data); |
168 | } | 168 | } |
169 | } | 169 | } |
@@ -179,7 +179,7 @@ void output_unmanaged_for_each_surface(struct sway_output *output, | |||
179 | double ox = unmanaged_surface->lx - output->swayc->current.swayc_x; | 179 | double ox = unmanaged_surface->lx - output->swayc->current.swayc_x; |
180 | double oy = unmanaged_surface->ly - output->swayc->current.swayc_y; | 180 | double oy = unmanaged_surface->ly - output->swayc->current.swayc_y; |
181 | 181 | ||
182 | output_surface_for_each_surface(output, xsurface->surface, ox, oy, 0, | 182 | output_surface_for_each_surface(output, xsurface->surface, ox, oy, |
183 | iterator, user_data); | 183 | iterator, user_data); |
184 | } | 184 | } |
185 | } | 185 | } |
@@ -195,7 +195,7 @@ void output_drag_icons_for_each_surface(struct sway_output *output, | |||
195 | 195 | ||
196 | if (drag_icon->wlr_drag_icon->mapped) { | 196 | if (drag_icon->wlr_drag_icon->mapped) { |
197 | output_surface_for_each_surface(output, | 197 | output_surface_for_each_surface(output, |
198 | drag_icon->wlr_drag_icon->surface, ox, oy, 0, | 198 | drag_icon->wlr_drag_icon->surface, ox, oy, |
199 | iterator, user_data); | 199 | iterator, user_data); |
200 | } | 200 | } |
201 | } | 201 | } |
@@ -430,7 +430,7 @@ static void damage_surface_iterator(struct sway_output *output, | |||
430 | 430 | ||
431 | void output_damage_surface(struct sway_output *output, double ox, double oy, | 431 | void output_damage_surface(struct sway_output *output, double ox, double oy, |
432 | struct wlr_surface *surface, bool whole) { | 432 | struct wlr_surface *surface, bool whole) { |
433 | output_surface_for_each_surface(output, surface, ox, oy, 0, | 433 | output_surface_for_each_surface(output, surface, ox, oy, |
434 | damage_surface_iterator, &whole); | 434 | damage_surface_iterator, &whole); |
435 | } | 435 | } |
436 | 436 | ||