diff options
author | emersion <contact@emersion.fr> | 2018-04-03 16:56:12 -0400 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2018-04-03 16:56:12 -0400 |
commit | 6929124cef2af533b15e93babb98fcd2fc3df471 (patch) | |
tree | 3d43aa04e4c9d89c92477621dc0fba19dc3c9f55 /swaybg | |
parent | swaybg: add HiDPI support (diff) | |
download | sway-6929124cef2af533b15e93babb98fcd2fc3df471.tar.gz sway-6929124cef2af533b15e93babb98fcd2fc3df471.tar.zst sway-6929124cef2af533b15e93babb98fcd2fc3df471.zip |
swaybg: rename w{width,height} to buffer_{width,height}
Diffstat (limited to 'swaybg')
-rw-r--r-- | swaybg/main.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/swaybg/main.c b/swaybg/main.c index 053225bd..25a1d73a 100644 --- a/swaybg/main.c +++ b/swaybg/main.c | |||
@@ -75,52 +75,53 @@ static void render_image(struct swaybg_state *state) { | |||
75 | cairo_surface_t *image = state->context.image; | 75 | cairo_surface_t *image = state->context.image; |
76 | double width = cairo_image_surface_get_width(image); | 76 | double width = cairo_image_surface_get_width(image); |
77 | double height = cairo_image_surface_get_height(image); | 77 | double height = cairo_image_surface_get_height(image); |
78 | int wwidth = state->width * state->scale; | 78 | int buffer_width = state->width * state->scale; |
79 | int wheight = state->height * state->scale; | 79 | int buffer_height = state->height * state->scale; |
80 | 80 | ||
81 | switch (state->args->mode) { | 81 | switch (state->args->mode) { |
82 | case BACKGROUND_MODE_STRETCH: | 82 | case BACKGROUND_MODE_STRETCH: |
83 | cairo_scale(cairo, (double)wwidth / width, (double)wheight / height); | 83 | cairo_scale(cairo, (double)buffer_width / width, |
84 | (double)buffer_height / height); | ||
84 | cairo_set_source_surface(cairo, image, 0, 0); | 85 | cairo_set_source_surface(cairo, image, 0, 0); |
85 | break; | 86 | break; |
86 | case BACKGROUND_MODE_FILL: { | 87 | case BACKGROUND_MODE_FILL: { |
87 | double window_ratio = (double)wwidth / wheight; | 88 | double window_ratio = (double)buffer_width / buffer_height; |
88 | double bg_ratio = width / height; | 89 | double bg_ratio = width / height; |
89 | 90 | ||
90 | if (window_ratio > bg_ratio) { | 91 | if (window_ratio > bg_ratio) { |
91 | double scale = (double)wwidth / width; | 92 | double scale = (double)buffer_width / width; |
92 | cairo_scale(cairo, scale, scale); | 93 | cairo_scale(cairo, scale, scale); |
93 | cairo_set_source_surface(cairo, image, | 94 | cairo_set_source_surface(cairo, image, |
94 | 0, (double)wheight / 2 / scale - height / 2); | 95 | 0, (double)buffer_height / 2 / scale - height / 2); |
95 | } else { | 96 | } else { |
96 | double scale = (double)wheight / height; | 97 | double scale = (double)buffer_height / height; |
97 | cairo_scale(cairo, scale, scale); | 98 | cairo_scale(cairo, scale, scale); |
98 | cairo_set_source_surface(cairo, image, | 99 | cairo_set_source_surface(cairo, image, |
99 | (double)wwidth / 2 / scale - width / 2, 0); | 100 | (double)buffer_width / 2 / scale - width / 2, 0); |
100 | } | 101 | } |
101 | break; | 102 | break; |
102 | } | 103 | } |
103 | case BACKGROUND_MODE_FIT: { | 104 | case BACKGROUND_MODE_FIT: { |
104 | double window_ratio = (double)wwidth / wheight; | 105 | double window_ratio = (double)buffer_width / buffer_height; |
105 | double bg_ratio = width / height; | 106 | double bg_ratio = width / height; |
106 | 107 | ||
107 | if (window_ratio > bg_ratio) { | 108 | if (window_ratio > bg_ratio) { |
108 | double scale = (double)wheight / height; | 109 | double scale = (double)buffer_height / height; |
109 | cairo_scale(cairo, scale, scale); | 110 | cairo_scale(cairo, scale, scale); |
110 | cairo_set_source_surface(cairo, image, | 111 | cairo_set_source_surface(cairo, image, |
111 | (double)wwidth / 2 / scale - width / 2, 0); | 112 | (double)buffer_width / 2 / scale - width / 2, 0); |
112 | } else { | 113 | } else { |
113 | double scale = (double)wwidth / width; | 114 | double scale = (double)buffer_width / width; |
114 | cairo_scale(cairo, scale, scale); | 115 | cairo_scale(cairo, scale, scale); |
115 | cairo_set_source_surface(cairo, image, | 116 | cairo_set_source_surface(cairo, image, |
116 | 0, (double)wheight / 2 / scale - height / 2); | 117 | 0, (double)buffer_height / 2 / scale - height / 2); |
117 | } | 118 | } |
118 | break; | 119 | break; |
119 | } | 120 | } |
120 | case BACKGROUND_MODE_CENTER: | 121 | case BACKGROUND_MODE_CENTER: |
121 | cairo_set_source_surface(cairo, image, | 122 | cairo_set_source_surface(cairo, image, |
122 | (double)wwidth / 2 - width / 2, | 123 | (double)buffer_width / 2 - width / 2, |
123 | (double)wheight / 2 - height / 2); | 124 | (double)buffer_height / 2 - height / 2); |
124 | break; | 125 | break; |
125 | case BACKGROUND_MODE_TILE: { | 126 | case BACKGROUND_MODE_TILE: { |
126 | cairo_pattern_t *pattern = cairo_pattern_create_for_surface(image); | 127 | cairo_pattern_t *pattern = cairo_pattern_create_for_surface(image); |