diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-01 22:48:57 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-05-01 22:48:57 +1000 |
commit | cb07434913b89580a4025824cb181733b2db1eb7 (patch) | |
tree | c2c7e713a150c7f9a947b100e0fa4c56efb5c3b2 /sway/config.c | |
parent | Update cursor when border is changed (diff) | |
download | sway-cb07434913b89580a4025824cb181733b2db1eb7.tar.gz sway-cb07434913b89580a4025824cb181733b2db1eb7.tar.zst sway-cb07434913b89580a4025824cb181733b2db1eb7.zip |
Remove unnecessary pointers
Diffstat (limited to 'sway/config.c')
-rw-r--r-- | sway/config.c | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/sway/config.c b/sway/config.c index ed291450..f4d78e19 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -130,11 +130,11 @@ static void destroy_removed_seats(struct sway_config *old_config, | |||
130 | } | 130 | } |
131 | } | 131 | } |
132 | 132 | ||
133 | static void set_color(float (*dest)[4], uint32_t color) { | 133 | static void set_color(float dest[static 4], uint32_t color) { |
134 | (*dest)[0] = ((color >> 16) & 0xff) / 255.0; | 134 | dest[0] = ((color >> 16) & 0xff) / 255.0; |
135 | (*dest)[1] = ((color >> 8) & 0xff) / 255.0; | 135 | dest[1] = ((color >> 8) & 0xff) / 255.0; |
136 | (*dest)[2] = (color & 0xff) / 255.0; | 136 | dest[2] = (color & 0xff) / 255.0; |
137 | (*dest)[3] = 1.0; | 137 | dest[3] = 1.0; |
138 | } | 138 | } |
139 | 139 | ||
140 | static void config_defaults(struct sway_config *config) { | 140 | static void config_defaults(struct sway_config *config) { |
@@ -205,38 +205,38 @@ static void config_defaults(struct sway_config *config) { | |||
205 | config->hide_edge_borders = E_NONE; | 205 | config->hide_edge_borders = E_NONE; |
206 | 206 | ||
207 | // border colors | 207 | // border colors |
208 | set_color(&config->border_colors.focused.border, 0x4C7899); | 208 | set_color(config->border_colors.focused.border, 0x4C7899); |
209 | set_color(&config->border_colors.focused.border, 0x4C7899); | 209 | set_color(config->border_colors.focused.border, 0x4C7899); |
210 | set_color(&config->border_colors.focused.background, 0x285577); | 210 | set_color(config->border_colors.focused.background, 0x285577); |
211 | set_color(&config->border_colors.focused.text, 0xFFFFFF); | 211 | set_color(config->border_colors.focused.text, 0xFFFFFF); |
212 | set_color(&config->border_colors.focused.indicator, 0x2E9EF4); | 212 | set_color(config->border_colors.focused.indicator, 0x2E9EF4); |
213 | set_color(&config->border_colors.focused.child_border, 0x285577); | 213 | set_color(config->border_colors.focused.child_border, 0x285577); |
214 | 214 | ||
215 | set_color(&config->border_colors.focused_inactive.border, 0x333333); | 215 | set_color(config->border_colors.focused_inactive.border, 0x333333); |
216 | set_color(&config->border_colors.focused_inactive.background, 0x5F676A); | 216 | set_color(config->border_colors.focused_inactive.background, 0x5F676A); |
217 | set_color(&config->border_colors.focused_inactive.text, 0xFFFFFF); | 217 | set_color(config->border_colors.focused_inactive.text, 0xFFFFFF); |
218 | set_color(&config->border_colors.focused_inactive.indicator, 0x484E50); | 218 | set_color(config->border_colors.focused_inactive.indicator, 0x484E50); |
219 | set_color(&config->border_colors.focused_inactive.child_border, 0x5F676A); | 219 | set_color(config->border_colors.focused_inactive.child_border, 0x5F676A); |
220 | 220 | ||
221 | set_color(&config->border_colors.unfocused.border, 0x333333); | 221 | set_color(config->border_colors.unfocused.border, 0x333333); |
222 | set_color(&config->border_colors.unfocused.background, 0x222222); | 222 | set_color(config->border_colors.unfocused.background, 0x222222); |
223 | set_color(&config->border_colors.unfocused.text, 0x888888); | 223 | set_color(config->border_colors.unfocused.text, 0x888888); |
224 | set_color(&config->border_colors.unfocused.indicator, 0x292D2E); | 224 | set_color(config->border_colors.unfocused.indicator, 0x292D2E); |
225 | set_color(&config->border_colors.unfocused.child_border, 0x222222); | 225 | set_color(config->border_colors.unfocused.child_border, 0x222222); |
226 | 226 | ||
227 | set_color(&config->border_colors.urgent.border, 0x2F343A); | 227 | set_color(config->border_colors.urgent.border, 0x2F343A); |
228 | set_color(&config->border_colors.urgent.background, 0x900000); | 228 | set_color(config->border_colors.urgent.background, 0x900000); |
229 | set_color(&config->border_colors.urgent.text, 0xFFFFFF); | 229 | set_color(config->border_colors.urgent.text, 0xFFFFFF); |
230 | set_color(&config->border_colors.urgent.indicator, 0x900000); | 230 | set_color(config->border_colors.urgent.indicator, 0x900000); |
231 | set_color(&config->border_colors.urgent.child_border, 0x900000); | 231 | set_color(config->border_colors.urgent.child_border, 0x900000); |
232 | 232 | ||
233 | set_color(&config->border_colors.placeholder.border, 0x000000); | 233 | set_color(config->border_colors.placeholder.border, 0x000000); |
234 | set_color(&config->border_colors.placeholder.background, 0x0C0C0C); | 234 | set_color(config->border_colors.placeholder.background, 0x0C0C0C); |
235 | set_color(&config->border_colors.placeholder.text, 0xFFFFFF); | 235 | set_color(config->border_colors.placeholder.text, 0xFFFFFF); |
236 | set_color(&config->border_colors.placeholder.indicator, 0x000000); | 236 | set_color(config->border_colors.placeholder.indicator, 0x000000); |
237 | set_color(&config->border_colors.placeholder.child_border, 0x0C0C0C); | 237 | set_color(config->border_colors.placeholder.child_border, 0x0C0C0C); |
238 | 238 | ||
239 | set_color(&config->border_colors.background, 0xFFFFFF); | 239 | set_color(config->border_colors.background, 0xFFFFFF); |
240 | 240 | ||
241 | // Security | 241 | // Security |
242 | if (!(config->command_policies = create_list())) goto cleanup; | 242 | if (!(config->command_policies = create_list())) goto cleanup; |