diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-01-27 04:55:44 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2016-01-27 04:55:44 -0500 |
| commit | 3a4564a3670f11794a8f8de28b394bb7774610fd (patch) | |
| tree | d1f5bd624cf3dccc1987ccfc1fe20130a2d4cf4a /sway/config.c | |
| parent | baa958eaf2a727c1f8e72aa2606b4b975087939f (diff) | |
| parent | 0ee55474067364159f84806b7b0813492ed4e546 (diff) | |
Merge pull request #479 from crondog/font
font: Allow adding font to the config. In prep for border titles
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) { list_free(config->output_configs); list_free(config->active_bar_modifiers); + free(config->font); free(config); } @@ -149,6 +150,8 @@ static void config_defaults(struct sway_config *config) { config->resizing_key = M_RIGHT_CLICK; config->default_layout = L_NONE; config->default_orientation = L_NONE; + config->font = strdup("pango:monospace 10"); + // Flags config->focus_follows_mouse = true; config->mouse_warping = true; @@ -879,7 +882,7 @@ struct bar_config *default_bar_config(void) { bar->bindings = create_list(); bar->status_command = strdup("while :; do date +'%Y-%m-%d %l:%M:%S %p' && sleep 1; done"); bar->swaybar_command = NULL; - bar->font = strdup("pango:monospace 10"); + bar->font = NULL; bar->height = -1; bar->workspace_buttons = true; bar->separator_symbol = NULL; |