fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-12 10:22:12 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Refactor to use ffFontInitCopy and detect font size

Browse Source 
printAlacritty now usese ffFontInitCopy instead of ffFontInitPango
and also detects font size.
This commit is contained in:
Péter Bohner (xzvf)
2022-07-12 16:31:19 +02:00
parent 85b0be5213
commit c95ad74ea2
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/terminalfont.c
+22 -8
View File
@@ -180,22 +180,36 @@ static void printXCFETerminal(FFinstance* instance)
static void printAlacritty(FFinstance* instance) {
FFstrbuf fontName;
FFstrbuf fontSize;
ffStrbufInit(&fontName);
ffStrbufInit(&fontSize);
FFpropquery fontQuery[] = {
{"family:", &fontName},
{"size:", &fontSize},
};
// alacritty parses config files in this order
ffParsePropFileConfig(instance, "alacritty/alacritty.yml", "family:", &fontName);
if(fontName.length == 0)
ffParsePropFileConfig(instance, "alacritty.yml", "family:", &fontName);
if(fontName.length == 0)
ffParsePropFileConfig(instance, ".alacritty.yml", "family:", &fontName);
if(fontName.length == 0)
ffStrbufAppendS(&fontName, "alacritty"); //by default alacritty uses it's own font called alacritty
ffParsePropFileConfigValues(instance, "alacritty/alacritty.yml", 2, fontQuery);
if(fontName.length == 0 || fontSize.length == 0)
ffParsePropFileConfigValues(instance, "alacritty.yml", 2, fontQuery);
if(fontName.length == 0 || fontSize.length == 0)
ffParsePropFileConfigValues(instance, ".alacritty.yml", 2, fontQuery);
if(fontName.length == 0 || fontSize.length == 0)
{
//by default alacritty uses it's own font called alacritty at size 11
ffStrbufAppendS(&fontName, "alacritty");
ffStrbufAppendS(&fontSize, "11");
}
FFfont font;
ffFontInitPango(&font, fontName.chars);
ffFontInitCopy(&font, fontName.chars);
ffStrbufInitCopy(&font.size, &fontSize);
printTerminalFont(instance, fontName.chars, &font);
ffFontDestroy(&font);
ffStrbufDestroy(&fontName);
ffStrbufDestroy(&fontSize);
}
static void printTTY(FFinstance* instance)