summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2015-12-14 08:11:51 -0500
committerLibravatar Drew DeVault <sir@cmpwn.com>2015-12-14 08:11:51 -0500
commit3ef6173c15e5c3df2208df81f5e15e8fb8ca6d2c (patch)
treef1b0ebb5decb035f70e4a96f9b1efb246049a4e1 /include
parentMerge pull request #310 from fluxchief/set-focused-container-fix (diff)
parentImplement bar option: tray_padding <px> [px] (diff)
downloadsway-3ef6173c15e5c3df2208df81f5e15e8fb8ca6d2c.tar.gz
sway-3ef6173c15e5c3df2208df81f5e15e8fb8ca6d2c.tar.zst
sway-3ef6173c15e5c3df2208df81f5e15e8fb8ca6d2c.zip
Merge pull request #311 from mikkeloscar/bar-config-parser
Implement bar { } config parsing
Diffstat (limited to 'include')
-rw-r--r--include/config.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/config.h b/include/config.h
index 4019f479..4e62ee68 100644
--- a/include/config.h
+++ b/include/config.h
@@ -77,6 +77,7 @@ struct bar_config {
77 char *status_command; 77 char *status_command;
78 char *font; 78 char *font;
79 int bar_height; 79 int bar_height;
80 int tray_padding;
80 bool workspace_buttons; 81 bool workspace_buttons;
81 bool strip_workspace_numbers; 82 bool strip_workspace_numbers;
82 bool binding_mode_indicator; 83 bool binding_mode_indicator;
@@ -102,12 +103,14 @@ struct bar_config {
102struct sway_config { 103struct sway_config {
103 list_t *symbols; 104 list_t *symbols;
104 list_t *modes; 105 list_t *modes;
106 list_t *bars;
105 list_t *cmd_queue; 107 list_t *cmd_queue;
106 list_t *workspace_outputs; 108 list_t *workspace_outputs;
107 list_t *output_configs; 109 list_t *output_configs;
108 list_t *criteria; 110 list_t *criteria;
109 struct sway_mode *current_mode; 111 struct sway_mode *current_mode;
110 struct bar_config bar; 112 struct bar_config bar;
113 struct bar_config *current_bar;
111 uint32_t floating_mod; 114 uint32_t floating_mod;
112 uint32_t dragging_key; 115 uint32_t dragging_key;
113 uint32_t resizing_key; 116 uint32_t resizing_key;