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: improve conhost font detection (Windows)

Browse Source
This commit is contained in:
李通洲
2022-12-20 12:03:05 +08:00
parent 75341e8172
commit 1153d29099
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/terminalfont/terminalfont_windows.c
+10 -14
View File
@@ -2,7 +2,9 @@
#include "common/io.h"
#include "detection/terminalshell/terminalshell.h"
#include "terminalfont.h"
#include "util/windows/registry.h"
#include "util/windows/unicode.h"
#include <wincon.h>
static void detectMintty(const FFinstance* instance, FFTerminalFontResult* terminalFont)
{
@@ -28,23 +30,17 @@ static void detectConhost(const FFinstance* instance, FFTerminalFontResult* term
{
FF_UNUSED(instance);
//Current font of conhost doesn't seem to be detectable, we detect default font instead
FF_HKEY_AUTO_DESTROY hKey = NULL;
if(!ffRegOpenKeyForRead(HKEY_CURRENT_USER, L"Console", &hKey, &terminalFont->error))
CONSOLE_FONT_INFOEX cfi = { .cbSize = sizeof(cfi) };
if(!GetCurrentConsoleFontEx(GetStdHandle(STD_OUTPUT_HANDLE), FALSE, &cfi))
{
ffStrbufAppendS(&terminalFont->error, "GetCurrentConsoleFontEx() failed");
return;
}
FF_STRBUF_AUTO_DESTROY fontName;
ffStrbufInit(&fontName);
if(!ffRegReadStrbuf(hKey, L"FaceName", &fontName, &terminalFont->error))
return;
uint32_t fontSizeNum = 0;
if(!ffRegReadUint(hKey, L"FontSize", &fontSizeNum, &terminalFont->error))
return;
FF_STRBUF_AUTO_DESTROY fontName = ffStrbufCreateWS(cfi.FaceName);
char fontSize[16];
_ultoa((unsigned long)(fontSizeNum >> 16), fontSize, 10);
_ultoa((unsigned long)(cfi.dwFontSize.Y), fontSize, 10);
ffFontInitValues(&terminalFont->font, fontName.chars, fontSize);
}