mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-02 11:55:59 +01:00
rootston: damage tracking scale support
This commit is contained in:
parent
3f96427d08
commit
4223fbc763
4 changed files with 45 additions and 3 deletions
9
include/wlr/util/region.h
Normal file
9
include/wlr/util/region.h
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
#ifndef WLR_UTIL_REGION_H
|
||||||
|
#define WLR_UTIL_REGION_H
|
||||||
|
|
||||||
|
#include <pixman.h>
|
||||||
|
|
||||||
|
void wlr_region_scale(pixman_region32_t *dst, pixman_region32_t *src,
|
||||||
|
float scale);
|
||||||
|
|
||||||
|
#endif
|
|
@ -8,6 +8,7 @@
|
||||||
#include <wlr/types/wlr_xdg_shell_v6.h>
|
#include <wlr/types/wlr_xdg_shell_v6.h>
|
||||||
#include <wlr/render/matrix.h>
|
#include <wlr/render/matrix.h>
|
||||||
#include <wlr/util/log.h>
|
#include <wlr/util/log.h>
|
||||||
|
#include <wlr/util/region.h>
|
||||||
#include "rootston/server.h"
|
#include "rootston/server.h"
|
||||||
#include "rootston/output.h"
|
#include "rootston/output.h"
|
||||||
#include "rootston/config.h"
|
#include "rootston/config.h"
|
||||||
|
@ -186,7 +187,7 @@ static void render_surface(struct wlr_surface *surface, double lx, double ly,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: output scale, output transform support
|
// TODO: output transform support
|
||||||
pixman_region32_t damage;
|
pixman_region32_t damage;
|
||||||
pixman_region32_init(&damage);
|
pixman_region32_init(&damage);
|
||||||
pixman_region32_union_rect(&damage, &damage, box.x, box.y,
|
pixman_region32_union_rect(&damage, &damage, box.x, box.y,
|
||||||
|
@ -257,7 +258,7 @@ static void render_decorations(struct roots_view *view,
|
||||||
struct wlr_box box;
|
struct wlr_box box;
|
||||||
get_decoration_box(view, output, &box);
|
get_decoration_box(view, output, &box);
|
||||||
|
|
||||||
// TODO: output scale, output transform support
|
// TODO: output transform support
|
||||||
pixman_region32_t damage;
|
pixman_region32_t damage;
|
||||||
pixman_region32_init(&damage);
|
pixman_region32_init(&damage);
|
||||||
pixman_region32_union_rect(&damage, &damage, box.x, box.y,
|
pixman_region32_union_rect(&damage, &damage, box.x, box.y,
|
||||||
|
@ -583,10 +584,11 @@ static void damage_from_surface(struct wlr_surface *surface,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: output scale, output transform support
|
// TODO: output transform support
|
||||||
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);
|
||||||
pixman_region32_translate(&damage, box.x, box.y);
|
pixman_region32_translate(&damage, box.x, box.y);
|
||||||
pixman_region32_union(&output->damage, &output->damage, &damage);
|
pixman_region32_union(&output->damage, &output->damage, &damage);
|
||||||
pixman_region32_fini(&damage);
|
pixman_region32_fini(&damage);
|
||||||
|
|
|
@ -3,6 +3,8 @@ lib_wlr_util = static_library(
|
||||||
files(
|
files(
|
||||||
'log.c',
|
'log.c',
|
||||||
'os-compatibility.c',
|
'os-compatibility.c',
|
||||||
|
'region.c',
|
||||||
),
|
),
|
||||||
include_directories: wlr_inc,
|
include_directories: wlr_inc,
|
||||||
|
dependencies: [pixman],
|
||||||
)
|
)
|
||||||
|
|
29
util/region.c
Normal file
29
util/region.c
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <math.h>
|
||||||
|
#include <wlr/util/region.h>
|
||||||
|
|
||||||
|
void wlr_region_scale(pixman_region32_t *dst, pixman_region32_t *src,
|
||||||
|
float scale) {
|
||||||
|
if (scale == 1) {
|
||||||
|
pixman_region32_copy(dst, src);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int nrects;
|
||||||
|
pixman_box32_t *src_rects = pixman_region32_rectangles(src, &nrects);
|
||||||
|
|
||||||
|
pixman_box32_t *dst_rects = malloc(nrects * sizeof(pixman_box32_t));
|
||||||
|
if (dst_rects == NULL) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < nrects; ++i) {
|
||||||
|
dst_rects[i].x1 = floor(src_rects[i].x1 * scale);
|
||||||
|
dst_rects[i].x2 = ceil(src_rects[i].x2 * scale);
|
||||||
|
dst_rects[i].y1 = floor(src_rects[i].y1 * scale);
|
||||||
|
dst_rects[i].y2 = ceil(src_rects[i].y2 * scale);
|
||||||
|
}
|
||||||
|
|
||||||
|
pixman_region32_fini(dst);
|
||||||
|
pixman_region32_init_rects(dst, dst_rects, nrects);
|
||||||
|
}
|
Loading…
Reference in a new issue