From c2a906fca800be11393c7039323bf7cb29c3556e Mon Sep 17 00:00:00 2001
From: misyaguziya <53165965+misyaguziya@users.noreply.github.com>
Date: Sat, 10 Jan 2026 02:13:20 +0900
Subject: [PATCH] =?UTF-8?q?[Update]=20=E3=82=AF=E3=83=AA=E3=83=83=E3=83=97?=
 =?UTF-8?q?=E3=83=9C=E3=83=BC=E3=83=89=E6=A9=9F=E8=83=BD=E3=81=AE=E5=BC=B7?=
 =?UTF-8?q?=E5=8C=96:=20VR=E3=83=A2=E3=83=8B=E3=82=BF=E3=83=AA=E3=83=B3?=
 =?UTF-8?q?=E3=82=B0=E3=82=92=E3=83=90=E3=83=83=E3=82=AF=E3=82=B0=E3=83=A9?=
 =?UTF-8?q?=E3=82=A6=E3=83=B3=E3=83=89=E3=82=B9=E3=83=AC=E3=83=83=E3=83=89?=
 =?UTF-8?q?=E3=81=A7=E5=AE=9F=E8=A1=8C=E3=81=97=E3=80=81=E6=A9=9F=E8=83=BD?=
 =?UTF-8?q?=E3=81=AE=E6=9C=89=E5=8A=B9=E5=8C=96/=E7=84=A1=E5=8A=B9?=
 =?UTF-8?q?=E5=8C=96=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-python/models/clipboard/clipboard.py | 56 ++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 4 deletions(-)

diff --git a/src-python/models/clipboard/clipboard.py b/src-python/models/clipboard/clipboard.py
index c284edc6..a26b536d 100644
--- a/src-python/models/clipboard/clipboard.py
+++ b/src-python/models/clipboard/clipboard.py
@@ -1,6 +1,7 @@
 import sys
 import time
 import os
+import threading
 from subprocess import Popen, PIPE
 from psutil import process_iter
 import openvr
@@ -138,9 +139,35 @@ def paste_via_pyautogui(countdown: int = 0) -> bool:
 
 class Clipboard:
     def __init__(self):
-        if not checkSteamvrRunning():
-            self.app_name = None
-        else:
+        self.is_enabled = True
+        self._vr_monitor_thread = None
+        self._stop_monitoring = False
+        self.app_name = None
+        
+        self._initialize()
+
+    def _initialize(self):
+        """Initialize clipboard by starting VR monitor thread."""
+        self._stop_monitoring = False
+        self._vr_monitor_thread = threading.Thread(target=self._monitor_steamvr, daemon=True)
+        self._vr_monitor_thread.start()
+        self.app_name = None
+        printLog("Clipboard initialized. Waiting for SteamVR.")
+
+    def _monitor_steamvr(self):
+        """Monitor SteamVR startup in background thread."""
+        printLog("Clipboard: VR monitor thread started.")
+        while not self._stop_monitoring:
+            if checkSteamvrRunning():
+                printLog("Clipboard: SteamVR detected. Setting up app info.")
+                self._setup_vr_app_name()
+                break
+            time.sleep(10)
+        printLog("Clipboard: VR monitor thread ended.")
+
+    def _setup_vr_app_name(self):
+        """Setup VR application name from OpenVR."""
+        try:
             openvr.init(openvr.VRApplication_Background)
             apps = openvr.VRApplications()
 
@@ -161,7 +188,24 @@ class Clipboard:
                     self.app_name = name
                     break
             openvr.shutdown()
-        printLog(f"Clipboard initialized. SteamVR App Name: {self.app_name}")
+        except Exception as e:
+            printLog(f"Clipboard: Error setting up VR app name: {e}")
+            self.app_name = None
+
+    def enable(self):
+        """Enable clipboard functionality. Reinitialize the class."""
+        printLog("Clipboard: Enabling clipboard functionality.")
+        self.is_enabled = True
+        self._initialize()
+
+    def disable(self):
+        """Disable clipboard functionality. Stop VR monitoring."""
+        printLog("Clipboard: Disabling clipboard functionality.")
+        self.is_enabled = False
+        self._stop_monitoring = True
+        if self._vr_monitor_thread is not None and self._vr_monitor_thread.is_alive():
+            self._vr_monitor_thread.join(timeout=1)
+            self._vr_monitor_thread = None
 
     def copy(self, message: str) -> bool:
         """Copy `message` to clipboard.
@@ -172,6 +216,8 @@ class Clipboard:
         Returns:
             True if copy succeeded, False otherwise.
         """
+        if not self.is_enabled:
+            return False
         return copy_to_clipboard(message)
 
     def paste(self, window_name: str|None = None, countdown: int = 0) -> bool:
@@ -184,6 +230,8 @@ class Clipboard:
         Returns:
             True if paste command was sent, False otherwise.
         """
+        if not self.is_enabled:
+            return False
 
         window_name = window_name if window_name is not None else self.app_name