blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scene: add scene outputs 

These allow describing an output's viewport inside the scene-graph.
This commit is contained in:
Simon Ser 2021-08-17 12:24:11 +02:00 committed by Simon Zeni
parent 872993f95d
commit 968c1df7e9
2 changed files with 74 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/wlr/types/wlr_scene.h
View File

@ -56,6 +56,8 @@ struct wlr_scene_node {
/** The root scene-graph node. */
struct wlr_scene {
struct wlr_scene_node node;
struct wl_list outputs; // wlr_scene_output.link
};
/** A scene-graph node displaying a single surface. */
@ -75,6 +77,16 @@ struct wlr_scene_rect {
float color[4];
};
/** A viewport for an output in the scene-graph */
struct wlr_scene_output {
struct wlr_output *output;
struct wl_list link; // wlr_scene.outputs
struct wlr_scene *scene;
struct wlr_addon addon;
int x, y;
};
typedef void (*wlr_scene_node_iterator_func_t)(struct wlr_scene_node *node,
int sx, int sy, void *data);
@ -161,4 +173,21 @@ void wlr_scene_rect_set_size(struct wlr_scene_rect *rect, int width, int height)
*/
void wlr_scene_rect_set_color(struct wlr_scene_rect *rect, const float color[static 4]);
/**
* Add a viewport for the specified output to the scene-graph.
*
* An output can only be added once to the scene-graph.
*/
struct wlr_scene_output *wlr_scene_output_create(struct wlr_scene *scene,
struct wlr_output *output);
/**
* Destroy a scene-graph output.
*/
void wlr_scene_output_destroy(struct wlr_scene_output *scene_output);
/**
* Set the output's position in the scene-graph.
*/
void wlr_scene_output_set_position(struct wlr_scene_output *scene_output,
int lx, int ly);
#endif

46
types/wlr_scene.c
View File

@ -71,6 +71,12 @@ void wlr_scene_node_destroy(struct wlr_scene_node *node) {
switch (node->type) {
case WLR_SCENE_NODE_ROOT:;
struct wlr_scene *scene = scene_root_from_node(node);
struct wlr_scene_output *scene_output, *scene_output_tmp;
wl_list_for_each_safe(scene_output, scene_output_tmp, &scene->outputs, link) {
wlr_scene_output_destroy(scene_output);
}
free(scene);
break;
case WLR_SCENE_NODE_SURFACE:;
@ -91,7 +97,7 @@ struct wlr_scene *wlr_scene_create(void) {
return NULL;
}
scene_node_init(&scene->node, WLR_SCENE_NODE_ROOT, NULL);
wl_list_init(&scene->outputs);
return scene;
}
@ -433,3 +439,41 @@ void wlr_scene_render_output(struct wlr_scene *scene, struct wlr_output *output,
pixman_region32_fini(&full_region);
}
static void scene_output_handle_destroy(struct wlr_addon *addon) {
struct wlr_scene_output *scene_output =
wl_container_of(addon, scene_output, addon);
wlr_scene_output_destroy(scene_output);
}
static const struct wlr_addon_interface output_addon_impl = {
.name = "wlr_scene_output",
.destroy = scene_output_handle_destroy,
};
struct wlr_scene_output *wlr_scene_output_create(struct wlr_scene *scene,
struct wlr_output *output) {
struct wlr_scene_output *scene_output = calloc(1, sizeof(*output));
if (scene_output == NULL) {
return NULL;
}
scene_output->output = output;
scene_output->scene = scene;
wlr_addon_init(&scene_output->addon, &output->addons, scene, &output_addon_impl);
wl_list_insert(&scene->outputs, &scene_output->link);
return scene_output;
}
void wlr_scene_output_destroy(struct wlr_scene_output *scene_output) {
wlr_addon_finish(&scene_output->addon);
wl_list_remove(&scene_output->link);
free(scene_output);
}
void wlr_scene_output_set_position(struct wlr_scene_output *scene_output,
int lx, int ly) {
scene_output->x = lx;
scene_output->y = ly;
}