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

Make pango: prefix optional for font config

Browse source
This commit is contained in:
Mikkel Oscar Lyderik 2016-03-28 19:38:19 +02:00
parent e2774aee3c
commit da567317ab
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/commands.c
View file

@ -1872,16 +1872,16 @@ static struct cmd_results *cmd_font(int argc, char **argv) {
} }
char *font = join_args(argv, argc); char *font = join_args(argv, argc);
free(config->font);
if (strlen(font) > 6 && strncmp("pango:", font, 6) == 0) { if (strlen(font) > 6 && strncmp("pango:", font, 6) == 0) {
free(config->font); config->font = strdup(font + 6);
config->font = font;
sway_log(L_DEBUG, "Settings font %s", config->font);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} else {
free(font); free(font);
return cmd_results_new(CMD_FAILURE, "font", "non-pango font detected"); } else {
config->font = font;
} }
sway_log(L_DEBUG, "Settings font %s", config->font);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }

2
sway/config.c
View file

@ -160,7 +160,7 @@ static void config_defaults(struct sway_config *config) {
config->resizing_key = M_RIGHT_CLICK; config->resizing_key = M_RIGHT_CLICK;
config->default_layout = L_NONE; config->default_layout = L_NONE;
config->default_orientation = L_NONE; config->default_orientation = L_NONE;
config->font = strdup("pango:monospace 10"); config->font = strdup("monospace 10");
// Flags // Flags
config->focus_follows_mouse = true; config->focus_follows_mouse = true;