From 55c939a8ef8303c55a98f912521407852db3b650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sun, 25 Sep 2022 18:22:16 +0800 Subject: [PATCH] macOS: don't build cursor / icons / theme --- src/modules/cursor.c | 17 +++++++++++++---- src/modules/icons.c | 13 +++++++++---- src/modules/theme.c | 13 +++++++++---- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/src/modules/cursor.c b/src/modules/cursor.c index 5d6aa4d59..c0f572823 100644 --- a/src/modules/cursor.c +++ b/src/modules/cursor.c @@ -11,6 +11,8 @@ #define FF_CURSOR_MODULE_NAME "Cursor" #define FF_CURSOR_NUM_FORMAT_ARGS 2 +#if !(defined(__ANDROID__) || defined(__APPLE__)) + static void printCursor(FFinstance* instance, FFstrbuf* cursorTheme, const FFstrbuf* cursorSize) { ffStrbufRemoveIgnCaseEndS(cursorTheme, "cursors"); @@ -190,12 +192,17 @@ static bool printCursorFromEnv(FFinstance* instance) return true; } +#endif + void ffPrintCursor(FFinstance* instance) { - #ifdef __ANDROID__ - ffPrintError(instance, FF_CURSOR_MODULE_NAME, 0, &instance->config.cursor, "Cursor detection is not supported on Android"); - return; - #endif + #if defined(__ANDROID__) || defined(__APPLE__) + + FF_UNUSED(instance); + ffPrintError(instance, FF_CURSOR_MODULE_NAME, 0, &instance->config.cursor, "Cursor detection is not supported"); + return; + + #else const FFDisplayServerResult* wmde = ffConnectDisplayServer(instance); @@ -243,4 +250,6 @@ void ffPrintCursor(FFinstance* instance) ) return; printCursorGTK(instance); + + #endif } diff --git a/src/modules/icons.c b/src/modules/icons.c index 36e12230c..38d0823fb 100644 --- a/src/modules/icons.c +++ b/src/modules/icons.c @@ -10,10 +10,13 @@ void ffPrintIcons(FFinstance* instance) { - #ifdef __ANDROID__ - ffPrintError(instance, FF_ICONS_MODULE_NAME, 0, &instance->config.icons, "Icons detection is not supported on Android"); - return; - #endif + #if defined(__ANDROID__) || defined(__APPLE__) + + FF_UNUSED(instance); + ffPrintError(instance, FF_ICONS_MODULE_NAME, 0, &instance->config.icons, "Icons detection is not supported"); + return; + + #else const FFDisplayServerResult* wmde = ffConnectDisplayServer(instance); @@ -64,4 +67,6 @@ void ffPrintIcons(FFinstance* instance) } ffStrbufDestroy(>kPretty); + + #endif } diff --git a/src/modules/theme.c b/src/modules/theme.c index e3b2387b2..612bb6b96 100644 --- a/src/modules/theme.c +++ b/src/modules/theme.c @@ -10,10 +10,13 @@ void ffPrintTheme(FFinstance* instance) { - #ifdef __ANDROID__ - ffPrintError(instance, FF_THEME_MODULE_NAME, 0, &instance->config.theme, "Theme detection is not supported on Android"); - return; - #endif + #if defined(__ANDROID__) || defined(__APPLE__) + + FF_UNUSED(instance); + ffPrintError(instance, FF_THEME_MODULE_NAME, 0, &instance->config.theme, "Theme detection is not supported"); + return; + + #else const FFDisplayServerResult* wmde = ffConnectDisplayServer(instance); @@ -98,4 +101,6 @@ void ffPrintTheme(FFinstance* instance) ffStrbufDestroy(&plasmaColorPretty); ffStrbufDestroy(>kPretty); + + #endif }