From 40af25998ff8b2d3ee9d139117b94bc808289060 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 4 Nov 2025 21:35:02 +0100
Subject: [PATCH] chore: Handle use implicit event function calls for glance,
 b=no-bug, c=common, glance

---
 src/zen/common/ZenActorsManager.sys.mjs      |  3 ++
 src/zen/glance/actors/ZenGlanceChild.sys.mjs | 30 +++++++-------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/zen/common/ZenActorsManager.sys.mjs b/src/zen/common/ZenActorsManager.sys.mjs
index 817cfef79..bfaf184af 100644
--- a/src/zen/common/ZenActorsManager.sys.mjs
+++ b/src/zen/common/ZenActorsManager.sys.mjs
@@ -42,6 +42,9 @@ let JSWINDOWACTORS = {
       esModuleURI: 'resource:///actors/ZenGlanceChild.sys.mjs',
       events: {
         DOMContentLoaded: {},
+        click: {
+          capture: true,
+        },
         keydown: {
           capture: true,
         },
diff --git a/src/zen/glance/actors/ZenGlanceChild.sys.mjs b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
index 51cd6cb17..8ebf72eaa 100644
--- a/src/zen/glance/actors/ZenGlanceChild.sys.mjs
+++ b/src/zen/glance/actors/ZenGlanceChild.sys.mjs
@@ -6,18 +6,12 @@ export class ZenGlanceChild extends JSWindowActorChild {
 
   constructor() {
     super();
-    this.clickListener = this.handleClick.bind(this);
   }
 
   async handleEvent(event) {
-    switch (event.type) {
-      case 'DOMContentLoaded':
-        await this.initiateGlance();
-        break;
-      case 'keydown':
-        this.onKeyDown(event);
-        break;
-      default:
+    const handler = this[`on_${event.type}`];
+    if (typeof handler === 'function') {
+      await handler.call(this, event);
     }
   }
 
@@ -25,13 +19,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
     this.#activationMethod = await this.sendQuery('ZenGlance:GetActivationMethod');
   }
 
-  async initiateGlance() {
-    this.mouseIsDown = false;
-    await this.#initActivationMethod();
-    this.contentWindow.document.addEventListener('click', this.clickListener, { capture: true });
-  }
-
-  ensureOnlyKeyModifiers(event) {
+  #ensureOnlyKeyModifiers(event) {
     return !(event.ctrlKey ^ event.altKey ^ event.shiftKey ^ event.metaKey);
   }
 
@@ -66,7 +54,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
     });
   }
 
-  handleClick(event) {
+  on_click(event) {
     if (event.button !== 0 || event.defaultPrevented) {
       return;
     }
@@ -79,7 +67,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
     // The problem is that at that stage we don't know the rect or even what
     // element has been clicked, so we send the data here.
     this.#sendClickDataToParent(target, elementToRecord);
-    if (this.ensureOnlyKeyModifiers(event)) {
+    if (this.#ensureOnlyKeyModifiers(event)) {
       return;
     }
     const activationMethod = this.#activationMethod;
@@ -100,7 +88,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
     }
   }
 
-  onKeyDown(event) {
+  on_keydown(event) {
     if (event.defaultPrevented || event.key !== 'Escape') {
       return;
     }
@@ -108,4 +96,8 @@ export class ZenGlanceChild extends JSWindowActorChild {
       hasFocused: this.contentWindow.document.activeElement !== this.contentWindow.document.body,
     });
   }
+
+  async on_DOMContentLoaded() {
+    await this.#initActivationMethod();
+  }
 }