diff options
author | crondog <crondog@gmail.com> | 2016-01-27 16:57:55 +1100 |
---|---|---|
committer | crondog <crondog@gmail.com> | 2016-01-27 20:53:31 +1100 |
commit | 0ee55474067364159f84806b7b0813492ed4e546 (patch) | |
tree | d1f5bd624cf3dccc1987ccfc1fe20130a2d4cf4a /sway/config.c | |
parent | Remove pointer from swaylock surface (diff) | |
download | sway-0ee55474067364159f84806b7b0813492ed4e546.tar.gz sway-0ee55474067364159f84806b7b0813492ed4e546.tar.zst sway-0ee55474067364159f84806b7b0813492ed4e546.zip |
font: Allow adding font to the config. In prep for border titles
v2: Give default font and make bar use it if no bar font
Diffstat (limited to 'sway/config.c')
-rw-r--r-- | sway/config.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sway/config.c b/sway/config.c index c4614521..65dba365 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -119,6 +119,7 @@ static void free_config(struct sway_config *config) { | |||
119 | list_free(config->output_configs); | 119 | list_free(config->output_configs); |
120 | 120 | ||
121 | list_free(config->active_bar_modifiers); | 121 | list_free(config->active_bar_modifiers); |
122 | free(config->font); | ||
122 | free(config); | 123 | free(config); |
123 | } | 124 | } |
124 | 125 | ||
@@ -149,6 +150,8 @@ static void config_defaults(struct sway_config *config) { | |||
149 | config->resizing_key = M_RIGHT_CLICK; | 150 | config->resizing_key = M_RIGHT_CLICK; |
150 | config->default_layout = L_NONE; | 151 | config->default_layout = L_NONE; |
151 | config->default_orientation = L_NONE; | 152 | config->default_orientation = L_NONE; |
153 | config->font = strdup("pango:monospace 10"); | ||
154 | |||
152 | // Flags | 155 | // Flags |
153 | config->focus_follows_mouse = true; | 156 | config->focus_follows_mouse = true; |
154 | config->mouse_warping = true; | 157 | config->mouse_warping = true; |
@@ -879,7 +882,7 @@ struct bar_config *default_bar_config(void) { | |||
879 | bar->bindings = create_list(); | 882 | bar->bindings = create_list(); |
880 | bar->status_command = strdup("while :; do date +'%Y-%m-%d %l:%M:%S %p' && sleep 1; done"); | 883 | bar->status_command = strdup("while :; do date +'%Y-%m-%d %l:%M:%S %p' && sleep 1; done"); |
881 | bar->swaybar_command = NULL; | 884 | bar->swaybar_command = NULL; |
882 | bar->font = strdup("pango:monospace 10"); | 885 | bar->font = NULL; |
883 | bar->height = -1; | 886 | bar->height = -1; |
884 | bar->workspace_buttons = true; | 887 | bar->workspace_buttons = true; |
885 | bar->separator_symbol = NULL; | 888 | bar->separator_symbol = NULL; |