Merge branch 'wlr_mirror-output-dst-as-addon' into wlr_mirror_v1

This commit is contained in:
Alexander Courtis 2022-01-12 12:58:37 +11:00
commit ebae11dd32
5 changed files with 53 additions and 6 deletions

View file

@ -11,6 +11,7 @@
#include <wayland-client-protocol.h>
#include <wayland-server-core.h>
#include <wlr/util/addon.h>
#include <wlr/util/box.h>
/**
@ -119,5 +120,10 @@ void wlr_mirror_request_blank(struct wlr_mirror *mirror);
void wlr_mirror_request_box(struct wlr_mirror *mirror,
struct wlr_output *output_src, struct wlr_box box);
/**
* Output is in use as a dst by another mirror session.
*/
bool wlr_mirror_v1_output_is_dst(struct wlr_output *output);
#endif

View file

@ -151,9 +151,6 @@ struct wlr_output {
// Commit sequence number. Incremented on each commit, may overflow.
uint32_t commit_seq;
// dst for an active wlr_mirror session
bool mirror_dst;
struct {
// Request to render a frame
struct wl_signal frame;

View file

@ -40,4 +40,7 @@ void wlr_addon_finish(struct wlr_addon *addon);
struct wlr_addon *wlr_addon_find(struct wlr_addon_set *set, const void *owner,
const struct wlr_addon_interface *impl);
void wlr_addon_find_all(struct wl_array *all, struct wlr_addon_set *set,
const struct wlr_addon_interface *impl);
#endif