mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 00:16:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #335 from mikkeloscar/bar-font

Browse source 
Implement bar option: font <font>
This commit is contained in:
Drew DeVault 2015-12-15 18:11:21 -05:00
commit efff8e5ba5
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sway/commands.c
View file

@ -68,6 +68,7 @@ static sway_cmd cmd_ws_auto_back_and_forth;
static sway_cmd bar_cmd_binding_mode_indicator; static sway_cmd bar_cmd_binding_mode_indicator;
static sway_cmd bar_cmd_bindsym; static sway_cmd bar_cmd_bindsym;
static sway_cmd bar_cmd_colors; static sway_cmd bar_cmd_colors;
static sway_cmd bar_cmd_font;
static sway_cmd bar_cmd_mode; static sway_cmd bar_cmd_mode;
static sway_cmd bar_cmd_modifier; static sway_cmd bar_cmd_modifier;
static sway_cmd bar_cmd_output; static sway_cmd bar_cmd_output;
@ -1618,6 +1619,28 @@ static struct cmd_results *bar_cmd_colors(int argc, char **argv) {
return cmd_results_new(CMD_BLOCK_BAR_COLORS, NULL, NULL); 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) { static struct cmd_results *bar_cmd_height(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
if ((error = checkarg(argc, "height", EXPECTED_EQUAL_TO, 1))) { if ((error = checkarg(argc, "height", EXPECTED_EQUAL_TO, 1))) {
@ -1914,7 +1937,7 @@ static struct cmd_handler bar_handlers[] = {
{ "binding_mode_indicator", bar_cmd_binding_mode_indicator }, { "binding_mode_indicator", bar_cmd_binding_mode_indicator },
{ "bindsym", bar_cmd_bindsym }, { "bindsym", bar_cmd_bindsym },
{ "colors", bar_cmd_colors }, { "colors", bar_cmd_colors },
{ "font", NULL }, { "font", bar_cmd_font },
{ "height", bar_cmd_height }, { "height", bar_cmd_height },
{ "hidden_state", bar_cmd_hidden_state }, { "hidden_state", bar_cmd_hidden_state },
{ "id", bar_cmd_id }, { "id", bar_cmd_id },