ntk 3.5.2 → 3.5.3

package/lib/renderingcontext_2d.js

@@ -552,6 +552,34 @@ class RenderingContext2d {
    * Core fill: rasterize device-space polys into the scratch a8 mask,
    * scale by globalAlpha, intersect with the clip, composite the source.
    */
+  /**
+   * Device-space bounding box of flattened polys, with a pixel of slack for
+   * the antialiased edge, clamped to the surface. Null when nothing lands
+   * on it.
+   */
+  _polysBBox(polys) {
+    let minX = Infinity;
+    let minY = Infinity;
+    let maxX = -Infinity;
+    let maxY = -Infinity;
+    for (const poly of polys) {
+      const pts = poly.pts;
+      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 === -Infinity) return null;
+    const x = Math.max(0, Math.floor(minX) - 1);
+    const y = Math.max(0, Math.floor(minY) - 1);
+    const w = Math.min(this.width, Math.ceil(maxX) + 1) - x;
+    const h = Math.min(this.height, Math.ceil(maxY) + 1) - y;
+    if (w <= 0 || h <= 0) return null;
+    return { x, y, w, h };
+  }
+
   _fillPolys(polys, rule, { src = null, op = null, alpha = null } = {}) {
     if (!polys.length) return;
     src = src ?? this._backgroundPicture;
@@ -559,26 +587,31 @@ class RenderingContext2d {
     alpha = alpha ?? this.globalAlpha;
     if (alpha <= 0) return;
 
+    // Everything below is bounded to the shape's bounding box rather than
+    // the whole surface. On the wire it makes no difference — a Composite
+    // request is the same size either way — but it is the difference
+    // between the server touching a 34x34 box and a 400x400 one per fill.
+    // Stale mask content outside the box is never composited, so clearing
+    // only the box is safe.
+    const b = this._polysBBox(polys);
+    if (!b) return;
+    const R = this.Render;
+
     this._ensureFillMask();
-    this.Render.FillRectangles(this.Render.PictOp.Src, this.fillMask.id, [0, 0, 0, 0], [0, 0, this.width, this.height]);
+    R.FillRectangles(R.PictOp.Src, this.fillMask.id, [0, 0, 0, 0], [b.x, b.y, b.w, b.h]);
     this._rasterizePolys(this.fillMask, polys, rule);
 
     if (alpha < 1) {
       // In with a constant color scales the a8 coverage by that alpha
-      this.Render.FillRectangles(this.Render.PictOp.In, this.fillMask.id, [0, 0, 0, alpha], [0, 0, this.width, this.height]);
+      R.FillRectangles(R.PictOp.In, this.fillMask.id, [0, 0, 0, alpha], [b.x, b.y, b.w, b.h]);
     }
     if (this.clipMask) {
-      this.Render.Composite(
-        this.Render.PictOp.In,
-        this.clipMask.id,
-        0,
-        this.fillMask.id,
-        0, 0, 0, 0, 0, 0,
-        this.width,
-        this.height
-      );
+      // clipMask is surface-aligned, so it is sampled at the same offset
+      R.Composite(R.PictOp.In, this.clipMask.id, 0, this.fillMask.id, b.x, b.y, 0, 0, b.x, b.y, b.w, b.h);
     }
-    this.Render.Composite(op, src.id, this.fillMask.id, this.picture.id, 0, 0, 0, 0, 0, 0, this.width, this.height);
+    // src is either a 1x1 repeating solid (offset irrelevant) or a
+    // surface-aligned gradient, so it is sampled at the same offset too
+    R.Composite(op, src.id, this.fillMask.id, this.picture.id, b.x, b.y, b.x, b.y, b.x, b.y, b.w, b.h);
     this._markDirty();
   }
 

package/package.json

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