ntk 7.1.0 → 7.3.0

package/lib/window.js

@@ -435,6 +435,10 @@ export default class Window extends Drawable {
     this._updateRegion = 0;
     this._presentSerial = 0;
     this._presentEid = 0;
+    // A direct GL context's swap chain, when one is presenting on this window
+    // (see _setGenericEventSink)
+    this._geSink = null;
+    this._geSinkOpcode = 0;
     // The vblank clock (see _onPresentComplete): the period learnt from
     // completion events, the samples it is drawn from, and the latch the
     // watchdog sets when completions stop arriving.
@@ -612,7 +616,13 @@ export default class Window extends Drawable {
       // and a sub-type where a core event carries its code — the name table
       // below cannot see them, and they are not events user code asked for
       if (ev.type === 35) {
-        if (this._presentExt && ev.extension === this._presentExt.majorOpcode) {
+        // A direct GL context presenting on this window selected these events
+        // itself and owns the pixmaps they name, so they are its to read — and
+        // it is the only user of Present there, a GL window having no backing
+        // store to blit.
+        if (this._geSink && ev.extension === this._geSinkOpcode) {
+          this._geSink.handleEvent(ev);
+        } else if (this._presentExt && ev.extension === this._presentExt.majorOpcode) {
           this._handlePresentEvent(ev);
         }
         return;
@@ -1256,6 +1266,24 @@ export default class Window extends Drawable {
     });
   }
 
+  /**
+   * Route this window's Generic Events for one extension to `sink`, ahead of
+   * the built-in Present handling.
+   *
+   * The direct GL context is the caller: its swap chain selects Present's
+   * CompleteNotify and IdleNotify for itself, because it needs to know when a
+   * *specific* buffer came back — a question the window's own present path,
+   * which owns exactly one grow-only pixmap, never has to ask. Pass `null` to
+   * unregister.
+   *
+   * @param {number} majorOpcode the extension whose events to route
+   * @param {{handleEvent: (ev: object) => void}|null} sink
+   */
+  _setGenericEventSink(majorOpcode, sink) {
+    this._geSink = sink;
+    this._geSinkOpcode = sink ? majorOpcode : 0;
+  }
+
   /**
    * Present's events, which are the ones the core event table cannot name:
    * they arrive as X Generic Events (type 35), carrying an extension opcode

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ntk",
-  "version": "7.1.0",
+  "version": "7.3.0",
   "description": "Desktop UI toolkit for X11 with canvas-like 2d and OpenGL rendering",
   "author": "Andrey Sidorov <sidorares@yandex.ru>",
   "license": "MIT",
@@ -48,9 +48,12 @@
     "parse-color": "^1.0.0",
     "pngjs": "^7.0.0",
     "postcss": "^8.5.23",
-    "x11": "^3.8.0",
+    "x11": "^3.9.0",
     "yoga-layout": "^3.2.1"
   },
+  "optionalDependencies": {
+    "x11-dri": "^0.2.0"
+  },
   "scripts": {
     "test": "NTK_STRICT_COLORS=1 node --test",
     "check-release-message": "node scripts/check-release-message.mjs"