feat(tray_animation): added capslock

Author: vladelaina

include/tray/tray_animation_loader.h

@@ -23,6 +23,7 @@ typedef enum {
     ANIM_SOURCE_UNKNOWN = 0,
     ANIM_SOURCE_LOGO,
     ANIM_SOURCE_PERCENT,
+    ANIM_SOURCE_CAPSLOCK,
     ANIM_SOURCE_GIF,
     ANIM_SOURCE_WEBP,
     ANIM_SOURCE_STATIC,

include/tray/tray_animation_percent.h

@@ -50,5 +50,22 @@ COLORREF GetPercentIconBgColor(void);
  */
 HICON CreatePercentIcon16(int percent);
 
+/**
+ * @brief Create Caps Lock indicator icon
+ * @param capsOn TRUE if Caps Lock is on, FALSE otherwise
+ * @return HICON or NULL on failure
+ * 
+ * @details
+ * Renders "A" when Caps Lock is on, "a" when off.
+ * Uses same color scheme as percent icons.
+ */
+HICON CreateCapsLockIcon(BOOL capsOn);
+
+/**
+ * @brief Check current Caps Lock state
+ * @return TRUE if Caps Lock is on
+ */
+BOOL IsCapsLockOn(void);
+
 #endif /* TRAY_ANIMATION_PERCENT_H */
 

resource/resource.h

@@ -371,6 +371,7 @@
 #define CLOCK_IDM_ANIMATIONS_USE_CPU 2203    /**< Use CPU animation */
 #define CLOCK_IDM_ANIMATIONS_USE_MEM 2204    /**< Use memory animation */
 #define CLOCK_IDM_ANIMATIONS_USE_BATTERY 2205 /**< Use battery percent icon */
+#define CLOCK_IDM_ANIMATIONS_USE_CAPSLOCK 2207 /**< Use Caps Lock indicator */
 #define CLOCK_IDM_ANIMATIONS_USE_NONE 2206   /**< Use transparent/hidden icon */
 #define CLOCK_IDM_ANIM_SPEED_MEMORY 2210     /**< Memory-based animation speed */
 #define CLOCK_IDM_ANIM_SPEED_CPU 2211        /**< CPU-based animation speed */

src/tray/tray_animation_core.c

@@ -247,6 +247,25 @@ static void UpdateTrayIconToCurrentFrame(void) {
         return;
     }
 
+    /* Handle Caps Lock indicator */
+    if (currentAnim->sourceType == ANIM_SOURCE_CAPSLOCK) {
+        BOOL capsOn = IsCapsLockOn();
+        
+        HICON hIcon = CreateCapsLockIcon(capsOn);
+        if (hIcon) {
+            NOTIFYICONDATAW nid = {0};
+            nid.cbSize = sizeof(nid);
+            nid.hWnd = g_trayHwnd;
+            nid.uID = CLOCK_ID_TRAY_APP_ICON;
+            nid.uFlags = NIF_ICON;
+            nid.hIcon = hIcon;
+            Shell_NotifyIconW(NIM_MODIFY, &nid);
+            DestroyIcon(hIcon);
+            RecordSuccessfulUpdate();
+        }
+        return;
+    }
+    
     if (currentAnim->count <= 0) {
         if (g_isPreviewActive) {
             g_isPreviewActive = FALSE;
@@ -469,7 +488,9 @@ BOOL SetCurrentAnimationName(const char* name) {
 
     /* Seamless preview promotion */
     if (g_isPreviewActive && g_previewAnimationName[0] != '\0' &&
-        _stricmp(g_previewAnimationName, name) == 0 && g_previewAnimation.count > 0) {
+        _stricmp(g_previewAnimationName, name) == 0 && 
+        (g_previewAnimation.count > 0 || g_previewAnimation.sourceType == ANIM_SOURCE_PERCENT ||
+         g_previewAnimation.sourceType == ANIM_SOURCE_CAPSLOCK)) {
 
         if (g_criticalSectionInitialized) {
             EnterCriticalSection(&g_animCriticalSection);
@@ -639,9 +660,9 @@ static DWORD WINAPI AsyncLoadPreviewThread(LPVOID param) {
         g_previewIndex = 0;
         g_frameRateCtrl.framePosition = 0.0;
 
-        /* For percent icons (count=0), __none__ (transparent), or regular animations (count>0), activate preview */
+        /* For percent icons, capslock icons (count=0), __none__ (transparent), or regular animations (count>0), activate preview */
         if (tempAnim.count > 0 || tempAnim.sourceType == ANIM_SOURCE_PERCENT ||
-            _stricmp(name, "__none__") == 0) {
+            tempAnim.sourceType == ANIM_SOURCE_CAPSLOCK || _stricmp(name, "__none__") == 0) {
             strncpy(g_previewAnimationName, name, sizeof(g_previewAnimationName) - 1);
             g_previewAnimationName[sizeof(g_previewAnimationName) - 1] = '\0';
             g_isPreviewActive = TRUE;
@@ -903,22 +924,31 @@ void TrayAnimation_ClearCurrentName(void) {
 void TrayAnimation_UpdatePercentIconIfNeeded(void) {
     if (!g_trayHwnd || !IsWindow(g_trayHwnd)) return;
     if (!g_animationName[0]) return;
+    if (g_isPreviewActive) return;
 
-    /* Only update if it's a builtin percent type (e.g. __cpu__, __mem__, __battery__) */
     const BuiltinAnimDef* def = GetBuiltinAnimDef(g_animationName);
-    if (!def || def->type != ANIM_SOURCE_PERCENT) return;
+    if (!def) return;
 
-    if (g_isPreviewActive) return;
+    HICON hIcon = NULL;
 
-    int p = 0;
-    if (def->getValue) {
-        p = def->getValue();
+    /* Handle percent type (CPU, Memory, Battery) */
+    if (def->type == ANIM_SOURCE_PERCENT) {
+        int p = 0;
+        if (def->getValue) {
+            p = def->getValue();
+        }
+        if (p < 0) p = 0;
+        if (p > 100) p = 100;
+        hIcon = CreatePercentIcon16(p);
+    }
+    /* Handle Caps Lock indicator */
+    else if (def->type == ANIM_SOURCE_CAPSLOCK) {
+        hIcon = CreateCapsLockIcon(IsCapsLockOn());
+    }
+    else {
+        return;
     }
 
-    if (p < 0) p = 0;
-    if (p > 100) p = 100;
-    
-    HICON hIcon = CreatePercentIcon16(p);
     if (!hIcon) return;
 
     NOTIFYICONDATAW nid = {0};

src/tray/tray_animation_loader.c

@@ -55,6 +55,7 @@ static const BuiltinAnimDef g_builtinAnims[] = {
     { "__cpu__",     CLOCK_IDM_ANIMATIONS_USE_CPU,     L"CPU Percent",     ANIM_SOURCE_PERCENT, GetCpuValue },
     { "__mem__",     CLOCK_IDM_ANIMATIONS_USE_MEM,     L"Memory Percent",  ANIM_SOURCE_PERCENT, GetMemValue },
     { "__battery__", CLOCK_IDM_ANIMATIONS_USE_BATTERY, L"Battery Percent", ANIM_SOURCE_PERCENT, GetBatteryValue },
+    { "__capslock__", CLOCK_IDM_ANIMATIONS_USE_CAPSLOCK, L"Caps Lock",     ANIM_SOURCE_CAPSLOCK, NULL },
     { "__none__",    CLOCK_IDM_ANIMATIONS_USE_NONE,    L"None",            ANIM_SOURCE_UNKNOWN, NULL }
 };
 
@@ -300,7 +301,7 @@ BOOL IsValidAnimationSource(const char* name) {
 
     AnimationSourceType type = DetectAnimationSourceType(name);
 
-    if (type == ANIM_SOURCE_LOGO || type == ANIM_SOURCE_PERCENT) {
+    if (type == ANIM_SOURCE_LOGO || type == ANIM_SOURCE_PERCENT || type == ANIM_SOURCE_CAPSLOCK) {
         return TRUE;
     }
 
@@ -380,6 +381,13 @@ BOOL LoadAnimationByName(const char* name, LoadedAnimation* anim,
         return TRUE;
     }
 
+    if (type == ANIM_SOURCE_CAPSLOCK) {
+        /* Caps Lock icons are generated dynamically, not pre-loaded */
+        anim->count = 0;
+        anim->isAnimated = FALSE;
+        return TRUE;
+    }
+    
     /* Handle __none__ (transparent icon) - no frames needed */
     if (_stricmp(name, "__none__") == 0) {
         anim->count = 0;

src/tray/tray_animation_percent.c

@@ -213,3 +213,150 @@ HICON CreatePercentIcon16(int percent) {
     return hIcon;
 }
 
+/**
+ * @brief Check current Caps Lock state
+ */
+BOOL IsCapsLockOn(void) {
+    return (GetKeyState(VK_CAPITAL) & 0x0001) != 0;
+}
+
+/**
+ * @brief Create Caps Lock indicator icon
+ */
+HICON CreateCapsLockIcon(BOOL capsOn) {
+    int cx = GetSystemMetrics(SM_CXSMICON);
+    int cy = GetSystemMetrics(SM_CYSMICON);
+    if (cx <= 0) cx = 16;
+    if (cy <= 0) cy = 16;
+
+    /* Determine colors: use theme-based or user-configured */
+    BOOL useTransparentBg = (g_percentBgColor == TRANSPARENT_BG_AUTO);
+    COLORREF textColor = useTransparentBg ? GetThemeTextColor() : g_percentTextColor;
+    COLORREF bgColor = g_percentBgColor;
+
+    /* Create DIB section for color bitmap */
+    BITMAPINFO bi;
+    ZeroMemory(&bi, sizeof(bi));
+    bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+    bi.bmiHeader.biWidth = cx;
+    bi.bmiHeader.biHeight = -cy;
+    bi.bmiHeader.biPlanes = 1;
+    bi.bmiHeader.biBitCount = 32;
+    bi.bmiHeader.biCompression = BI_RGB;
+
+    VOID* pvBits = NULL;
+    HBITMAP hbmColor = CreateDIBSection(NULL, &bi, DIB_RGB_COLORS, &pvBits, NULL, 0);
+    if (!hbmColor || !pvBits) {
+        if (hbmColor) DeleteObject(hbmColor);
+        return NULL;
+    }
+
+    /* Draw on color bitmap */
+    HDC hdc = GetDC(NULL);
+    HDC mem = CreateCompatibleDC(hdc);
+    HGDIOBJ old = SelectObject(mem, hbmColor);
+
+    if (useTransparentBg) {
+        /* Transparent background: fill with transparent pixels (alpha=0) */
+        DWORD* pixels = (DWORD*)pvBits;
+        for (int i = 0; i < cx * cy; i++) {
+            pixels[i] = 0x00000000;
+        }
+    } else {
+        /* Solid background: use configured color */
+        RECT rc = {0, 0, cx, cy};
+        HBRUSH bk = CreateSolidBrush(bgColor);
+        FillRect(mem, &rc, bk);
+        DeleteObject(bk);
+    }
+
+    /* Setup text rendering */
+    SetBkMode(mem, TRANSPARENT);
+    SetTextColor(mem, textColor);
+
+    /* Display "A" or "a" based on Caps Lock state */
+    const wchar_t* txt = capsOn ? L"A" : L"a";
+
+    /* Font size - -13 is the standard system icon font size */
+    int fontSize = -13;
+
+    /* Use FW_NORMAL (400) to match system UI look, ANTIALIASED_QUALITY for smooth blending */
+    HFONT hFont = CreateFontW(fontSize, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE,
+                              DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
+                              ANTIALIASED_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Segoe UI");
+    HFONT oldf = hFont ? (HFONT)SelectObject(mem, hFont) : NULL;
+
+    /* Center text */
+    SIZE sz = {0};
+    GetTextExtentPoint32W(mem, txt, 1, &sz);
+    int x = (cx - sz.cx) / 2;
+    int y = (cy - sz.cy) / 2;
+
+    TextOutW(mem, x, y, txt, 1);
+
+    /* Cleanup font */
+    if (oldf) SelectObject(mem, oldf);
+    if (hFont) DeleteObject(hFont);
+
+    SelectObject(mem, old);
+
+    /* Create mask bitmap */
+    HBITMAP hbmMask = CreateBitmap(cx, cy, 1, 1, NULL);
+    if (!hbmMask) {
+        ReleaseDC(NULL, hdc);
+        DeleteDC(mem);
+        DeleteObject(hbmColor);
+        return NULL;
+    }
+
+    HDC memMask = CreateCompatibleDC(hdc);
+    HGDIOBJ oldMask = SelectObject(memMask, hbmMask);
+
+    if (useTransparentBg) {
+        /* For transparent background: mask = white for bg, black for text */
+        RECT rc = {0, 0, cx, cy};
+        HBRUSH whiteBrush = CreateSolidBrush(RGB(255, 255, 255));
+        FillRect(memMask, &rc, whiteBrush);
+        DeleteObject(whiteBrush);
+
+        /* Draw text in black on mask */
+        SetBkMode(memMask, TRANSPARENT);
+        SetTextColor(memMask, RGB(0, 0, 0));
+
+        HFONT hMaskFont = CreateFontW(fontSize, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE,
+                                      DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
+                                      ANTIALIASED_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Segoe UI");
+        HFONT oldMaskFont = hMaskFont ? (HFONT)SelectObject(memMask, hMaskFont) : NULL;
+
+        TextOutW(memMask, x, y, txt, 1);
+
+        if (oldMaskFont) SelectObject(memMask, oldMaskFont);
+        if (hMaskFont) DeleteObject(hMaskFont);
+    } else {
+        /* For solid background: entire icon is opaque */
+        RECT rc = {0, 0, cx, cy};
+        HBRUSH blackBrush = CreateSolidBrush(RGB(0, 0, 0));
+        FillRect(memMask, &rc, blackBrush);
+        DeleteObject(blackBrush);
+    }
+
+    SelectObject(memMask, oldMask);
+    DeleteDC(memMask);
+    ReleaseDC(NULL, hdc);
+    DeleteDC(mem);
+
+    /* Create icon */
+    ICONINFO ii;
+    ZeroMemory(&ii, sizeof(ii));
+    ii.fIcon = TRUE;
+    ii.hbmColor = hbmColor;
+    ii.hbmMask = hbmMask;
+
+    HICON hIcon = CreateIconIndirect(&ii);
+
+    DeleteObject(hbmMask);
+    DeleteObject(hbmColor);
+
+    return hIcon;
+}
+