diff --git a/view.c b/view.c index 5f9169c..70af974 100644 --- a/view.c +++ b/view.c @@ -204,21 +204,6 @@ view_position(struct cg_view *view) } } -void -view_for_each_surface(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data) -{ - view->impl->for_each_surface(view, iterator, data); -} - -void -view_for_each_popup_surface(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data) -{ - if (!view->impl->for_each_popup_surface) { - return; - } - view->impl->for_each_popup_surface(view, iterator, data); -} - void view_unmap(struct cg_view *view) { diff --git a/view.h b/view.h index b748b03..a0be53d 100644 --- a/view.h +++ b/view.h @@ -45,8 +45,6 @@ struct cg_view_impl { void (*activate)(struct cg_view *view, bool activate); void (*maximize)(struct cg_view *view, int output_width, int output_height); void (*destroy)(struct cg_view *view); - void (*for_each_surface)(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data); - void (*for_each_popup_surface)(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data); struct wlr_surface *(*wlr_surface_at)(struct cg_view *view, double sx, double sy, double *sub_x, double *sub_y); }; @@ -75,8 +73,6 @@ void view_damage_part(struct cg_view *view); void view_damage_whole(struct cg_view *view); void view_activate(struct cg_view *view, bool activate); void view_position(struct cg_view *view); -void view_for_each_surface(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data); -void view_for_each_popup_surface(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data); void view_unmap(struct cg_view *view); void view_map(struct cg_view *view, struct wlr_surface *surface); void view_destroy(struct cg_view *view); diff --git a/xdg_shell.c b/xdg_shell.c index 502d84a..efb9d8b 100644 --- a/xdg_shell.c +++ b/xdg_shell.c @@ -225,20 +225,6 @@ destroy(struct cg_view *view) free(xdg_shell_view); } -static void -for_each_surface(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data) -{ - struct cg_xdg_shell_view *xdg_shell_view = xdg_shell_view_from_view(view); - wlr_xdg_surface_for_each_surface(xdg_shell_view->xdg_surface, iterator, data); -} - -static void -for_each_popup_surface(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data) -{ - struct cg_xdg_shell_view *xdg_shell_view = xdg_shell_view_from_view(view); - wlr_xdg_surface_for_each_popup_surface(xdg_shell_view->xdg_surface, iterator, data); -} - static struct wlr_surface * wlr_surface_at(struct cg_view *view, double sx, double sy, double *sub_x, double *sub_y) { @@ -315,8 +301,6 @@ static const struct cg_view_impl xdg_shell_view_impl = { .activate = activate, .maximize = maximize, .destroy = destroy, - .for_each_surface = for_each_surface, - .for_each_popup_surface = for_each_popup_surface, .wlr_surface_at = wlr_surface_at, }; diff --git a/xwayland.c b/xwayland.c index ebd8e54..ccfca5f 100644 --- a/xwayland.c +++ b/xwayland.c @@ -95,12 +95,6 @@ destroy(struct cg_view *view) free(xwayland_view); } -static void -for_each_surface(struct cg_view *view, wlr_surface_iterator_func_t iterator, void *data) -{ - wlr_surface_for_each_surface(view->wlr_surface, iterator, data); -} - static struct wlr_surface * wlr_surface_at(struct cg_view *view, double sx, double sy, double *sub_x, double *sub_y) { @@ -178,9 +172,6 @@ static const struct cg_view_impl xwayland_view_impl = { .activate = activate, .maximize = maximize, .destroy = destroy, - .for_each_surface = for_each_surface, - /* XWayland doesn't have a separate popup iterator. */ - .for_each_popup_surface = NULL, .wlr_surface_at = wlr_surface_at, };