From 0e236c7d6a16750cb33a5ffbbe1e68d2a4193329 Mon Sep 17 00:00:00 2001 From: DarN Date: Sun, 9 May 2021 08:03:09 +0200 Subject: [PATCH 1/3] Cleanup/Note on future changes --- src/modules/terminalfont.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/terminalfont.c b/src/modules/terminalfont.c index e3d6794dc..e3c83b044 100644 --- a/src/modules/terminalfont.c +++ b/src/modules/terminalfont.c @@ -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); From 70c1b477d015d666ac73a9814a3c35335957fabb Mon Sep 17 00:00:00 2001 From: DarN Date: Sun, 9 May 2021 09:02:56 +0200 Subject: [PATCH 2/3] Added Terminal Font for lxterminal --- src/modules/terminalfont.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/modules/terminalfont.c b/src/modules/terminalfont.c index e3c83b044..fcc594dd8 100644 --- a/src/modules/terminalfont.c +++ b/src/modules/terminalfont.c @@ -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 From 479188ec3ec4ef56b75125c16edda6dc5eccc150 Mon Sep 17 00:00:00 2001 From: DarN <82701459+DarNCelsius@users.noreply.github.com> Date: Sun, 9 May 2021 09:04:31 +0200 Subject: [PATCH 3/3] Added lxterminal --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 891732556..f1c28497c 100644 --- a/README.md +++ b/README.md @@ -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