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

Global: make FFinstance instance a global variable

Browse Source 
As discussed in https://github.com/fastfetch-cli/fastfetch/discussions/473
This commit is contained in:
李通洲
2023-06-24 10:59:53 +08:00
parent 48b01c9665
commit d0f093c567
255 changed files with 2020 additions and 2064 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/font/font.c
+3 -3
View File
@@ -1,11 +1,11 @@
#include "font.h"
#include "detection/internal.h"
const char* ffDetectFontImpl(const FFinstance* instance, FFFontResult* font);
const char* ffDetectFontImpl(FFFontResult* font);
const char* ffDetectFont(const FFinstance* instance, FFFontResult* font)
const char* ffDetectFont(FFFontResult* font)
{
const char* error = ffDetectFontImpl(instance, font);
const char* error = ffDetectFontImpl(font);
if(error) return error;
src/detection/font/font.h
+1 -1
View File
@@ -19,6 +19,6 @@ typedef struct FFFontResult
FFstrbuf display;
} FFFontResult;
const char* ffDetectFont(const FFinstance* instance, FFFontResult* font);
const char* ffDetectFont(FFFontResult* font);
#endif
src/detection/font/font_apple.m
+1 -1
View File
@@ -21,7 +21,7 @@ static void generateString(FFFontResult* font)
}
}
const char* ffDetectFontImpl(FF_MAYBE_UNUSED const FFinstance* instance, FFFontResult* result)
const char* ffDetectFontImpl(FFFontResult* result)
{
ffStrbufAppendS(&result->fonts[0], [NSFont systemFontOfSize:12].familyName.UTF8String);
ffStrbufAppendS(&result->fonts[1], [NSFont userFontOfSize:12].familyName.UTF8String);
src/detection/font/font_linux.c
+6 -6
View File
@@ -24,30 +24,30 @@ static void generateString(FFFontResult* font)
ffParseGTK(&font->display, &font->fonts[1], &font->fonts[2], &font->fonts[3]);
}
const char* ffDetectFontImpl(const FFinstance* instance, FFFontResult* result)
const char* ffDetectFontImpl(FFFontResult* result)
{
const FFDisplayServerResult* wmde = ffConnectDisplayServer(instance);
const FFDisplayServerResult* wmde = ffConnectDisplayServer();
if(ffStrbufIgnCaseCompS(&wmde->wmProtocolName, FF_WM_PROTOCOL_TTY) == 0)
return "Font isn't supported in TTY";
FFfont qt;
ffFontInitQt(&qt, ffDetectQt(instance)->font.chars);
ffFontInitQt(&qt, ffDetectQt()->font.chars);
ffStrbufAppend(&result->fonts[0], &qt.pretty);
ffFontDestroy(&qt);
FFfont gtk2;
ffFontInitPango(&gtk2, ffDetectGTK2(instance)->font.chars);
ffFontInitPango(&gtk2, ffDetectGTK2()->font.chars);
ffStrbufAppend(&result->fonts[1], &gtk2.pretty);
ffFontDestroy(&gtk2);
FFfont gtk3;
ffFontInitPango(&gtk3, ffDetectGTK3(instance)->font.chars);
ffFontInitPango(&gtk3, ffDetectGTK3()->font.chars);
ffStrbufAppend(&result->fonts[2], &gtk3.pretty);
ffFontDestroy(&gtk3);
FFfont gtk4;
ffFontInitPango(&gtk4, ffDetectGTK4(instance)->font.chars);
ffFontInitPango(&gtk4, ffDetectGTK4()->font.chars);
ffStrbufAppend(&result->fonts[3], &gtk4.pretty);
ffFontDestroy(&gtk4);
src/detection/font/font_nosupport.c
+2 -2
View File
@@ -1,8 +1,8 @@
#include "fastfetch.h"
#include "font.h"
const char* ffDetectFontImpl(const FFinstance* instance, FFFontResult* result)
const char* ffDetectFontImpl(FF_MAYBE_UNUSED FFFontResult* result)
{
FF_UNUSED(instance, result);
FF_UNUSED(result);
return "Not supported on this platform";
}
src/detection/font/font_windows.c
+1 -1
View File
@@ -23,7 +23,7 @@ static void generateString(FFFontResult* font)
ffStrbufAppendC(&font->display, ']');
}
const char* ffDetectFontImpl(FF_MAYBE_UNUSED const FFinstance* instance, FFFontResult* result)
const char* ffDetectFontImpl(FFFontResult* result)
{
NONCLIENTMETRICSW info = { .cbSize = sizeof(info) };
if(!SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(info), &info, 0))