feat(cli, hotkey): change their respective defined processing methods into a unified calling method instead of scattered

Author: vladelaina

include/window_procedure/window_procedure.h

@@ -157,6 +157,21 @@ void CleanupBeforeTimerAction(void);
  */
 BOOL StartCountdownWithTime(HWND hwnd, int seconds);
 
+/**
+ * @brief Toggle window visibility (show/hide)
+ */
+void ToggleWindowVisibility(HWND hwnd);
+
+/**
+ * @brief Toggle window topmost status
+ */
+void ToggleTopmost(HWND hwnd);
+
+/**
+ * @brief Toggle millisecond display
+ */
+void ToggleMilliseconds(HWND hwnd);
+
 /* ============================================================================
  * Configuration Handlers
  * ============================================================================ */

src/cli.c

@@ -209,12 +209,7 @@ static BOOL HandleQuickCountdown(HWND hwnd, const char* input) {
 
 static BOOL HandleVisibility(HWND hwnd, const char* input) {
     (void)input;
-    if (IsWindowVisible(hwnd)) {
-        ShowWindow(hwnd, SW_HIDE);
-    } else {
-        ShowWindow(hwnd, SW_SHOW);
-        SetForegroundWindow(hwnd);
-    }
+    ToggleWindowVisibility(hwnd);
     return TRUE;
 }
 
@@ -234,7 +229,6 @@ static BOOL HandlePauseResume(HWND hwnd, const char* input) {
 
 static BOOL HandleRestart(HWND hwnd, const char* input) {
     (void)input;
-    CloseAllNotifications();
     RestartCurrentTimer(hwnd);
     return TRUE;
 }

src/window_procedure/window_commands.c

@@ -71,7 +71,7 @@ static LRESULT CmdAbout(HWND hwnd, WPARAM wp, LPARAM lp) {
 
 static LRESULT CmdToggleTopmost(HWND hwnd, WPARAM wp, LPARAM lp) {
     (void)wp; (void)lp; (void)hwnd;
-    WriteConfigTopmost(!CLOCK_WINDOW_TOPMOST ? STR_TRUE : STR_FALSE);
+    ToggleTopmost(hwnd);
     return 0;
 }
 
@@ -185,7 +185,7 @@ static LRESULT CmdEditMode(HWND hwnd, WPARAM wp, LPARAM lp) {
 
 static LRESULT CmdToggleVisibility(HWND hwnd, WPARAM wp, LPARAM lp) {
     (void)wp; (void)lp;
-    PostMessage(hwnd, WM_HOTKEY, HOTKEY_ID_TOGGLE_VISIBILITY, 0);
+    ToggleWindowVisibility(hwnd);
     return 0;
 }
 

src/window_procedure/window_commands_timer.c

@@ -53,31 +53,13 @@ LRESULT CmdCustomCountdown(HWND hwnd, WPARAM wp, LPARAM lp) {
 
 LRESULT CmdShowCurrentTime(HWND hwnd, WPARAM wp, LPARAM lp) {
     (void)wp; (void)lp;
-    CleanupBeforeTimerAction();
-    
-    TimerMode mode = CLOCK_SHOW_CURRENT_TIME ? TIMER_MODE_COUNTDOWN : TIMER_MODE_SHOW_TIME;
-    TimerModeParams params = {0, TRUE, FALSE, TRUE};
-    SwitchTimerMode(hwnd, mode, &params);
-    
-    KillTimer(hwnd, 1);
-    ResetTimerWithInterval(hwnd);
+    ToggleShowTimeMode(hwnd);
     return 0;
 }
 
 LRESULT CmdCountUp(HWND hwnd, WPARAM wp, LPARAM lp) {
     (void)wp; (void)lp;
-    CleanupBeforeTimerAction();
-    
-    if (!CLOCK_COUNT_UP) {
-        TimerModeParams params = {0, TRUE, FALSE, TRUE};
-        SwitchTimerMode(hwnd, TIMER_MODE_COUNTUP, &params);
-    } else {
-        CLOCK_COUNT_UP = FALSE;
-    }
-    
-    KillTimer(hwnd, 1);
-    ResetTimerWithInterval(hwnd);
-    InvalidateRect(hwnd, NULL, TRUE);
+    StartCountUp(hwnd);
     return 0;
 }
 
@@ -125,8 +107,6 @@ LRESULT CmdPauseResume(HWND hwnd, WPARAM wp, LPARAM lp) {
 
 LRESULT CmdRestartTimer(HWND hwnd, WPARAM wp, LPARAM lp) {
     (void)wp; (void)lp;
-    CleanupBeforeTimerAction();
-    CloseAllNotifications();
     RestartCurrentTimer(hwnd);
     return 0;
 }
@@ -143,13 +123,7 @@ LRESULT CmdTimeFormat(HWND hwnd, TimeFormatType format) {
 
 LRESULT CmdToggleMilliseconds(HWND hwnd, WPARAM wp, LPARAM lp) {
     (void)wp; (void)lp;
-    WriteConfigShowMilliseconds(!g_AppConfig.display.time_format.show_milliseconds);
-    
-    /* Reset timer with new interval (10ms for milliseconds, 1000ms without) */
-    extern void ResetTimerWithInterval(HWND hwnd);
-    ResetTimerWithInterval(hwnd);
-    
-    InvalidateRect(hwnd, NULL, TRUE);
+    ToggleMilliseconds(hwnd);
     return 0;
 }
 
@@ -222,20 +196,7 @@ LRESULT CmdSetCountdownTime(HWND hwnd, WPARAM wp, LPARAM lp) {
 
 LRESULT CmdPomodoroStart(HWND hwnd, WPARAM wp, LPARAM lp) {
     (void)wp; (void)lp;
-    CleanupBeforeTimerAction();
-
-    if (!IsWindowVisible(hwnd)) ShowWindow(hwnd, SW_SHOW);
-
-    extern void InitializePomodoro(void);
-    InitializePomodoro();
-
-    CLOCK_SHOW_CURRENT_TIME = FALSE;
-    CLOCK_COUNT_UP = FALSE;
-    CLOCK_IS_PAUSED = FALSE;
-
-    KillTimer(hwnd, 1);
-    ResetTimerWithInterval(hwnd);
-    InvalidateRect(hwnd, NULL, TRUE);
+    StartPomodoroTimer(hwnd);
     return 0;
 }
 

src/window_procedure/window_hotkeys.c

@@ -36,27 +36,15 @@ extern void WriteConfigShowMilliseconds(BOOL showMilliseconds);
 typedef void (*HotkeyAction)(HWND);
 
 static void HotkeyToggleVisibility(HWND hwnd) {
-    if (IsWindowVisible(hwnd)) {
-        ShowWindow(hwnd, SW_HIDE);
-    } else {
-        ShowWindow(hwnd, SW_SHOW);
-        SetForegroundWindow(hwnd);
-    }
+    ToggleWindowVisibility(hwnd);
 }
 
 static void HotkeyRestartTimer(HWND hwnd) {
-    CloseAllNotifications();
     RestartCurrentTimer(hwnd);
 }
 
 static void HotkeyToggleMilliseconds(HWND hwnd) {
-    WriteConfigShowMilliseconds(!g_AppConfig.display.time_format.show_milliseconds);
-    
-    /* Reset timer with new interval (10ms for milliseconds, 1000ms without) */
-    extern void ResetTimerWithInterval(HWND hwnd);
-    ResetTimerWithInterval(hwnd);
-    
-    InvalidateRect(hwnd, NULL, TRUE);
+    ToggleMilliseconds(hwnd);
 }
 
 static void HotkeyCustomCountdown(HWND hwnd) {

src/window_procedure/window_procedure.c

@@ -291,7 +291,19 @@ void StartDefaultCountDown(HWND hwnd) {
 
 void StartPomodoroTimer(HWND hwnd) {
     CleanupBeforeTimerAction();
-    PostMessage(hwnd, WM_COMMAND, CLOCK_IDM_POMODORO_START, 0);
+    
+    if (!IsWindowVisible(hwnd)) ShowWindow(hwnd, SW_SHOW);
+
+    extern void InitializePomodoro(void);
+    InitializePomodoro();
+
+    CLOCK_SHOW_CURRENT_TIME = FALSE;
+    CLOCK_COUNT_UP = FALSE;
+    CLOCK_IS_PAUSED = FALSE;
+
+    KillTimer(hwnd, 1);
+    ResetTimerWithInterval(hwnd);
+    InvalidateRect(hwnd, NULL, TRUE);
 }
 
 #define TIMER_ID_TRANSITION_END 100
@@ -316,6 +328,7 @@ void RestartCurrentTimer(HWND hwnd) {
     extern int countdown_elapsed_time, countup_elapsed_time;
     extern void ResetMillisecondAccumulator(void);
 
+    CloseAllNotifications(); // Centralized cleanup
     StopNotificationSound();
 
     CleanupBeforeTimerAction();
@@ -400,3 +413,31 @@ BOOL StartCountdownWithTime(HWND hwnd, int seconds) {
     return result;
 }
 
+void ToggleMilliseconds(HWND hwnd) {
+    extern void WriteConfigShowMilliseconds(BOOL showMilliseconds);
+    extern void ResetTimerWithInterval(HWND hwnd);
+    
+    BOOL newState = !g_AppConfig.display.time_format.show_milliseconds;
+    WriteConfigShowMilliseconds(newState);
+    
+    /* Reset timer with new interval (10ms for milliseconds, 1000ms without) */
+    ResetTimerWithInterval(hwnd);
+    
+    InvalidateRect(hwnd, NULL, TRUE);
+}
+
+void ToggleTopmost(HWND hwnd) {
+    extern void WriteConfigTopmost(const char* value);
+    // Use "true"/"false" literals to avoid dependency on specific header macros if not present
+    WriteConfigTopmost(!CLOCK_WINDOW_TOPMOST ? "true" : "false");
+}
+
+void ToggleWindowVisibility(HWND hwnd) {
+    if (IsWindowVisible(hwnd)) {
+        ShowWindow(hwnd, SW_HIDE);
+    } else {
+        ShowWindow(hwnd, SW_SHOW);
+        SetForegroundWindow(hwnd);
+    }
+}
+