react-x11 2.47.2 → 2.47.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-x11",
-  "version": "2.47.2",
+  "version": "2.47.4",
   "description": "react renderer with X11 as a target",
   "main": "./src/index.js",
   "files": [
@@ -151,7 +151,7 @@
     "eslint-plugin-react": "^7.37.5",
     "globals": "^17.8.0",
     "hot-module-replacement": "^4.0.1",
-    "katex": "^0.18.1",
+    "katex": "^0.19.0",
     "prettier": "^3.6.0",
     "react": "^19.3.0",
     "react-devtools-core": "^8.0.0",

package/src/anchor.js

@@ -55,6 +55,26 @@ export function windowOrigin(node) {
   return win?._screenOrigin ?? { x: win?.x ?? 0, y: win?.y ?? 0 };
 }
 
+/**
+ * The rect of the window that owns `node`, on the screen, in logical
+ * pixels: what a dialog is centred over. From the window rather than from
+ * the root's laid-out box, because a dialog that opens with its owner is
+ * asked for it before that box has been laid out — the window already has
+ * its size. Null with no window yet.
+ */
+export function windowRect(node) {
+  const win = node?.root?.window;
+  if (!win) return null;
+  const origin = windowOrigin(node);
+  const s = node.scale ?? 1;
+  return {
+    x: origin.x / s,
+    y: origin.y / s,
+    width: win.width / s,
+    height: win.height / s,
+  };
+}
+
 /**
  * The rect within a node that a popup is anchored to, in the node's own
  * coordinates — a caret, a table cell, a chart datapoint, the span under a
@@ -198,6 +218,11 @@ export function deviceAnchorArea(node) {
  *
  * ## Which side is which
  *
+ * `placement: 'center'` is no side at all: the popup goes **over** the
+ * anchor, the middle of one on the middle of the other, and is only clamped
+ * — a dialog over its owner window (`centerRect`, and `Dialog` through a
+ * `<popup anchor>`).
+ *
  * `placement: 'start'` and `'end'` are the **logical** sides, and they are
  * what a submenu wants: a menu opens away from the edge its rows begin at, so
  * it goes out to the right in an LTR menu and out to the left in an RTL one.
@@ -340,7 +365,14 @@ function placeAgainst(anchor, cross, area, s, options) {
   let x;
   let y;
 
-  if (side === 'bottom' || side === 'top') {
+  if (side === 'center') {
+    // Over the anchor rather than beside it: the middle of the one on the
+    // middle of the other, on both axes. Nothing to flip to, and nothing
+    // for `align` or an `offset` to mean — the clamp below is the whole of
+    // what keeps it on the screen.
+    x = ax + (aw - width) / 2;
+    y = ay + (ah - height) / 2;
+  } else if (side === 'bottom' || side === 'top') {
     const below = ay + ah + offset;
     const above = ay - height - offset;
     if (
@@ -399,19 +431,15 @@ function placeAgainst(anchor, cross, area, s, options) {
 /**
  * Where to put a `<popup>` of this size **centred over the owner window**,
  * in screen coordinates, clamped into the screen. A dialog is anchored to
- * the window rather than to a widget, which is the one placement
- * `anchorRect` cannot express.
+ * the window rather than to a widget — `placement: 'center'` against the
+ * window's rect, which is what this is.
  */
-export function centerRect(node, { width: logicalW, height: logicalH }) {
+export function centerRect(node, { width, height }) {
   if (!node) return null;
   // Logical in, logical out, device in between — anchorRect's contract,
   // for the same caller: the result becomes a popup's `x`/`y` props.
   const s = node.scale ?? 1;
-  const width = logicalW * s;
-  const height = logicalH * s;
   const win = node.root?.window;
-  const ww = win?.width ?? width;
-  const wh = win?.height ?? height;
   // `_screenOrigin` for the same reason `anchorRect` uses it: `x`/`y` come
   // from ConfigureNotify, and under a reparenting window manager those can be
   // relative to the *frame* rather than the root — which would centre the
@@ -420,19 +448,17 @@ export function centerRect(node, { width: logicalW, height: logicalH }) {
   // coordinates, so the two agree there; that is not something to rely on.)
   // The raw coordinates stay as the fallback, since the headless mock has no
   // server to ask.
-  const origin = win?._screenOrigin ?? { x: win?.x ?? 0, y: win?.y ?? 0 };
-  let x = origin.x + (ww - width) / 2;
-  let y = origin.y + (wh - height) / 2;
-
-  const area = deviceAnchorArea(node);
-  if (area) {
-    x = Math.max(area.x, Math.min(x, area.x + area.width - width));
-    y = Math.max(area.y, Math.min(y, area.y + area.height - height));
-  }
-  return {
-    x: Math.round(x) / s,
-    y: Math.round(y) / s,
-    width: logicalW,
-    height: logicalH,
+  const origin = windowOrigin(node);
+  const over = {
+    x: origin.x,
+    y: origin.y,
+    width: win?.width ?? width * s,
+    height: win?.height ?? height * s,
   };
+  const at = placeAgainst(over, over, deviceAnchorArea(node), s, {
+    placement: 'center',
+    width,
+    height,
+  });
+  return { x: at.x, y: at.y, width: at.width, height: at.height };
 }

package/src/cocoa/app.js

@@ -31,6 +31,7 @@ import { CocoaDockMenu } from './dock.js';
 import { CocoaGlobalMenuExport } from './globalmenu.js';
 import { CocoaStatusItem } from './statusitem.js';
 import { CocoaCalendars } from './calendar.js';
+import { CocoaClipboard } from './clipboard.js';
 import { CocoaNotifications } from './notifications.js';
 import { CocoaPaneHost } from './panehost.js';
 import { CocoaPermissions } from './permissions.js';
@@ -38,13 +39,13 @@ import { CocoaPaneSubwindow, CocoaPaneWindow } from './panewindow.js';
 import { CocoaColorSampler } from './screencolor.js';
 import { CocoaFilePanels } from './filepanels.js';
 import { CocoaFontManager } from './fonts.js';
+import { lastInputReader } from './idle.js';
 import { releaseImageUpload } from '../backend/context2d.js';
 import { PanePlayer, canShowPanePlayers } from './paneplayer.js';
 import { CocoaPlayer, canPlay } from './player.js';
 import { CocoaSurface } from './surface.js';
 import { CocoaSymbols } from './symbols.js';
 import { CocoaWindow, FRAME_SLACK_MS } from './window.js';
-import { utiFromMime, wire } from './dnd.js';
 import { decodeKey, modifierMask } from './keymap.js';
 import { loadNative } from './native.js';
 import { requestAppKit, threadedChannel } from './threaded.js';
@@ -345,6 +346,12 @@ export class CocoaApp {
         ? new CocoaColorSampler(native)
         : null;
 
+    // How long since anybody touched the Mac, which is what `useIdle()`
+    // asks of an app with no X server behind it (src/idle.js): the bridge's
+    // `lastInputMs` where it has one, `ioreg` where it does not
+    // (src/cocoa/idle.js, #938).
+    this.lastInputMs = lastInputReader(native);
+
     // The GL policy, glbackend.js's shape. No GLX exists here, so the
     // default is 'auto' (the direct backend where the runtime loads);
     // useSupports('shaders') stays false until the first <glarea> resolves
@@ -391,110 +398,10 @@ export class CocoaApp {
     };
     this._atoms = new Map();
 
-    // ntk's clipboard shape over `NSPasteboard.general` — which is the one
-    // pasteboard, and it is CLIPBOARD's. X's other everyday selection,
-    // PRIMARY, is taken by *selecting text at all* and pasted with a middle
-    // click, and core takes it on every selection gesture (textselection.js
-    // `own()`, the text controls' `_ownSelection`). Sent to the pasteboard,
-    // each of those gestures was a Copy: a drag across a paragraph replaced
-    // the link the user had just copied in another app.
-    //
-    // So every other name — PRIMARY, SECONDARY, one of the app's own — is a
-    // selection nobody on this desktop can paste from: a write resolves and
-    // changes nothing, a read finds no owner, `targets()` is empty, `clear()`
-    // leaves the pasteboard alone. Deliberately not a PRIMARY kept in this
-    // process: its point is the paste in *another* application, and inside
-    // one all it would keep is a middle click that types into a text field,
-    // which no Mac text field does. An app that wants select-to-copy anyway
-    // — a terminal — writes CLIPBOARD from `onSelectionChange`
-    // (docs/clipboard.md, "Two clipboards").
-    const isClipboard = (selection = 'CLIPBOARD') => selection === 'CLIPBOARD';
-    this.clipboard = {
-      // A write is one pasteboard item with every flavour under its UTI —
-      // dnd.js's table, then the system's — the way a drag offers its
-      // payload. Text alone keeps pasteboardWriteText, the verb every
-      // bridge has; anything else needs pasteboardWrite (windowkit/appkit
-      // #119), and a bridge without it keeps the text and says, once, what
-      // it dropped — an image that silently never reaches the pasteboard
-      // looks like a Copy that did nothing.
-      write: (data, { selection } = {}) => {
-        if (!isClipboard(selection)) return Promise.resolve();
-        if (typeof data === 'string') {
-          native.pasteboardWriteText(data);
-          return Promise.resolve();
-        }
-        const item = {};
-        for (const [type, value] of Object.entries(data ?? {})) {
-          const uti = utiFromMime(type, native);
-          if (uti && value != null && !(uti in item)) item[uti] = wire(value);
-        }
-        const TEXT = 'public.utf8-plain-text';
-        const raw = item[TEXT];
-        const text =
-          raw == null
-            ? ''
-            : typeof raw === 'string'
-              ? raw
-              : Buffer.from(raw).toString('utf8');
-        const others = Object.keys(item).filter((uti) => uti !== TEXT);
-        if (others.length === 0) {
-          native.pasteboardWriteText(text);
-        } else if (typeof native.pasteboardWrite === 'function') {
-          native.pasteboardWrite(item);
-        } else {
-          if (
-            !this._warnedPasteboardFlavours &&
-            process.env.NODE_ENV !== 'production'
-          ) {
-            this._warnedPasteboardFlavours = true;
-            console.warn(
-              `react-x11: clipboard.write() kept only the text — this ` +
-                `@windowkit/appkit has no pasteboardWrite, so ` +
-                `${others.join(', ')} did not reach the pasteboard. ` +
-                'Update @windowkit/appkit to a release with pasteboardWrite ' +
-                '(windowkit/appkit#119).',
-            );
-          }
-          native.pasteboardWriteText(text);
-        }
-        return Promise.resolve();
-      },
-      clear: (selection) => {
-        if (isClipboard(selection)) native.pasteboardClear();
-        return Promise.resolve();
-      },
-      targets: ({ selection } = {}) => {
-        if (!isClipboard(selection)) return Promise.resolve([]);
-        return this._ask('pasteboardReadText').then((text) =>
-          text == null ? [] : ['UTF8_STRING', 'STRING'],
-        );
-      },
-      read: ({ selection, target } = {}) => {
-        if (!isClipboard(selection)) {
-          return Promise.reject(
-            new Error(
-              `clipboard: nothing to paste — ${selection} is an X11 ` +
-                'selection, and on macOS only CLIPBOARD is the pasteboard',
-            ),
-          );
-        }
-        return this._ask('pasteboardReadText').then((text) => {
-          if (text == null) {
-            throw new Error(
-              'clipboard: nothing to paste — the pasteboard is empty',
-            );
-          }
-          if (target === undefined) return text;
-          if (target === 'UTF8_STRING' || target === 'STRING') {
-            return Buffer.from(text, 'utf8');
-          }
-          throw new Error(
-            `clipboard: cannot convert the pasteboard to ${target}`,
-          );
-        });
-      },
-      watch: () => Promise.resolve(() => {}),
-    };
+    // ntk's clipboard shape over `NSPasteboard.general`, the one pasteboard
+    // and CLIPBOARD's — every other selection is one nobody here can paste
+    // from (src/cocoa/clipboard.js says why).
+    this.clipboard = new CocoaClipboard(this, native);
   }
 
   _parseColor(value) {
@@ -1912,6 +1819,7 @@ export class CocoaApp {
     if (this._frameTimer) clearTimeout(this._frameTimer);
     this._frameTimer = null;
     this._pollScreens(false);
+    this.clipboard.close();
     this._cocoaGL?.destroy();
     this._cocoaGL = null;
     this._unsubscribe?.();