ntk 8.14.6 → 8.14.7

package/lib/renderingcontext_2d.js

@@ -1899,11 +1899,12 @@ class RenderingContext2d {
    * well as the AddTraps: two requests become one, and the one that is left
    * touches only the bounding box.
    */
-  _uploadCoverage(job, b, out, edges) {
+  _uploadCoverage(job, b, out, edges, route) {
     const rasterizer = this.window.app.rasterizer;
     if (!rasterizer) return false;
-    if (routeRaster(b.w, b.h, edges, this.window.app.rasterPolicy) !== "local")
-      return false;
+    const where =
+      route ?? routeRaster(b.w, b.h, edges, this.window.app.rasterPolicy);
+    if (where !== "local") return false;
 
     // Rasterized over the whole box, as always, so a drawing that clips
     // split across passes — a pan's strips, a full repaint — gets the same
@@ -1978,6 +1979,84 @@ class RenderingContext2d {
     return out;
   }
 
+  /**
+   * A drawing's own extent: its box with the same pixel of slack as
+   * `_clampBBox`, and *not* clamped to the surface — what its masks are
+   * clustered and routed by (`_fillPolys`, the stroke's mask path).
+   *
+   * Which rasterizer draws a mask — ours or the server's — has to be a
+   * property of the drawing, never of where it lands. The two antialias
+   * differently, so a route taken from the part the surface shows changed
+   * as the drawing moved: a stroke whose cap had just left the surface had
+   * three triangles fewer to count, went to the other rasterizer, and came
+   * out up to ten levels different along its whole length — a pan's copy
+   * of it one way, the strip beside it the other. Clamping and culling
+   * decide how much work a mask is, never how it is drawn.
+   */
+  _rawBox(minX, minY, maxX, maxY) {
+    const x = Math.floor(minX) - 1;
+    const y = Math.floor(minY) - 1;
+    return { x, y, w: Math.ceil(maxX) + 1 - x, h: Math.ceil(maxY) + 1 - y };
+  }
+
+  /** `_rawBox` of one flat `[x0, y0, …]` point list; null for none. */
+  _pointsExtent(pts) {
+    let minX = Infinity;
+    let minY = Infinity;
+    let maxX = -Infinity;
+    let maxY = -Infinity;
+    for (let i = 0; i < pts.length; i += 2) {
+      if (pts[i] < minX) minX = pts[i];
+      if (pts[i] > maxX) maxX = pts[i];
+      if (pts[i + 1] < minY) minY = pts[i + 1];
+      if (pts[i + 1] > maxY) maxY = pts[i + 1];
+    }
+    if (!(maxX >= minX && maxY >= minY)) return null;
+    return this._rawBox(minX, minY, maxX, maxY);
+  }
+
+  /** `_rawBox` over every subpath of a flattened path; null for none. */
+  _polysExtent(polys) {
+    let out = null;
+    for (const poly of polys) {
+      const b = this._pointsExtent(poly.pts);
+      if (!b) continue;
+      out = out ? unionBox(out, b) : b;
+    }
+    return out;
+  }
+
+  /**
+   * Where a drawing whose own box is `box` is rasterized (`routeRaster`),
+   * sized by as much of it as the surface could ever show — each side no
+   * longer than the surface's, and its edges in the same proportion —
+   * rather than by the part it shows now: a route that depends only on the
+   * drawing's size and complexity is the same wherever the drawing lands
+   * (`_rawBox`). Counting every edge of a stroke that runs far past the
+   * surface sent it through the mask more often than the part it shows
+   * earned: a fifth more bytes a frame for a hundred such strokes.
+   */
+  _routeFor(box, edges) {
+    const w = Math.min(box.w, this.width);
+    const h = Math.min(box.h, this.height);
+    return routeRaster(
+      w,
+      h,
+      (edges * w * h) / (box.w * box.h),
+      this.window.app.rasterPolicy,
+    );
+  }
+
+  /** the part of a box on the surface; null where there is none */
+  _onSurface(b) {
+    const x = Math.max(0, b.x);
+    const y = Math.max(0, b.y);
+    const w = Math.min(this.width, b.x + b.w) - x;
+    const h = Math.min(this.height, b.y + b.h) - y;
+    if (w <= 0 || h <= 0) return null;
+    return { x, y, w, h };
+  }
+
   // a pixel of slack for the antialiased edge, clamped to the surface
   _clampBBox(minX, minY, maxX, maxY) {
     const x = Math.max(0, Math.floor(minX) - 1);
@@ -2030,7 +2109,7 @@ class RenderingContext2d {
    *
    * @returns {boolean} whether anything was composited
    */
-  _paintThroughMask(b, job, { edges, src, op, alpha, server }) {
+  _paintThroughMask(b, job, { edges, route, src, op, alpha, server }) {
     const R = this.Render;
     // Everything is bounded to the part of the box the clip lets through:
     // the clip's rectangle, or the extents of a stack with a path in it —
@@ -2049,7 +2128,9 @@ class RenderingContext2d {
       if (!out) return false;
     }
     if (this._hasPolyClip) this._requireClipMask();
-    if (!this._uploadCoverage({ ...job, dx: -b.x, dy: -b.y }, b, out, edges)) {
+    if (
+      !this._uploadCoverage({ ...job, dx: -b.x, dy: -b.y }, b, out, edges, route)
+    ) {
       R.FillRectangles(
         R.PictOp.Src,
         this.fillMask.id,
@@ -2118,12 +2199,13 @@ class RenderingContext2d {
     if (!prepareStyle(src, this._m)) return;
 
     // one box per subpath, so a path holding disjoint ones can be masked as
-    // the pieces it is rather than as the box around all of them
+    // the pieces it is rather than as the box around all of them — each the
+    // subpath's own box, on the surface or not (`_rawBox`)
     const shapes = [];
     const pieces = [];
     for (const p of polys) {
       if (p.pts.length < 6) continue;
-      const b = this._pointsBBox(p.pts);
+      const b = this._pointsExtent(p.pts);
       if (!b) continue;
       shapes.push(p.pts);
       pieces.push(b);
@@ -2133,18 +2215,30 @@ class RenderingContext2d {
     this._ensureFillMask();
     let painted = false;
     for (const cluster of this._maskClusters(pieces, op)) {
+      // Routed by every subpath of the cluster, and rasterized from the
+      // ones the surface shows, over the part of them it shows: a subpath
+      // wholly off it adds nothing to the winding of a pixel outside its
+      // own box.
       const flat = [];
+      let box = null;
       let edges = 0;
+      let drawn = 0;
       for (const i of cluster.items) {
-        flat.push(shapes[i]);
         edges += shapes[i].length / 2;
+        const shown = this._onSurface(pieces[i]);
+        if (!shown) continue;
+        flat.push(shapes[i]);
+        drawn += shapes[i].length / 2;
+        box = box ? unionBox(box, shown) : shown;
       }
+      if (!box) continue;
       painted =
         this._paintThroughMask(
-          cluster,
+          box,
           { polys: flat, rule },
           {
-            edges,
+            edges: drawn,
+            route: this._routeFor(cluster, edges),
             src,
             op,
             alpha,
@@ -2497,28 +2591,12 @@ class RenderingContext2d {
     // cuts above are meant to keep the extruder off that path; this keeps
     // a future miss from being catastrophic. A sum is finite iff every
     // term is.
-    //
-    // A triangle wholly off the surface is left out as well: it adds
-    // nothing on either route — the rasterizer would walk its rows only for
-    // its edges to cancel on the border column, and the server would be
-    // sent it only to clip it away — and a zoomed graph has hundreds of
-    // edges past the window every frame.
-    const right = this.width + 1;
-    const bottom = this.height + 1;
     let w = 0;
     for (let i = 0; i < tris.length; i += 6) {
-      const ax = tris[i];
-      const ay = tris[i + 1];
-      const bx = tris[i + 2];
-      const by = tris[i + 3];
-      const cx = tris[i + 4];
-      const cy = tris[i + 5];
-      if (!Number.isFinite(ax + ay + bx + by + cx + cy)) continue;
       if (
-        (ax < -1 && bx < -1 && cx < -1) ||
-        (ay < -1 && by < -1 && cy < -1) ||
-        (ax > right && bx > right && cx > right) ||
-        (ay > bottom && by > bottom && cy > bottom)
+        !Number.isFinite(
+          tris[i] + tris[i + 1] + tris[i + 2] + tris[i + 3] + tris[i + 4] + tris[i + 5],
+        )
       ) {
         continue;
       }
@@ -2527,19 +2605,6 @@ class RenderingContext2d {
     }
     if (w < tris.length) tris.length = w;
     if (!tris.length) return;
-    // Triangles are 16.16 fixed point, and the source origin a direct stroke
-    // hands the server is 16 bits: a stroke that reaches that far is cut to
-    // the surface first (lib/cliprect.js), a pixel to spare on every side, so
-    // what the surface shows is drawn exactly as before. One that does not
-    // goes as it came, for the server to clip.
-    const edgeX = this.width + 1;
-    const edgeY = this.height + 1;
-    if (!withinRect(tris, -WIRE_REACH, -WIRE_REACH, WIRE_REACH, WIRE_REACH)) {
-      const cut = clipTrianglesToRect(tris, -1, -1, edgeX, edgeY);
-      tris.length = 0;
-      for (let i = 0; i < cut.length; i++) tris.push(cut[i]);
-      if (!tris.length) return;
-    }
 
     const op = this._op();
     // round-cap/join disks overlap the stroke body; overlapping coverage
@@ -2555,6 +2620,14 @@ class RenderingContext2d {
       op === this.Render.PictOp.Over;
     const chunk = 4000 * 6;
     if (direct) {
+      this._cullTris(tris);
+      if (!tris.length) return;
+      const cut = this._wireCut(tris);
+      if (cut !== tris) {
+        tris.length = 0;
+        for (let i = 0; i < cut.length; i++) tris.push(cut[i]);
+        if (!tris.length) return;
+      }
       for (let i = 0; i < tris.length; i += chunk) {
         const batch = tris.slice(i, i + chunk);
         // RENDER aligns the source with the *first triangle's first vertex*,
@@ -2588,24 +2661,31 @@ class RenderingContext2d {
     // and took 1.9 s on XQuartz where the bounded version takes 37 ms
     // (react-x11#148). Stale mask content outside the boxes is never
     // composited, so clearing only them is safe.
+    //
+    // The islands are the whole stroke's, on the surface or not, and so are
+    // the clusters and the route each is drawn by (`_rawBox`); only the
+    // triangles the surface shows are rasterized.
     this._ensureFillMask();
     const pieces = this._trisPieces(tris);
     if (!pieces.length) return;
-    // the soup itself when it is one piece holding every triangle — the
-    // common case (one polyline is one piece), and worth not copying
-    const whole =
-      pieces.length === 1 &&
-      pieces[0].start === 0 &&
-      pieces[0].end === tris.length;
     let painted = false;
     for (const cluster of this._maskClusters(pieces, op)) {
-      const batch = whole ? tris : this._trisOf(tris, pieces, cluster.items);
+      let edges = 0;
+      for (const i of cluster.items) {
+        edges += (pieces[i].end - pieces[i].start) / 2;
+      }
+      const batch = this._trisBatch(tris, pieces, cluster);
+      if (!batch.length) continue;
+      // the mask over what is drawn, as tight as it always was
+      const box = this._pointsBBox(batch);
+      if (!box) continue;
       painted =
         this._paintThroughMask(
-          cluster,
+          box,
           { triangles: batch },
           {
             edges: batch.length / 2,
+            route: this._routeFor(cluster, edges),
             src,
             op,
             alpha: this.globalAlpha,
@@ -2642,17 +2722,17 @@ class RenderingContext2d {
    * linear pre-pass whose only job is to hand the clustering a handful of
    * boxes instead of thousands of triangles.
    *
-   * A piece that misses the surface entirely is dropped, leaving a hole in
-   * the spans — which is why the caller gathers a batch from the spans it
-   * has rather than assuming they tile `tris`.
+   * Each piece is its own box (`_rawBox`), on the surface or not: the
+   * clusters and the routes are the stroke's, and the surface only bounds
+   * the work (`_trisBatch`).
    */
   _trisPieces(tris) {
     const pieces = [];
     let open = null;
     const close = () => {
       if (!open) return;
-      const b = this._clampBBox(open.minX, open.minY, open.maxX, open.maxY);
-      if (b) pieces.push({ ...b, start: open.start, end: open.end });
+      const b = this._rawBox(open.minX, open.minY, open.maxX, open.maxY);
+      pieces.push({ ...b, start: open.start, end: open.end });
       open = null;
     };
     for (let i = 0; i < tris.length; i += 6) {
@@ -2681,17 +2761,81 @@ class RenderingContext2d {
     return pieces;
   }
 
-  /** the triangles of the given pieces, gathered into one soup */
-  _trisOf(tris, pieces, items) {
-    let n = 0;
-    for (const i of items) n += pieces[i].end - pieces[i].start;
-    const out = new Array(n);
-    let w = 0;
+  /**
+   * One cluster's triangles, gathered from its pieces: less those wholly
+   * off the surface, which add nothing on either route — the rasterizer
+   * would walk their rows only for their edges to cancel on the border
+   * column, and the server would be sent them only to clip them away — and
+   * cut to the wire's reach (`_wireCut`). The soup itself when the cluster
+   * is all of it and all of it is on the surface: the common case, one
+   * polyline in view, and worth not copying.
+   */
+  _trisBatch(tris, pieces, cluster) {
+    const { items } = cluster;
+    const inside =
+      cluster.x >= -1 &&
+      cluster.y >= -1 &&
+      cluster.x + cluster.w <= this.width + 1 &&
+      cluster.y + cluster.h <= this.height + 1;
+    if (
+      inside &&
+      items.length === 1 &&
+      pieces[items[0]].start === 0 &&
+      pieces[items[0]].end === tris.length
+    ) {
+      return this._wireCut(tris);
+    }
+    const out = [];
     for (const i of items) {
-      const piece = pieces[i];
-      for (let k = piece.start; k < piece.end; ++k) out[w++] = tris[k];
+      for (let k = pieces[i].start; k < pieces[i].end; ++k) out.push(tris[k]);
     }
-    return out;
+    if (!inside) this._cullTris(out);
+    return this._wireCut(out);
+  }
+
+  /**
+   * Leave out, in place, every triangle wholly off the surface: nothing of
+   * it can land on it, and a zoomed graph has hundreds of edges past the
+   * window every frame.
+   */
+  _cullTris(tris) {
+    const right = this.width + 1;
+    const bottom = this.height + 1;
+    let w = 0;
+    for (let i = 0; i < tris.length; i += 6) {
+      const ax = tris[i];
+      const ay = tris[i + 1];
+      const bx = tris[i + 2];
+      const by = tris[i + 3];
+      const cx = tris[i + 4];
+      const cy = tris[i + 5];
+      if (
+        (ax < -1 && bx < -1 && cx < -1) ||
+        (ay < -1 && by < -1 && cy < -1) ||
+        (ax > right && bx > right && cx > right) ||
+        (ay > bottom && by > bottom && cy > bottom)
+      ) {
+        continue;
+      }
+      if (w < i) for (let k = 0; k < 6; k++) tris[w + k] = tris[i + k];
+      w += 6;
+    }
+    if (w < tris.length) tris.length = w;
+    return tris;
+  }
+
+  /**
+   * Triangles are 16.16 fixed point, and the source origin a direct stroke
+   * hands the server is 16 bits: a stroke that reaches that far is cut to
+   * the surface first (lib/cliprect.js), a pixel to spare on every side, so
+   * what the surface shows is drawn exactly as before. One that does not
+   * goes as it came, for the server to clip — the same array.
+   */
+  _wireCut(tris) {
+    if (withinRect(tris, -WIRE_REACH, -WIRE_REACH, WIRE_REACH, WIRE_REACH)) {
+      return tris;
+    }
+    return clipTrianglesToRect(tris, -1, -1, this.width + 1, this.height + 1);
   }
 
   /**
@@ -4129,11 +4273,10 @@ class RenderingContext2d {
     if (!rasterizer) return false;
     const { shapes, edges } = fillableShapes(entry.polys);
     if (!shapes.length) return false;
-    if (
-      routeRaster(bb.w, bb.h, edges, this.window.app.rasterPolicy) !== "local"
-    ) {
+    // routed by the clip's own extent, as a fill is (`_rawBox`), and
+    // rasterized over the part of it on the surface
+    if (this._routeFor(this._polysExtent(entry.polys) ?? bb, edges) !== "local")
       return false;
-    }
 
     const coverage = rasterizer.rasterize({
       polys: shapes,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ntk",
-  "version": "8.14.6",
+  "version": "8.14.7",
   "description": "Desktop UI toolkit for X11 with canvas-like 2d and OpenGL rendering",
   "author": "Andrey Sidorov <sidorares@yandex.ru>",
   "license": "MIT",