mirror/computer
1
0
Fork 0
mirror of https://github.com/trycua/computer.git synced 2026-01-05 21:09:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

App-usage stability fixes

Browse Source
This commit is contained in:
Dillon DuPont
2025-06-04 09:05:20 -04:00
parent 79bcf9d05d
commit 58a453dc49
3 changed files with 107 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libs/computer-server/computer_server/diorama/diorama.py
View File

@@ -36,11 +36,21 @@ class Diorama:
cls._ensure_scheduler()
return cls(args).computer
# Dictionary to store cursor positions for each unique app_list hash
_cursor_positions = {}
def __init__(self, app_list):
self.app_list = app_list
self.interface = self.Interface(self)
self.computer = DioramaComputer(self)
self.focus_context = None
# Create a hash for this app_list to use as a key
self.app_list_hash = hash(tuple(sorted(app_list)))
# Initialize cursor position for this app_list if it doesn't exist
if self.app_list_hash not in Diorama._cursor_positions:
Diorama._cursor_positions[self.app_list_hash] = (0, 0)
@classmethod
def _ensure_scheduler(cls):
@@ -67,10 +77,11 @@ class Diorama:
frontmost_app, active_app_to_use, active_app_pid = get_frontmost_and_active_app(all_windows, running_apps, app_whitelist)
focus_context = AppActivationContext(active_app_pid, active_app_to_use, logger)
app_list_hash = hash(tuple(sorted(app_whitelist)))
with focus_context:
try:
if action == "screenshot":
app_whitelist = list(args["app_list"])
logger.info(f"Taking screenshot for apps: {app_whitelist}")
result, img = capture_all_apps(
app_whitelist=app_whitelist,
@@ -82,8 +93,15 @@ class Diorama:
future.set_result((result, img))
# Mouse actions
elif action in ["left_click", "right_click", "double_click", "move_cursor", "drag_to"]:
x = args.get("x")
y = args.get("y")
# Get last cursor position for this app_list hash
last_pos = Diorama._cursor_positions.get(app_list_hash, (0, 0))
x = args.get("x", last_pos[0])
y = args.get("y", last_pos[1])
# Update the cursor position for this app_list hash
Diorama._cursor_positions[app_list_hash] = (x, y)
duration = args.get("duration", 0.5)
if action == "left_click":
await automation_handler.left_click(x, y)
@@ -98,6 +116,10 @@ class Diorama:
if future:
future.set_result(None)
elif action in ["scroll_up", "scroll_down"]:
# Move cursor to last known position for this app_list hash
last_pos = Diorama._cursor_positions.get(app_list_hash, (0, 0))
await automation_handler.move_cursor(*last_pos)
clicks = args.get("clicks", 1)
if action == "scroll_up":
await automation_handler.scroll_up(clicks)