feat(config): unfiy style configuration files into one

Author: vladelaina

include/config.h

@@ -233,11 +233,7 @@ typedef struct {
     int opacity_step_fast;
     int scale_step_normal;
     int scale_step_fast;
-    BOOL glow_effect;
-    BOOL glass_effect;
-    BOOL neon_effect;
-    BOOL holographic_effect;
-    BOOL liquid_effect;
+    int text_effect;  /* TextEffectType enum value */
 } DisplayConfig;
 
 /**

include/config/config_loader.h

@@ -49,11 +49,7 @@ typedef struct {
     int opacityStepFast;
     int scaleStepNormal;
     int scaleStepFast;
-    BOOL glowEffect;
-    BOOL glassEffect;
-    BOOL neonEffect;
-    BOOL holographicEffect;
-    BOOL liquidEffect;
+    int textEffect;  /* TextEffectType enum value */
 
     /* Timer */
     int defaultStartTime;

include/window.h

@@ -13,15 +13,6 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-/* Global effect flags */
-extern BOOL CLOCK_GLOW_EFFECT;
-extern BOOL CLOCK_GLASS_EFFECT;
-extern BOOL CLOCK_NEON_EFFECT;
-extern BOOL CLOCK_HOLOGRAPHIC_EFFECT;
-extern BOOL CLOCK_LIQUID_EFFECT;
-
-/* Global configuration variables */
-
 /* Include all window module headers */
 #include "window/window_core.h"
 #include "window/window_visual_effects.h"

include/window/window_core.h

@@ -30,9 +30,25 @@ extern BOOL CLOCK_TEXT_RECT_VALID;
 extern float CLOCK_FONT_SCALE_FACTOR;
 extern float PLUGIN_FONT_SCALE_FACTOR;
 extern int CLOCK_BASE_FONT_SIZE;
-extern BOOL CLOCK_GLOW_EFFECT;
-extern BOOL CLOCK_GLASS_EFFECT;
-extern BOOL CLOCK_NEON_EFFECT;
+
+/* Text effect type enumeration */
+typedef enum {
+    TEXT_EFFECT_NONE = 0,
+    TEXT_EFFECT_GLOW,
+    TEXT_EFFECT_GLASS,
+    TEXT_EFFECT_NEON,
+    TEXT_EFFECT_HOLOGRAPHIC,
+    TEXT_EFFECT_LIQUID
+} TextEffectType;
+
+extern TextEffectType CLOCK_TEXT_EFFECT;
+
+/* Legacy compatibility macros - map old BOOL checks to new enum */
+#define CLOCK_GLOW_EFFECT        (CLOCK_TEXT_EFFECT == TEXT_EFFECT_GLOW)
+#define CLOCK_GLASS_EFFECT       (CLOCK_TEXT_EFFECT == TEXT_EFFECT_GLASS)
+#define CLOCK_NEON_EFFECT        (CLOCK_TEXT_EFFECT == TEXT_EFFECT_NEON)
+#define CLOCK_HOLOGRAPHIC_EFFECT (CLOCK_TEXT_EFFECT == TEXT_EFFECT_HOLOGRAPHIC)
+#define CLOCK_LIQUID_EFFECT      (CLOCK_TEXT_EFFECT == TEXT_EFFECT_LIQUID)
 
 /* ============================================================================
  * Public API

src/config/config_applier.c

@@ -19,11 +19,8 @@
 #include <time.h>
 #include <math.h>
 
-/* Global effect flags */
-extern BOOL CLOCK_GLOW_EFFECT;
-extern BOOL CLOCK_GLASS_EFFECT;
-extern BOOL CLOCK_NEON_EFFECT;
-extern BOOL CLOCK_HOLOGRAPHIC_EFFECT;
+/* Global text effect */
+extern TextEffectType CLOCK_TEXT_EFFECT;
 
 /* ============================================================================
  * Helper: Language enum mapping
@@ -118,16 +115,8 @@ void ApplyDisplaySettings(const ConfigSnapshot* snapshot) {
     g_AppConfig.display.opacity_step_fast = snapshot->opacityStepFast;
     g_AppConfig.display.scale_step_normal = snapshot->scaleStepNormal;
     g_AppConfig.display.scale_step_fast = snapshot->scaleStepFast;
-    CLOCK_GLOW_EFFECT = snapshot->glowEffect;
-    CLOCK_GLASS_EFFECT = snapshot->glassEffect;
-    CLOCK_NEON_EFFECT = snapshot->neonEffect;
-    CLOCK_HOLOGRAPHIC_EFFECT = snapshot->holographicEffect;
-    CLOCK_LIQUID_EFFECT = snapshot->liquidEffect;
-    g_AppConfig.display.glow_effect = snapshot->glowEffect;
-    g_AppConfig.display.glass_effect = snapshot->glassEffect;
-    g_AppConfig.display.neon_effect = snapshot->neonEffect;
-    g_AppConfig.display.holographic_effect = snapshot->holographicEffect;
-    g_AppConfig.display.liquid_effect = snapshot->liquidEffect;
+    CLOCK_TEXT_EFFECT = (TextEffectType)snapshot->textEffect;
+    g_AppConfig.display.text_effect = snapshot->textEffect;
 
     HWND hwnd = FindWindowW(L"CatimeWindowClass", L"Catime");
     if (hwnd) {

src/config/config_defaults.c

@@ -49,11 +49,7 @@ static const ConfigItemMeta CONFIG_METADATA[] = {
     {INI_SECTION_DISPLAY, "OPACITY_STEP_FAST", "5", CONFIG_TYPE_INT, "Opacity Ctrl+scroll step (1-100)"},
     {INI_SECTION_DISPLAY, "SCALE_STEP_NORMAL", "10", CONFIG_TYPE_INT, "Scale scroll step (1-100)"},
     {INI_SECTION_DISPLAY, "SCALE_STEP_FAST", "15", CONFIG_TYPE_INT, "Scale Ctrl+scroll step (1-100)"},
-    {INI_SECTION_DISPLAY, "TEXT_GLOW_EFFECT", "FALSE", CONFIG_TYPE_BOOL, "Enable neon glow effect"},
-    {INI_SECTION_DISPLAY, "TEXT_GLASS_EFFECT", "FALSE", CONFIG_TYPE_BOOL, "Enable optical prism effect"},
-    {INI_SECTION_DISPLAY, "TEXT_NEON_EFFECT", "FALSE", CONFIG_TYPE_BOOL, "Enable Hong Kong neon tube effect"},
-    {INI_SECTION_DISPLAY, "TEXT_HOLOGRAPHIC_EFFECT", "FALSE", CONFIG_TYPE_BOOL, "Enable holographic dispersion effect"},
-    {INI_SECTION_DISPLAY, "TEXT_LIQUID_EFFECT", "FALSE", CONFIG_TYPE_BOOL, "Enable liquid flow/caustics effect"},
+    {INI_SECTION_DISPLAY, "TEXT_EFFECT", "NONE", CONFIG_TYPE_ENUM, "Text effect style (NONE/GLOW/GLASS/NEON/HOLOGRAPHIC/LIQUID)"},
 
     /* Timer settings */
     {INI_SECTION_TIMER, "CLOCK_DEFAULT_START_TIME", "1500", CONFIG_TYPE_INT, "Default timer duration (seconds)"},

src/config/config_loader.c

@@ -7,6 +7,7 @@
 #include "config/config_recovery.h"
 #include "config/config_defaults.h"
 #include "config.h"
+#include "window/window_core.h"
 #include "log.h"
 #include "../resource/resource.h"
 #include <stdio.h>
@@ -182,11 +183,7 @@ void InitializeDefaultSnapshot(ConfigSnapshot* snapshot) {
     snapshot->opacityStepFast = 5;
     snapshot->scaleStepNormal = DEFAULT_SCALE_STEP_NORMAL;
     snapshot->scaleStepFast = DEFAULT_SCALE_STEP_FAST;
-    snapshot->glowEffect = FALSE;
-    snapshot->glassEffect = FALSE;
-    snapshot->neonEffect = FALSE;
-    snapshot->holographicEffect = FALSE;
-    snapshot->liquidEffect = FALSE;
+    snapshot->textEffect = TEXT_EFFECT_NONE;
     snapshot->defaultStartTime = DEFAULT_START_TIME_SECONDS;
     snapshot->notificationTimeoutMs = DEFAULT_NOTIFICATION_TIMEOUT_MS;
     snapshot->notificationMaxOpacity = DEFAULT_NOTIFICATION_MAX_OPACITY;
@@ -260,17 +257,25 @@ BOOL LoadConfigFromFile(const char* config_path, ConfigSnapshot* snapshot) {
                                           DEFAULT_SCALE_STEP_NORMAL, config_path);
     snapshot->scaleStepFast = ReadIniInt(INI_SECTION_DISPLAY, "SCALE_STEP_FAST",
                                         DEFAULT_SCALE_STEP_FAST, config_path);
-    snapshot->glowEffect = ReadIniBool(INI_SECTION_DISPLAY, "TEXT_GLOW_EFFECT",
-                                       FALSE, config_path);
-    snapshot->glassEffect = ReadIniBool(INI_SECTION_DISPLAY, "TEXT_GLASS_EFFECT",
-                                       FALSE, config_path);
-    snapshot->neonEffect = ReadIniBool(INI_SECTION_DISPLAY, "TEXT_NEON_EFFECT",
-                                       FALSE, config_path);
-    snapshot->holographicEffect = ReadIniBool(INI_SECTION_DISPLAY, "TEXT_HOLOGRAPHIC_EFFECT",
-                                       FALSE, config_path);
-    snapshot->liquidEffect = ReadIniBool(INI_SECTION_DISPLAY, "TEXT_LIQUID_EFFECT",
-                                       FALSE, config_path);
-    
+
+    /* Read text effect as enum */
+    char textEffectStr[32] = {0};
+    ReadIniString(INI_SECTION_DISPLAY, "TEXT_EFFECT", "NONE",
+                 textEffectStr, sizeof(textEffectStr), config_path);
+    if (_stricmp(textEffectStr, "GLOW") == 0) {
+        snapshot->textEffect = TEXT_EFFECT_GLOW;
+    } else if (_stricmp(textEffectStr, "GLASS") == 0) {
+        snapshot->textEffect = TEXT_EFFECT_GLASS;
+    } else if (_stricmp(textEffectStr, "NEON") == 0) {
+        snapshot->textEffect = TEXT_EFFECT_NEON;
+    } else if (_stricmp(textEffectStr, "HOLOGRAPHIC") == 0) {
+        snapshot->textEffect = TEXT_EFFECT_HOLOGRAPHIC;
+    } else if (_stricmp(textEffectStr, "LIQUID") == 0) {
+        snapshot->textEffect = TEXT_EFFECT_LIQUID;
+    } else {
+        snapshot->textEffect = TEXT_EFFECT_NONE;
+    }
+
     /* Read Timer section */
     snapshot->defaultStartTime = ReadIniInt(INI_SECTION_TIMER, "CLOCK_DEFAULT_START_TIME", 
                                            1500, config_path);

src/drawing/drawing_render.c

@@ -16,6 +16,7 @@
 #include "timer/timer.h"
 #include "config.h"
 #include "window_procedure/window_procedure.h"
+#include "window/window_core.h"
 #include "menu_preview.h"
 #include "font/font_path_manager.h"
 #include "log.h"
@@ -567,10 +568,7 @@ void HandleWindowPaint(HWND hwnd, PAINTSTRUCT* ps) {
 
     /* Dynamic timer interval adjustment based on current window size */
     /* This ensures smooth animation for small windows, reduced lag for large windows */
-    extern BOOL CLOCK_GLOW_EFFECT, CLOCK_GLASS_EFFECT, CLOCK_NEON_EFFECT;
-    extern BOOL CLOCK_HOLOGRAPHIC_EFFECT, CLOCK_LIQUID_EFFECT;
-    
-    if (CLOCK_LIQUID_EFFECT || CLOCK_HOLOGRAPHIC_EFFECT || 
+    if (CLOCK_LIQUID_EFFECT || CLOCK_HOLOGRAPHIC_EFFECT ||
         CLOCK_NEON_EFFECT || CLOCK_GLOW_EFFECT || CLOCK_GLASS_EFFECT) {
         static UINT s_lastInterval = 0;
         int pixelCount = rect.right * rect.bottom;

src/menu_preview.c

@@ -13,6 +13,7 @@
 #include "color/color_parser.h"
 #include "timer/timer.h"
 #include "tray/tray_animation_core.h"
+#include "window/window_core.h"
 #include "log.h"
 
 /* ============================================================================
@@ -29,13 +30,6 @@ extern BOOL IS_PREVIEWING;
 extern char PREVIEW_FONT_NAME[MAX_PATH];
 extern char PREVIEW_INTERNAL_NAME[MAX_PATH];
 
-/* Effect global flags */
-extern BOOL CLOCK_GLOW_EFFECT;
-extern BOOL CLOCK_GLASS_EFFECT;
-extern BOOL CLOCK_NEON_EFFECT;
-extern BOOL CLOCK_HOLOGRAPHIC_EFFECT;
-extern BOOL CLOCK_LIQUID_EFFECT;
-
 extern void ResetTimerWithInterval(HWND hwnd);
 extern void WriteConfigColor(const char* color);
 extern void WriteConfigFont(const char* fontName, BOOL isCustom);

src/timer/timer_events.c

@@ -506,7 +506,6 @@ static BOOL HandleMainTimer(HWND hwnd) {
     DWORD now = GetTickCount();
     BOOL shouldRender = TRUE;
 
-    extern BOOL CLOCK_HOLOGRAPHIC_EFFECT;
     if (CLOCK_HOLOGRAPHIC_EFFECT) {
         RECT rect;
         GetClientRect(hwnd, &rect);