frontengine 1.0.67__tar.gz → 1.0.68__tar.gz

{frontengine-1.0.67 → frontengine-1.0.68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frontengine
-Version: 1.0.67
+Version: 1.0.68
 Summary: FrontEngine is use-define frontview or only use like screen saver
 Author-email: JE-Chen <jechenmailman@gmail.com>
 Project-URL: Homepage, https://github.com/Intergration-Automation-Testing/FrontEngine

{frontengine-1.0.67 → frontengine-1.0.68}/frontengine/show/pet/desktop_pet.py

@@ -669,6 +669,9 @@ class PetMotion:
         self.vx = float(self.speed)
         self.vy = 0.0 if behaviour != BEHAVIOUR_WANDER else float(self.speed)
         self._airborne = False
+        # 打字時安分下來：True 的時候 step() 原地不動。
+        # Settled while typing: step() stays put while this is True.
+        self.settled = False
         self.state = "walk"  # walk | idle | sleep
         self._state_ticks = 0
         self._idle_count = 0
@@ -784,6 +787,13 @@ class PetMotion:
         self.follow_target_x = None
 
     def step(self) -> Tuple[int, int]:
+        # 安分的時候原地不動。閘門放在這裡而不是各個行為分支裡：每個分支都要記得
+        # 檢查的話，總有一個會漏掉，而漏掉的那個就是打字時還在跑的那隻。
+        # Settled means staying put. The gate is here rather than inside each
+        # behaviour branch: with a check per branch one of them eventually gets
+        # missed, and the missed one is the pet still running about while you type.
+        if self.settled:
+            return int(self.x), int(self.y)
         left, top, right, bottom = self.bounds
         floor_y = bottom - self.height
         if self.behaviour == BEHAVIOUR_CHASE:

{frontengine-1.0.67 → frontengine-1.0.68}/frontengine/ui/page/pet/pet_setting_ui.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from PySide6.QtCore import QTimer
+from PySide6.QtCore import Qt, QTimer
 from PySide6.QtGui import QGuiApplication
 from PySide6.QtWidgets import (
     QLabel, QPushButton, QMessageBox, QComboBox, QCheckBox, QFileDialog,
@@ -28,6 +28,8 @@ from frontengine.utils.focus_timer.focus_timer import (
     PHASE_BREAK, PHASE_FOCUS, PHASE_LONG_BREAK, FocusTimer,
 )
 from frontengine.ui.page.layout_kit import SettingPage
+from frontengine.utils.input_watch.input_watch_service import InputWatchService
+from frontengine.utils.input_watch.typing_watch import TypingWatch
 from frontengine.utils.logging.loggin_instance import front_engine_logger
 from frontengine.utils.multi_language.language_wrapper import language_wrapper
 from frontengine.utils.multi_language.retranslate import retranslator, tr
@@ -49,6 +51,14 @@ class PetSettingUI(SettingPage):
 
         # Init variable
         self.pet_list: list = []
+        # 打字時安分：按鍵由既有的全域監聽服務推過來，這裡只記時間並在停手後放行
+        # Settling while typing: keys come from the existing global watch
+        # service; this only times them and lets the pet go once typing stops.
+        self._typing_watch = TypingWatch()
+        self._input_watch: Optional[InputWatchService] = None
+        self._settle_timer = QTimer(self)
+        self._settle_timer.setSingleShot(True)
+        self._settle_timer.timeout.connect(lambda: self._apply_settled(False))
         self.ready_to_play = False
         self.pet_image_path: Optional[str] = None
         self.pet_sound_path: Optional[str] = None
@@ -106,6 +116,13 @@ class PetSettingUI(SettingPage):
         self.sit_checkbox.setChecked(True)
         self.tag_checkbox = tr(QCheckBox(), "pet_tag_label", "Play tag with each other")
         self.tag_checkbox.toggled.connect(self._on_tag_toggled)
+        # 打字時安分：寵物在螢幕上跑過你正在看的那一行，是最常被抱怨的一點。
+        # Settle while typing: a pet walking over the line you are reading is
+        # the single thing people complain about most.
+        self.settle_typing_checkbox = tr(QCheckBox(), "pet_settle_typing",
+                                         "Settle while typing")
+        self.settle_typing_checkbox.clicked.connect(self._on_settle_typing_toggled)
+
         self.speech_checkbox = tr(QCheckBox(), "pet_speech_label", "Speak out loud")
         self.chat_checkbox = tr(QCheckBox(), "pet_chat_label", "AI chat (needs API key)")
         self.chat_checkbox.setToolTip(
@@ -169,6 +186,7 @@ class PetSettingUI(SettingPage):
         behaviour = self.add_section("section_behaviour", "Behaviour")
         behaviour.add_row(self.behaviour_label, self.behaviour_combobox)
         behaviour.add_inline(self.climb_checkbox, self.sit_checkbox)
+        behaviour.add_inline(self.settle_typing_checkbox)
 
         sound = self.add_section("section_options", "Sound and speech")
         sound.add_row(self.volume_label, self.volume_combobox)
@@ -189,6 +207,54 @@ class PetSettingUI(SettingPage):
         self.finish_body()
         self.set_footer(primary=self.start_button, status=self.ready_label)
 
+    def _start_typing_watch(self) -> bool:
+        """開始監聽按鍵（只在第一次需要時建立）。pynput 不能用時安靜跳過。"""
+        if self._input_watch is None:
+            self._input_watch = InputWatchService(self)
+            # 按鍵在 pynput 自己的執行緒觸發，一定要排回 UI 執行緒才能碰 widget。
+            # Keys fire on pynput's own thread; this has to hop to the UI thread
+            # before touching any widget.
+            self._input_watch.key_pressed.connect(
+                self._on_key_pressed, Qt.ConnectionType.QueuedConnection)
+        # start() 本身是冪等的：已經在監聽時再呼叫不會多開一個 listener。
+        # start() is idempotent: calling it again does not add a second listener.
+        return self._input_watch.start(keyboard=True, mouse=False)
+
+    def _stop_typing_watch(self) -> None:
+        """停止監聽並讓所有寵物恢復走動。"""
+        self._settle_timer.stop()
+        self._typing_watch.clear()
+        if self._input_watch is not None:
+            self._input_watch.stop()
+        self._apply_settled(False)
+
+    def _on_settle_typing_toggled(self) -> None:
+        if self.settle_typing_checkbox.isChecked():
+            if self.pet_list:
+                self._start_typing_watch()
+        else:
+            # 關掉時一定要放行。少了這一步，剛好在打字時關掉這個選項的寵物會
+            # 永遠停在原地——看起來就是寵物壞了。
+            # Releasing on the way out matters: switched off mid-keystroke
+            # without it, the pet stays frozen for good and simply looks broken.
+            self._stop_typing_watch()
+
+    def _on_key_pressed(self, _keys) -> None:
+        """有人按了鍵：寵物先停下來，停手一段時間後再放行。"""
+        if not self.settle_typing_checkbox.isChecked():
+            return
+        self._typing_watch.note_key()
+        self._apply_settled(True)
+        self._settle_timer.start(int(self._typing_watch.settle_seconds * 1000))
+
+    def _apply_settled(self, settled: bool) -> None:
+        """把安分狀態套到目前所有寵物身上。"""
+        for pet in self.pet_list[:]:
+            try:
+                pet.motion.settled = settled
+            except RuntimeError:  # pragma: no cover - 底層物件已消失
+                continue
+
     def _spawn_pet(self) -> None:
         """建立、顯示並開始移動一隻寵物（供 Start 與右鍵複製共用）。"""
         if not self.pet_image_path:
@@ -215,6 +281,9 @@ class PetSettingUI(SettingPage):
         if self.audio_react_checkbox.isChecked():
             pet.set_audio_level_provider(self._audio_provider(geometry))
         pet.set_pet_window_flag()
+        if self.settle_typing_checkbox.isChecked():
+            pet.motion.settled = self._typing_watch.typing()
+            self._start_typing_watch()
         self.pet_list.append(pet)
         pet.show()
         self._start_tag_game()

frontengine-1.0.68/frontengine/utils/input_watch/typing_watch.py

@@ -0,0 +1,73 @@
+"""
+「使用者正在打字嗎」——用來讓桌寵在打字時安分下來。
+
+桌寵在螢幕上到處跑，是打字時最常被抱怨的一點：牠正好跑過你在看的那一行。這裡只
+記住最後一次按鍵的時間，讓呼叫端問「現在算不算在打字」。
+
+時鐘可以注入，所以測試不必真的等兩秒。
+
+"Is the user typing?" - so the desktop pet can settle down while they are.
+
+A pet wandering across the screen is the thing people complain about most while
+typing: it walks over the line you are reading. This only remembers when the last
+key went down and lets the caller ask whether that counts as typing now.
+
+The clock is injectable, so tests do not wait two seconds.
+"""
+from __future__ import annotations
+
+import time
+from typing import Any, Callable, Optional
+
+DEFAULT_SETTLE_SECONDS = 2.0
+MIN_SETTLE_SECONDS = 0.5
+MAX_SETTLE_SECONDS = 30.0
+
+
+def clamp_settle_seconds(value: Any, fallback: float = DEFAULT_SETTLE_SECONDS) -> float:
+    """安分的持續時間夾在 0.5 到 30 秒。"""
+    try:
+        return max(MIN_SETTLE_SECONDS, min(MAX_SETTLE_SECONDS, float(value)))
+    except (TypeError, ValueError):
+        return fallback
+
+
+class TypingWatch:
+    """
+    記住最後一次按鍵的時間，回答「現在還算在打字嗎」。
+
+    用單調時鐘而不是牆上時鐘：系統時間被調整（校時、換時區）時，牆上時鐘會讓
+    「距離上次按鍵幾秒」變成負數或一大跳，寵物就會莫名其妙卡住或突然衝出去。
+    Remembers when the last key went down and answers whether that still counts
+    as typing.
+
+    On a monotonic clock rather than the wall clock: when the system time is
+    adjusted - an NTP step, a timezone change - a wall clock makes "seconds since
+    the last key" negative or wildly large, and the pet either freezes for no
+    reason or bolts.
+    """
+
+    def __init__(self, settle_seconds: Any = DEFAULT_SETTLE_SECONDS,
+                 clock: Callable[[], float] = time.monotonic) -> None:
+        self.settle_seconds = clamp_settle_seconds(settle_seconds)
+        self._clock = clock
+        self._last_key: Optional[float] = None
+
+    def note_key(self) -> None:
+        """記下這一刻有人按了鍵。"""
+        self._last_key = self._clock()
+
+    def clear(self) -> None:
+        """忘掉先前的按鍵（功能關掉時用，免得寵物停在原地不動）。"""
+        self._last_key = None
+
+    def seconds_since_key(self) -> Optional[float]:
+        """距離上次按鍵幾秒；還沒按過就是 None。"""
+        if self._last_key is None:
+            return None
+        return max(0.0, self._clock() - self._last_key)
+
+    def typing(self) -> bool:
+        """現在算不算在打字。"""
+        elapsed = self.seconds_since_key()
+        return elapsed is not None and elapsed < self.settle_seconds

{frontengine-1.0.67 → frontengine-1.0.68}/frontengine/utils/multi_language/english.py

@@ -46,6 +46,7 @@ english_word_dict = {
     "tools_shape": "Shape",
     "tools_name": "Name",
     "tools_saved": "Saved",
+    "pet_settle_typing": "Settle while typing",
     "target_monitor_span": "Span all screens",
     "tools_replicate_window": "Replicate a window...",
     "window_replica_title": "Replicate a window",

{frontengine-1.0.67 → frontengine-1.0.68}/frontengine/utils/multi_language/france.py

@@ -47,6 +47,7 @@ french_word_dict = {
     "tools_shape": "Forme",
     "tools_name": "Nom",
     "tools_saved": "Enregistrés",
+    "pet_settle_typing": "Rester tranquille pendant la frappe",
     "target_monitor_span": "Sur tous les écrans",
     "tools_replicate_window": "Dupliquer une fenêtre...",
     "window_replica_title": "Dupliquer une fenêtre",

{frontengine-1.0.67 → frontengine-1.0.68}/frontengine/utils/multi_language/germany.py

@@ -47,6 +47,7 @@ germany_word_dict = {
     "tools_shape": "Form",
     "tools_name": "Name",
     "tools_saved": "Gespeichert",
+    "pet_settle_typing": "Beim Tippen still halten",
     "target_monitor_span": "Über alle Bildschirme",
     "tools_replicate_window": "Fenster duplizieren...",
     "window_replica_title": "Fenster duplizieren",

{frontengine-1.0.67 → frontengine-1.0.68}/frontengine/utils/multi_language/italy.py

@@ -47,6 +47,7 @@ italian_word_dict = {
     "tools_shape": "Forma",
     "tools_name": "Nome",
     "tools_saved": "Salvati",
+    "pet_settle_typing": "Fermo mentre scrivi",
     "target_monitor_span": "Su tutti gli schermi",
     "tools_replicate_window": "Duplica una finestra...",
     "window_replica_title": "Duplica una finestra",

{frontengine-1.0.67 → frontengine-1.0.68}/frontengine/utils/multi_language/russian.py

@@ -47,6 +47,7 @@ russian_word_dict = {
     "tools_shape": "Форма",
     "tools_name": "Имя",
     "tools_saved": "Сохранённые",
+    "pet_settle_typing": "Не двигаться при наборе текста",
     "target_monitor_span": "На все экраны",
     "tools_replicate_window": "Копия окна...",
     "window_replica_title": "Копия окна",

{frontengine-1.0.67 → frontengine-1.0.68}/frontengine/utils/multi_language/simplified_chinese.py

@@ -47,6 +47,7 @@ simplified_chinese_word_dict = {
     "tools_shape": "形状",
     "tools_name": "名称",
     "tools_saved": "已保存",
+    "pet_settle_typing": "打字时安分",
     "target_monitor_span": "横跨所有屏幕",
     "tools_replicate_window": "窗口副本⋯",
     "window_replica_title": "窗口副本",

{frontengine-1.0.67 → frontengine-1.0.68}/frontengine/utils/multi_language/traditional_chinese.py

@@ -47,6 +47,7 @@ traditional_chinese_word_dict = {
     "tools_shape": "形狀",
     "tools_name": "名稱",
     "tools_saved": "已儲存",
+    "pet_settle_typing": "打字時安分",
     "target_monitor_span": "橫跨所有螢幕",
     "tools_replicate_window": "視窗複本⋯",
     "window_replica_title": "視窗複本",

{frontengine-1.0.67 → frontengine-1.0.68}/frontengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frontengine
-Version: 1.0.67
+Version: 1.0.68
 Summary: FrontEngine is use-define frontview or only use like screen saver
 Author-email: JE-Chen <jechenmailman@gmail.com>
 Project-URL: Homepage, https://github.com/Intergration-Automation-Testing/FrontEngine

{frontengine-1.0.67 → frontengine-1.0.68}/frontengine.egg-info/SOURCES.txt

@@ -184,6 +184,7 @@ frontengine/utils/hotkey/__init__.py
 frontengine/utils/hotkey/hotkey_service.py
 frontengine/utils/input_watch/__init__.py
 frontengine/utils/input_watch/input_watch_service.py
+frontengine/utils/input_watch/typing_watch.py
 frontengine/utils/json/__init__.py
 frontengine/utils/json/json_file.py
 frontengine/utils/json/json_repository.py

{frontengine-1.0.67 → frontengine-1.0.68}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "frontengine"
-version = "1.0.67"
+version = "1.0.68"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]