summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Mikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-03-28 15:16:55 +0200
committerLibravatar Mikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-03-30 00:47:58 +0200
commite2774aee3c80088c7509ed31ae00baee92d6c6ba (patch)
tree6e6ed0fd86ac5bfff03062409d7eeb6c1e18775c
parentImplement some more on borders (diff)
downloadsway-e2774aee3c80088c7509ed31ae00baee92d6c6ba.tar.gz
sway-e2774aee3c80088c7509ed31ae00baee92d6c6ba.tar.zst
sway-e2774aee3c80088c7509ed31ae00baee92d6c6ba.zip
Add default border colors
-rw-r--r--include/config.h18
-rw-r--r--sway/config.c33
2 files changed, 51 insertions, 0 deletions
diff --git a/include/config.h b/include/config.h
index 4bcf55e8..5a58c07c 100644
--- a/include/config.h
+++ b/include/config.h
@@ -148,6 +148,14 @@ struct bar_config {
148 } colors; 148 } colors;
149}; 149};
150 150
151struct border_colors {
152 uint32_t border;
153 uint32_t background;
154 uint32_t text;
155 uint32_t indicator;
156 uint32_t child_border;
157};
158
151/** 159/**
152 * The configuration struct. The result of loading a config file. 160 * The configuration struct. The result of loading a config file.
153 */ 161 */
@@ -187,6 +195,16 @@ struct sway_config {
187 195
188 list_t *config_chain; 196 list_t *config_chain;
189 const char *current_config; 197 const char *current_config;
198
199 // border colors
200 struct {
201 struct border_colors focused;
202 struct border_colors focused_inactive;
203 struct border_colors unfocused;
204 struct border_colors urgent;
205 struct border_colors placeholder;
206 uint32_t background;
207 } border_colors;
190}; 208};
191 209
192/** 210/**
diff --git a/sway/config.c b/sway/config.c
index a877261c..4a1cb2bb 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -181,6 +181,39 @@ static void config_defaults(struct sway_config *config) {
181 181
182 config->config_chain = create_list(); 182 config->config_chain = create_list();
183 config->current_config = NULL; 183 config->current_config = NULL;
184
185 // border colors
186 config->border_colors.focused.border = 0x4C7899FF;
187 config->border_colors.focused.background = 0x285577FF;
188 config->border_colors.focused.text = 0xFFFFFFFF;
189 config->border_colors.focused.indicator = 0x2E9EF4FF;
190 config->border_colors.focused.child_border = 0x285577FF;
191
192 config->border_colors.focused_inactive.border = 0x333333FF;
193 config->border_colors.focused_inactive.background = 0x5F676AFF;
194 config->border_colors.focused_inactive.text = 0xFFFFFFFF;
195 config->border_colors.focused_inactive.indicator = 0x484E50FF;
196 config->border_colors.focused_inactive.child_border = 0x5F676AFF;
197
198 config->border_colors.unfocused.border = 0x333333FF;
199 config->border_colors.unfocused.background = 0x222222FF;
200 config->border_colors.unfocused.text = 0x888888FF;
201 config->border_colors.unfocused.indicator = 0x292D2EFF;
202 config->border_colors.unfocused.child_border = 0x222222FF;
203
204 config->border_colors.urgent.border = 0x2F343AFF;
205 config->border_colors.urgent.background = 0x900000FF;
206 config->border_colors.urgent.text = 0xFFFFFFFF;
207 config->border_colors.urgent.indicator = 0x900000FF;
208 config->border_colors.urgent.child_border = 0x900000FF;
209
210 config->border_colors.placeholder.border = 0x000000FF;
211 config->border_colors.placeholder.background = 0x0C0C0CFF;
212 config->border_colors.placeholder.text = 0xFFFFFFFF;
213 config->border_colors.placeholder.indicator = 0x000000FF;
214 config->border_colors.placeholder.child_border = 0x0C0C0CFF;
215
216 config->border_colors.background = 0xFFFFFFFF;
184} 217}
185 218
186static int compare_modifiers(const void *left, const void *right) { 219static int compare_modifiers(const void *left, const void *right) {