fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-03 11:44:18 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

TerminalFont (Linux): support xfce4-terminal 1.1.0+

Browse Source 
Fixes #602
This commit is contained in:
李通洲
2023-11-01 09:39:24 +08:00
parent 761c649817
commit 494cc1493e
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/terminalfont/terminalfont_linux.c
+22 -4
View File
@@ -125,15 +125,33 @@ static void detectXFCETerminal(FFTerminalFontResult* terminalFont)
FF_STRBUF_AUTO_DESTROY useSysFont = ffStrbufCreate();
FF_STRBUF_AUTO_DESTROY fontName = ffStrbufCreate();
ffParsePropFileConfigValues("xfce4/terminal/terminalrc", 2, (FFpropquery[]) {
{"FontUseSystem = ", &useSysFont},
{"FontName = ", &fontName}
const char* path = "xfce4/xfconf/xfce-perchannel-xml/xfce4-terminal.xml";
bool configFound = ffParsePropFileConfigValues(path, 2, (FFpropquery[]) {
{"<property name=\"font-use-system\" type=\"bool\" value=\"", &useSysFont},
{"<property name=\"font-name\" type=\"string\" value=\"", &fontName}
});
if (configFound)
{
ffStrbufSubstrBeforeLastC(&useSysFont, '"');
ffStrbufSubstrBeforeLastC(&fontName, '"');
}
else
{
path = "xfce4/terminal/terminalrc";
configFound = ffParsePropFileConfigValues(path, 2, (FFpropquery[]) {
{"FontUseSystem = ", &useSysFont},
{"FontName = ", &fontName}
});
}
if (!configFound)
ffStrbufSetStatic(&terminalFont->error, "Couldn't find xfce4/xfconf/xfce-perchannel-xml/xfce4-terminal.xml or xfce4/terminal/terminalrc");
if(useSysFont.length == 0 || ffStrbufIgnCaseCompS(&useSysFont, "false") == 0)
{
if(fontName.length == 0)
ffStrbufAppendS(&terminalFont->error, "Couldn't find FontName in .config/xfce4/terminal/terminalrc");
ffStrbufAppendF(&terminalFont->error, "Couldn't find FontName in %s", path);
else
ffFontInitPango(&terminalFont->font, fontName.chars);
}