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

Merge pull request #35 from DarNCelsius/master

Browse Source 
Added Terminal Font for lxterminal
This commit is contained in:
Linus Dierheimer
2021-05-09 12:24:34 +02:00
committed by GitHub
parent cdf82e91b2 479188ec3e
commit fc314e6ded
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -51,7 +51,7 @@ KWin, Mutter, Muffin, Openbox (LXDE, LXQT & without DE)
### Terminal fonts:
```
konsole, xfce4-terminal, tilix, TTY
konsole, xfce4-terminal, tilix, lxterminal, TTY
```
## Building
src/modules/terminalfont.c
+18 -3
View File
@@ -68,12 +68,12 @@ static void printXFCE4Terminal(FFinstance* instance)
}
static void printTilixTerminal(FFinstance* instance)
{
{ // Note - Subject to change when DConf/GSettings fix their implementations of defaults/relocatable schemas respectively
const char* fontName = NULL;
const char* defaultProfile = ffSettingsGetGsettings(instance, "com.gexperts.Tilix.ProfilesList", NULL, "default", FF_VARIANT_TYPE_STRING).strValue;
if (!defaultProfile)
if(!defaultProfile)
{
ffPrintError(instance, FF_TERMFONT_MODULE_NAME, 0, &instance->config.termFontKey, &instance->config.termFontFormat, FF_TERMFONT_NUM_FORMAT_ARGS, "Couldn't find \"Default\" profile in Tilix settings");
return;
@@ -96,7 +96,7 @@ static void printTilixTerminal(FFinstance* instance)
else if(!res.boolValueSet || res.boolValue) // system font
fontName = ffSettingsGetDConf(instance, "/org/gnome/desktop/interface/monospace-font-name", FF_VARIANT_TYPE_STRING).strValue;
if (!fontName)
if(!fontName)
{
ffPrintError(instance, FF_TERMFONT_MODULE_NAME, 0, &instance->config.termFontKey, &instance->config.termFontFormat, FF_TERMFONT_NUM_FORMAT_ARGS, "Couldn't find \"Terminal font\" in Tilix settings");
ffStrbufDestroy(&key);
@@ -107,6 +107,19 @@ static void printTilixTerminal(FFinstance* instance)
ffStrbufDestroy(&key);
}
static void printLxTerminal(FFinstance* instance)
{
char font[128];
ffParsePropFileConfig(instance, "lxterminal/lxterminal.conf", "fontname=%[^\n]", font);
if(font[0] == '\0')
{
ffPrintError(instance, FF_TERMFONT_MODULE_NAME, 0, &instance->config.termFontKey, &instance->config.termFontFormat, FF_TERMFONT_NUM_FORMAT_ARGS, "Couldn't find \"fontname=%%[^\\n]\" in \".config/lxterminal/lxterminal.conf\"");
return;
}
printTerminalFont(instance, font);
}
static void printTTY(FFinstance* instance)
{
FFstrbuf font;
@@ -145,6 +158,8 @@ void ffPrintTerminalFont(FFinstance* instance)
printXFCE4Terminal(instance);
else if(ffStrbufIgnCaseCompS(&result->exeName, "tilix") == 0)
printTilixTerminal(instance);
else if(ffStrbufIgnCaseCompS(&result->exeName, "lxterminal") == 0)
printLxTerminal(instance);
else if(ffStrbufStartsWithIgnCaseS(&result->exeName, "/dev/tty"))
printTTY(instance);
else