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

rootston: do not rely on current view size when accumulating damage

This commit is contained in:
emersion 2018-02-03 16:33:58 +01:00
parent faa57341ca
commit 6ba36cc52f
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rootston/output.c
View File

@ -549,12 +549,12 @@ static void damage_whole_surface(struct wlr_surface *surface,
return; return;
} }
int ow, oh;
wlr_output_transformed_resolution(output->wlr_output, &ow, &oh);
struct wlr_box box; struct wlr_box box;
bool intersects = surface_intersect_output(surface, output->desktop->layout, 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 // Take the surface damage and damage the whole surface
// The surface damage is still useful in case the surface got resized // The surface damage is still useful in case the surface got resized
@ -564,6 +564,7 @@ static void damage_whole_surface(struct wlr_surface *surface,
wlr_region_scale(&damage, &damage, output->wlr_output->scale); wlr_region_scale(&damage, &damage, output->wlr_output->scale);
pixman_region32_union_rect(&damage, &damage, 0, 0, box.width, box.height); pixman_region32_union_rect(&damage, &damage, 0, 0, box.width, box.height);
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_box32_t *extents = pixman_region32_extents(&damage); pixman_box32_t *extents = pixman_region32_extents(&damage);
struct wlr_box extents_box = { struct wlr_box extents_box = {
.x = extents->x1, .x = extents->x1,
@ -620,12 +621,12 @@ static void damage_from_surface(struct wlr_surface *surface,
return; return;
} }
int ow, oh;
wlr_output_transformed_resolution(output->wlr_output, &ow, &oh);
struct wlr_box box; struct wlr_box box;
bool intersects = surface_intersect_output(surface, output->desktop->layout, surface_intersect_output(surface, output->desktop->layout,
output->wlr_output, lx, ly, rotation, &box); output->wlr_output, lx, ly, rotation, &box);
if (!intersects) {
return;
}
pixman_region32_t damage; pixman_region32_t damage;
pixman_region32_init(&damage); pixman_region32_init(&damage);
@ -638,6 +639,7 @@ static void damage_from_surface(struct wlr_surface *surface,
ceil(output->wlr_output->scale) - surface->current->scale); ceil(output->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);