From 93168517154cfc306008fbba7e13f2351f07860f Mon Sep 17 00:00:00 2001 From: Mikkel Oscar Lyderik Date: Tue, 15 Dec 2015 23:24:37 +0100 Subject: [PATCH] Implement bar option: font --- sway/commands.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/sway/commands.c b/sway/commands.c index d05a9069f..0f9656388 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -67,6 +67,7 @@ static sway_cmd cmd_ws_auto_back_and_forth; static sway_cmd bar_cmd_bindsym; static sway_cmd bar_cmd_colors; +static sway_cmd bar_cmd_font; static sway_cmd bar_cmd_mode; static sway_cmd bar_cmd_modifier; static sway_cmd bar_cmd_output; @@ -1594,6 +1595,28 @@ static struct cmd_results *bar_cmd_colors(int argc, char **argv) { return cmd_results_new(CMD_BLOCK_BAR_COLORS, NULL, NULL); } +static struct cmd_results *bar_cmd_font(int argc, char **argv) { + struct cmd_results *error = NULL; + if ((error = checkarg(argc, "font", EXPECTED_AT_LEAST, 1))) { + return error; + } + + if (!config->current_bar) { + return cmd_results_new(CMD_FAILURE, "font", "No bar defined."); + } + + char *font = join_args(argv, argc); + if (strlen(font) > 6 && strncmp("pango:", font, 6) == 0) { + free(config->current_bar->font); + config->current_bar->font = font; + sway_log(L_DEBUG, "Settings font '%s' for bar: %s", config->current_bar->font, config->current_bar->id); + } else { + sway_log(L_ERROR, "warning: non-pango font '%s' not supported.", font); + } + + return cmd_results_new(CMD_SUCCESS, NULL, NULL); +} + static struct cmd_results *bar_cmd_height(int argc, char **argv) { struct cmd_results *error = NULL; if ((error = checkarg(argc, "height", EXPECTED_EQUAL_TO, 1))) { @@ -1890,7 +1913,7 @@ static struct cmd_handler bar_handlers[] = { { "binding_mode_indicator", NULL }, { "bindsym", bar_cmd_bindsym }, { "colors", bar_cmd_colors }, - { "font", NULL }, + { "font", bar_cmd_font }, { "height", bar_cmd_height }, { "hidden_state", bar_cmd_hidden_state }, { "id", bar_cmd_id },