From 62fd03a7beb18da6c4a5929e38739cf2199dfa79 Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 25 Feb 2019 14:59:57 +0100 Subject: rootston: refactor rendering This implements rootston surface iterators to ease rendering, sending frame/presentation events and accumulating damage. --- include/rootston/output.h | 22 ++++++++++++++++++++-- include/rootston/view.h | 4 ++++ 2 files changed, 24 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/rootston/output.h b/include/rootston/output.h index 3f07ab6f..60648f75 100644 --- a/include/rootston/output.h +++ b/include/rootston/output.h @@ -29,9 +29,27 @@ struct roots_output { struct wl_listener damage_destroy; }; +typedef void (*roots_surface_iterator_func_t)(struct roots_output *output, + struct wlr_surface *surface, struct wlr_box *box, float rotation, + void *user_data); + void rotate_child_position(double *sx, double *sy, double sw, double sh, double pw, double ph, float rotation); +struct roots_input; + +void output_surface_for_each_surface(struct roots_output *output, + struct wlr_surface *surface, double ox, double oy, + roots_surface_iterator_func_t iterator, void *user_data); +void output_view_for_each_surface(struct roots_output *output, + struct roots_view *view, roots_surface_iterator_func_t iterator, + void *user_data); +void output_drag_icons_for_each_surface(struct roots_output *output, + struct roots_input *input, roots_surface_iterator_func_t iterator, + void *user_data); +void output_for_each_surface(struct roots_output *output, + roots_surface_iterator_func_t iterator, void *user_data); + void handle_new_output(struct wl_listener *listener, void *data); struct roots_view; @@ -45,8 +63,8 @@ void output_damage_from_view(struct roots_output *output, void output_damage_whole_drag_icon(struct roots_output *output, struct roots_drag_icon *icon); void output_damage_from_local_surface(struct roots_output *output, - struct wlr_surface *surface, double ox, double oy, float rotation); + struct wlr_surface *surface, double ox, double oy); void output_damage_whole_local_surface(struct roots_output *output, - struct wlr_surface *surface, double ox, double oy, float rotation); + struct wlr_surface *surface, double ox, double oy); #endif diff --git a/include/rootston/view.h b/include/rootston/view.h index e701b161..531c615b 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -20,6 +20,8 @@ struct roots_view_interface { void (*maximize)(struct roots_view *view, bool maximized); void (*set_fullscreen)(struct roots_view *view, bool fullscreen); void (*close)(struct roots_view *view); + void (*for_each_surface)(struct roots_view *view, + wlr_surface_iterator_func_t iterator, void *user_data); void (*destroy)(struct roots_view *view); }; @@ -250,6 +252,8 @@ void view_set_title(struct roots_view *view, const char *title); void view_set_app_id(struct roots_view *view, const char *app_id); void view_create_foreign_toplevel_handle(struct roots_view *view); void view_get_deco_box(const struct roots_view *view, struct wlr_box *box); +void view_for_each_surface(struct roots_view *view, + wlr_surface_iterator_func_t iterator, void *user_data); struct roots_wl_shell_surface *roots_wl_shell_surface_from_view( struct roots_view *view); -- cgit v1.2.3