alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

swaybg: rename w{width,height} to buffer_{width,height}

Browse source
This commit is contained in:
emersion 2018-04-03 16:56:12 -04:00
parent 9b4f8637a9
commit 6929124cef
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
swaybg/main.c
View file

@ -75,52 +75,53 @@ static void render_image(struct swaybg_state *state) {
cairo_surface_t *image = state->context.image; cairo_surface_t *image = state->context.image;
double width = cairo_image_surface_get_width(image); double width = cairo_image_surface_get_width(image);
double height = cairo_image_surface_get_height(image); double height = cairo_image_surface_get_height(image);
int wwidth = state->width * state->scale; int buffer_width = state->width * state->scale;
int wheight = state->height * state->scale; int buffer_height = state->height * state->scale;
switch (state->args->mode) { switch (state->args->mode) {
case BACKGROUND_MODE_STRETCH: case BACKGROUND_MODE_STRETCH:
cairo_scale(cairo, (double)wwidth / width, (double)wheight / height); cairo_scale(cairo, (double)buffer_width / width,
(double)buffer_height / height);
cairo_set_source_surface(cairo, image, 0, 0); cairo_set_source_surface(cairo, image, 0, 0);
break; break;
case BACKGROUND_MODE_FILL: { case BACKGROUND_MODE_FILL: {
double window_ratio = (double)wwidth / wheight; double window_ratio = (double)buffer_width / buffer_height;
double bg_ratio = width / height; double bg_ratio = width / height;
if (window_ratio > bg_ratio) { if (window_ratio > bg_ratio) {
double scale = (double)wwidth / width; double scale = (double)buffer_width / width;
cairo_scale(cairo, scale, scale); cairo_scale(cairo, scale, scale);
cairo_set_source_surface(cairo, image, cairo_set_source_surface(cairo, image,
0, (double)wheight / 2 / scale - height / 2); 0, (double)buffer_height / 2 / scale - height / 2);
} else { } else {
double scale = (double)wheight / height; double scale = (double)buffer_height / height;
cairo_scale(cairo, scale, scale); cairo_scale(cairo, scale, scale);
cairo_set_source_surface(cairo, image, cairo_set_source_surface(cairo, image,
(double)wwidth / 2 / scale - width / 2, 0); (double)buffer_width / 2 / scale - width / 2, 0);
} }
break; break;
} }
case BACKGROUND_MODE_FIT: { case BACKGROUND_MODE_FIT: {
double window_ratio = (double)wwidth / wheight; double window_ratio = (double)buffer_width / buffer_height;
double bg_ratio = width / height; double bg_ratio = width / height;
if (window_ratio > bg_ratio) { if (window_ratio > bg_ratio) {
double scale = (double)wheight / height; double scale = (double)buffer_height / height;
cairo_scale(cairo, scale, scale); cairo_scale(cairo, scale, scale);
cairo_set_source_surface(cairo, image, cairo_set_source_surface(cairo, image,
(double)wwidth / 2 / scale - width / 2, 0); (double)buffer_width / 2 / scale - width / 2, 0);
} else { } else {
double scale = (double)wwidth / width; double scale = (double)buffer_width / width;
cairo_scale(cairo, scale, scale); cairo_scale(cairo, scale, scale);
cairo_set_source_surface(cairo, image, cairo_set_source_surface(cairo, image,
0, (double)wheight / 2 / scale - height / 2); 0, (double)buffer_height / 2 / scale - height / 2);
} }
break; break;
} }
case BACKGROUND_MODE_CENTER: case BACKGROUND_MODE_CENTER:
cairo_set_source_surface(cairo, image, cairo_set_source_surface(cairo, image,
(double)wwidth / 2 - width / 2, (double)buffer_width / 2 - width / 2,
(double)wheight / 2 - height / 2); (double)buffer_height / 2 - height / 2);
break; break;
case BACKGROUND_MODE_TILE: { case BACKGROUND_MODE_TILE: {
cairo_pattern_t *pattern = cairo_pattern_create_for_surface(image); cairo_pattern_t *pattern = cairo_pattern_create_for_surface(image);