mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-17 13:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove output_surface_for_each_surface from header

Browse source
This commit is contained in:
emersion 2018-07-27 19:19:30 +01:00
parent 8d5cc8625c
commit fe0750fec1
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/sway/output.h
View file

@ -67,10 +67,6 @@ struct sway_container *output_get_active_workspace(struct sway_output *output);
void output_render(struct sway_output *output, struct timespec *when, void output_render(struct sway_output *output, struct timespec *when,
pixman_region32_t *damage); pixman_region32_t *damage);
void output_surface_for_each_surface2(struct sway_output *output,
struct wlr_surface *surface, double ox, double oy, float rotation,
sway_surface_iterator_func_t iterator, void *user_data);
void output_view_for_each_surface(struct sway_output *output, void output_view_for_each_surface(struct sway_output *output,
struct sway_view *view, sway_surface_iterator_func_t iterator, struct sway_view *view, sway_surface_iterator_func_t iterator,
void *user_data); void *user_data);

14
sway/desktop/output.c
View file

@ -119,8 +119,8 @@ void output_surface_for_each_surface_iterator(struct wlr_surface *surface,
data->user_data); data->user_data);
} }
void output_surface_for_each_surface(struct sway_output *output, static void output_surface_for_each_surface(struct sway_output *output,
struct wlr_surface *surface, double ox, double oy, float rotation, struct wlr_surface *surface, double ox, double oy,
sway_surface_iterator_func_t iterator, void *user_data) { sway_surface_iterator_func_t iterator, void *user_data) {
struct surface_iterator_data data = { struct surface_iterator_data data = {
.user_iterator = iterator, .user_iterator = iterator,
@ -130,7 +130,7 @@ void output_surface_for_each_surface(struct sway_output *output,
.oy = oy, .oy = oy,
.width = surface->current.width, .width = surface->current.width,
.height = surface->current.height, .height = surface->current.height,
.rotation = rotation, .rotation = 0,
}; };
wlr_surface_for_each_surface(surface, wlr_surface_for_each_surface(surface,
@ -163,7 +163,7 @@ void output_layer_for_each_surface(struct sway_output *output,
struct wlr_layer_surface *wlr_layer_surface = struct wlr_layer_surface *wlr_layer_surface =
layer_surface->layer_surface; layer_surface->layer_surface;
output_surface_for_each_surface(output, wlr_layer_surface->surface, output_surface_for_each_surface(output, wlr_layer_surface->surface,
layer_surface->geo.x, layer_surface->geo.y, 0, iterator, layer_surface->geo.x, layer_surface->geo.y, iterator,
user_data); user_data);
} }
} }
@ -179,7 +179,7 @@ void output_unmanaged_for_each_surface(struct sway_output *output,
double ox = unmanaged_surface->lx - output->swayc->current.swayc_x; double ox = unmanaged_surface->lx - output->swayc->current.swayc_x;
double oy = unmanaged_surface->ly - output->swayc->current.swayc_y; double oy = unmanaged_surface->ly - output->swayc->current.swayc_y;
output_surface_for_each_surface(output, xsurface->surface, ox, oy, 0, output_surface_for_each_surface(output, xsurface->surface, ox, oy,
iterator, user_data); iterator, user_data);
} }
} }
@ -195,7 +195,7 @@ void output_drag_icons_for_each_surface(struct sway_output *output,
if (drag_icon->wlr_drag_icon->mapped) { if (drag_icon->wlr_drag_icon->mapped) {
output_surface_for_each_surface(output, output_surface_for_each_surface(output,
drag_icon->wlr_drag_icon->surface, ox, oy, 0, drag_icon->wlr_drag_icon->surface, ox, oy,
iterator, user_data); iterator, user_data);
} }
} }
@ -430,7 +430,7 @@ static void damage_surface_iterator(struct sway_output *output,
void output_damage_surface(struct sway_output *output, double ox, double oy, void output_damage_surface(struct sway_output *output, double ox, double oy,
struct wlr_surface *surface, bool whole) { struct wlr_surface *surface, bool whole) {
output_surface_for_each_surface(output, surface, ox, oy, 0, output_surface_for_each_surface(output, surface, ox, oy,
damage_surface_iterator, &whole); damage_surface_iterator, &whole);
} }