react-x11 2.42.0 → 2.44.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-x11",
-  "version": "2.42.0",
+  "version": "2.44.0",
   "description": "react renderer with X11 as a target",
   "main": "./src/index.js",
   "files": [
@@ -104,7 +104,7 @@
     "ical.js": "^2.2.1",
     "image-in-browser": "^3.6.0",
     "linebreak": "^1.1.0",
-    "ntk": "^8.23.0",
+    "ntk": "^8.23.2",
     "react-reconciler": "^0.34.0",
     "yoga-layout": "^3.2.1"
   },

package/src/cocoa/app.js

@@ -44,6 +44,7 @@ import { CocoaPlayer, canPlay } from './player.js';
 import { CocoaSurface } from './surface.js';
 import { CocoaSymbols } from './symbols.js';
 import { CocoaWindow, FRAME_SLACK_MS } from './window.js';
+import { utiFromMime, wire } from './dnd.js';
 import { decodeKey, modifierMask } from './keymap.js';
 import { loadNative } from './native.js';
 import { requestAppKit, threadedChannel } from './threaded.js';
@@ -409,13 +410,53 @@ export class CocoaApp {
     // (docs/clipboard.md, "Two clipboards").
     const isClipboard = (selection = 'CLIPBOARD') => selection === 'CLIPBOARD';
     this.clipboard = {
+      // A write is one pasteboard item with every flavour under its UTI —
+      // dnd.js's table, then the system's — the way a drag offers its
+      // payload. Text alone keeps pasteboardWriteText, the verb every
+      // bridge has; anything else needs pasteboardWrite (windowkit/appkit
+      // #119), and a bridge without it keeps the text and says, once, what
+      // it dropped — an image that silently never reaches the pasteboard
+      // looks like a Copy that did nothing.
       write: (data, { selection } = {}) => {
         if (!isClipboard(selection)) return Promise.resolve();
+        if (typeof data === 'string') {
+          native.pasteboardWriteText(data);
+          return Promise.resolve();
+        }
+        const item = {};
+        for (const [type, value] of Object.entries(data ?? {})) {
+          const uti = utiFromMime(type, native);
+          if (uti && value != null && !(uti in item)) item[uti] = wire(value);
+        }
+        const TEXT = 'public.utf8-plain-text';
+        const raw = item[TEXT];
         const text =
-          typeof data === 'string'
-            ? data
-            : (data?.UTF8_STRING ?? data?.STRING ?? '');
-        native.pasteboardWriteText(String(text));
+          raw == null
+            ? ''
+            : typeof raw === 'string'
+              ? raw
+              : Buffer.from(raw).toString('utf8');
+        const others = Object.keys(item).filter((uti) => uti !== TEXT);
+        if (others.length === 0) {
+          native.pasteboardWriteText(text);
+        } else if (typeof native.pasteboardWrite === 'function') {
+          native.pasteboardWrite(item);
+        } else {
+          if (
+            !this._warnedPasteboardFlavours &&
+            process.env.NODE_ENV !== 'production'
+          ) {
+            this._warnedPasteboardFlavours = true;
+            console.warn(
+              `react-x11: clipboard.write() kept only the text — this ` +
+                `@windowkit/appkit has no pasteboardWrite, so ` +
+                `${others.join(', ')} did not reach the pasteboard. ` +
+                'Update @windowkit/appkit to a release with pasteboardWrite ' +
+                '(windowkit/appkit#119).',
+            );
+          }
+          native.pasteboardWriteText(text);
+        }
         return Promise.resolve();
       },
       clear: (selection) => {

package/src/cocoa/dnd.js

@@ -208,7 +208,7 @@ export function readPayload(native, types, carried = null) {
 
 /** A value as the pasteboard carries it: strings and bytes as they are,
  * anything else as JSON — the same rule the X transport applies. */
-const wire = (value) =>
+export const wire = (value) =>
   typeof value === 'string' ||
   Buffer.isBuffer(value) ||
   ArrayBuffer.isView(value) ||

package/src/node.d.ts

@@ -220,6 +220,24 @@ export interface Context2D {
     dw: number,
     dh: number,
   ): void;
+  /**
+   * Draw an image through a projection, in one draw: its pixel (u, v) lands
+   * where the 3×3 `matrix` — row-major, `[a, b, c, d, e, f, g, h, i]` — takes
+   * it, ((a·u + b·v + c) / w, (d·u + e·v + f) / w) with
+   * w = g·u + h·v + i, and the current transform takes that; clipped and
+   * faded by `globalAlpha` as `drawImage` is. A plane turned out of the page
+   * — CSS `rotateY()` in a `perspective` — is one draw where it would be
+   * hundreds of tiles each drawn through the affine matrix nearest it.
+   * Answers false, drawing nothing, where a corner of the image has w ≤ 0,
+   * behind the viewer.
+   *
+   * The Wayland context only. A GPU interpolates texture coordinates in
+   * perspective; XRender on glamor divides at the corners and folds the
+   * image along its diagonal, and CoreGraphics and Direct2D draw an image
+   * through an affine matrix alone. Test for it with `'drawImageProjected'
+   * in ctx`, and tile where it is absent.
+   */
+  drawImageProjected?(image: unknown, matrix: readonly number[]): boolean;
   createLinearGradient(
     x0: number,
     y0: number,

package/src/wayland/context2d.js

@@ -65,6 +65,8 @@ const MODE_TEXTURE = 1;
 const MODE_GLYPH = 2;
 const MODE_RRECT = 3;
 const MODE_GRADIENT = 4;
+/** A texture read through a projection: `vParams` is (s/w, t/w, 1/w). */
+const MODE_PROJECTIVE = 5;
 
 /**
  * The stencil buffer, shared between two uses: bit 7 is the clip (set where
@@ -114,7 +116,9 @@ const FRAG = `
 precision mediump float;
 varying vec2 vUV;
 varying vec4 vColor;
-varying vec4 vParams;
+// highp: in MODE_PROJECTIVE these are texture coordinates over w, divided
+// per fragment, and half floats would put a large texture a pixel out
+varying highp vec4 vParams;
 uniform int uMode;
 uniform int uSwizzle;
 uniform sampler2D uTex;
@@ -156,6 +160,10 @@ void main() {
     else if (w < 0.0) a = 1.0 - smoothstep(w, -w, d);
     else a = 1.0 - smoothstep(-0.5, 0.5, d);
     gl_FragColor = vColor * a;
+  } else if (uMode == 5) {
+    // Interpolated across the quad in the plane of the screen, s/w, t/w and
+    // 1/w are each exact, and so is their quotient: a texture in perspective.
+    gl_FragColor = vColor * sampleTex(vParams.xy / vParams.z);
   } else {
     // Gradients are evaluated per fragment from its device position, so any
     // shape — a cover quad over a path included — can be filled with one.
@@ -1450,6 +1458,56 @@ export class WaylandContext2D {
     );
   }
 
+  /**
+   * Draw `img` through a projection, as one quad: its pixel (u, v) lands
+   * where the 3×3 `m` — row-major, `[a, b, c, d, e, f, g, h, i]` — takes it,
+   * ((a·u + b·v + c) / w, (d·u + e·v + f) / w) with w = g·u + h·v + i, and
+   * the current transform takes that. Clipped and faded by `globalAlpha` as
+   * `drawImage` is. Each corner carries its texture coordinates over its w,
+   * which are exact anywhere across the quad, and the fragment divides them
+   * back: the image in perspective, where a quad's own interpolation would
+   * fold it along its diagonal. That fold is what RENDER on glamor draws for
+   * a projective picture transform, and why X11 has no such call.
+   *
+   * Draws nothing and answers false where a corner has w ≤ 0, behind the
+   * viewer: the caller draws the part in front another way.
+   */
+  drawImageProjected(img, m) {
+    this._claim();
+    const src = this._textureFor(img);
+    if (!src) return false;
+    const [a, b, c, d, e, f, g, h, i] = m;
+    const W = src.w;
+    const H = src.h;
+    const ctm = this._m;
+    const pos = new Array(8);
+    const params = new Array(16);
+    const us = [0, W, W, 0];
+    const vs = [0, 0, H, H];
+    for (let k = 0; k < 4; k++) {
+      const u = us[k];
+      const v = vs[k];
+      const w = g * u + h * v + i;
+      if (!(w > 1e-9)) return false;
+      const x = (a * u + b * v + c) / w;
+      const y = (d * u + e * v + f) / w;
+      if (!Number.isFinite(x) || !Number.isFinite(y)) return false;
+      pos[k * 2] = applyX(ctm, x, y);
+      pos[k * 2 + 1] = applyY(ctm, x, y);
+      const s = u / W;
+      // a render target's row 0 is the bottom of what was drawn into it
+      const t = src.flipY ? 1 - v / H : v / H;
+      params[k * 4] = s / w;
+      params[k * 4 + 1] = t / w;
+      params[k * 4 + 2] = 1 / w;
+      params[k * 4 + 3] = 0;
+    }
+    this._setMode(MODE_PROJECTIVE, src.tex, src.swizzle);
+    const alpha = this.globalAlpha;
+    this._quad(pos, ZERO8, [alpha, alpha, alpha, alpha], params);
+    return true;
+  }
+
   /**
    * Write pixels, ignoring the transform and the clip (the canvas rule).
    * `dirtyX/Y/Width/Height` select part of the data, as the spec has it.
@@ -1926,7 +1984,8 @@ export class WaylandContext2D {
     }
   }
 
-  /** Two triangles from four corners, in order TL, TR, BR, BL. */
+  /** Two triangles from four corners, in order TL, TR, BR, BL. `params` is
+   * one vec4 for every corner, or sixteen numbers, a vec4 a corner. */
   _quad(pos, uv, color, params) {
     // Buffering is taking the device, not a step before it: the quad is GL
     // work that has been decided on and not yet issued, and the handover in
@@ -1935,9 +1994,11 @@ export class WaylandContext2D {
     this._claim();
     if (this._n + 6 > MAX_VERTS) this._flush();
     const v = this._verts;
+    const each = params.length === 16 ? 4 : 0;
     let o = this._n * STRIDE;
     for (let k = 0; k < 6; k++) {
       const i = TRI[k];
+      const p = i * each;
       v[o++] = pos[i * 2];
       v[o++] = pos[i * 2 + 1];
       v[o++] = uv[i * 2];
@@ -1946,10 +2007,10 @@ export class WaylandContext2D {
       v[o++] = color[1];
       v[o++] = color[2];
       v[o++] = color[3];
-      v[o++] = params[0];
-      v[o++] = params[1];
-      v[o++] = params[2];
-      v[o++] = params[3];
+      v[o++] = params[p];
+      v[o++] = params[p + 1];
+      v[o++] = params[p + 2];
+      v[o++] = params[p + 3];
     }
     this._n += 6;
     this.shapeStats.quads++;
@@ -2081,6 +2142,7 @@ export class WaylandContext2D {
 
 const UV_UNIT = Object.freeze([0, 0, 1, 0, 1, 1, 0, 1]);
 const ZERO4 = Object.freeze([0, 0, 0, 0]);
+const ZERO8 = Object.freeze([0, 0, 0, 0, 0, 0, 0, 0]);
 
 // ---- geometry helpers ------------------------------------------------------------
 

package/src/wayland/device.js

@@ -70,7 +70,8 @@ export function releaseDevice(gl) {
  * The owner is the only context that can be holding anything (see above), so
  * flushing it is flushing the device. Call before *reading* a target's pixels
  * behind the contexts' backs — a framebuffer blit, a scroll copy — the way
- * `releaseDevice` is called after writing them.
+ * `releaseDevice` is called after writing them, and before deleting a target
+ * a buffered draw may still read (`WaylandSurface.destroy`).
  */
 export function flushDevice(gl) {
   const device = shared(gl) ? devices.get(gl) : null;

package/src/wayland/surface.js

@@ -25,6 +25,7 @@
 // back by hand either.
 
 import { WaylandContext2D } from './context2d.js';
+import { flushDevice } from './device.js';
 import { GLTarget } from './target.js';
 
 export class WaylandSurface {
@@ -130,6 +131,15 @@ export class WaylandSurface {
     if (this._destroyed) return;
     this._destroyed = true;
     this.app.makeCurrent();
+    // A draw that reads this surface may still be buffered in the context
+    // that made it — a window's quad, to be drawn in one call with the rest
+    // of its batch — and a texture deleted under a draw not yet issued is
+    // sampled as GLES samples a texture that is not there: opaque black. A
+    // surface painted for one paint, drawn, and destroyed in a `finally`
+    // drew as a black box (`<Html>`'s transformed boxes too large to keep).
+    // The owner is the only context holding anything (device.js), so
+    // flushing it issues every draw that could read this one.
+    flushDevice(this.target.gl);
     this._ctx?.destroy();
     this._ctx = null;
     this.target.destroy();