Add a mousedown handler to also signal user activity in the app

emain/emain-ipc.ts

@@ -17,6 +17,7 @@ import {
     incrementTermCommandsRemote,
     incrementTermCommandsRun,
     incrementTermCommandsWsl,
+    setWasActive,
 } from "./emain-activity";
 import { createBuilderWindow, getAllBuilderWindows, getBuilderWindowByWebContentsId } from "./emain-builder";
 import { callWithOriginalXdgCurrentDesktopAsync, unamePlatform } from "./emain-platform";
@@ -317,6 +318,10 @@ export function initIpcHandlers() {
         tabView?.setKeyboardChordMode(true);
     });
 
+    electron.ipcMain.handle("set-is-active", () => {
+        setWasActive(true);
+    });
+
     const fac = new FastAverageColor();
     electron.ipcMain.on("update-window-controls-overlay", async (event, rect: Dimensions) => {
         if (unamePlatform === "darwin") return;

emain/preload.ts

@@ -71,6 +71,7 @@ contextBridge.exposeInMainWorld("api", {
     setBuilderWindowAppId: (appId: string) => ipcRenderer.send("set-builder-window-appid", appId),
     doRefresh: () => ipcRenderer.send("do-refresh"),
     saveTextFile: (fileName: string, content: string) => ipcRenderer.invoke("save-text-file", fileName, content),
+    setIsActive: () => ipcRenderer.invoke("set-is-active"),
 });
 
 // Custom event for "new-window"

frontend/app/app.tsx

@@ -34,7 +34,7 @@
 // tailwindsetup.css should come *after* app.scss (don't remove the newline above otherwise prettier will reorder these imports)
 import "../tailwindsetup.css";
 
 const dlog = debug("wave:app");
 const focusLog = debug("wave:focus");
 
 const App = ({ onFirstRender }: { onFirstRender: () => void }) => {
@@ -89,7 +89,7 @@
             return null;
         }
         return url;
     } catch (e) {
         return null;
     }
 }
@@ -103,7 +103,7 @@
     if (!canPaste && !canCopy && !canCut && !clipboardURL) {
         return;
     }
     let menu: ContextMenuItem[] = [];
     if (canCut) {
         menu.push({ label: "Cut", role: "cut" });
     }
@@ -168,7 +168,7 @@
     focusLog("focusout", getElemAsStr(e.target), "=>", getElemAsStr(e.relatedTarget));
 }
 
 function appSelectionChange(e: Event) {
     const selection = document.getSelection();
     focusLog("selectionchange", getElemAsStr(selection.anchorNode));
 }
@@ -200,12 +200,16 @@
 const AppKeyHandlers = () => {
     useEffect(() => {
         const staticKeyDownHandler = keyutil.keydownWrapper(appHandleKeyDown);
+        const staticMouseDownHandler = (e: MouseEvent) => {
+            keyboardMouseDownHandler(e);
+            void GlobalModel.getInstance().setIsActive();
+        };
         document.addEventListener("keydown", staticKeyDownHandler);
-        document.addEventListener("mousedown", keyboardMouseDownHandler);
+        document.addEventListener("mousedown", staticMouseDownHandler);
 
         return () => {
             document.removeEventListener("keydown", staticKeyDownHandler);
-            document.removeEventListener("mousedown", keyboardMouseDownHandler);
+            document.removeEventListener("mousedown", staticMouseDownHandler);
         };
     }, []);
     return null;

frontend/app/store/global-model.ts

@@ -3,14 +3,17 @@
 
 import * as WOS from "@/app/store/wos";
 import { ClientModel } from "@/app/store/client-model";
+import { getApi } from "@/store/global";
 import { atom, Atom } from "jotai";
 
 class GlobalModel {
     private static instance: GlobalModel;
+    static readonly IsActiveThrottleMs = 5000;
 
     windowId: string;
     builderId: string;
     platform: NodeJS.Platform;
+    lastSetIsActiveTs = 0;
 
     windowDataAtom!: Atom<WaveWindow>;
     workspaceAtom!: Atom<Workspace>;
@@ -47,6 +50,15 @@ class GlobalModel {
             return WOS.getObjectValue(WOS.makeORef("workspace", windowData.workspaceid), get);
         });
     }
+
+    async setIsActive(): Promise<void> {
+        const now = Date.now();
+        if (now - this.lastSetIsActiveTs < GlobalModel.IsActiveThrottleMs) {
+            return;
+        }
+        this.lastSetIsActiveTs = now;
+        await getApi().setIsActive();
+    }
 }
 
-export { GlobalModel };
+export { GlobalModel };

frontend/types/custom.d.ts

@@ -132,6 +132,7 @@ declare global {
         setBuilderWindowAppId: (appId: string) => void; // set-builder-window-appid
         doRefresh: () => void; // do-refresh
         saveTextFile: (fileName: string, content: string) => Promise<boolean>; // save-text-file
+        setIsActive: () => Promise<void>; // set-is-active
     };
 
     type ElectronContextMenuItem = {