ntk 8.14.3 → 8.14.5

package/lib/cliprect.js

@@ -101,9 +101,19 @@ export function clipTrianglesToRect(tris, x0, y0, x1, y1) {
 }
 
 /**
- * A flat `[x, y, w, h, …]` list of rectangles cut to `[0, width) × [0,
- * height)`, dropping the ones with nothing left: core X's rectangles are 16
- * bits. The list itself when every rectangle is already on the surface.
+ * A flat `[x, y, w, h, …]` list of rectangles on whole pixels and cut to
+ * `[0, width) × [0, height)`, dropping the ones with nothing left: core X's
+ * rectangles are 16 bits. The list itself when every rectangle is already
+ * whole and on the surface.
+ *
+ * Each edge is rounded on its own. The wire truncates a rectangle's x and
+ * its width separately, so two rectangles meeting at a fractional edge —
+ * the selection bands of two lines whose height is the face's, 15.13px —
+ * left a row of neither between them every seventh or eighth line, and one
+ * that crossed the surface's edge was cut a pixel differently from the
+ * same rectangle moved: a scroll's copy and a repaint disagreed. Rounded
+ * edges meet whoever they are shared with, and move with a whole-pixel
+ * shift.
  */
 export function rectsOnSurface(flat, width, height) {
   let out = null;
@@ -112,16 +122,21 @@ export function rectsOnSurface(flat, width, height) {
     const y = flat[i + 1];
     const w = flat[i + 2];
     const h = flat[i + 3];
+    const whole =
+      Number.isInteger(x) &&
+      Number.isInteger(y) &&
+      Number.isInteger(w) &&
+      Number.isInteger(h);
     const inside = x >= 0 && y >= 0 && x + w <= width && y + h <= height;
-    if (inside) {
+    if (whole && inside) {
       if (out) out.push(x, y, w, h);
       continue;
     }
     if (!out) out = flat.slice(0, i);
-    const x0 = Math.max(x, 0);
-    const y0 = Math.max(y, 0);
-    const x1 = Math.min(x + w, width);
-    const y1 = Math.min(y + h, height);
+    const x0 = Math.max(Math.round(x), 0);
+    const y0 = Math.max(Math.round(y), 0);
+    const x1 = Math.min(Math.round(x + w), width);
+    const y1 = Math.min(Math.round(y + h), height);
     if (x1 > x0 && y1 > y0) out.push(x0, y0, x1 - x0, y1 - y0);
   }
   return out ?? flat;

package/lib/path.js

@@ -491,13 +491,19 @@ function normalizeRadii(w, h, radii) {
     br = take(radii[2]);
     bl = take(radii[3]);
   }
-  // scale down so opposite corners never overlap
+  // Scale down so opposite corners never overlap: by the side's length over
+  // the radii along it, which is 0 for a side of no length, and the radii go
+  // with it. Only radii of nothing leave a side alone — `|| 1` guarded that
+  // 0 / 0 and took a real 0 for one as well, so a box of no height kept its
+  // corners, and a clip to it was two lobes of arc a radius above and below
+  // it that let what it should have hidden through.
+  const fit = (side, radii) => (radii > 0 ? side / radii : 1);
   const s = Math.min(
     1,
-    w / (tl.x + tr.x) || 1,
-    h / (tr.y + br.y) || 1,
-    w / (br.x + bl.x) || 1,
-    h / (bl.y + tl.y) || 1
+    fit(w, tl.x + tr.x),
+    fit(h, tr.y + br.y),
+    fit(w, br.x + bl.x),
+    fit(h, bl.y + tl.y)
   );
   const f = (r) => ({ x: Math.max(0, r.x * s), y: Math.max(0, r.y * s) });
   return [f(tl), f(tr), f(br), f(bl)];
@@ -803,6 +809,62 @@ function addCubic(pts, x0, y0, x1, y1, x2, y2, x3, y3, tol2, depth) {
   addCubic(pts, mx, my, bcx, bcy, cx, cy, x3, y3, tol2, depth + 1);
 }
 
+/**
+ * Which way a cubic leaves (x0, y0), or arrives at (x, y) with `end`: the
+ * control point next to that end, or the next one along where it sits on
+ * the end itself. Null for a cubic that is a single point.
+ */
+function cubicTangent(x0, y0, x1, y1, x2, y2, x, y, end) {
+  if (end) {
+    if (x !== x2 || y !== y2) return [x - x2, y - y2];
+    if (x !== x1 || y !== y1) return [x - x1, y - y1];
+    return x !== x0 || y !== y0 ? [x - x0, y - y0] : null;
+  }
+  if (x1 !== x0 || y1 !== y0) return [x1 - x0, y1 - y0];
+  if (x2 !== x0 || y2 !== y0) return [x2 - x0, y2 - y0];
+  return x !== x0 || y !== y0 ? [x - x0, y - y0] : null;
+}
+
+/**
+ * The tangent at a curve command's end or start, in the flattened
+ * polyline's space; (x0, y0) is where the command begins, already there.
+ */
+function commandTangent(c, x0, y0, m, end) {
+  const p = (x, y) => (m ? matApply(m, x, y) : [x, y]);
+  const [x, y] = p(c.x, c.y);
+  if (c.type === 'Q') {
+    const [qx, qy] = p(c.x1, c.y1);
+    return cubicTangent(
+      x0, y0,
+      x0 + (2 / 3) * (qx - x0), y0 + (2 / 3) * (qy - y0),
+      x + (2 / 3) * (qx - x), y + (2 / 3) * (qy - y),
+      x, y,
+      end
+    );
+  }
+  const [x1, y1] = p(c.x1, c.y1);
+  const [x2, y2] = p(c.x2, c.y2);
+  return cubicTangent(x0, y0, x1, y1, x2, y2, x, y, end);
+}
+
+/**
+ * The tangents a flattened subpath leaves its first point and arrives at its
+ * last with, where that end is a curve — null where it is a line, whose
+ * chord already says which way the path heads. Worked out on demand from the
+ * commands `flattenPath` kept: only a stroke whose ends meet asks.
+ */
+export function subpathHead(poly) {
+  return poly.head
+    ? commandTangent(poly.head, poly.pts[0], poly.pts[1], poly.m, false)
+    : null;
+}
+
+export function subpathTail(poly) {
+  return poly.tail
+    ? commandTangent(poly.tail, poly.tailX, poly.tailY, poly.m, true)
+    : null;
+}
+
 /**
  * Chords of the arc a tagged cubic stands for, appended to `pts`. Returns
  * false — flatten the cubic instead — when the path's current point is not
@@ -858,6 +920,13 @@ function addArcChords(pts, cmd, m, tol, x0, y0) {
  * geometry (see addArcChords); genuine beziers — hand-built paths, SVG curve
  * commands, font outlines — take the adaptive bisection route.
  *
+ * A subpath that begins or ends on a curve also keeps the command it began
+ * or ended with, for `subpathHead` and `subpathTail`: flattening turns a
+ * curve's end into a chord, which points half a chord's angle away from the
+ * curve, and the stroker asks for the curve's own tangent where that
+ * difference shows (a ring's seam). Kept rather than worked out, because a
+ * fill never asks.
+ *
  * @returns {Array<{pts: number[], closed: boolean}>} flat [x0,y0,x1,y1,…]
  */
 export function flattenPath(cmds, m = null, tol = FLATTEN_TOLERANCE) {
@@ -872,19 +941,24 @@ export function flattenPath(cmds, m = null, tol = FLATTEN_TOLERANCE) {
       case 'M': {
         if (pts && pts.pts.length >= 4) polys.push(pts);
         const [x, y] = p(c.x, c.y);
-        pts = { pts: [x, y], closed: false };
+        pts = { pts: [x, y], closed: false, head: null, tail: null, tailX: 0, tailY: 0, m };
         break;
       }
       case 'L': {
         if (!pts) break;
         const [x, y] = p(c.x, c.y);
         pts.pts.push(x, y);
+        pts.tail = null;
         break;
       }
       case 'C': {
         if (!pts) break;
         const x0 = pts.pts[pts.pts.length - 2];
         const y0 = pts.pts[pts.pts.length - 1];
+        if (pts.pts.length === 2) pts.head = c;
+        pts.tail = c;
+        pts.tailX = x0;
+        pts.tailY = y0;
         if (c.arc && addArcChords(pts.pts, c, m, tol, x0, y0)) break;
         const [x1, y1] = p(c.x1, c.y1);
         const [x2, y2] = p(c.x2, c.y2);
@@ -896,6 +970,10 @@ export function flattenPath(cmds, m = null, tol = FLATTEN_TOLERANCE) {
         if (!pts) break;
         const x0 = pts.pts[pts.pts.length - 2];
         const y0 = pts.pts[pts.pts.length - 1];
+        if (pts.pts.length === 2) pts.head = c;
+        pts.tail = c;
+        pts.tailX = x0;
+        pts.tailY = y0;
         const [qx, qy] = p(c.x1, c.y1);
         const [x, y] = p(c.x, c.y);
         // degree elevation: quadratic -> cubic
@@ -916,7 +994,7 @@ export function flattenPath(cmds, m = null, tol = FLATTEN_TOLERANCE) {
             polys.push(pts);
           }
           // a new subpath continues from the subpath start
-          pts = { pts: [pts.pts[0], pts.pts[1]], closed: false };
+          pts = { pts: [pts.pts[0], pts.pts[1]], closed: false, head: null, tail: null, tailX: 0, tailY: 0, m };
         }
         break;
       }

package/lib/renderingcontext_2d.js

@@ -22,6 +22,8 @@ import {
   matInvert,
   matIsIdentity,
   matMultiply,
+  subpathHead,
+  subpathTail,
 } from "./path.js";
 import Picture from "./picture.js";
 import { formatForDepth } from "./pictformat.js";
@@ -524,16 +526,23 @@ class RenderingContext2d {
       );
     }
     if (typeof window.on === "function") {
-      window.on("_backing", () => this._bindTarget());
+      // Kept, so `destroy` can take them off again: a surface drawn through
+      // `render()` gets a context a call, and each one left three listeners
+      // on the pixmap — holding the dead context — for as long as the
+      // surface lived. A fade redraws its group surface every frame.
+      this._onBacking = () => this._bindTarget();
       // masks are sized to the drawable — recreate them after a resize
-      window.on("resize", () => this._dropMasks());
+      this._onResize = () => this._dropMasks();
       // window-backed pictures are freed server-side with the window
-      window.on("_destroyed", () => {
+      this._onDestroyed = () => {
         if (this._picture && this._target === this.window) {
           this._picture.forget();
           this._picture = null;
         }
-      });
+      };
+      window.on("_backing", this._onBacking);
+      window.on("resize", this._onResize);
+      window.on("_destroyed", this._onDestroyed);
     }
 
     this.fillMask = null;
@@ -876,6 +885,13 @@ class RenderingContext2d {
     if (this._destroyed) return;
     this._destroyed = true;
     gcRegistry.unregister(this);
+    const drawable = this.window;
+    if (this._onBacking && typeof drawable?.removeListener === "function") {
+      drawable.removeListener("_backing", this._onBacking);
+      drawable.removeListener("resize", this._onResize);
+      drawable.removeListener("_destroyed", this._onDestroyed);
+      this._onBacking = this._onResize = this._onDestroyed = null;
+    }
 
     this._setClips([]);
     this._dropMasks();
@@ -2401,6 +2417,32 @@ class RenderingContext2d {
         addDisk(pts[pts.length - 1][0], pts[pts.length - 1][1]);
       }
     };
+    // An open subpath that ends where it began, heading the way it began —
+    // a full circle from arc(), which leaves its subpath open. Stroked
+    // open, each end got a cap square to its own chord, and a flattened
+    // curve's first and last chords point a chord's angle apart: a wedge
+    // of ink went missing outside the seam, a hairline across every
+    // stroked ring, and doubled inside it. Where the two ends meet head to
+    // tail the caps and a join are the same ink, so it is stroked as the
+    // loop it is. A path that comes back to its start at a corner keeps
+    // its caps, as the spec gives them.
+    const smoothLoop = (poly, pts) => {
+      const n = pts.length;
+      if (n < 4) return false;
+      const [fx, fy] = pts[0];
+      const [lx, ly] = pts[n - 1];
+      if (Math.abs(fx - lx) > 1e-6 || Math.abs(fy - ly) > 1e-6) return false;
+      const [hx, hy] = (poly.head && subpathHead(poly)) ?? [
+        pts[1][0] - fx,
+        pts[1][1] - fy,
+      ];
+      const [tx, ty] = (poly.tail && subpathTail(poly)) ?? [
+        lx - pts[n - 2][0],
+        ly - pts[n - 2][1],
+      ];
+      const lengths = Math.hypot(hx, hy) * Math.hypot(tx, ty);
+      return lengths > 0 && (hx * tx + hy * ty) / lengths > 1 - 1e-9;
+    };
     // dash boundaries can duplicate run endpoints; collapse them
     const cleanRun = (run) => {
       const out = [run[0]];
@@ -2433,12 +2475,13 @@ class RenderingContext2d {
           pts.push([fx, fy]);
       }
       if (pts.length < 2) continue;
+      const closed = poly.closed || smoothLoop(poly, pts);
 
       if (!dash) {
-        extrudeRun(pts, poly.closed);
+        extrudeRun(pts, closed);
         continue;
       }
-      const dashed = dashPolyline(pts, poly.closed, dash, dashOffset, view);
+      const dashed = dashPolyline(pts, closed, dash, dashOffset, view);
       if (!dashed) {
         extrudeRun(pts, poly.closed);
       } else if (dashed.closedLoop) {
@@ -3056,6 +3099,25 @@ class RenderingContext2d {
    * for the whole list and then draws the rectangles through here */
   _fillRect(x, y, w, h) {
     if (matIsIdentity(this._m)) {
+      // On whole pixels, each edge rounded on its own (see rectsOnSurface):
+      // the wire truncates x and width separately, so rectangles that met
+      // at a fractional edge left a row of neither between them. Whole, a
+      // rectangle under a rectangular clip also keeps the bounded
+      // composite below instead of building a mask.
+      if (
+        !Number.isInteger(x) ||
+        !Number.isInteger(y) ||
+        !Number.isInteger(w) ||
+        !Number.isInteger(h)
+      ) {
+        const x0 = Math.round(x);
+        const y0 = Math.round(y);
+        w = Math.round(x + w) - x0;
+        h = Math.round(y + h) - y0;
+        x = x0;
+        y = y0;
+        if (!(w > 0 && h > 0)) return;
+      }
       // X coordinates and sizes are 16 bits, and a coordinate past 32,767
       // throws out of the paint (lib/cliprect.js): a rectangle that reaches
       // past the surface is filled as the part of it the surface has.
@@ -3224,13 +3286,14 @@ class RenderingContext2d {
     let x1 = -Infinity;
     let y1 = -Infinity;
     for (let i = 0; i < flat.length; i += 4) {
-      // the part of it on the surface: the wire's coordinates are 16 bits
-      const left = Math.trunc(flat[i]);
-      const top = Math.trunc(flat[i + 1]);
+      // on whole pixels, each edge rounded as `_fillRect` rounds it, and the
+      // part of it on the surface: the wire's coordinates are 16 bits
+      const left = Math.round(flat[i]);
+      const top = Math.round(flat[i + 1]);
       const x = Math.max(0, left);
       const y = Math.max(0, top);
-      const w = Math.min(this.width, left + Math.trunc(flat[i + 2])) - x;
-      const h = Math.min(this.height, top + Math.trunc(flat[i + 3])) - y;
+      const w = Math.min(this.width, Math.round(flat[i] + flat[i + 2])) - x;
+      const h = Math.min(this.height, Math.round(flat[i + 1] + flat[i + 3])) - y;
       if (w <= 0 || h <= 0) continue;
       rects.push(x, y, w, h);
       if (x < x0) x0 = x;

package/lib/sharedglyphs.js

@@ -42,14 +42,20 @@ const RPC_TIMEOUT = 2000;
  * The token naming one shared font page: content-addressed, because the
  * generator's input is a font file far too big to name literally.
  *
- *     ntkg1:<sha1 of font file bytes>:<variation coords>:<px size>:<format>
+ *     ntkg2:<sha1 of font file bytes>:<face>:<variation coords>:<px size>:<format>
  *
- * The `ntkg1` version prefix is load-bearing, not hygiene: advances are
+ * The `ntkg2` version prefix is load-bearing, not hygiene: advances are
  * baked into glyphs at AddGlyphs time and idempotent duplicate uploads
  * assume byte-identical rasterization, both of which hold only among
  * processes running the same rasterizer and rounding. Change either — bump
  * the version, and two ntk versions on one display simply share nothing.
  *
+ * `<face>` is the face's PostScript name, because a file is not a face. A
+ * collection — Helvetica.ttc, a .dfont — holds several, which number their
+ * glyphs alike, and `ntkg1` named a page by the file alone: Helvetica and
+ * Helvetica-Bold were one page, and whichever face uploaded a glyph first
+ * was what both drew, in every ntk app on the display.
+ *
  * The sha1 is computed from the loaded font buffer, lazily on first shared
  * use, and cached on the base face (a variation instance hashes the same
  * file its base was cut from). `null` — no buffer to hash, or no crypto in
@@ -68,7 +74,8 @@ export function fontPageToken(font, size) {
     base._ntkSha1 = crypto ? crypto.createHash('sha1').update(buffer).digest('hex') : null;
   }
   if (!base._ntkSha1) return null;
-  return `ntkg1:${base._ntkSha1}:${variationKey(font.variationCoords)}:${size}:a8`;
+  const face = base.fk?.postscriptName ?? '';
+  return `ntkg2:${base._ntkSha1}:${face}:${variationKey(font.variationCoords)}:${size}:a8`;
 }
 
 // ---------------------------------------------------------------------------

package/lib/text/font.js

@@ -111,6 +111,28 @@ function answerWithCharacters(fk) {
   Object.defineProperty(fk, '__ntkCharacters', { value: true });
 }
 
+/**
+ * A face's cap height or x-height, as its OS/2 table states it, or else the
+ * top of its `H` or `x`. A table older than version 2 has neither field, and
+ * a face with no OS/2 table at all — Apple's Courier.ttc — has no table to
+ * state them: fontkit answered 0 for one and nothing for the other, and an
+ * `ex` in either came out half an em (CSS Values 4, 6.1.1 lets the height
+ * of a lowercase glyph stand in, as browsers measure it). NaN where the face
+ * has no such glyph either, which is the "half an em" case the spec keeps.
+ */
+function statedOrGlyph(fk, field, codePoint) {
+  const os2 = fk['OS/2'];
+  const stated = os2 && os2.version >= 2 ? os2[field] : undefined;
+  if (stated > 0) return stated;
+  try {
+    if (!fk.hasGlyphForCodePoint(codePoint)) return NaN;
+    const top = fk.glyphForCodePoint(codePoint).bbox.maxY;
+    return top > 0 ? top : NaN;
+  } catch {
+    return NaN;
+  }
+}
+
 export default class Font {
   constructor(fkFont, path, postscriptName) {
     answerWithCharacters(fkFont);
@@ -286,8 +308,8 @@ export default class Font {
       ascent: this.fk.ascent,
       descent: -this.fk.descent,
       lineGap: this.fk.lineGap,
-      capHeight: this.fk.capHeight,
-      xHeight: this.fk.xHeight
+      capHeight: statedOrGlyph(this.fk, 'capHeight', 0x48),
+      xHeight: statedOrGlyph(this.fk, 'xHeight', 0x78)
     });
     const s = this.scale(size);
     const ascent = v.ascent * s;

package/package.json

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