mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2025-10-29 05:40:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Drop view_for_each_surface and view_for_each_popup_surface

Browse source 
With the scene-graph, these are no longer used.
This commit is contained in:
Simon Ser 2021-08-10 11:37:19 +02:00 • committed by Jente Hidskes
parent f544483340
commit 6d60c6c464
4 changed files with 0 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

15
view.c
View file

@ -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 void
view_unmap(struct cg_view *view) view_unmap(struct cg_view *view)
{ {

4
view.h
View file

@ -45,8 +45,6 @@ struct cg_view_impl {
void (*activate)(struct cg_view *view, bool activate); void (*activate)(struct cg_view *view, bool activate);
void (*maximize)(struct cg_view *view, int output_width, int output_height); void (*maximize)(struct cg_view *view, int output_width, int output_height);
void (*destroy)(struct cg_view *view); 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); 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_damage_whole(struct cg_view *view);
void view_activate(struct cg_view *view, bool activate); void view_activate(struct cg_view *view, bool activate);
void view_position(struct cg_view *view); 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_unmap(struct cg_view *view);
void view_map(struct cg_view *view, struct wlr_surface *surface); void view_map(struct cg_view *view, struct wlr_surface *surface);
void view_destroy(struct cg_view *view); void view_destroy(struct cg_view *view);

16
xdg_shell.c
View file

@ -225,20 +225,6 @@ destroy(struct cg_view *view)
free(xdg_shell_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 * static struct wlr_surface *
wlr_surface_at(struct cg_view *view, double sx, double sy, double *sub_x, double *sub_y) 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, .activate = activate,
.maximize = maximize, .maximize = maximize,
.destroy = destroy, .destroy = destroy,
.for_each_surface = for_each_surface,
.for_each_popup_surface = for_each_popup_surface,
.wlr_surface_at = wlr_surface_at, .wlr_surface_at = wlr_surface_at,
}; };

9
xwayland.c
View file

@ -95,12 +95,6 @@ destroy(struct cg_view *view)
free(xwayland_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 * static struct wlr_surface *
wlr_surface_at(struct cg_view *view, double sx, double sy, double *sub_x, double *sub_y) 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, .activate = activate,
.maximize = maximize, .maximize = maximize,
.destroy = destroy, .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, .wlr_surface_at = wlr_surface_at,
}; };