ntk 6.1.0 → 6.2.0

package/lib/widgets/htmlview.js

@@ -105,8 +105,10 @@ export default class HtmlView {
     if (this.window) {
       this._ctx = this.window.getContext('2d');
       this.window.on('expose', () => this.render());
-      this.window.on('resize', () => {
-        this._layoutWidth = -1;
+      // a move is a ConfigureNotify too; re-laying out a document per step
+      // of a window drag is exactly what ev.resized is for
+      this.window.on('resize', (ev) => {
+        if (ev.resized) this._layoutWidth = -1;
       });
       this.window.on('mousedown', (ev) => {
         if (ev.keycode === 4 || ev.keycode === 5) {

package/lib/widgets/markdownview.js

@@ -74,8 +74,10 @@ export default class MarkdownView {
     if (this.window) {
       this._ctx = this.window.getContext('2d');
       this.window.on('expose', () => this.render());
-      this.window.on('resize', () => {
-        this._layoutWidth = -1; // invalidate
+      // a move is a ConfigureNotify too; re-laying out a document per step
+      // of a window drag is exactly what ev.resized is for
+      this.window.on('resize', (ev) => {
+        if (ev.resized) this._layoutWidth = -1; // invalidate
       });
       this.window.on('mousedown', (ev) => {
         if (ev.keycode !== 1 || !this.onLink) return; // left button only

package/lib/window.js

@@ -386,6 +386,10 @@ export default class Window extends Drawable {
       this.height = args.height ?? 800;
       this.x = args.x ?? 0;
       this.y = args.y ?? 0;
+      // the baseline 'resize' compares against (see _tagResize): what the
+      // window was asked to be, so the window manager's first ConfigureNotify
+      // reports only what it actually overrode
+      this._deliveredGeom = { x: this.x, y: this.y, width: this.width, height: this.height };
       const values = {
         // NorthWest bit gravity: keep the old content anchored during
         // resize instead of discarding it (less flicker between the resize
@@ -419,6 +423,8 @@ export default class Window extends Drawable {
       this.eventMask = 0;
       this.visual = 0;
       this.depth = 0;
+      // an adopted window's geometry is not known until GetGeometry replies
+      this._deliveredGeom = null;
       // populate width and height
       X.GetGeometry(this.id, (err, res) => {
         if (!err) {
@@ -427,6 +433,10 @@ export default class Window extends Drawable {
           this.x = res.xPos;
           this.y = res.yPos;
           this.depth = res.depth;
+          // nothing was known about this window until now, so until this
+          // reply lands a 'resize' reports both moved and resized (see
+          // _tagResize) rather than guessing
+          this._deliveredGeom ??= { x: this.x, y: this.y, width: this.width, height: this.height };
         }
         this._readyPromiseResolve();
       });
@@ -523,6 +533,7 @@ export default class Window extends Drawable {
       // deliver buffered state events before a discrete one so handlers see
       // them in the order they happened (a drag sees the move, then the up)
       this._flushCoalesced();
+      if (eventName === 'resize') this._tagResize(ntkev);
       this.emit(eventName, ntkev);
       // a WM_DELETE_WINDOW ClientMessage is the window manager *asking*, and
       // 'close' is that question in a form an application can answer
@@ -628,8 +639,6 @@ export default class Window extends Drawable {
     this._dirty = false;
     this._backingValid = false;
     this._presentScheduled = false;
-    this._backedW = this.width;
-    this._backedH = this.height;
 
     this._presentGc = this.X.AllocID();
     this.X.CreateGC(this._presentGc, this.id, { graphicsExposures: 0 });
@@ -642,10 +651,11 @@ export default class Window extends Drawable {
       this.X.ChangeWindowAttributes(this.id, { eventMask: this.eventMask }, () => {});
     }
 
+    // a pure move is a ConfigureNotify too, and reallocating a backing
+    // pixmap per step of a window drag is the bug this flag exists to spare
+    // everyone (see _tagResize)
     this.on('resize', (ev) => {
-      if (ev.width === this._backedW && ev.height === this._backedH) return;
-      this._backedW = ev.width;
-      this._backedH = ev.height;
+      if (!ev.resized) return;
       this._allocBacking(ev.width, ev.height);
       this._backingValid = false;
       this._requestRedraw();
@@ -875,6 +885,46 @@ export default class Window extends Drawable {
     this._scheduleFrame();
   }
 
+  /**
+   * Say what a 'resize' actually changed.
+   *
+   * 'resize' is ConfigureNotify, which fires for pure moves and for
+   * reparents as much as for size changes — under an opaque-move window
+   * manager a window drag is one per pointer step. Every consumer used to
+   * rediscover that by keeping its own copy of the last size (this library
+   * included, in the backing-store listener), and one that didn't paid a
+   * full relayout per step of a drag.
+   *
+   * So the delivered event says which it was:
+   *
+   *   - `ev.resized` — the size differs from the last delivered event's
+   *   - `ev.moved` — the position does
+   *   - `ev.previous` — that event's `{x, y, width, height}`, for a delta;
+   *     null on an adopted window whose geometry is not known yet, where
+   *     both flags read true because nothing can be ruled out
+   *
+   * Measured against the last *delivered* event, not the last raw one, so
+   * that coalescing cannot swallow a change: a frame that merges two moves
+   * and a resize reports both, where per-hop flags would report only the
+   * final hop. The merged raw events in `ev.coalesced` are not tagged for
+   * that reason — the flags are a property of the delivery.
+   *
+   * Position is compared as reported. A reparenting window manager sends
+   * real ConfigureNotify in frame coordinates and synthetic ones in root
+   * coordinates (ICCCM 4.2.3), so a frame's own offset can read as a move
+   * on the first event after the switch. That is the safe direction —
+   * spurious work, never missed work — and the alternative is a
+   * TranslateCoordinates round trip per event, which is the cost this flag
+   * exists to avoid.
+   */
+  _tagResize(ev) {
+    const prev = this._deliveredGeom;
+    ev.previous = prev;
+    ev.moved = !prev || ev.x !== prev.x || ev.y !== prev.y;
+    ev.resized = !prev || ev.width !== prev.width || ev.height !== prev.height;
+    this._deliveredGeom = { x: ev.x, y: ev.y, width: ev.width, height: ev.height };
+  }
+
   _flushCoalesced() {
     const pending = this._frame.pending;
     if (!pending.size) return;
@@ -884,6 +934,7 @@ export default class Window extends Drawable {
       const ev = pending.get(name);
       if (ev) {
         pending.delete(name);
+        if (name === 'resize') this._tagResize(ev);
         this.emit(name, ev);
       }
     }

package/package.json

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