restty 0.1.32 → 0.1.34

package/dist/{chunk-8bv82tek.js → chunk-meqn8xtd.js}

@@ -13522,6 +13522,118 @@ function observeOscPromptState(state2, seq) {
 }
 
 // src/input/output/index.ts
+function normalizeCursorPosition(value) {
+  if (!value)
+    return null;
+  const row = Number(value.row);
+  const col = Number(value.col);
+  if (!Number.isFinite(row) || !Number.isFinite(col))
+    return null;
+  return {
+    row: Math.max(1, Math.floor(row)),
+    col: Math.max(1, Math.floor(col))
+  };
+}
+function resolveCursorStepParam(raw) {
+  if (!raw)
+    return 1;
+  const parsed = Number(raw);
+  if (!Number.isFinite(parsed) || parsed <= 0)
+    return 1;
+  return Math.floor(parsed);
+}
+function resolveCursorSetParam(raw) {
+  if (!raw)
+    return 1;
+  const parsed = Number(raw);
+  if (!Number.isFinite(parsed))
+    return 1;
+  return Math.max(1, Math.floor(parsed));
+}
+function applyTextToCursorHint(cursor, text, cols) {
+  for (const ch of text) {
+    const code = ch.charCodeAt(0);
+    if (code === 13) {
+      cursor.col = 1;
+      continue;
+    }
+    if (code === 10) {
+      cursor.row += 1;
+      continue;
+    }
+    if (code === 8) {
+      cursor.col = Math.max(1, cursor.col - 1);
+      continue;
+    }
+    if (code === 9) {
+      const nextTabCol = Math.floor((cursor.col - 1) / 8) * 8 + 9;
+      cursor.col = cols > 0 ? Math.min(cols, nextTabCol) : nextTabCol;
+      continue;
+    }
+    if (code < 32 || code === 127)
+      continue;
+    cursor.col += 1;
+    if (cols > 0 && cursor.col > cols) {
+      cursor.col = 1;
+      cursor.row += 1;
+    }
+  }
+}
+function applyCsiToCursorHint(cursor, seq, cols) {
+  if (!seq.startsWith("\x1B[") || seq.length < 3)
+    return;
+  const final = seq[seq.length - 1];
+  const body = seq.slice(2, -1);
+  if (!/^[0-9;]*$/.test(body))
+    return;
+  const parts = body.length ? body.split(";") : [];
+  switch (final) {
+    case "A": {
+      cursor.row = Math.max(1, cursor.row - resolveCursorStepParam(parts[0]));
+      return;
+    }
+    case "B": {
+      cursor.row += resolveCursorStepParam(parts[0]);
+      return;
+    }
+    case "C": {
+      const next = cursor.col + resolveCursorStepParam(parts[0]);
+      cursor.col = cols > 0 ? Math.min(cols, next) : next;
+      return;
+    }
+    case "D": {
+      cursor.col = Math.max(1, cursor.col - resolveCursorStepParam(parts[0]));
+      return;
+    }
+    case "E": {
+      cursor.row += resolveCursorStepParam(parts[0]);
+      cursor.col = 1;
+      return;
+    }
+    case "F": {
+      cursor.row = Math.max(1, cursor.row - resolveCursorStepParam(parts[0]));
+      cursor.col = 1;
+      return;
+    }
+    case "G": {
+      const next = resolveCursorSetParam(parts[0]);
+      cursor.col = cols > 0 ? Math.min(cols, next) : next;
+      return;
+    }
+    case "H":
+    case "f": {
+      cursor.row = resolveCursorSetParam(parts[0]);
+      const next = resolveCursorSetParam(parts[1]);
+      cursor.col = cols > 0 ? Math.min(cols, next) : next;
+      return;
+    }
+    case "d": {
+      cursor.row = resolveCursorSetParam(parts[0]);
+      return;
+    }
+  }
+}
+
 class OutputFilter {
   remainder = "";
   getCursorPosition;
@@ -13538,6 +13650,7 @@ class OutputFilter {
   getDefaultColors;
   desktopNotificationHandler;
   promptState = createPromptState();
+  cursorHint = null;
   constructor(options) {
     this.getCursorPosition = options.getCursorPosition;
     this.sendReply = options.sendReply;
@@ -13551,6 +13664,7 @@ class OutputFilter {
   }
   setCursorProvider(fn) {
     this.getCursorPosition = fn;
+    this.cursorHint = null;
   }
   setReplySink(fn) {
     this.sendReply = fn;
@@ -13616,12 +13730,17 @@ class OutputFilter {
       return output;
     let data = this.remainder + output;
     this.remainder = "";
+    const metricCols = this.getWindowMetrics?.()?.cols;
+    const colsHint = Number.isFinite(metricCols) && Number(metricCols) > 1 ? Math.floor(Number(metricCols)) : 0;
+    let trackedCursor = this.cursorHint ?? normalizeCursorPosition(this.getCursorPosition()) ?? { row: 1, col: 1 };
+    const getReplyCursor = () => trackedCursor;
     let result = "";
     let i = 0;
     while (i < data.length) {
       const ch = data[i];
       if (ch !== "\x1B") {
         result += ch;
+        applyTextToCursorHint(trackedCursor, ch, colsHint);
         i += 1;
         continue;
       }
@@ -13686,12 +13805,14 @@ class OutputFilter {
       }
       if (!handleCoreCsiSequence(seq, {
         sendReply: this.sendReply,
-        getCursorPosition: this.getCursorPosition
+        getCursorPosition: getReplyCursor
       })) {
         result += seq;
+        applyCsiToCursorHint(trackedCursor, seq, colsHint);
       }
       i = j + 1;
     }
+    this.cursorHint = { ...trackedCursor };
     return result;
   }
 }
@@ -19513,11 +19634,18 @@ function normalizeSelectionCell(cell, rows, cols, wideFlags) {
   }
   return { row, col };
 }
-function positionToCell(clientX, clientY, canvasRect, dpr, cellW, cellH, cols, rows) {
-  const x = (clientX - canvasRect.left) * dpr;
-  const y = (clientY - canvasRect.top) * dpr;
-  const col = clamp(Math.floor(x / (cellW || 1)), 0, (cols || 1) - 1);
-  const row = clamp(Math.floor(y / (cellH || 1)), 0, (rows || 1) - 1);
+function positionToCell(clientX, clientY, canvasRect, dpr, cellW, cellH, cols, rows, canvasWidth, canvasHeight) {
+  const safeDpr = dpr || 1;
+  const safeCols = cols || 1;
+  const safeRows = rows || 1;
+  const safeCellW = cellW || 1;
+  const safeCellH = cellH || 1;
+  const scaleX = canvasRect.width > 0 ? (canvasWidth && canvasWidth > 0 ? canvasWidth : safeDpr) / canvasRect.width : safeDpr;
+  const scaleY = canvasRect.height > 0 ? (canvasHeight && canvasHeight > 0 ? canvasHeight : safeDpr) / canvasRect.height : safeDpr;
+  const x = (clientX - canvasRect.left) * scaleX;
+  const y = (clientY - canvasRect.top) * scaleY;
+  const col = clamp(Math.floor(x / safeCellW), 0, safeCols - 1);
+  const row = clamp(Math.floor(y / safeCellH), 0, safeRows - 1);
   return { row, col };
 }
 
@@ -59385,13 +59513,16 @@ function createRuntimeInteraction(options) {
     const canvas = getCanvas();
     const rect2 = canvas.getBoundingClientRect();
     const { cellW, cellH, cols, rows } = getGridState();
-    return positionToCell(event.clientX, event.clientY, rect2, getCurrentDpr(), cellW || 1, cellH || 1, cols || 1, rows || 1);
+    return positionToCell(event.clientX, event.clientY, rect2, getCurrentDpr(), cellW || 1, cellH || 1, cols || 1, rows || 1, canvas.width, canvas.height);
   };
   const positionToPixel = (event) => {
     const canvas = getCanvas();
     const rect2 = canvas.getBoundingClientRect();
-    const x3 = (event.clientX - rect2.left) * getCurrentDpr();
-    const y = (event.clientY - rect2.top) * getCurrentDpr();
+    const fallbackScale = getCurrentDpr() || 1;
+    const scaleX = rect2.width > 0 ? canvas.width / rect2.width : fallbackScale;
+    const scaleY = rect2.height > 0 ? canvas.height / rect2.height : fallbackScale;
+    const x3 = (event.clientX - rect2.left) * scaleX;
+    const y = (event.clientY - rect2.top) * scaleY;
     return {
       x: Math.max(1, Math.round(x3 + 1)),
       y: Math.max(1, Math.round(y + 1))
@@ -63669,7 +63800,7 @@ function createRuntimeReporting(options) {
   function resolveCursorPosition(cursor) {
     if (!cursor)
       return lastResolvedCursor;
-    if (cursor.visible === 0) {
+    if (cursor.visible === 0 && lastResolvedCursor) {
       return lastResolvedCursor;
     }
     let col = Number(cursor.col);
@@ -63690,14 +63821,32 @@ function createRuntimeReporting(options) {
     };
     const wasmExports = options.getWasmExports();
     const wasmHandle = options.getWasmHandle();
-    if (!inBounds(col, row) && wasmExports?.restty_active_cursor_x && wasmExports?.restty_active_cursor_y && wasmHandle) {
+    const getActiveCursor = () => {
+      if (!wasmExports?.restty_active_cursor_x || !wasmExports?.restty_active_cursor_y || !wasmHandle) {
+        return null;
+      }
       const activeCol = wasmExports.restty_active_cursor_x(wasmHandle);
       const activeRow = wasmExports.restty_active_cursor_y(wasmHandle);
-      if (inBounds(activeCol, activeRow)) {
-        col = activeCol;
-        row = activeRow;
+      if (!inBounds(activeCol, activeRow))
+        return null;
+      return { col: activeCol, row: activeRow };
+    };
+    if (cursor.visible === 0 && !lastResolvedCursor) {
+      const active = getActiveCursor();
+      if (active) {
+        lastResolvedCursor = {
+          col: active.col,
+          row: active.row,
+          wideTail: cursor.wideTail === 1
+        };
+        return lastResolvedCursor;
       }
     }
+    const activeFallback = !inBounds(col, row) ? getActiveCursor() : null;
+    if (activeFallback) {
+      col = activeFallback.col;
+      row = activeFallback.row;
+    }
     if (cols > 0 && rows > 0) {
       col = Math.max(0, Math.min(cols - 1, Math.floor(col)));
       row = Math.max(0, Math.min(rows - 1, Math.floor(row)));
@@ -64451,6 +64600,22 @@ function createResttyApp(options) {
     onFlush: (output) => sendInput(output, "pty")
   });
   let lastCursorForCpr = { row: 1, col: 1 };
+  function resolveCursorForCpr() {
+    if (wasmHandle && wasmExports?.restty_active_cursor_x && wasmExports?.restty_active_cursor_y) {
+      const activeCol = wasmExports.restty_active_cursor_x(wasmHandle);
+      const activeRow = wasmExports.restty_active_cursor_y(wasmHandle);
+      const cols = lastRenderState?.cols ?? 0;
+      const rows = lastRenderState?.rows ?? 0;
+      const inBounds = cols > 0 && rows > 0 && Number.isFinite(activeCol) && Number.isFinite(activeRow) && activeCol >= 0 && activeRow >= 0 && activeCol < cols && activeRow < rows;
+      if (inBounds) {
+        lastCursorForCpr = {
+          row: Math.floor(activeRow) + 1,
+          col: Math.floor(activeCol) + 1
+        };
+      }
+    }
+    return lastCursorForCpr;
+  }
   let inputHandler = null;
   let activeTheme = null;
   const webgpuUniforms = new Float32Array(8);
@@ -64588,7 +64753,7 @@ function createResttyApp(options) {
     }
   });
   inputHandler = createInputHandler({
-    getCursorPosition: () => lastCursorForCpr,
+    getCursorPosition: resolveCursorForCpr,
     sendReply: (data) => {
       ptyTransport.sendInput(data);
     },
@@ -64649,7 +64814,7 @@ function createResttyApp(options) {
         cellH: gridState.cellH
       };
     },
-    getCursorForCpr: () => lastCursorForCpr,
+    getCursorForCpr: resolveCursorForCpr,
     sendInput,
     runBeforeInputHook,
     shouldClearSelection: () => selectionState.active || selectionState.dragging,

package/dist/input/output/index.d.ts

@@ -54,6 +54,7 @@ export declare class OutputFilter {
     private getDefaultColors?;
     private desktopNotificationHandler?;
     private promptState;
+    private cursorHint;
     constructor(options: OutputFilterOptions);
     setCursorProvider(fn: () => CursorPosition): void;
     setReplySink(fn: (data: string) => void): void;

package/dist/internal.js

@@ -100,7 +100,7 @@ import {
   updateGridState,
   updateImePosition,
   updateSelection
-} from "./chunk-8bv82tek.js";
+} from "./chunk-meqn8xtd.js";
 export {
   updateSelection,
   updateImePosition,

package/dist/restty.js

@@ -8,7 +8,7 @@ import {
   isBuiltinThemeName,
   listBuiltinThemeNames,
   parseGhosttyTheme
-} from "./chunk-8bv82tek.js";
+} from "./chunk-meqn8xtd.js";
 export {
   parseGhosttyTheme,
   listBuiltinThemeNames,

package/dist/selection/core.d.ts

@@ -23,4 +23,4 @@ export declare function selectionForRow(state: SelectionState, row: number, cols
  */
 export declare function normalizeSelectionCell(cell: CellPosition | null, rows: number, cols: number, wideFlags?: Uint8Array | null): CellPosition | null;
 /** Convert client pixel coordinates to a grid cell position. */
-export declare function positionToCell(clientX: number, clientY: number, canvasRect: DOMRect, dpr: number, cellW: number, cellH: number, cols: number, rows: number): CellPosition;
+export declare function positionToCell(clientX: number, clientY: number, canvasRect: DOMRect, dpr: number, cellW: number, cellH: number, cols: number, rows: number, canvasWidth?: number, canvasHeight?: number): CellPosition;

package/dist/xterm.js

@@ -1,6 +1,6 @@
 import {
   createRestty
-} from "./chunk-8bv82tek.js";
+} from "./chunk-meqn8xtd.js";
 
 // src/xterm/app-options.ts
 function createCompatAppOptions(userAppOptions, emitData) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "restty",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "description": "Browser terminal rendering library powered by WASM, WebGPU/WebGL2, and TypeScript text shaping.",
   "keywords": [
     "terminal",