mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 06:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Render borders with damage

Browse Source
This commit is contained in:
emersion 2018-05-05 19:23:55 +01:00
parent c8a9ea3903
commit 98f7ee8f59
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 91 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
sway/desktop/output.c
View File

@ -189,6 +189,36 @@ static void scissor_output(struct wlr_output *wlr_output,
wlr_renderer_scissor(renderer, &box); wlr_renderer_scissor(renderer, &box);
} }
static void render_texture(struct wlr_output *wlr_output,
pixman_region32_t *output_damage, struct wlr_texture *texture,
const struct wlr_box *_box, const float matrix[static 9], float alpha) {
struct wlr_renderer *renderer =
wlr_backend_get_renderer(wlr_output->backend);
struct wlr_box box = *_box;
scale_box(&box, wlr_output->scale);
pixman_region32_t damage;
pixman_region32_init(&damage);
pixman_region32_union_rect(&damage, &damage, box.x, box.y,
box.width, box.height);
pixman_region32_intersect(&damage, &damage, output_damage);
bool damaged = pixman_region32_not_empty(&damage);
if (!damaged) {
goto damage_finish;
}
int nrects;
pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
for (int i = 0; i < nrects; ++i) {
scissor_output(wlr_output, &rects[i]);
wlr_render_texture_with_matrix(renderer, texture, matrix, alpha);
}
damage_finish:
pixman_region32_fini(&damage);
}
static void render_surface_iterator(struct wlr_surface *surface, int sx, int sy, static void render_surface_iterator(struct wlr_surface *surface, int sx, int sy,
void *_data) { void *_data) {
struct render_data *data = _data; struct render_data *data = _data;
@ -208,43 +238,16 @@ static void render_surface_iterator(struct wlr_surface *surface, int sx, int sy,
return; return;
} }
scale_box(&box, wlr_output->scale);
pixman_region32_t damage;
pixman_region32_init(&damage);
pixman_region32_union_rect(&damage, &damage, box.x, box.y,
box.width, box.height);
pixman_region32_intersect(&damage, &damage, output_damage);
bool damaged = pixman_region32_not_empty(&damage);
if (!damaged) {
goto damage_finish;
}
struct wlr_renderer *renderer =
wlr_backend_get_renderer(wlr_output->backend);
if (!sway_assert(renderer != NULL,
"expected the output backend to have a renderer")) {
return;
}
float matrix[9]; float matrix[9];
enum wl_output_transform transform = enum wl_output_transform transform =
wlr_output_transform_invert(surface->current->transform); wlr_output_transform_invert(surface->current->transform);
wlr_matrix_project_box(matrix, &box, transform, rotation, wlr_matrix_project_box(matrix, &box, transform, rotation,
wlr_output->transform_matrix); wlr_output->transform_matrix);
int nrects; render_texture(wlr_output, output_damage, surface->texture, &box, matrix,
pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
for (int i = 0; i < nrects; ++i) {
scissor_output(wlr_output, &rects[i]);
wlr_render_texture_with_matrix(renderer, surface->texture, matrix,
alpha); alpha);
} }
damage_finish:
pixman_region32_fini(&damage);
}
static void render_layer(struct sway_output *output, static void render_layer(struct sway_output *output,
pixman_region32_t *damage, struct wl_list *layer_surfaces) { pixman_region32_t *damage, struct wl_list *layer_surfaces) {
struct render_data data = { struct render_data data = {
@ -278,14 +281,44 @@ static void render_view(struct sway_view *view, struct sway_output *output,
view, &data.root_geo, render_surface_iterator, &data); view, &data.root_geo, render_surface_iterator, &data);
} }
static void render_rect(struct wlr_output *wlr_output,
pixman_region32_t *output_damage, const struct wlr_box *_box,
float color[static 4]) {
struct wlr_renderer *renderer =
wlr_backend_get_renderer(wlr_output->backend);
struct wlr_box box = *_box;
scale_box(&box, wlr_output->scale);
pixman_region32_t damage;
pixman_region32_init(&damage);
pixman_region32_union_rect(&damage, &damage, box.x, box.y,
box.width, box.height);
pixman_region32_intersect(&damage, &damage, output_damage);
bool damaged = pixman_region32_not_empty(&damage);
if (!damaged) {
goto damage_finish;
}
int nrects;
pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
for (int i = 0; i < nrects; ++i) {
scissor_output(wlr_output, &rects[i]);
wlr_render_rect(renderer, &box, color,
wlr_output->transform_matrix);
}
damage_finish:
pixman_region32_fini(&damage);
}
/** /**
* Render decorations for a view with "border normal". * Render decorations for a view with "border normal".
*/ */
static void render_container_simple_border_normal(struct sway_output *output, static void render_container_simple_border_normal(struct sway_output *output,
pixman_region32_t *output_damage,
struct sway_container *con, struct border_colors *colors, struct sway_container *con, struct border_colors *colors,
struct wlr_texture *title_texture) { struct wlr_texture *title_texture) {
struct wlr_renderer *renderer =
wlr_backend_get_renderer(output->wlr_output->backend);
struct wlr_box box; struct wlr_box box;
float color[4]; float color[4];
@ -296,9 +329,7 @@ static void render_container_simple_border_normal(struct sway_output *output,
box.y = con->y + 1; box.y = con->y + 1;
box.width = con->sway_view->border_thickness; box.width = con->sway_view->border_thickness;
box.height = con->height - 1; box.height = con->height - 1;
scale_box(&box, output->wlr_output->scale); render_rect(output->wlr_output, output_damage, &box, color);
wlr_render_rect(renderer, &box, color,
output->wlr_output->transform_matrix);
// Child border - right edge // Child border - right edge
if (con->parent->children->length == 1 && con->parent->layout == L_HORIZ) { if (con->parent->children->length == 1 && con->parent->layout == L_HORIZ) {
@ -311,9 +342,7 @@ static void render_container_simple_border_normal(struct sway_output *output,
box.y = con->y + 1; box.y = con->y + 1;
box.width = con->sway_view->border_thickness; box.width = con->sway_view->border_thickness;
box.height = con->height - 1; box.height = con->height - 1;
scale_box(&box, output->wlr_output->scale); render_rect(output->wlr_output, output_damage, &box, color);
wlr_render_rect(renderer, &box, color,
output->wlr_output->transform_matrix);
// Child border - bottom edge // Child border - bottom edge
if (con->parent->children->length == 1 && con->parent->layout == L_VERT) { if (con->parent->children->length == 1 && con->parent->layout == L_VERT) {
@ -326,9 +355,7 @@ static void render_container_simple_border_normal(struct sway_output *output,
box.y = con->y + con->height - con->sway_view->border_thickness; box.y = con->y + con->height - con->sway_view->border_thickness;
box.width = con->width; box.width = con->width;
box.height = con->sway_view->border_thickness; box.height = con->sway_view->border_thickness;
scale_box(&box, output->wlr_output->scale); render_rect(output->wlr_output, output_damage, &box, color);
wlr_render_rect(renderer, &box, color,
output->wlr_output->transform_matrix);
// Single pixel bar above title // Single pixel bar above title
memcpy(&color, colors->border, sizeof(float) * 4); memcpy(&color, colors->border, sizeof(float) * 4);
@ -337,18 +364,14 @@ static void render_container_simple_border_normal(struct sway_output *output,
box.y = con->y; box.y = con->y;
box.width = con->width; box.width = con->width;
box.height = 1; box.height = 1;
scale_box(&box, output->wlr_output->scale); render_rect(output->wlr_output, output_damage, &box, color);
wlr_render_rect(renderer, &box, color,
output->wlr_output->transform_matrix);
// Single pixel bar below title // Single pixel bar below title
box.x = con->x + con->sway_view->border_thickness; box.x = con->x + con->sway_view->border_thickness;
box.y = con->sway_view->y - 1; box.y = con->sway_view->y - 1;
box.width = con->width - con->sway_view->border_thickness * 2; box.width = con->width - con->sway_view->border_thickness * 2;
box.height = 1; box.height = 1;
scale_box(&box, output->wlr_output->scale); render_rect(output->wlr_output, output_damage, &box, color);
wlr_render_rect(renderer, &box, color,
output->wlr_output->transform_matrix);
// Title background // Title background
memcpy(&color, colors->background, sizeof(float) * 4); memcpy(&color, colors->background, sizeof(float) * 4);
@ -357,20 +380,20 @@ static void render_container_simple_border_normal(struct sway_output *output,
box.y = con->y + 1; box.y = con->y + 1;
box.width = con->width - con->sway_view->border_thickness * 2; box.width = con->width - con->sway_view->border_thickness * 2;
box.height = con->sway_view->y - con->y - 2; box.height = con->sway_view->y - con->y - 2;
scale_box(&box, output->wlr_output->scale); render_rect(output->wlr_output, output_damage, &box, color);
wlr_render_rect(renderer, &box, color,
output->wlr_output->transform_matrix);
// Title text // Title text
if (title_texture) { if (title_texture) {
struct wlr_box scissor_box; struct wlr_box texture_box = { .x = box.x, .y = box.y };
wlr_box_transform(&box, wlr_texture_get_size(title_texture,
wlr_output_transform_invert(output->wlr_output->transform), &texture_box.width, &texture_box.height);
output->swayc->width, output->swayc->height, &scissor_box);
wlr_renderer_scissor(renderer, &scissor_box); float matrix[9];
wlr_render_texture(renderer, title_texture, wlr_matrix_project_box(matrix, &texture_box, WL_OUTPUT_TRANSFORM_NORMAL,
output->wlr_output->transform_matrix, box.x, box.y, 1); 0.0, output->wlr_output->transform_matrix);
wlr_renderer_scissor(renderer, NULL);
render_texture(output->wlr_output, output_damage, title_texture, &box,
matrix, 1.0);
} }
} }
@ -378,9 +401,8 @@ static void render_container_simple_border_normal(struct sway_output *output,
* Render decorations for a view with "border pixel". * Render decorations for a view with "border pixel".
*/ */
static void render_container_simple_border_pixel(struct sway_output *output, static void render_container_simple_border_pixel(struct sway_output *output,
struct sway_container *con, struct border_colors *colors) { pixman_region32_t *output_damage, struct sway_container *con,
struct wlr_renderer *renderer = struct border_colors *colors) {
wlr_backend_get_renderer(output->wlr_output->backend);
struct wlr_box box; struct wlr_box box;
float color[4]; float color[4];
@ -391,9 +413,7 @@ static void render_container_simple_border_pixel(struct sway_output *output,
box.y = con->y; box.y = con->y;
box.width = con->sway_view->border_thickness; box.width = con->sway_view->border_thickness;
box.height = con->height; box.height = con->height;
scale_box(&box, output->wlr_output->scale); render_rect(output->wlr_output, output_damage, &box, color);
wlr_render_rect(renderer, &box, color,
output->wlr_output->transform_matrix);
// Child border - right edge // Child border - right edge
if (con->parent->children->length == 1 && con->parent->layout == L_HORIZ) { if (con->parent->children->length == 1 && con->parent->layout == L_HORIZ) {
@ -406,18 +426,14 @@ static void render_container_simple_border_pixel(struct sway_output *output,
box.y = con->y; box.y = con->y;
box.width = con->sway_view->border_thickness; box.width = con->sway_view->border_thickness;
box.height = con->height; box.height = con->height;
scale_box(&box, output->wlr_output->scale); render_rect(output->wlr_output, output_damage, &box, color);
wlr_render_rect(renderer, &box, color,
output->wlr_output->transform_matrix);
// Child border - top edge // Child border - top edge
box.x = con->x; box.x = con->x;
box.y = con->y; box.y = con->y;
box.width = con->width; box.width = con->width;
box.height = con->sway_view->border_thickness; box.height = con->sway_view->border_thickness;
scale_box(&box, output->wlr_output->scale); render_rect(output->wlr_output, output_damage, &box, color);
wlr_render_rect(renderer, &box, color,
output->wlr_output->transform_matrix);
// Child border - bottom edge // Child border - bottom edge
if (con->parent->children->length == 1 && con->parent->layout == L_VERT) { if (con->parent->children->length == 1 && con->parent->layout == L_VERT) {
@ -430,9 +446,7 @@ static void render_container_simple_border_pixel(struct sway_output *output,
box.y = con->y + con->height - con->sway_view->border_thickness; box.y = con->y + con->height - con->sway_view->border_thickness;
box.width = con->width; box.width = con->width;
box.height = con->sway_view->border_thickness; box.height = con->sway_view->border_thickness;
scale_box(&box, output->wlr_output->scale); render_rect(output->wlr_output, output_damage, &box, color);
wlr_render_rect(renderer, &box, color,
output->wlr_output->transform_matrix);
} }
static void render_container(struct sway_output *output, static void render_container(struct sway_output *output,
@ -468,10 +482,11 @@ static void render_container_simple(struct sway_output *output,
} }
if (child->sway_view->border == B_NORMAL) { if (child->sway_view->border == B_NORMAL) {
render_container_simple_border_normal(output, child, render_container_simple_border_normal(output, damage,
colors, title_texture); child, colors, title_texture);
} else { } else {
render_container_simple_border_pixel(output, child, colors); render_container_simple_border_pixel(output, damage, child,
colors);
} }
} }
render_view(child->sway_view, output, damage); render_view(child->sway_view, output, damage);
@ -551,7 +566,7 @@ static void render_output(struct sway_output *output, struct timespec *when,
goto renderer_end; goto renderer_end;
} }
wlr_renderer_clear(renderer, (float[]){1, 1, 0, 0}); //wlr_renderer_clear(renderer, (float[]){1, 1, 0, 0});
struct sway_container *workspace = output_get_active_workspace(output); struct sway_container *workspace = output_get_active_workspace(output);