Free games for graphing calculators: NumWorks, TI-Nspire CX, Casio fx-CG50 and soon TI-84 Plus CE. Balatro, Celeste, Hollow Knight, Minecraft and more.
C calculatorcalculator-gamescasiochesscrossy-roaddrive-madfx-cg50gamesgeometry-dashgraphing-calculatorndlessnumworksnumworks-appsnumworks-calculatornumworks-gamenumworks-gamestetristi-84-plus-ceti-nspire
Live emulator: a Mac app around the calculator
Mason3634c574fb61875
diff --git a/tools/emu_live.py b/tools/emu_live.pyindex 6497cff6..7a6f4c6f 100644--- a/tools/emu_live.py+++ b/tools/emu_live.py@@ -50,9 +50,10 @@ import webbrowserfrom pathlib import Pathimport tkinter as tkfrom tkinter import filedialog, messagebox, ttk+import tkinter.font as tkfontimport numpy as np-from PIL import Image, ImageTk, ImageDraw, ImageFont+from PIL import Image, ImageTk, ImageDraw, ImageFont, ImageFiltertry:from tkinterdnd2 import DND_FILES, TkinterDnD@@ -92,20 +93,19 @@ LCD_MS_PER_PIXEL = (85.0 / (24 * 320 * 152) + 45.0 / (120 * 320 * 16)) / 2# replacement for a firmware-specific glyph rasterizer cycle model.FONT_CALL_MS = 0.030FONT_CHAR_MS = (44.0 / 120.0 - FONT_CALL_MS) / 18-# The interface uses Epsilon's yellow and greys; the LCD artwork keeps its own colours.+# The interface takes macOS's own colours (window background, labels, separators, accent), light and dark;+# the calculator's picture keeps its own.SETTINGS_FILE = Path.home() / ".numplay-emulator" / "settings.json"THEME_PALETTES = {"light": {- "BG": "#f5f5f5", "PANEL": "#ffffff", "PANEL_2": "#ececec",- "HOVER": "#d9d9d9", "LINE": "#d9d9d9", "FG": "#414147",- "MUTED": "#8c8c8c", "ACCENT": "#ffb734", "SELECT": "#d4d7e0",- "ERROR_BG": "#fde3e3",+ "BG": "#ececec", "PANEL": "#ececec", "PANEL_2": "#e0e0e3", "HOVER": "#d8d8dc", "LINE": "#d0d0d4",+ "FG": "#1d1d1f", "MUTED": "#6e6e73", "ACCENT": "#007aff", "SELECT": "#cfe0fc", "ERROR_BG": "#fbe3e1",+ "GREEN": "#28cd41", "ORANGE": "#ff9500", "RED": "#ff3b30", "CHIP": "#ffffff",},"dark": {- "BG": "#242427", "PANEL": "#2d2d31", "PANEL_2": "#38383b",- "HOVER": "#414147", "LINE": "#414147", "FG": "#f2f2f2",- "MUTED": "#b4b4b6", "ACCENT": "#ffb734", "SELECT": "#414147",- "ERROR_BG": "#4c3232",+ "BG": "#323232", "PANEL": "#323232", "PANEL_2": "#3d3d3f", "HOVER": "#48484a", "LINE": "#4a4a4c",+ "FG": "#ececec", "MUTED": "#9a9a9f", "ACCENT": "#0a84ff", "SELECT": "#25416b", "ERROR_BG": "#4a2b2a",+ "GREEN": "#30d158", "ORANGE": "#ff9f0a", "RED": "#ff453a", "CHIP": "#48484c",},}@@ -137,7 +137,7 @@ def _activate_theme_palette(name):globals().update(THEME_PALETTES[CURRENT_THEME])-_activate_theme_palette(_read_settings().get("theme", "light"))+_activate_theme_palette(_read_settings().get("theme", "light")) # ("system" is settled once Tk runs)UI_FAMILY = ("Helvetica Neue" if sys.platform == "darwin" else "Segoe UI" if os.name == "nt" else "DejaVu Sans")MONO_FAMILY = ("Menlo" if sys.platform == "darwin" else "Consolas" if os.name == "nt" else "DejaVu Sans Mono")FONT_GROW = 3 if sys.platform == "darwin" else 0 # (Tk's points are smaller on a Mac)@@ -1248,6 +1248,8 @@ class LiveApp:# Don't send keyboard shortcuts from another Toplevel (e.g. Keymap).if event.widget.winfo_toplevel() is not self.root:return None+ if sys.platform == "darwin" and event.state & 0x8: # (Command: a menu's shortcut)+ return Nonesym = event.keysym.lower()key = PC_KEYSYM.get(sym)if key == "onoff":@@ -1539,6 +1541,83 @@ def _safe_window_geometry(placement, root):return (width, height, x, y, placement.get("maximized") is True)+# ---------- Keys pressed: each sinks in, in its own shape ----------+def _key_radius(key, w, h):+ """The corner radius of a key's face, in the same units as w and h (None: it's round)."""+ if key in ("ok", "back"):+ return None+ if key in ("up", "down", "left", "right"):+ return min(w, h) * 0.3+ return h * (0.42 if key in DIGITS else 0.5)+++def key_sprite(key, w, h, state):+ """A see-through picture laid over a key: "pressed" darkens its face and shades its top edge inside, as a+ key pushed in; "hover" shades it a little."""+ k = 4 # (drawn 4 times bigger, then made smaller: smooth edges)+ mask = Image.new("L", (w * k, h * k), 0)+ d = ImageDraw.Draw(mask)+ r = _key_radius(key, w * k, h * k)+ if r is None:+ d.ellipse((0, 0, w * k - 1, h * k - 1), fill=255)+ else:+ d.rounded_rectangle((0, 0, w * k - 1, h * k - 1), radius=r, fill=255)+ mask = mask.resize((w, h), Image.Resampling.LANCZOS)+ m = np.asarray(mask, dtype=np.float32) / 255+ if state == "hover":+ alpha = m * 0.06+ out = np.zeros((h, w, 4), np.float32)+ out[..., 3] = alpha+ return Image.fromarray((out * 255).astype(np.uint8), "RGBA")+ # the shadow under the top edge: the face less itself moved down, blurred, kept inside the face+ drop = max(1, round(h * 0.08))+ moved = np.zeros_like(m)+ moved[drop:] = m[:-drop]+ edge = Image.fromarray((np.clip(m - moved, 0, 1) * 255).astype(np.uint8), "L")+ edge = edge.filter(ImageFilter.GaussianBlur(max(1.0, h * 0.07)))+ shade = np.asarray(edge, dtype=np.float32) / 255 * m+ dark = np.clip(m * 0.15 + shade * 0.6, 0, 0.8)+ # a thin light line along the bottom edge, inside+ up = np.zeros_like(m)+ up[:-1] = m[1:]+ light = np.clip(m - up, 0, 1) * 0.35+ layer = lambda rgb, a: Image.merge("RGBA", [Image.new("L", (w, h), c) for c in rgb] ++ [Image.fromarray((a * 255).astype(np.uint8), "L")])+ return Image.alpha_composite(layer((16, 18, 24), dark), layer((255, 255, 255), light))+++# what a computer key is called on its key cap, for the badge over the calculator key it presses+PC_GLYPH = {"return": "⏎", "kp_enter": "⌅", "escape": "esc", "left": "←", "right": "→", "up": "↑",+ "down": "↓", "shift_l": "⇧", "shift_r": "⇧", "alt_l": "⌥", "alt_r": "⌥", "space": "space",+ "delete": "⌫", "backspace": "⌫", "home": "home", "plus": "+", "kp_add": "+", "minus": "−",+ "kp_subtract": "−", "asterisk": "*", "kp_multiply": "*", "slash": "/", "kp_divide": "/",+ "period": ".", "kp_decimal": ".", "comma": ",", "parenleft": "(", "parenright": ")",+ "asciicircum": "^"}+++# the calculator keys by name, where their label is a symbol+KEY_NAMES = {"left": "Left", "right": "Right", "up": "Up", "down": "Down", "ok": "OK", "back": "Back",+ "home": "Home", "onoff": "On/Off", "shift": "Shift", "alpha": "Alpha", "backspace": "Delete",+ "exe": "EXE", "toolbox": "Toolbox"}+++def pc_glyph(sym):+ if sym in PC_GLYPH:+ return PC_GLYPH[sym]+ if sym.startswith("kp_"):+ return sym[3:]+ if len(sym) == 1:+ return sym.upper()+ return sym.upper() if re.fullmatch(r"f\d+", sym) else sym+++def round_rect(canvas, x0, y0, x1, y1, r, **kw):+ """A rounded rectangle on a Tk canvas (a smoothed polygon)."""+ pts = [x0 + r, y0, x1 - r, y0, x1, y0, x1, y0 + r, x1, y1 - r, x1, y1, x1 - r, y1, x0 + r, y1, x0, y1,+ x0, y1 - r, x0, y0 + r, x0, y0]+ return canvas.create_polygon(pts, smooth=True, **kw)++class CalculatorSkinApp(LiveApp):"""NumWorks skin with mutually exclusive file and live-development modes.@@ -1588,9 +1667,18 @@ class CalculatorSkinApp(LiveApp):self._upload_progress_is_reported = Falseself._upload_log_window = Noneself._upload_log_text = None- self.upload_status = tk.StringVar(master=root, value="USB upload: idle")+ self.upload_status = tk.StringVar(master=root, value="Installs the open app on a calculator plugged in "+ "with USB")self.upload_activity = tk.StringVar(master=root, value="")self.upload_elapsed = tk.StringVar(master=root, value="")+ self.appearance = _read_settings().get("theme", "system")+ if self.appearance not in ("system", "light", "dark"):+ self.appearance = "system"+ self._sprites = {}+ self._sprite_photos = []+ self._speed_hist = deque(maxlen=60)+ self._snap_id = None+ self._look_checked = 0.0super().__init__(root, initial, nwlink, model, system, False,max_sleep_ms=max_sleep_ms, profile_speed=profile_speed)# Avoid the original fallback's ambiguous 'newest local file' behavior.@@ -1598,7 +1686,8 @@ class CalculatorSkinApp(LiveApp):self.follow_var.set(False)self._builder_poll_id = self.root.after(120, self._poll_builder)self._upload_poll_id = self.root.after(160, self._poll_upload)- self._apply_interface_theme(initial=True)+ self._set_appearance(self.appearance, initial=True)+ self._apply_interface_theme()self._restore_window_placement()self.root.bind("<Configure>", self._remember_window_geometry, add="+")if start_live:@@ -1660,121 +1749,127 @@ class CalculatorSkinApp(LiveApp):except (OSError, ValueError, tk.TclError) as exc:print(f"[NumPlay] Could not save window placement: {exc}", file=sys.stderr)+ INSPECTOR_W = 280+ MODELS = (("N0120", "n0120"), ("N0110 or N0115", "n0110"))+ SYSTEMS = (("Epsilon", "epsilon"), ("Upsilon", "upsilon"))+ SPEEDS = ("Like the calculator", "Like this computer (less exact)", "108 MHz", "54 MHz", "27 MHz")+def _build_ui(self):- self.root.title("NumPlay emulator")- self.root.geometry("1050x800")- self.root.minsize(770, 510)+ aqua = self.root.tk.call("tk", "windowingsystem") == "aqua"+ self._aqua = aqua+ if aqua: # (the system font, San Francisco)+ global UI_FAMILY+ UI_FAMILY = tkfont.nametofont("TkDefaultFont").actual("family")+ self._cmd = "Command" if aqua else "Control"+ self.root.title("NumPlay Simulator")+ # the window holds the calculator and the inspector, no more: the calculator as tall as fits+ dev_h = max(560, min(860, self.root.winfo_screenheight() - 150))+ dev_w = round(dev_h * self.art_px[0] / self.art_px[1])+ self.root.geometry(f"{dev_w + 1 + self.INSPECTOR_W}x{dev_h + 47}")+ self.root.minsize(520, 560)+ self.live_var = tk.BooleanVar(master=self.root, value=self.mode_var.get() == "live")+ self.model_var = tk.StringVar(master=self.root, value=dict((v, k) for k, v in self.MODELS)[self.model])+ self.system_var = tk.StringVar(master=self.root, value=dict((v, k) for k, v in self.SYSTEMS)[self.system])+ self.speed_var = tk.StringVar(master=self.root, value=self.SPEEDS[0])+ self.appearance_var = tk.StringVar(master=self.root, value=self.appearance)+ self.speed_value = tk.StringVar(master=self.root, value="")+ self.speed_detail = tk.StringVar(master=self.root, value="Not running")+ self._app_name = None+ self._update_subtitle()+ self._build_menus()++ toolbar = tk.Frame(self.root, bg=PANEL)+ toolbar.pack(fill="x", side="top")+ bar = tk.Frame(toolbar, bg=PANEL)+ bar.pack(fill="x", padx=10, pady=7)+ self.shot_button = ttk.Button(bar, text="Screenshot", command=self._focus_after(self.screenshot))+ self.shot_button.pack(side="right", padx=(6, 0))+ self.reload_button = ttk.Button(bar, text="Restart", command=self._focus_after(self.reset))+ self.reload_button.pack(side="right", padx=(6, 0))+ self.pause_button = ttk.Button(bar, text="Pause", command=self._focus_after(self.toggle_pause))+ self.pause_button.pack(side="right", padx=(6, 0))+ self.pick_button = ttk.Button(bar, text="Open…", command=self._focus_after(self.open_file))+ self.pick_button.pack(side="left")+ tk.Frame(self.root, bg=LINE, height=1).pack(fill="x", side="top")body = tk.Frame(self.root, bg=BG)- body.pack(fill="both", expand=True, padx=8, pady=8)- sidebar = tk.Frame(body, bg=PANEL, width=310)- sidebar.pack(side="right", fill="y", padx=(8, 0))+ body.pack(fill="both", expand=True)+ sidebar = tk.Frame(body, bg=PANEL, width=self.INSPECTOR_W)+ sidebar.pack(side="right", fill="y")sidebar.pack_propagate(False)- left = tk.Frame(body, bg=BG)- left.pack(side="left", fill="both", expand=True)- self.canvas = tk.Canvas(left, bg=BG, bd=0, highlightthickness=0, takefocus=1)- self.canvas.pack(fill="both", expand=True)+ tk.Frame(body, bg=LINE, width=1).pack(side="right", fill="y")+ self.canvas = tk.Canvas(body, bg=BG, bd=0, highlightthickness=0, takefocus=1)+ self.canvas.pack(side="left", fill="both", expand=True)self.screen_label = self.canvasself.canvas.bind("<Configure>", self._resize)self.canvas.bind("<ButtonPress-1>", self._mouse_press)self.canvas.bind("<Motion>", self._mouse_move)self.canvas.bind("<Leave>", self._mouse_leave)+ self.root.bind("<Configure>", self._schedule_snap, add="+")- tk.Frame(body, bg=LINE, width=1).pack(side="right", fill="y") # (the panel's edge)inner = tk.Frame(sidebar, bg=PANEL)- inner.pack(fill="both", expand=True, padx=18, pady=(16, 10))- titlebar = tk.Frame(inner, bg=PANEL)- titlebar.pack(fill="x")- tk.Label(titlebar, text="NumPlay emulator", bg=PANEL, fg=FG, font=font(13, "bold"),+ inner.pack(fill="both", expand=True, padx=16, pady=(12, 12))+ wrap = self.INSPECTOR_W - 34++ # Device+ self._section(inner, "Device", first=True)+ grid = tk.Frame(inner, bg=PANEL)+ grid.pack(fill="x")+ grid.grid_columnconfigure(1, weight=1)+ for row, (label, var, values, command) in enumerate((+ ("Model", self.model_var, [k for k, _ in self.MODELS], self._change_model),+ ("Software", self.system_var, [k for k, _ in self.SYSTEMS], self._change_system),+ ("Speed", self.speed_var, list(self.SPEEDS), self._change_speed))):+ tk.Label(grid, text=label, bg=PANEL, fg=FG, font=font(10), anchor="w").grid(+ row=row, column=0, sticky="w", pady=3)+ menu = ttk.OptionMenu(grid, var, var.get(), *values, command=lambda _v, c=command: c())+ menu.grid(row=row, column=1, sticky="e", pady=3)++ # Live Build+ self._section(inner, "Live Build")+ ttk.Checkbutton(inner, text="Rebuild and reload when I save", variable=self.live_var,+ command=self._live_checked).pack(anchor="w")+ state = tk.Frame(inner, bg=PANEL)+ state.pack(fill="x", pady=(6, 0))+ self.build_dot = tk.Canvas(state, width=8, height=8, bg=PANEL, bd=0, highlightthickness=0)+ self.build_dot.pack(side="left", padx=(1, 7))+ self.build_dot_item = self.build_dot.create_oval(0, 0, 7, 7, fill=MUTED, outline="")+ self.build_status_label = tk.Label(state, textvariable=self.build_status, bg=PANEL, fg=FG, font=font(10),+ anchor="w", justify="left", wraplength=wrap - 16)+ self.build_status_label.pack(side="left", fill="x")+ self.build_info = tk.Label(inner, textvariable=self.build_detail, bg=PANEL, fg=MUTED, font=font(8),+ anchor="w", justify="left", wraplength=wrap)+ self.build_info.pack(fill="x", pady=(2, 0))+ self.progress = ttk.Progressbar(inner, mode="indeterminate")+ self.progress_after = self.build_info+ log_row = tk.Frame(inner, bg=PANEL)+ log_row.pack(fill="x", pady=(6, 0))+ self.build_log_button = ttk.Button(log_row, text="Build Log", command=self._show_build_log)+ self.build_log_button.pack(side="left")++ # Speed+ self._section(inner, "Speed")+ speed = tk.Frame(inner, bg=PANEL)+ speed.pack(fill="x")+ tk.Label(speed, textvariable=self.speed_value, bg=PANEL, fg=FG, font=font(18, "bold"),anchor="w").pack(side="left")- options_button = tk.Menubutton(titlebar, text="Options", bg=PANEL, fg=FG, relief="flat", bd=0,- font=font(10), cursor="hand2", activebackground=PANEL_2,- activeforeground=FG)- options_button.pack(side="right")- self._options_menu = tk.Menu(options_button, tearoff=0)- self.dark_mode_var = tk.BooleanVar(master=self.root, value=(CURRENT_THEME == "dark"))- self._options_menu.add_checkbutton(label="Dark mode", variable=self.dark_mode_var,- command=self._toggle_dark_mode)- self._options_menu.add_separator()- options_button.configure(menu=self._options_menu)- self._options_menu.add_command(label="Screenshot", command=self._focus_after(self.screenshot))- self._options_menu.add_command(label="Keyboard shortcuts", command=self._focus_after(self.show_keymap))- self._options_menu.add_command(label="Full screen (F11)", command=self._focus_after(self.toggle_fullscreen))- self._options_menu.add_separator()- self._options_menu.add_command(label="Build log", command=self._show_build_log)- self._options_menu.add_command(label="USB log", command=self._show_upload_log)- self._options_menu.add_command(label="Open the built files", command=self._open_dist)- self._options_menu.add_command(label="NumWorks web installer",- command=lambda: webbrowser.open("https://my.numworks.com/apps"))- self._options_menu.add_separator()- self.auto_clock_var = tk.BooleanVar(master=self.root, value=self.auto_clock[0])- self.clock_option = tk.StringVar(master=self.root, value=(- "550 MHz (N0120 calibrated)" if self.model == "n0120"- else "216 MHz (N0110 / N0115)"))- clock_submenu = tk.Menu(self._options_menu, tearoff=0)- clock_submenu.add_checkbutton(label="Follow this computer's speed (less exact)",- variable=self.auto_clock_var, command=self.toggle_auto_clock)- clock_submenu.add_separator()- self._manual_clock_menu = tk.Menu(clock_submenu, tearoff=0)- for clock in ("550 MHz (N0120 calibrated)", "216 MHz (N0110 / N0115)",- "108 MHz", "54 MHz", "27 MHz"):- self._manual_clock_menu.add_radiobutton(label=clock, variable=self.clock_option,- value=clock, command=lambda value=clock: self.change_clock(value))- clock_submenu.add_cascade(label="Clock", menu=self._manual_clock_menu, state="normal")- self._clock_submenu = clock_submenu- self._options_menu.add_cascade(label="Processor", menu=clock_submenu)-- self._section(inner, "View")- self._segmented(inner, self.view_var, (("Calculator", "calculator"), ("Screen only", "screen")),- self._switch_view)- self.view_detail = tk.Label(inner, text="", bg=PANEL, fg=MUTED, font=font(9), anchor="w")- self.view_detail.pack(fill="x", pady=(4, 0))-- self._section(inner, "Run")- self._segmented(inner, self.mode_var, (("One file", "file"), ("Live", "live")), self._switch_mode)-- # the two modes' panels, one at a time- self.file_panel = tk.Frame(inner, bg=PANEL)- self.file_panel.pack(fill="x", pady=(10, 0))- self.pick_button = self._button(self.file_panel, "Open a .nwa", self.open_file, primary=True)- self.pick_button.pack(fill="x")- tk.Label(self.file_panel, text="Runs that file. Open it again after building.", bg=PANEL, fg=MUTED,- font=font(9), wraplength=270, anchor="w", justify="left").pack(fill="x", pady=(6, 0))-- self.live_panel = tk.Frame(inner, bg=PANEL)- self.live_button = self._button(self.live_panel, "Start live build", self._toggle_builder, primary=True)- self.live_button.pack(fill="x", pady=(10, 0))- tk.Label(self.live_panel, text="Builds when you save a file, then reloads.", bg=PANEL, fg=MUTED,- font=font(9), wraplength=270, anchor="w", justify="left").pack(fill="x", pady=(6, 0))-- self.build_info = tk.Frame(inner, bg=PANEL_2, padx=10, pady=8)- self.build_info.pack(fill="x", pady=(10, 0))- tk.Label(self.build_info, textvariable=self.build_status, bg=PANEL_2, fg=FG, font=font(10, "bold"),- anchor="w", justify="left", wraplength=260).pack(fill="x")- tk.Label(self.build_info, textvariable=self.build_detail, bg=PANEL_2, fg=MUTED, font=font(9),- anchor="w", justify="left", wraplength=260).pack(fill="x", pady=(2, 0))- self.progress = ttk.Progressbar(self.build_info, mode="indeterminate")-- self.running_header = self._section(inner, "App")- self.file_title = tk.Label(inner, text="No file open", bg=PANEL, fg=FG, font=font(11, "bold"),- anchor="w", wraplength=270, justify="left")- self.file_title.pack(fill="x")- tk.Label(inner, textvariable=self.file_label, bg=PANEL, fg=MUTED, font=font(8), anchor="w",- wraplength=270, justify="left").pack(fill="x", pady=(2, 8))- action_panel = tk.Frame(inner, bg=PANEL)- action_panel.pack(fill="x")- for col in (0, 1):- action_panel.grid_columnconfigure(col, weight=1, uniform="actions")- self.reload_button = self._button(action_panel, "Restart", self.reset)- self.reload_button.grid(row=0, column=0, sticky="ew", padx=(0, 4))- self.pause_button = self._button(action_panel, "Pause", self.toggle_pause)- self.pause_button.grid(row=0, column=1, sticky="ew", padx=(4, 0))- # sending to a real calculator: only when asked, never part of the live builds- self.upload_button = self._button(inner, "Send to the calculator", self._push_current_build)- self.upload_button.pack(fill="x", pady=(8, 0))+ self.spark = tk.Canvas(speed, width=110, height=28, bg=PANEL, bd=0, highlightthickness=0)+ self.spark.pack(side="right")+ tk.Label(inner, textvariable=self.speed_detail, bg=PANEL, fg=MUTED, font=font(8), anchor="w",+ justify="left", wraplength=wrap).pack(fill="x", pady=(2, 0))++ # Keys Held+ self._section(inner, "Keys Held")+ self.chips = tk.Canvas(inner, height=24, bg=PANEL, bd=0, highlightthickness=0)+ self.chips.pack(fill="x")++ tk.Frame(inner, bg=PANEL).pack(fill="both", expand=True)++ # Calculator: sending the app to a real one, only when asked+ self._section(inner, "Calculator")self.upload_status_label = tk.Label(inner, textvariable=self.upload_status, bg=PANEL, fg=MUTED,- font=font(9), wraplength=270, justify="left", anchor="w")- self.upload_status_label.pack(fill="x", pady=(4, 0))+ font=font(8), wraplength=wrap, justify="left", anchor="w")+ self.upload_status_label.pack(fill="x")# (nwlink's own percentage when it gives one, else a bar that only says it is still running)self.upload_progress_panel = tk.Frame(inner, bg=PANEL)self.upload_progress = ttk.Progressbar(self.upload_progress_panel, mode="indeterminate", maximum=100)@@ -1782,58 +1877,197 @@ class CalculatorSkinApp(LiveApp):tk.Label(self.upload_progress_panel, textvariable=self.upload_elapsed, bg=PANEL, fg=MUTED,font=font(8), anchor="w").pack(fill="x")tk.Label(self.upload_progress_panel, textvariable=self.upload_activity, bg=PANEL, fg=MUTED,- font=font(8), anchor="w", justify="left", wraplength=265).pack(fill="x", pady=(2, 0))-- self._section(inner, "Emulator")- for var in (self.rate_label, self.input_status, self.time_label):- tk.Label(inner, textvariable=var, bg=PANEL, fg=MUTED, font=font(9), anchor="w").pack(fill="x")+ font=font(8), anchor="w", justify="left", wraplength=wrap).pack(fill="x", pady=(2, 0))+ self.upload_button = ttk.Button(inner, text="Install on Calculator…", command=self._push_current_build)+ self.upload_button.pack(anchor="w", pady=(6, 0))- tk.Frame(inner, bg=PANEL).pack(fill="both", expand=True)- self.drop_line = tk.Label(inner, text="Drop a .nwa on the calculator to open it", bg=PANEL, fg=MUTED,- font=font(8), wraplength=270, justify="left", anchor="w")+ tk.Frame(inner, bg=LINE, height=1).pack(fill="x", pady=(12, 8))+ self.drop_line = tk.Label(inner, textvariable=self.status, bg=PANEL, fg=MUTED, font=font(8),+ anchor="w", justify="left", wraplength=wrap)self.drop_line.pack(fill="x")- tk.Frame(sidebar, bg=LINE, height=1).pack(fill="x", side="bottom")- tk.Label(sidebar, textvariable=self.status, bg=PANEL, fg=MUTED, anchor="w", justify="left",- wraplength=282, padx=18, pady=8, font=font(9)).pack(fill="x", side="bottom")+ self.status.set("Drop a .nwa on the calculator, or choose Open")self._configure_mode_panel()self._update_upload_controls()+ self._draw_chips()self.root.focus_force()self.root.after(150, self.refocus_input)- def _toggle_dark_mode(self):- requested = "dark" if self.dark_mode_var.get() else "light"- self._apply_interface_theme(requested)- try:- _save_setting("theme", requested)- except OSError as exc:- messagebox.showwarning("NumPlay theme",- f"Theme changed, but could not save it for next time:\n{exc}",- parent=self.root)- self.set_status("Dark mode" if requested == "dark" else "Light mode")- self.root.after(75, self.refocus_input)+ def _build_menus(self):+ """The menu bar: what the app can do, where a Mac app keeps it."""+ cmd, mac = self._cmd, self._aqua+ acc = (lambda keys: keys) if mac else (lambda keys: keys.replace("Command-", "Ctrl+"))+ bar = tk.Menu(self.root)+ if mac:+ app = tk.Menu(bar, name="apple", tearoff=0)+ app.add_command(label="About NumPlay Simulator",+ command=lambda: webbrowser.open("https://github.com/Mason363/NumPlay"))+ bar.add_cascade(menu=app)+ def bind(seq, action):+ self.root.bind_all(f"<{cmd}-{seq}>", lambda e: (action(), "break")[1])++ m = tk.Menu(bar, tearoff=0)+ m.add_command(label="Open App…", accelerator=acc("Command-O"), command=self._focus_after(self.open_file))+ m.add_command(label="Take Screenshot", accelerator=acc("Command-S"), command=self._focus_after(self.screenshot))+ m.add_separator()+ m.add_command(label="Install on Calculator…", accelerator=acc("Command-I"), command=self._push_current_build)+ m.add_command(label="Show Built Apps", command=self._open_dist)+ bar.add_cascade(label="File", menu=m)+ bind("o", self.open_file)+ bind("s", self.screenshot)+ bind("i", self._push_current_build)++ m = tk.Menu(bar, tearoff=0)+ m.add_radiobutton(label="Calculator", variable=self.view_var, value="calculator",+ accelerator=acc("Command-1"), command=self._switch_view)+ m.add_radiobutton(label="Screen Only, Actual Size", variable=self.view_var, value="screen",+ accelerator=acc("Command-2"), command=self._switch_view)+ m.add_separator()+ look = tk.Menu(m, tearoff=0)+ for label, value in (("Like the System", "system"), ("Light", "light"), ("Dark", "dark")):+ look.add_radiobutton(label=label, variable=self.appearance_var, value=value,+ command=lambda: self._set_appearance(self.appearance_var.get()))+ m.add_cascade(label="Appearance", menu=look)+ m.add_separator()+ m.add_command(label="Enter Full Screen", accelerator=acc("Command-F"), command=self.toggle_fullscreen)+ bar.add_cascade(label="View", menu=m)+ bind("1", lambda: (self.view_var.set("calculator"), self._switch_view()))+ bind("2", lambda: (self.view_var.set("screen"), self._switch_view()))+ bind("f", self.toggle_fullscreen)++ m = tk.Menu(bar, tearoff=0)+ m.add_command(label="Home", accelerator=acc("Shift-Command-H"), command=lambda: self._tap("home"))+ m.add_command(label="Restart App", accelerator=acc("Command-R"), command=self._focus_after(self.reset))+ m.add_command(label="Pause or Resume", accelerator=acc("Command-P"), command=self.toggle_pause)+ m.add_command(label="Turn Off or On", command=self.power_button)+ m.add_separator()+ sub = tk.Menu(m, tearoff=0)+ for label, _ in self.MODELS:+ sub.add_radiobutton(label=label, variable=self.model_var, value=label, command=self._change_model)+ m.add_cascade(label="Model", menu=sub)+ sub = tk.Menu(m, tearoff=0)+ for label, _ in self.SYSTEMS:+ sub.add_radiobutton(label=label, variable=self.system_var, value=label, command=self._change_system)+ m.add_cascade(label="Software", menu=sub)+ sub = tk.Menu(m, tearoff=0)+ for label in self.SPEEDS:+ sub.add_radiobutton(label=label, variable=self.speed_var, value=label, command=self._change_speed)+ m.add_cascade(label="Speed", menu=sub)+ bar.add_cascade(label="Device", menu=m)+ self.root.bind_all(f"<Shift-{cmd}-H>", lambda e: (self._tap("home"), "break")[1])+ self.root.bind_all(f"<Shift-{cmd}-h>", lambda e: (self._tap("home"), "break")[1])+ bind("r", self.reset)+ bind("p", self.toggle_pause)++ m = tk.Menu(bar, tearoff=0)+ m.add_checkbutton(label="Rebuild and Reload When I Save", variable=self.live_var,+ accelerator=acc("Command-B"), command=self._live_checked)+ m.add_command(label="Show Build Log", accelerator=acc("Command-L"), command=self._show_build_log)+ m.add_command(label="Show USB Log", command=self._show_upload_log)+ bar.add_cascade(label="Build", menu=m)+ bind("b", lambda: (self.live_var.set(not self.live_var.get()), self._live_checked()))+ bind("l", self._show_build_log)++ if mac:+ bar.add_cascade(menu=tk.Menu(bar, name="window", tearoff=0), label="Window")+ m = tk.Menu(bar, name="help" if mac else None, tearoff=0)+ m.add_command(label="Keyboard Shortcuts", command=self.show_keymap)+ m.add_command(label="Make Your Own Game",+ command=lambda: webbrowser.open("https://github.com/Mason363/NumPlay/blob/main/docs/make-a-game.md"))+ m.add_command(label="NumWorks Web Installer", command=lambda: webbrowser.open("https://my.numworks.com/apps"))+ bar.add_cascade(label="Help", menu=m)+ self.root.configure(menu=bar)+ self._menubar = bar++ def _tap(self, key):+ """A calculator key pressed for a moment (the menus' Home)."""+ self.on_mouse_down(key)+ self.root.after(120, self.on_mouse_up)++ def _update_subtitle(self):+ """The window's title: the app, then the calculator it runs on (as Simulator names its device)."""+ model = dict((v, k) for k, v in self.MODELS)[self.model]+ system = dict((v, k) for k, v in self.SYSTEMS)[self.system]+ device = f"NumWorks {model} · {system}"+ self.root.title(f"{self._app_name} · {device}" if self._app_name else device)++ def _change_model(self):+ self.model = dict(self.MODELS)[self.model_var.get()]+ self._update_subtitle()+ self._change_speed(quiet=True)+ self._restart_for_device(f"Now an {self.model_var.get()}")++ def _change_system(self):+ self.system = dict(self.SYSTEMS)[self.system_var.get()]+ self._update_subtitle()+ self._restart_for_device(f"Now running {self.system_var.get()}")++ def _restart_for_device(self, message):+ if self.current is not None:+ self.load(self.current)+ self.set_status(message)- def _apply_interface_theme(self, requested=None, *, initial=False):- """Repaint Tk widgets, including log windows, without restarting Unicorn.+ def _change_speed(self, quiet=False):+ choice = self.speed_var.get()+ self.auto_clock[0] = choice == self.SPEEDS[1]+ if self.auto_clock[0]:+ # (the adaptive clock was tuned around 216 MHz: it starts there, not with a jump from 550)+ self.clock_mhz[0] = 216+ elif choice == self.SPEEDS[0]:+ self.clock_mhz[0] = 550 if self.model == "n0120" else 216+ else:+ self.clock_mhz[0] = int(choice.split()[0])+ if not quiet:+ self.set_status("Speed follows this computer, so timing may differ from a calculator"+ if self.auto_clock[0] else f"The processor runs at {self.clock_mhz[0]} MHz")++ def _live_checked(self):+ self.mode_var.set("live" if self.live_var.get() else "file")+ self._switch_mode()++ def _set_appearance(self, choice, *, initial=False):+ """Light, dark, or the system's: the window, its controls (aqua) and the colours drawn here."""+ self.appearance = choice+ if self._aqua:+ try:+ self.root.tk.call("::tk::unsupported::MacWindowStyle", "appearance", self.root._w,+ {"light": "aqua", "dark": "darkaqua"}.get(choice, "auto"))+ except tk.TclError:+ pass+ if not initial:+ try:+ _save_setting("theme", choice)+ except OSError as exc:+ self.set_status(f"Could not keep the appearance for next time: {exc}")+ self._follow_appearance()- Colours are replaced by their palette values rather than rebuilding- the window: doing so would interrupt the active calculator/game and- live builder. FlatButton stores its own background for mouse hovering.- """+ def _is_dark(self):+ if self.appearance in ("light", "dark"):+ return self.appearance == "dark"+ if self._aqua:+ try:+ return bool(int(self.root.tk.call("::tk::unsupported::MacWindowStyle", "isdark", self.root._w)))+ except (tk.TclError, ValueError):+ return False+ return False++ def _follow_appearance(self):+ want = "dark" if self._is_dark() else "light"+ if want != CURRENT_THEME:+ self._apply_interface_theme(want)++ def _apply_interface_theme(self, requested=None, *, initial=False):+ """Repaint the Tk widgets in the other palette, without restarting the emulator or the builder."""previous = THEME_PALETTES[CURRENT_THEME]if requested is not None:_activate_theme_palette(requested)updated = THEME_PALETTES[CURRENT_THEME]- mapping = {old.lower(): updated[key]- for key, old in previous.items()}- tk_options = (- "background", "foreground", "activebackground", "activeforeground",- "selectcolor", "disabledforeground", "highlightbackground",- "highlightcolor", "insertbackground", "troughcolor",- )+ mapping = {old.lower(): updated[key] for key, old in previous.items()}+ tk_options = ("background", "foreground", "activebackground", "activeforeground", "selectcolor",+ "disabledforeground", "highlightbackground", "highlightcolor", "insertbackground",+ "troughcolor")visited = set()def paint(widget):- # Tk menus and Toplevels can appear elsewhere in the widget tree.if str(widget) in visited:returnvisited.add(str(widget))@@ -1841,19 +2075,12 @@ class CalculatorSkinApp(LiveApp):options = set(widget.keys())changes = {}for option in tk_options:- if option not in options:- continue- value = str(widget.cget(option)).lower()- if value in mapping and mapping[value] != value:- changes[option] = mapping[value]+ if option in options:+ value = str(widget.cget(option)).lower()+ if value in mapping and mapping[value] != value:+ changes[option] = mapping[value]if changes:widget.configure(**changes)- if isinstance(widget, FlatButton):- # FlatButton remembers the hover/leave base colour.- primary = widget._bg.lower() == previous["ACCENT"].lower()- widget._bg = ACCENT if primary else PANEL_2- widget.configure(bg=widget._bg,- fg="#34343a" if primary else FG)for child in widget.winfo_children():paint(child)except tk.TclError:@@ -1861,73 +2088,39 @@ class CalculatorSkinApp(LiveApp):paint(self.root)self.root.configure(bg=BG)- for menu in (self._options_menu, self._clock_submenu, self._manual_clock_menu):+ if not getattr(self, "_aqua", False):try:- menu.configure(bg=PANEL, fg=FG,- activebackground=SELECT, activeforeground=FG,- selectcolor=ACCENT)- except (tk.TclError, AttributeError):- pass # Native system menus may ignore these colours on macOS.-- # ttk progress bars use the system theme unless styled explicitly.- try:- style = ttk.Style(self.root)- style.configure("NumPlay.Horizontal.TProgressbar",- background=ACCENT, troughcolor=PANEL_2, borderwidth=0)- for bar in (self.progress, self.upload_progress):- bar.configure(style="NumPlay.Horizontal.TProgressbar")- except (tk.TclError, AttributeError):- pass-- # Refresh the selected view and mode labels without switching modes.- # Re-running the existing variable trace repaints them without calling- # the mode-switch commands or restarting the compiler/emulator.- for var in (self.view_var, self.mode_var):- var.set(var.get())- # The calculator's picture on the new background (its edges are see-through), the screen's border too.+ style = ttk.Style(self.root)+ style.theme_use("clam")+ style.configure(".", background=PANEL, foreground=FG)+ style.configure("TButton", background=PANEL_2)+ style.configure("TCheckbutton", background=PANEL, foreground=FG)+ style.configure("TMenubutton", background=PANEL_2, foreground=FG)+ style.configure("Horizontal.TProgressbar", background=ACCENT, troughcolor=PANEL_2)+ except tk.TclError:+ pass+ # the calculator's picture on the new background (its edges are see-through), the rest drawn againself.art = self._art_on(BG)self._art_geometry = (0, 0, 0, 0)try:+ self.build_dot.itemconfigure(self.build_dot_item, fill=self._dot_colour())+ self._draw_spark()+ self._draw_chips()self._resize()self.canvas.itemconfigure("native-border", outline=LINE)self._draw_highlight()except (tk.TclError, AttributeError):pass- def _section(self, parent, title):- label = tk.Label(parent, text=title, bg=PANEL, fg=MUTED, font=font(9), anchor="w")- label.pack(fill="x", pady=(16, 6))+ def _section(self, parent, title, first=False):+ if not first:+ tk.Frame(parent, bg=LINE, height=1).pack(fill="x", pady=(14, 10))+ label = tk.Label(parent, text=title, bg=PANEL, fg=FG, font=font(10, "bold"), anchor="w")+ label.pack(fill="x", pady=(0, 6))return label- def _segmented(self, parent, var, choices, command):- """Two or three choices side by side, the chosen one shaded (radio buttons can't be coloured on a Mac)."""- row = tk.Frame(parent, bg=LINE)- row.pack(fill="x")- cells = []-- def paint(*_):- for cell, value in cells:- on = var.get() == value- cell.configure(bg=SELECT if on else PANEL, font=font(10, "bold" if on else "normal"))-- for i, (text, value) in enumerate(choices):- row.grid_columnconfigure(i, weight=1, uniform="seg")- cell = tk.Label(row, text=text, fg=FG, pady=7, cursor="hand2")- cell.grid(row=0, column=i, sticky="ew", padx=(1 if i == 0 else 0, 1), pady=1)-- def choose(_e, value=value):- var.set(value)- command()- self.root.after(75, self.refocus_input)-- cell.bind("<ButtonRelease-1>", choose)- cells.append((cell, value))- var.trace_add("write", paint)- paint()- return row-def _button(self, parent, label, callback, primary=False):- return FlatButton(parent, label, self._focus_after(callback), primary=primary)+ return ttk.Button(parent, text=label, command=self._focus_after(callback))def _focus_after(self, action):def call():@@ -1938,16 +2131,11 @@ class CalculatorSkinApp(LiveApp):return calldef _configure_mode_panel(self):- if self.mode_var.get() == "live":- self.file_panel.pack_forget()- self.live_panel.pack(before=self.running_header, fill="x")- self.build_info.pack(before=self.running_header, fill="x", pady=(10, 0))- self.drop_line.configure(text="Save a file to build again. Dropping a .nwa opens it on its own.")- else:- self.live_panel.pack_forget()- self.build_info.pack_forget()- self.file_panel.pack(before=self.running_header, fill="x", pady=(10, 0))- self.drop_line.configure(text="Drop a .nwa on the calculator to open it")+ live = self.mode_var.get() == "live"+ self.live_var.set(live)+ if not live:+ self._set_build_state("Off", "Opens one .nwa. Turn this on to build NumPlay again each time you save "+ "a file, and reload it.")def _switch_mode(self):self._configure_mode_panel()@@ -1959,7 +2147,7 @@ class CalculatorSkinApp(LiveApp):else:self.watch_var.set(False)self._stop_builder()- self._set_build_state("Single file mode", "No background compile or auto-reload")+ self._configure_mode_panel()self._update_upload_controls()self.root.after(75, self.refocus_input)@@ -1992,29 +2180,35 @@ class CalculatorSkinApp(LiveApp):def _set_build_state(self, status, detail="", *, busy=False, error=False):self.build_status.set(status)self.build_detail.set(detail)- if error:- self.build_info.configure(bg=ERROR_BG)- for child in self.build_info.winfo_children():- if isinstance(child, tk.Label):- child.configure(bg=ERROR_BG)- else:- self.build_info.configure(bg=PANEL_2)- for child in self.build_info.winfo_children():- if isinstance(child, tk.Label):- child.configure(bg=PANEL_2)+ self._build_error = error+ try:+ self.build_dot.itemconfigure(self.build_dot_item, fill=self._dot_colour(busy))+ self.build_status_label.configure(fg=RED if error else FG)+ except (tk.TclError, AttributeError):+ passif busy != self._builder_busy:self._builder_busy = busyif busy:- self.progress.pack(fill="x", pady=(9, 1))+ self.progress.pack(fill="x", pady=(6, 0), after=self.progress_after)self.progress.start(11)else:self.progress.stop()self.progress.pack_forget()+ def _dot_colour(self, busy=None):+ busy = self._builder_busy if busy is None else busy+ if getattr(self, "_build_error", False):+ return RED+ if busy:+ return ORANGE+ if self.mode_var.get() == "live" and self.build_process is not None:+ return GREEN+ return MUTED+def _toggle_builder(self):if self.build_process and self.build_process.poll() is None:self._stop_builder()- self._set_build_state("Watcher stopped", "Click Start live build to resume")+ self._set_build_state("Watcher stopped", "Turn Rebuild and reload back on to start again")else:self._start_builder()@@ -2052,7 +2246,6 @@ class CalculatorSkinApp(LiveApp):self._set_build_state("Cannot start compiler", str(exc), error=True)self.build_process = Nonereturn- self.live_button.configure(text="Stop live build")self._set_build_state("Starting the compiler", "Checking dependencies", busy=True)thread = threading.Thread(target=self._read_builder_output,args=(generation, self.build_process), daemon=True)@@ -2077,10 +2270,8 @@ class CalculatorSkinApp(LiveApp):self.watch_var.set(False)self.watch_candidate = Noneself.build_process = None- if hasattr(self, "live_button"):- self.live_button.configure(text="Start live build")- self._set_build_state("Watcher stopped" if self.mode_var.get() == "live" else "Single file mode",- "No background compilation", busy=False)+ self._set_build_state("Stopped" if self.mode_var.get() == "live" else "Off",+ "Not building" if self.mode_var.get() == "live" else self.build_detail.get(), busy=False)if process is None or process.poll() is not None:returnself._builder_stopping = True@@ -2128,12 +2319,11 @@ class CalculatorSkinApp(LiveApp):if generation != self._builder_generation:continueif kind == "ended":- self.live_button.configure(text="Start live build")self.build_process = Noneself.watch_var.set(False)if value != 0:self._set_build_state("Compiler stopped unexpectedly",- f"Exit code {value}. See Options, Build log", error=True)+ f"Exit code {value}. See the Build Log", error=True)else:self._set_build_state("Watcher stopped", "No longer monitoring edits")continue@@ -2160,7 +2350,7 @@ class CalculatorSkinApp(LiveApp):elif ("Build failed;" in line or "Initial build failed" in line or"Windows build failed:" in line):self._builder_has_error = True- self._set_build_state("Build failed", "The last good app stays. See Options, Build log",+ self._set_build_state("Build failed", "The last good app stays. See the Build Log",busy=False, error=True)elif "Watching for the next edit" in line or "Watching NumPlay source files" in line:if self._builder_has_error:@@ -2222,6 +2412,8 @@ class CalculatorSkinApp(LiveApp):path.mkdir(parents=True, exist_ok=True)if os.name == "nt":os.startfile(str(path))+ elif sys.platform == "darwin":+ subprocess.Popen(["open", str(path)])else:self.set_status(f"Compiled files: {path}")@@ -2240,9 +2432,7 @@ class CalculatorSkinApp(LiveApp):available = (not self._upload_running and source is not Noneand source.is_file() and source.suffix.lower() == ".nwa")self.upload_button.configure(state="normal" if available else "disabled",- text=("Sending to the calculator" if self._upload_running else- "Send this build to the calculator" if self.mode_var.get() == "live" else- "Send this .nwa to the calculator"))+ text="Installing…" if self._upload_running else "Install on Calculator…")def _show_upload_log(self):"""A small live log for USB details that nwlink prints to stdout."""@@ -2486,18 +2676,6 @@ class CalculatorSkinApp(LiveApp):return "break"return super().on_pc_up(event)- def toggle_auto_clock(self):- self.auto_clock[0] = bool(self.auto_clock_var.get())- self._clock_submenu.entryconfigure("Manual clock", state="disabled" if self.auto_clock[0] else "normal")- if self.auto_clock[0]:- # The adaptive heuristic was tuned around 216MHz. Start it there- # to avoid a disruptive 550-to-216 jump on its first adjustment.- self.clock_mhz[0] = 216- self.set_status("Adaptive clock enabled; game timing may differ from hardware.")- else:- self.clock_mhz[0] = int(self.clock_option.get().split()[0])- self.set_status(f"Manual CPU clock: {self.clock_mhz[0]} MHz")-def change_clock(self, selected):if self.auto_clock[0]:return@@ -2507,9 +2685,6 @@ class CalculatorSkinApp(LiveApp):def _switch_view(self):"""Switch the viewport only; the running game/keyboard/build are untouched."""- screen_only = self.view_var.get() == "screen"- self.view_detail.configure(text=("The screen alone, 320 x 240, pixel for pixel" if screen_only else- "Click the keys, or use your keyboard"))self._hover = None# A held mouse key was pressed on a key that disappears in screen view.# Release it to avoid a stuck calculator button.@@ -2548,9 +2723,9 @@ class CalculatorSkinApp(LiveApp):tags="native-border")self._display_screen()return- # Calculator POV: preserve the existing artwork proportions.+ # the calculator as big as its side of the window holds, edge to edgeratio = self.art_px[0] / self.art_px[1]- art_w = max(1, int(min(ww - 8, (hh - 8) * ratio)))+ art_w = max(1, int(min(ww, hh * ratio)))art_h = max(1, int(art_w / ratio))x0 = (ww - art_w) // 2y0 = (hh - art_h) // 2@@ -2562,6 +2737,12 @@ class CalculatorSkinApp(LiveApp):self.canvas.delete("all")self._canvas_image = self.canvas.create_image(x0, y0, image=self._bg_photo, anchor="nw", tags="art")self._canvas_screen = None+ self._sprites.clear()+ if self._screen_rgb is None:+ sx, sy, sw, sh = self._rect(SCREEN)+ self.canvas.create_text(sx + sw // 2, sy + sh // 2, tags="hint", fill="#8e8e93", font=font(10),+ width=sw - 40, justify="center",+ text="Drop a .nwa here, or choose Open")self._display_screen()self._draw_highlight()@@ -2587,6 +2768,7 @@ class CalculatorSkinApp(LiveApp):x, y, w, h = self._rect(SCREEN)photo = ImageTk.PhotoImage(self._screen_rgb.resize((w, h), Image.Resampling.NEAREST))self._photo = photo+ self.canvas.delete("hint")if self._canvas_screen is None or not self.canvas.find_withtag("screen"):self._canvas_screen = self.canvas.create_image(x, y, image=photo, anchor="nw", tags="screen")else:@@ -2606,29 +2788,103 @@ class CalculatorSkinApp(LiveApp):matched.append((center_distance, key))return min(matched)[1] if matched else None+ def _sprite(self, key, state, w, h):+ cache = (key, state, w, h)+ if cache not in self._sprites:+ self._sprites[cache] = ImageTk.PhotoImage(key_sprite(key, w, h, state))+ return self._sprites[cache]+def _draw_highlight(self):self.canvas.delete("key-light")if self.view_var.get() == "screen" or not self._art_geometry[2]:return- # V12 only drew the hovered/mouse-clicked key, so PC arrow presses- # were invisible unless the mouse happened to hover over that button.- # Paint *all* held keyboard/mouse buttons; combinations are supported.held = set(self.pressed_pc.values())if self.mouse_pressed:held.add(self.mouse_pressed)for key in sorted(held):+ if key in HOTSPOTS:+ x, y, w, h = self._rect(HOTSPOTS[key])+ self.canvas.create_image(x, y, image=self._sprite(key, "pressed", w, h), anchor="nw",+ tags="key-light")+ if self._hover and self._hover in HOTSPOTS and self._hover not in held:+ x, y, w, h = self._rect(HOTSPOTS[self._hover])+ self.canvas.create_image(x, y, image=self._sprite(self._hover, "hover", w, h), anchor="nw",+ tags="key-light")+ badge = font(8, "bold")+ measure = tkfont.Font(root=self.root, font=badge)+ for sym, key in sorted(self.pressed_pc.items()):if key not in HOTSPOTS:continuex, y, w, h = self._rect(HOTSPOTS[key])- self.canvas.create_oval(x + 2, y + 2, x + w - 2, y + h - 2,- outline=ACCENT, width=3, tags="key-light")- # Hover is a subtle white outline only when the key is not held.- if self._hover and self._hover in HOTSPOTS and self._hover not in held:- x, y, w, h = self._rect(HOTSPOTS[self._hover])- self.canvas.create_oval(x + 2, y + 2, x + w - 2, y + h - 2,- outline="#ffffff", width=2, tags="key-light")+ text = pc_glyph(sym)+ tw = measure.measure(text) + 12+ th = measure.metrics("linespace") + 4+ cx, top = x + w / 2, y - th - 3+ round_rect(self.canvas, cx - tw / 2, top, cx + tw / 2, top + th, th / 2, fill="#1d1d1f", outline="",+ tags="key-light")+ self.canvas.create_text(cx, top + th / 2, text=text, fill="#ffffff", font=badge, tags="key-light")self.canvas.tag_raise("key-light")+ def _draw_chips(self):+ """Keys Held: each key down, and the computer key it comes from."""+ c = self.chips+ c.delete("all")+ held = []+ name = lambda key: KEY_NAMES.get(key, LABEL.get(key, key))+ for sym, key in sorted(self.pressed_pc.items()):+ held.append(f"{name(key)} {pc_glyph(sym)}")+ if self.mouse_pressed and self.mouse_pressed not in self.pressed_pc.values():+ held.append(name(self.mouse_pressed))+ if not held:+ c.create_text(0, 12, text="None", anchor="w", fill=MUTED, font=font(8))+ return+ chip = font(8)+ measure = tkfont.Font(root=self.root, font=chip)+ x = 1+ for text in held:+ w = measure.measure(text) + 16+ round_rect(c, x, 2, x + w, 22, 6, fill=CHIP, outline=LINE)+ c.create_text(x + w / 2, 12, text=text, fill=FG, font=chip)+ x += w + 6++ def _draw_spark(self):+ c = self.spark+ c.delete("all")+ values = list(self._speed_hist)+ if len(values) < 2:+ return+ w, h = int(c.cget("width")), int(c.cget("height"))+ top = max(1.2, max(values))+ c.create_line(0, h - 2 - (h - 4) / top, w, h - 2 - (h - 4) / top, fill=LINE, dash=(2, 3))+ pts = []+ for i, v in enumerate(values):+ pts += [w * i / (len(values) - 1), h - 2 - (h - 4) * min(v, top) / top]+ c.create_line(*pts, fill=ACCENT, width=1.6, smooth=True)++ def _schedule_snap(self, event=None):+ if event is not None and event.widget is not self.root:+ return+ if self._snap_id is not None:+ self.root.after_cancel(self._snap_id)+ self._snap_id = self.root.after(300, self._snap_to_device)++ def _snap_to_device(self):+ """After the window is resized, its width follows the calculator again: no empty space beside it."""+ self._snap_id = None+ if self.fullscreen or self.view_var.get() != "calculator":+ return+ try:+ if self.root.state() != "normal":+ return+ ch, cw = self.canvas.winfo_height(), self.canvas.winfo_width()+ except tk.TclError:+ return+ if ch < 100:+ return+ want = int(ch * self.art_px[0] / self.art_px[1])+ if abs(cw - want) > 2:+ self.root.geometry(f"{self.root.winfo_width() - cw + want}x{self.root.winfo_height()}")+def _mouse_press(self, event):# Crucial on Windows: clicking the calculator after using a sidebar# button must direct the NEXT real keyboard press to the calculator.@@ -2657,6 +2913,7 @@ class CalculatorSkinApp(LiveApp):self.pressed.update(names)if hasattr(self, "canvas"):self._draw_highlight()+ self._draw_chips()def poll(self):if self._closing:@@ -2687,8 +2944,17 @@ class CalculatorSkinApp(LiveApp):_, factor, mhz, auto = latest_paceself.rate_label.set(f"Speed {factor:.2f}x, CPU: {mhz} MHz" +(" (auto)" if auto else " (manual)"))- if self.current:- self.file_title.configure(text=self.current.name)+ self._speed_hist.append(factor)+ self.speed_value.set(f"{factor:.2f}×")+ self.speed_detail.set(f"of the calculator's own speed, with the processor at {mhz} MHz" ++ (" (following this computer)" if auto else ""))+ self._draw_spark()+ if self.current and self._app_name != self.current.stem:+ self._app_name = self.current.stem+ self._update_subtitle()+ if self.appearance == "system" and time.monotonic() - self._look_checked > 1.5:+ self._look_checked = time.monotonic()+ self._follow_appearance()if (self.worker is not None and self.worker.is_alive() andnot self.powered_off and not self.pause_event.is_set() andtime.monotonic() - self._last_frame_wall > 3.0):