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

rootston: fix rotated views damage tracking

This commit is contained in:
emersion 2018-02-04 11:59:04 +01:00
parent 1842487d61
commit 1cea73d2d8
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
2 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
rootston/output.c
View File

@ -553,31 +553,16 @@ static void damage_whole_surface(struct wlr_surface *surface,
wlr_output_transformed_resolution(output->wlr_output, &ow, &oh); wlr_output_transformed_resolution(output->wlr_output, &ow, &oh);
struct wlr_box box; struct wlr_box box;
surface_intersect_output(surface, output->desktop->layout, bool intersects = surface_intersect_output(surface, output->desktop->layout,
output->wlr_output, lx, ly, rotation, &box); output->wlr_output, lx, ly, rotation, &box);
if (!intersects) {
return;
}
// Take the surface damage and damage the whole surface wlr_box_rotated_bounds(&box, -rotation, &box);
// The surface damage is still useful in case the surface got resized
pixman_region32_t damage;
pixman_region32_init(&damage);
pixman_region32_copy(&damage, &surface->current->surface_damage);
wlr_region_scale(&damage, &damage, output->wlr_output->scale);
pixman_region32_union_rect(&damage, &damage, 0, 0, box.width, box.height);
pixman_region32_translate(&damage, box.x, box.y);
pixman_region32_intersect_rect(&damage, &damage, 0, 0, ow, oh);
pixman_box32_t *extents = pixman_region32_extents(&damage);
struct wlr_box extents_box = {
.x = extents->x1,
.y = extents->y1,
.width = extents->x2 - extents->x1,
.height = extents->y2 - extents->y1,
};
pixman_region32_fini(&damage);
wlr_box_rotated_bounds(&extents_box, -rotation, &extents_box);
pixman_region32_union_rect(&output->damage, &output->damage, pixman_region32_union_rect(&output->damage, &output->damage,
extents_box.x, extents_box.y, extents_box.width, extents_box.height); box.x, box.y, box.width, box.height);
wlr_output_schedule_frame(output->wlr_output); wlr_output_schedule_frame(output->wlr_output);
} }
@ -616,34 +601,51 @@ void output_damage_whole_drag_icon(struct roots_output *output,
static void damage_from_surface(struct wlr_surface *surface, static void damage_from_surface(struct wlr_surface *surface,
double lx, double ly, float rotation, void *data) { double lx, double ly, float rotation, void *data) {
struct roots_output *output = data; struct roots_output *output = data;
struct wlr_output *wlr_output = output->wlr_output;
if (!wlr_surface_has_buffer(surface)) { if (!wlr_surface_has_buffer(surface)) {
return; return;
} }
int ow, oh; int ow, oh;
wlr_output_transformed_resolution(output->wlr_output, &ow, &oh); wlr_output_transformed_resolution(wlr_output, &ow, &oh);
struct wlr_box box; struct wlr_box box;
surface_intersect_output(surface, output->desktop->layout, surface_intersect_output(surface, output->desktop->layout,
output->wlr_output, lx, ly, rotation, &box); wlr_output, lx, ly, rotation, &box);
if (rotation == 0) {
pixman_region32_t damage; pixman_region32_t damage;
pixman_region32_init(&damage); pixman_region32_init(&damage);
pixman_region32_copy(&damage, &surface->current->surface_damage); pixman_region32_copy(&damage, &surface->current->surface_damage);
wlr_region_scale(&damage, &damage, output->wlr_output->scale); wlr_region_scale(&damage, &damage, wlr_output->scale);
if (ceil(output->wlr_output->scale) > surface->current->scale) { if (ceil(wlr_output->scale) > surface->current->scale) {
// When scaling up a surface, it'll become blurry so we need to expand // When scaling up a surface, it'll become blurry so we need to
// the damage region // expand the damage region
wlr_region_expand(&damage, &damage, wlr_region_expand(&damage, &damage,
ceil(output->wlr_output->scale) - surface->current->scale); ceil(wlr_output->scale) - surface->current->scale);
} }
pixman_region32_translate(&damage, box.x, box.y); pixman_region32_translate(&damage, box.x, box.y);
pixman_region32_intersect_rect(&damage, &damage, 0, 0, ow, oh);
pixman_region32_union(&output->damage, &output->damage, &damage); pixman_region32_union(&output->damage, &output->damage, &damage);
pixman_region32_fini(&damage); pixman_region32_fini(&damage);
} else {
pixman_box32_t *extents =
pixman_region32_extents(&surface->current->surface_damage);
struct wlr_box damage_box = {
.x = box.x + extents->x1 * wlr_output->scale,
.y = box.y + extents->y1 * wlr_output->scale,
.width = (extents->x2 - extents->x1) * wlr_output->scale,
.height = (extents->y2 - extents->y1) * wlr_output->scale,
};
wlr_box_rotated_bounds(&damage_box, -rotation, &damage_box);
pixman_region32_union_rect(&output->damage, &output->damage,
damage_box.x, damage_box.y, damage_box.width, damage_box.height);
}
wlr_output_schedule_frame(output->wlr_output); pixman_region32_intersect_rect(&output->damage, &output->damage, 0, 0,
ow, oh);
wlr_output_schedule_frame(wlr_output);
} }
void output_damage_from_view(struct roots_output *output, void output_damage_from_view(struct roots_output *output,
@ -652,11 +654,6 @@ void output_damage_from_view(struct roots_output *output,
return; return;
} }
if (view->rotation != 0) {
output_damage_whole_view(output, view);
return;
}
view_for_each_surface(view, damage_from_surface, output); view_for_each_surface(view, damage_from_surface, output);
} }

8
types/wlr_box.c
View File

@ -138,8 +138,8 @@ void wlr_box_rotated_bounds(const struct wlr_box *box, float rotation,
(box->x + box->width - ox) * s + (box->x + box->width - ox) * s +
(box->y + box->height - oy) * c; (box->y + box->height - oy) * c;
dest->x = fmin(x1, x2); dest->x = floor(fmin(x1, x2));
dest->width = fmax(x1, x2) - fmin(x1, x2); dest->width = ceil(fmax(x1, x2) - fmin(x1, x2));
dest->y = fmin(y1, y2); dest->y = floor(fmin(y1, y2));
dest->height = fmax(y1, y2) - fmin(y1, y2); dest->height = ceil(fmax(y1, y2) - fmin(y1, y2));
} }