Skip to content

Added system font recognition for xfce-terminal #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 12, 2021
Merged

Added system font recognition for xfce-terminal #36

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
719a5c9
Added system font recognition for xfce-terminal
DarNCelsius May 9, 2021
cf4b3c5
Added check for manual edits
DarNCelsius May 9, 2021
89187e9
Removed auto include
DarNCelsius May 9, 2021
ef3f4d9
Tweaks
DarNCelsius May 9, 2021
cac0c27
Merge branch 'LinusDierheimer:master' into master
DarNCelsius May 11, 2021
c549c7c
Rewrote function with XFConf
DarNCelsius May 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion src/modules/terminalfont.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "fastfetch.h"
#include <string.h>

#define FF_TERMFONT_MODULE_NAME "Terminal Font"
#define FF_TERMFONT_NUM_FORMAT_ARGS 4
Expand Down Expand Up @@ -107,6 +108,31 @@ static void printTilixTerminal(FFinstance* instance)
ffStrbufDestroy(&key);
}

static void printXCFETerminal(FFinstance* instance)
{
char useSysFont[6];
const char* fontName;

if(!ffParsePropFileConfig(instance, "xfce4/terminal/terminalrc", "FontUseSystem=%[^\n]", useSysFont))
{
ffPrintError(instance, FF_TERMFONT_MODULE_NAME, 0, &instance->config.termFontKey, &instance->config.termFontFormat, FF_TERMFONT_NUM_FORMAT_ARGS, "Couldn't open \"$XDG_CONFIG_HOME/xfce4/terminal/terminalrc\"");
return;
}

if((useSysFont[0] == '\0') || strcasecmp(useSysFont, "FALSE") == 0)
{
printTerminalFontFromConfigFile(instance, "xfce4/terminal/terminalrc", "FontName=%[^\n]");
return;
}
else
fontName = ffSettingsGetXFConf(instance, "xsettings", "/Gtk/MonospaceFontName", FF_VARIANT_TYPE_STRING).strValue;

if(fontName == NULL)
ffPrintError(instance, FF_TERMFONT_MODULE_NAME, 0, &instance->config.termFontKey, &instance->config.termFontFormat, FF_TERMFONT_NUM_FORMAT_ARGS, "Couldn't find \"xsettings::/Gtk/MonospaceFontName\" in XFConf");
else
printTerminalFont(instance, fontName);
}

static void printTTY(FFinstance* instance)
{
FFstrbuf font;
Expand Down Expand Up @@ -142,7 +168,7 @@ void ffPrintTerminalFont(FFinstance* instance)
if(ffStrbufIgnCaseCompS(&result->exeName, "konsole") == 0)
printKonsole(instance);
else if(ffStrbufIgnCaseCompS(&result->exeName, "xfce4-terminal") == 0)
printTerminalFontFromConfigFile(instance, "xfce4/terminal/terminalrc", "FontName=%[^\n]");
printXCFETerminal(instance);
else if(ffStrbufIgnCaseCompS(&result->exeName, "lxterminal") == 0)
printTerminalFontFromConfigFile(instance, "lxterminal/lxterminal.conf", "fontname=%[^\n]");
else if(ffStrbufIgnCaseCompS(&result->exeName, "tilix") == 0)
Expand Down