feat: 支持通过长句跳过

Author: iwangjie

Cargo.lock

@@ -33,6 +33,7 @@ dirs = "5.0"
 
 # macOS-specific dependencies
 [target.'cfg(target_os = "macos")'.dependencies]
+block2 = "0.6"
 objc2 = "0.6.3"
 objc2-app-kit = { version = "0.3.2", default-features = false, features = [
     "std",
@@ -42,6 +43,7 @@ objc2-app-kit = { version = "0.3.2", default-features = false, features = [
     "NSCell",
     "NSColor",
     "NSControl",
+    "NSEvent",
     "NSFont",
     "NSGraphics",
     "NSMenu",
@@ -55,6 +57,7 @@ objc2-app-kit = { version = "0.3.2", default-features = false, features = [
     "NSTextField",
     "NSView",
     "NSWindow",
+    "block2",
     "objc2-core-foundation",
 ] }
 objc2-foundation = { version = "0.3.2", default-features = false, features = [

Cargo.toml

@@ -10,13 +10,12 @@ use objc2_app_kit::{NSApplication, NSApplicationDelegate, NSMenu, NSMenuDelegate
 use objc2_foundation::{NSNotification, NSObjectProtocol, NSTimer};
 
 use super::state::{Phase, with_state, with_state_ref};
-use super::timer::{schedule_phase, start_break_now, transition_on_timer};
+use super::timer::{schedule_phase, skip_break as skip_break_phase, start_break_now, transition_on_timer};
 use super::ui::{
-    close_countdown_window, finish_countdown, open_settings_dialog, refresh_header_title,
-    refresh_menu_info, refresh_status_title, set_rest_now_enabled, setup_status_item,
-    show_about_dialog, update_countdown,
+    finish_countdown, open_settings_dialog, refresh_header_title, refresh_menu_info,
+    refresh_status_title, set_rest_now_enabled, setup_status_item, show_about_dialog,
+    update_countdown,
 };
-use super::utils::play_sound;
 
 define_class!(
     #[unsafe(super(NSObject))]
@@ -94,6 +93,20 @@ define_class!(
                 return;
             }
 
+            // 隐藏跳过：仅在倒计时窗口激活时处理，且不增加非休息时开销
+            let should_skip = with_state(|state| {
+                if state.countdown_skip_requested {
+                    state.countdown_skip_requested = false;
+                    true
+                } else {
+                    false
+                }
+            });
+            if should_skip {
+                skip_break_phase(self);
+                return;
+            }
+
             if !update_countdown() {
                 // 倒计时结束
                 finish_countdown();
@@ -102,9 +115,8 @@ define_class!(
 
         #[unsafe(method(skipBreak:))]
         fn skip_break(&self, _sender: Option<&AnyObject>) {
-            // 用户点击跳过休息按钮
-            close_countdown_window();
-            play_sound("Tink");
+            // 用户点击跳过休息按钮（或隐藏短语触发）
+            skip_break_phase(self);
         }
     }
 );

src/macos/delegate.rs

@@ -6,6 +6,7 @@ use std::cell::RefCell;
 use std::time::{Instant, SystemTime};
 
 use objc2::rc::Retained;
+use objc2::runtime::AnyObject;
 use objc2_app_kit::{NSMenuItem, NSStatusItem, NSTextField, NSWindow};
 use objc2_foundation::NSTimer;
 
@@ -43,6 +44,11 @@ pub struct AppState {
     pub countdown_label: Option<Retained<NSTextField>>,
     pub countdown_timer: Option<Retained<NSTimer>>,
     pub countdown_end_time: Option<Instant>,
+    // Hidden skip phrase state (only used during breaks)
+    pub countdown_key_monitor: Option<Retained<AnyObject>>,
+    pub countdown_skip_smart_idx: usize,
+    pub countdown_skip_ascii_idx: usize,
+    pub countdown_skip_requested: bool,
 }
 
 impl AppState {
@@ -62,6 +68,10 @@ impl AppState {
             countdown_label: None,
             countdown_timer: None,
             countdown_end_time: None,
+            countdown_key_monitor: None,
+            countdown_skip_smart_idx: 0,
+            countdown_skip_ascii_idx: 0,
+            countdown_skip_requested: false,
         }
     }
 }

src/macos/state.rs

@@ -100,3 +100,15 @@ pub fn start_break_now(delegate: &RestGapDelegate) {
         schedule_phase(delegate, Phase::Breaking);
     }
 }
+
+/// 跳过当前休息（仅在 Breaking 阶段生效）
+pub fn skip_break(delegate: &RestGapDelegate) {
+    let should_skip = with_state(|state| state.phase == Phase::Breaking);
+    if !should_skip {
+        return;
+    }
+
+    // 提前结束休息：关闭倒计时窗口并回到工作阶段
+    finish_countdown();
+    schedule_phase(delegate, Phase::Working);
+}

src/macos/timer.rs

@@ -1,21 +1,111 @@
 //! 倒计时窗口模块
 
+use std::ptr;
 use std::time::{Duration, Instant};
 
-use objc2::{MainThreadOnly, sel};
+use block2::global_block;
+use objc2::{MainThreadOnly, define_class, msg_send, sel};
 use objc2_app_kit::{
-    NSBackingStoreType, NSColor, NSFont, NSScreen, NSStatusWindowLevel, NSTextField, NSWindow,
-    NSWindowCollectionBehavior, NSWindowStyleMask,
+    NSEvent, NSEventMask, NSApplication, NSBackingStoreType, NSColor, NSFont, NSScreen,
+    NSStatusWindowLevel, NSTextField, NSWindow, NSWindowCollectionBehavior, NSWindowStyleMask,
 };
 use objc2_core_foundation::CGFloat;
-use objc2_foundation::{NSPoint, NSRect, NSSize, NSString, NSTimer};
+use objc2_foundation::{NSPoint, NSRect, NSSize, NSString, NSTimer, NSObjectProtocol};
 
 use super::super::constants::APP_NAME_ZH;
 use super::super::delegate::RestGapDelegate;
 use super::super::state::with_state;
 use super::super::utils::{format_countdown, play_sound};
 use super::status_bar::target_anyobject;
 
+const SKIP_PHRASE_SMART: &str = "i don’t care about my health.";
+const SKIP_PHRASE_ASCII: &str = "i don't care about my health.";
+
+define_class!(
+    #[unsafe(super(NSWindow))]
+    #[thread_kind = MainThreadOnly]
+    pub struct CountdownWindow;
+
+    unsafe impl NSObjectProtocol for CountdownWindow {}
+
+    impl CountdownWindow {
+        #[unsafe(method(canBecomeKeyWindow))]
+        fn can_become_key_window(&self) -> bool {
+            true
+        }
+
+        #[unsafe(method(canBecomeMainWindow))]
+        fn can_become_main_window(&self) -> bool {
+            true
+        }
+    }
+);
+
+fn advance_phrase_idx(idx: &mut usize, phrase: &str, ch: char) -> bool {
+    let mut buf = [0u8; 4];
+    let ch_bytes = ch.encode_utf8(&mut buf).as_bytes();
+    let phrase_bytes = phrase.as_bytes();
+
+    if *idx + ch_bytes.len() <= phrase_bytes.len()
+        && &phrase_bytes[*idx..(*idx + ch_bytes.len())] == ch_bytes
+    {
+        *idx += ch_bytes.len();
+        return *idx == phrase_bytes.len();
+    }
+
+    // 朴素回退：短语以 'I' 开头且几乎不重叠，足够可靠。
+    *idx = 0;
+    if ch_bytes.len() <= phrase_bytes.len() && &phrase_bytes[..ch_bytes.len()] == ch_bytes {
+        *idx = ch_bytes.len();
+        return *idx == phrase_bytes.len();
+    }
+    false
+}
+
+fn on_countdown_keydown(event: &NSEvent) {
+    let Some(text) = event
+        .charactersIgnoringModifiers()
+        .map(|s| s.to_string())
+    else {
+        return;
+    };
+
+    with_state(|state| {
+        if state.countdown_window.is_none() {
+            return;
+        }
+        if state.countdown_skip_requested {
+            return;
+        }
+
+        for ch in text.chars() {
+            let ch = if ch.is_ascii() {
+                ch.to_ascii_lowercase()
+            } else {
+                ch
+            };
+            let smart_done =
+                advance_phrase_idx(&mut state.countdown_skip_smart_idx, SKIP_PHRASE_SMART, ch);
+            let ascii_done =
+                advance_phrase_idx(&mut state.countdown_skip_ascii_idx, SKIP_PHRASE_ASCII, ch);
+            if smart_done || ascii_done {
+                state.countdown_skip_requested = true;
+                state.countdown_skip_smart_idx = 0;
+                state.countdown_skip_ascii_idx = 0;
+                break;
+            }
+        }
+    });
+}
+
+global_block! {
+    static COUNTDOWN_KEY_MONITOR = |event: core::ptr::NonNull<NSEvent>| -> *mut NSEvent {
+        let event_ref: &NSEvent = unsafe { event.as_ref() };
+        on_countdown_keydown(event_ref);
+        ptr::null_mut()
+    };
+}
+
 /// 显示倒计时窗口
 #[allow(clippy::too_many_lines)]
 pub fn show_countdown_window(delegate: &RestGapDelegate, seconds: u64, play_start_sound: bool) {
@@ -42,15 +132,10 @@ pub fn show_countdown_window(delegate: &RestGapDelegate, seconds: u64, play_star
 
     // 创建窗口 - 使用 Borderless 样式隐藏标题栏
     let style = NSWindowStyleMask::Borderless;
-    let window = unsafe {
-        NSWindow::initWithContentRect_styleMask_backing_defer(
-            NSWindow::alloc(mtm),
-            frame,
-            style,
-            NSBackingStoreType::Buffered,
-            false,
-        )
+    let window: objc2::rc::Retained<CountdownWindow> = unsafe {
+        msg_send![CountdownWindow::alloc(mtm), initWithContentRect: frame styleMask: style backing: NSBackingStoreType::Buffered defer: false]
     };
+    let window: objc2::rc::Retained<NSWindow> = window.into_super();
 
     // 设置窗口属性
     window.setLevel(NSStatusWindowLevel); // 使用状态窗口级别，确保在最前
@@ -134,9 +219,28 @@ pub fn show_countdown_window(delegate: &RestGapDelegate, seconds: u64, play_star
         content_view.addSubview(&hint_label);
     }
 
+    // 让倒计时窗口能获取键盘事件（Borderless 默认不可成为 key window）
+    NSApplication::sharedApplication(mtm).activateIgnoringOtherApps(true);
+
+    // 先标记窗口存在，避免用户刚弹窗就开始输入时被忽略
+    with_state(|state| {
+        state.countdown_window = Some(window.clone());
+        state.countdown_skip_smart_idx = 0;
+        state.countdown_skip_ascii_idx = 0;
+        state.countdown_skip_requested = false;
+    });
+
     // 显示窗口
     window.makeKeyAndOrderFront(None);
 
+    // 仅在倒计时窗口存在时安装本地键盘监听器，避免非休息时任何额外开销。
+    let key_monitor = unsafe {
+        NSEvent::addLocalMonitorForEventsMatchingMask_handler(
+            NSEventMask::KeyDown,
+            &COUNTDOWN_KEY_MONITOR,
+        )
+    };
+
     // 设置结束时间
     let end_time = Instant::now() + Duration::from_secs(seconds);
 
@@ -154,10 +258,10 @@ pub fn show_countdown_window(delegate: &RestGapDelegate, seconds: u64, play_star
 
     // 保存状态
     with_state(|state| {
-        state.countdown_window = Some(window);
         state.countdown_label = Some(countdown_label);
         state.countdown_timer = Some(timer);
         state.countdown_end_time = Some(end_time);
+        state.countdown_key_monitor = key_monitor;
     });
 }
 
@@ -188,6 +292,11 @@ pub fn update_countdown() -> bool {
 /// 关闭倒计时窗口
 pub fn close_countdown_window() {
     with_state(|state| {
+        if let Some(monitor) = state.countdown_key_monitor.take() {
+            // Safety: The monitor handle is created by NSEvent::addLocalMonitor...
+            unsafe { NSEvent::removeMonitor(&monitor) };
+        }
+
         // 先使定时器无效，防止后续触发
         if let Some(timer) = state.countdown_timer.take() {
             timer.invalidate();
@@ -198,6 +307,9 @@ pub fn close_countdown_window() {
         }
         state.countdown_label = None;
         state.countdown_end_time = None;
+        state.countdown_skip_smart_idx = 0;
+        state.countdown_skip_ascii_idx = 0;
+        state.countdown_skip_requested = false;
     });
 }
 

src/macos/ui/countdown.rs

@@ -7,7 +7,7 @@ pub mod dialogs;
 pub mod status_bar;
 
 pub use countdown::{
-    close_countdown_window, finish_countdown, show_countdown_window, update_countdown,
+    finish_countdown, show_countdown_window, update_countdown,
 };
 pub use dialogs::{open_settings_dialog, show_about_dialog};
 pub use status_bar::{

src/macos/ui/mod.rs

@@ -40,6 +40,9 @@ pub struct AppState {
     pub countdown_hwnd: Option<HWND>,
     pub countdown_timer_id: Option<usize>,
     pub countdown_end_time: Option<Instant>,
+    // Hidden skip phrase state (only used during breaks)
+    pub countdown_skip_smart_idx: usize,
+    pub countdown_skip_ascii_idx: usize,
 }
 
 impl AppState {
@@ -56,6 +59,8 @@ impl AppState {
             countdown_hwnd: None,
             countdown_timer_id: None,
             countdown_end_time: None,
+            countdown_skip_smart_idx: 0,
+            countdown_skip_ascii_idx: 0,
         }
     }
 }

src/windows/state.rs

@@ -94,3 +94,15 @@ pub fn start_break_now() {
         schedule_phase(Phase::Breaking);
     }
 }
+
+/// 跳过当前休息（仅在 Breaking 阶段生效）
+pub fn skip_break() {
+    let should_skip = with_state(|state| state.phase == Phase::Breaking);
+    if !should_skip {
+        return;
+    }
+
+    // 提前结束休息：关闭倒计时窗口并回到工作阶段
+    finish_countdown();
+    schedule_phase(Phase::Working);
+}