diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-06-14 18:53:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-14 18:53:32 -0400 |
commit | eb6e38c86d2deb37cc6f378f8644c4a530fd7448 (patch) | |
tree | e3c567c4684faf0f9a7f77494f1bf638171d5349 /sway/config.c | |
parent | Merge pull request #1236 from ykrivopalov/fix_complex_status_command (diff) | |
parent | Merge branch 'master' into tray (diff) | |
download | sway-eb6e38c86d2deb37cc6f378f8644c4a530fd7448.tar.gz sway-eb6e38c86d2deb37cc6f378f8644c4a530fd7448.tar.zst sway-eb6e38c86d2deb37cc6f378f8644c4a530fd7448.zip |
Implement Tray Icons
Diffstat (limited to 'sway/config.c')
-rw-r--r-- | sway/config.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sway/config.c b/sway/config.c index 85823953..e0b65615 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -69,6 +69,10 @@ static void free_bar(struct bar_config *bar) { | |||
69 | } | 69 | } |
70 | free(bar->mode); | 70 | free(bar->mode); |
71 | free(bar->hidden_state); | 71 | free(bar->hidden_state); |
72 | #ifdef ENABLE_TRAY | ||
73 | free(bar->tray_output); | ||
74 | free(bar->icon_theme); | ||
75 | #endif | ||
72 | free(bar->status_command); | 76 | free(bar->status_command); |
73 | free(bar->font); | 77 | free(bar->font); |
74 | free(bar->separator_symbol); | 78 | free(bar->separator_symbol); |
@@ -1386,7 +1390,14 @@ struct bar_config *default_bar_config(void) { | |||
1386 | bar->separator_symbol = NULL; | 1390 | bar->separator_symbol = NULL; |
1387 | bar->strip_workspace_numbers = false; | 1391 | bar->strip_workspace_numbers = false; |
1388 | bar->binding_mode_indicator = true; | 1392 | bar->binding_mode_indicator = true; |
1393 | #ifdef ENABLE_TRAY | ||
1394 | bar->tray_output = NULL; | ||
1395 | bar->icon_theme = NULL; | ||
1389 | bar->tray_padding = 2; | 1396 | bar->tray_padding = 2; |
1397 | bar->activate_button = 0x110; /* BTN_LEFT */ | ||
1398 | bar->context_button = 0x111; /* BTN_RIGHT */ | ||
1399 | bar->secondary_button = 0x112; /* BTN_MIDDLE */ | ||
1400 | #endif | ||
1390 | bar->verbose = false; | 1401 | bar->verbose = false; |
1391 | bar->pid = 0; | 1402 | bar->pid = 0; |
1392 | // set default colors | 1403 | // set default colors |