bare-pointer 0.1.2 → 0.1.4

package/README.md

@@ -32,7 +32,9 @@ pointer.destroy()
 | Android  | `bare-ndk`     | Motion events dispatched to the root of the view       |
 | Windows  | `bare-win-ui`  | `SendInput()` through `bare-user32`                    |
 
-On Linux and Windows the input goes through the system, so the window of the view has to be the one on top at the point. On macOS, a control tracks the mouse until it is released, so press one with `tap()` rather than `down()`.
+On Linux the input goes through the system, so the window of the view has to be the one on top at the point. On Windows it does too, and a window covered at the point is brought to the foreground first. On macOS, a control tracks the mouse until it is released, so press one with `tap()` rather than `down()`.
+
+On Windows, a press that no element marks as handled can leave windows opened after it without pointer input once one of them has closed. Have something take every press, such as the root of each window.
 
 ## License
 

package/index.js

@@ -52,6 +52,15 @@ module.exports = class Pointer {
 
     if (this._backend.tap) {
       this._backend.tap(view, ...point)
+
+      // A tap can be posted to an event queue rather than delivered at once.
+      if (this._backend.pending !== undefined) {
+        for (let frames = 0; this._backend.pending(view); frames++) {
+          if (frames === 60) throw new Error('The tap was not delivered')
+
+          await this._frame(view)
+        }
+      }
     } else {
       this._backend.down(view, ...point)
 

package/lib/darwin.js

@@ -2,7 +2,11 @@ const AnimationFrameProvider = require('bare-animation-frame')
 const AppKitApplication = require('bare-app-kit/application')
 const AppKitEvent = require('bare-app-kit/event')
 
-const { TYPE } = AppKitEvent
+const { TYPE, MASK } = AppKitEvent
+
+// A run loop mode of its own, so that nothing else runs while the event queue
+// is read.
+const MODE = 'to.holepunch.bare.pointer'
 
 module.exports = class DarwinPointer {
   constructor() {
@@ -16,6 +20,18 @@ module.exports = class DarwinPointer {
     return [width, height]
   }
 
+  covered(view) {
+    const window = view.window
+
+    if (window.keyWindow || !window.canBecomeKeyWindow || !AppKitApplication.active) {
+      return false
+    }
+
+    window.makeKeyAndOrderFront()
+
+    return true
+  }
+
   watch(view, onhidden) {
     let request = null
 
@@ -53,6 +69,21 @@ module.exports = class DarwinPointer {
     AppKitApplication.postEvent(this._event(TYPE.LEFT_MOUSE_UP, window, point))
   }
 
+  pending(view) {
+    const window = view.window
+
+    if (window === null) return false
+
+    const event = AppKitApplication.nextEventMatchingMask(
+      MASK.LEFT_MOUSE_DOWN | MASK.LEFT_MOUSE_UP,
+      null,
+      MODE,
+      false
+    )
+
+    return event !== null && event.windowNumber === window.windowNumber
+  }
+
   destroy() {}
 
   _send(type, view, x, y) {

package/lib/win32.js

@@ -16,10 +16,6 @@ const {
 } = user32.constants
 
 module.exports = class Win32Pointer {
-  constructor() {
-    this._point = null
-  }
-
   size(view) {
     return [view.actualWidth, view.actualHeight]
   }
@@ -36,35 +32,32 @@ module.exports = class Win32Pointer {
   }
 
   hover(view, x, y) {
-    this._point = normalize(locate(view, x, y).screen)
-    this._send(0)
+    this._move(view, x, y)
   }
 
   down() {
-    this._send(MOUSEEVENTF_LEFTDOWN)
+    this._send({ flags: MOUSEEVENTF_LEFTDOWN })
   }
 
   move(view, x, y) {
-    this._point = normalize(locate(view, x, y).screen)
-    this._send(0)
+    this._move(view, x, y)
   }
 
   up() {
-    this._send(MOUSEEVENTF_LEFTUP)
+    this._send({ flags: MOUSEEVENTF_LEFTUP })
   }
 
   destroy() {}
 
-  _send(flags) {
-    const sent = user32.sendInput([
-      {
-        type: INPUT_MOUSE,
-        mi: {
-          ...this._point,
-          flags: flags | MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_VIRTUALDESK
-        }
-      }
-    ])
+  _move(view, x, y) {
+    this._send({
+      ...normalize(locate(view, x, y).screen),
+      flags: MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_VIRTUALDESK
+    })
+  }
+
+  _send(mi) {
+    const sent = user32.sendInput([{ type: INPUT_MOUSE, mi }])
 
     if (sent === 0) throw new Error('Input was blocked')
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-pointer",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Simulated pointer input for testing Bare apps",
   "exports": {
     "./package": "./package.json",
@@ -48,7 +48,7 @@
   "homepage": "https://github.com/holepunchto/bare-pointer#readme",
   "dependencies": {
     "bare-animation-frame": "^0.1.1",
-    "bare-app-kit": "^0.3.1",
+    "bare-app-kit": "^0.3.3",
     "bare-ndk": "^0.3.4",
     "bare-ui-kit-touch": "^0.1.0",
     "bare-user32": "^0.1.1",