nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-25 16:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

backend/wayland: add support for cropping output layers

Browse Source
This commit is contained in:
Simon Ser 2023-04-20 12:04:01 +02:00 committed by Alexander Orzechowski
parent 4c5eadecce
commit 4e513c93bd
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
backend/wayland/output.c
View File

@ -290,19 +290,19 @@ static bool output_test(struct wlr_output *wlr_output,
int height = layer_state->dst_box.height; int height = layer_state->dst_box.height;
bool needs_viewport = width != layer_state->buffer->width || bool needs_viewport = width != layer_state->buffer->width ||
height != layer_state->buffer->height; height != layer_state->buffer->height;
if (!wlr_fbox_empty(&layer_state->src_box)) {
needs_viewport = needs_viewport ||
layer_state->src_box.x != 0 ||
layer_state->src_box.y != 0 ||
layer_state->src_box.width != width ||
layer_state->src_box.height != height;
}
if (x < 0 || y < 0 || if (x < 0 || y < 0 ||
x + width > wlr_output->width || x + width > wlr_output->width ||
y + height > wlr_output->height || y + height > wlr_output->height ||
(output->backend->viewporter == NULL && needs_viewport)) { (output->backend->viewporter == NULL && needs_viewport)) {
supported = false; supported = false;
} }
if (!wlr_fbox_empty(&layer_state->src_box)) {
supported = supported &&
layer_state->src_box.x == 0 &&
layer_state->src_box.y == 0 &&
layer_state->src_box.width == width &&
layer_state->src_box.height == height;
}
supported = supported && supported = supported &&
test_buffer(output->backend, layer_state->buffer); test_buffer(output->backend, layer_state->buffer);
} }
@ -419,6 +419,23 @@ static bool output_layer_commit(struct wlr_wl_output *output,
state->layer->dst_box.height != state->dst_box.height)) { state->layer->dst_box.height != state->dst_box.height)) {
wp_viewport_set_destination(layer->viewport, state->dst_box.width, state->dst_box.height); wp_viewport_set_destination(layer->viewport, state->dst_box.width, state->dst_box.height);
} }
if (layer->viewport != NULL && !wlr_fbox_equal(&state->layer->src_box, &state->src_box)) {
struct wlr_fbox src_box = state->src_box;
if (wlr_fbox_empty(&src_box)) {
// -1 resets the box
src_box = (struct wlr_fbox){
.x = -1,
.y = -1,
.width = -1,
.height = -1,
};
}
wp_viewport_set_source(layer->viewport,
wl_fixed_from_double(src_box.x),
wl_fixed_from_double(src_box.y),
wl_fixed_from_double(src_box.width),
wl_fixed_from_double(src_box.height));
}
wl_surface_attach(layer->surface, buffer->wl_buffer, 0, 0); wl_surface_attach(layer->surface, buffer->wl_buffer, 0, 0);
wl_surface_damage_buffer(layer->surface, 0, 0, INT32_MAX, INT32_MAX); wl_surface_damage_buffer(layer->surface, 0, 0, INT32_MAX, INT32_MAX);