aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2015-11-27 16:16:40 -0500
committerLibravatar Drew DeVault <sir@cmpwn.com>2015-11-27 16:16:54 -0500
commit9b62a98f3e104a6566891ecf491dd15327db443f (patch)
tree2f8f193f4b346801cf7eed3420f09def6bb015b0
parentRemove "See Also" from swaygrab man page (diff)
downloadsway-9b62a98f3e104a6566891ecf491dd15327db443f.tar.gz
sway-9b62a98f3e104a6566891ecf491dd15327db443f.tar.zst
sway-9b62a98f3e104a6566891ecf491dd15327db443f.zip
Style fixes in swaybg
CONTRIBUTING.md's code example is sourced from this file, so I updated it as well.
-rw-r--r--CONTRIBUTING.md78
-rw-r--r--swaybg/main.c78
2 files changed, 78 insertions, 78 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ff2b8b5e..cc29dad0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -106,57 +106,57 @@ int main(int argc, const char **argv) {
106 cairo_set_source_surface(window->cairo, image, 0, 0); 106 cairo_set_source_surface(window->cairo, image, 0, 0);
107 break; 107 break;
108 case SCALING_MODE_FILL: 108 case SCALING_MODE_FILL:
109 { 109 {
110 double window_ratio = (double) window->width / window->height; 110 double window_ratio = (double) window->width / window->height;
111 double bg_ratio = width / height; 111 double bg_ratio = width / height;
112 112
113 if (window_ratio > bg_ratio) { 113 if (window_ratio > bg_ratio) {
114 double scale = (double) window->width / width; 114 double scale = (double) window->width / width;
115 cairo_scale(window->cairo, scale, scale); 115 cairo_scale(window->cairo, scale, scale);
116 cairo_set_source_surface(window->cairo, image, 116 cairo_set_source_surface(window->cairo, image,
117 0, 117 0,
118 (double) window->height/2 / scale - height/2); 118 (double) window->height/2 / scale - height/2);
119 } else { 119 } else {
120 double scale = (double) window->height / height; 120 double scale = (double) window->height / height;
121 cairo_scale(window->cairo, scale, scale); 121 cairo_scale(window->cairo, scale, scale);
122 cairo_set_source_surface(window->cairo, image, 122 cairo_set_source_surface(window->cairo, image,
123 (double) window->width/2 / scale - width/2, 123 (double) window->width/2 / scale - width/2,
124 0); 124 0);
125 }
126 } 125 }
127 break; 126 break;
127 }
128 case SCALING_MODE_FIT: 128 case SCALING_MODE_FIT:
129 { 129 {
130 double window_ratio = (double) window->width / window->height; 130 double window_ratio = (double) window->width / window->height;
131 double bg_ratio = width / height; 131 double bg_ratio = width / height;
132 132
133 if (window_ratio > bg_ratio) { 133 if (window_ratio > bg_ratio) {
134 double scale = (double) window->height / height; 134 double scale = (double) window->height / height;
135 cairo_scale(window->cairo, scale, scale); 135 cairo_scale(window->cairo, scale, scale);
136 cairo_set_source_surface(window->cairo, image, 136 cairo_set_source_surface(window->cairo, image,
137 (double) window->width/2 / scale - width/2, 137 (double) window->width/2 / scale - width/2,
138 0); 138 0);
139 } else { 139 } else {
140 double scale = (double) window->width / width; 140 double scale = (double) window->width / width;
141 cairo_scale(window->cairo, scale, scale); 141 cairo_scale(window->cairo, scale, scale);
142 cairo_set_source_surface(window->cairo, image, 142 cairo_set_source_surface(window->cairo, image,
143 0, 143 0,
144 (double) window->height/2 / scale - height/2); 144 (double) window->height/2 / scale - height/2);
145 }
146 } 145 }
147 break; 146 break;
147 }
148 case SCALING_MODE_CENTER: 148 case SCALING_MODE_CENTER:
149 cairo_set_source_surface(window->cairo, image, 149 cairo_set_source_surface(window->cairo, image,
150 (double) window->width/2 - width/2, 150 (double) window->width/2 - width/2,
151 (double) window->height/2 - height/2); 151 (double) window->height/2 - height/2);
152 break; 152 break;
153 case SCALING_MODE_TILE: 153 case SCALING_MODE_TILE:
154 { 154 {
155 cairo_pattern_t *pattern = cairo_pattern_create_for_surface(image); 155 cairo_pattern_t *pattern = cairo_pattern_create_for_surface(image);
156 cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT); 156 cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
157 cairo_set_source(window->cairo, pattern); 157 cairo_set_source(window->cairo, pattern);
158 }
159 break; 158 break;
159 }
160 default: 160 default:
161 sway_abort("Scaling mode '%s' not implemented yet!", scaling_mode_str); 161 sway_abort("Scaling mode '%s' not implemented yet!", scaling_mode_str);
162 } 162 }
diff --git a/swaybg/main.c b/swaybg/main.c
index ff16a54e..73a8de0a 100644
--- a/swaybg/main.c
+++ b/swaybg/main.c
@@ -88,57 +88,57 @@ int main(int argc, const char **argv) {
88 cairo_set_source_surface(window->cairo, image, 0, 0); 88 cairo_set_source_surface(window->cairo, image, 0, 0);
89 break; 89 break;
90 case SCALING_MODE_FILL: 90 case SCALING_MODE_FILL:
91 { 91 {
92 double window_ratio = (double) window->width / window->height; 92 double window_ratio = (double) window->width / window->height;
93 double bg_ratio = width / height; 93 double bg_ratio = width / height;
94 94
95 if (window_ratio > bg_ratio) { 95 if (window_ratio > bg_ratio) {
96 double scale = (double) window->width / width; 96 double scale = (double) window->width / width;
97 cairo_scale(window->cairo, scale, scale); 97 cairo_scale(window->cairo, scale, scale);
98 cairo_set_source_surface(window->cairo, image, 98 cairo_set_source_surface(window->cairo, image,
99 0, 99 0,
100 (double) window->height/2 / scale - height/2); 100 (double) window->height/2 / scale - height/2);
101 } else { 101 } else {
102 double scale = (double) window->height / height; 102 double scale = (double) window->height / height;
103 cairo_scale(window->cairo, scale, scale); 103 cairo_scale(window->cairo, scale, scale);
104 cairo_set_source_surface(window->cairo, image, 104 cairo_set_source_surface(window->cairo, image,
105 (double) window->width/2 / scale - width/2, 105 (double) window->width/2 / scale - width/2,
106 0); 106 0);
107 }
108 } 107 }
109 break; 108 break;
109 }
110 case SCALING_MODE_FIT: 110 case SCALING_MODE_FIT:
111 { 111 {
112 double window_ratio = (double) window->width / window->height; 112 double window_ratio = (double) window->width / window->height;
113 double bg_ratio = width / height; 113 double bg_ratio = width / height;
114 114
115 if (window_ratio > bg_ratio) { 115 if (window_ratio > bg_ratio) {
116 double scale = (double) window->height / height; 116 double scale = (double) window->height / height;
117 cairo_scale(window->cairo, scale, scale); 117 cairo_scale(window->cairo, scale, scale);
118 cairo_set_source_surface(window->cairo, image, 118 cairo_set_source_surface(window->cairo, image,
119 (double) window->width/2 / scale - width/2, 119 (double) window->width/2 / scale - width/2,
120 0); 120 0);
121 } else { 121 } else {
122 double scale = (double) window->width / width; 122 double scale = (double) window->width / width;
123 cairo_scale(window->cairo, scale, scale); 123 cairo_scale(window->cairo, scale, scale);
124 cairo_set_source_surface(window->cairo, image, 124 cairo_set_source_surface(window->cairo, image,
125 0, 125 0,
126 (double) window->height/2 / scale - height/2); 126 (double) window->height/2 / scale - height/2);
127 }
128 } 127 }
129 break; 128 break;
129 }
130 case SCALING_MODE_CENTER: 130 case SCALING_MODE_CENTER:
131 cairo_set_source_surface(window->cairo, image, 131 cairo_set_source_surface(window->cairo, image,
132 (double) window->width/2 - width/2, 132 (double) window->width/2 - width/2,
133 (double) window->height/2 - height/2); 133 (double) window->height/2 - height/2);
134 break; 134 break;
135 case SCALING_MODE_TILE: 135 case SCALING_MODE_TILE:
136 { 136 {
137 cairo_pattern_t *pattern = cairo_pattern_create_for_surface(image); 137 cairo_pattern_t *pattern = cairo_pattern_create_for_surface(image);
138 cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT); 138 cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT);
139 cairo_set_source(window->cairo, pattern); 139 cairo_set_source(window->cairo, pattern);
140 }
141 break; 140 break;
141 }
142 default: 142 default:
143 sway_abort("Scaling mode '%s' not implemented yet!", scaling_mode_str); 143 sway_abort("Scaling mode '%s' not implemented yet!", scaling_mode_str);
144 } 144 }