mirror of
https://github.com/swaywm/sway
synced 2024-11-18 04:33:59 +01:00
Merge pull request #335 from mikkeloscar/bar-font
Implement bar option: font <font>
This commit is contained in:
commit
efff8e5ba5
@ -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_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;
|
||||
@ -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);
|
||||
}
|
||||
|
||||
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))) {
|
||||
@ -1914,7 +1937,7 @@ static struct cmd_handler bar_handlers[] = {
|
||||
{ "binding_mode_indicator", bar_cmd_binding_mode_indicator },
|
||||
{ "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 },
|
||||
|
Loading…
Reference in New Issue
Block a user