@fairyhunter13/opentui-core 0.1.120 → 0.1.122

package/{index-g2c8aqza.js → index-c4vtensm.js}

@@ -5788,6 +5788,18 @@ var isShiftKey = (code) => {
 var isCtrlKey = (code) => {
   return ["Oa", "Ob", "Oc", "Od", "Oe", "[2^", "[3^", "[5^", "[6^", "[7^", "[8^"].includes(code);
 };
+var getCtrlKeyName = (charCode) => {
+  if (charCode === 0) {
+    return "space";
+  }
+  if (charCode >= 1 && charCode <= 26) {
+    return String.fromCharCode(charCode + 97 - 1);
+  }
+  if (charCode >= 28 && charCode <= 31) {
+    return String.fromCharCode(charCode + 64);
+  }
+  return;
+};
 var modifyOtherKeysRe = /^\x1b\[27;(\d+);(\d+)~$/;
 var parseKeypress = (s = "", options = {}) => {
   let parts;
@@ -5852,6 +5864,8 @@ var parseKeypress = (s = "", options = {}) => {
     source: "raw"
   };
   key.sequence = key.sequence || s || key.name;
+  const ctrlKeyName = s.length === 1 ? getCtrlKeyName(s.charCodeAt(0)) : undefined;
+  const metaCtrlKeyName = s.length === 2 && s[0] === "\x1B" ? getCtrlKeyName(s.charCodeAt(1)) : undefined;
   if (options.useKittyKeyboard) {
     const kittyResult = parseKittyKeyboard(s);
     if (kittyResult) {
@@ -5907,11 +5921,8 @@ var parseKeypress = (s = "", options = {}) => {
   } else if (s === " " || s === "\x1B ") {
     key.name = "space";
     key.meta = s.length === 2;
-  } else if (s === "\x00") {
-    key.name = "space";
-    key.ctrl = true;
-  } else if (s.length === 1 && s <= "\x1A") {
-    key.name = String.fromCharCode(s.charCodeAt(0) + 97 - 1);
+  } else if (ctrlKeyName) {
+    key.name = ctrlKeyName;
     key.ctrl = true;
   } else if (s.length === 1 && s >= "0" && s <= "9") {
     key.name = s;
@@ -5937,10 +5948,10 @@ var parseKeypress = (s = "", options = {}) => {
     } else {
       key.name = char;
     }
-  } else if (s.length === 2 && s[0] === "\x1B" && s[1] <= "\x1A") {
+  } else if (metaCtrlKeyName) {
     key.meta = true;
     key.ctrl = true;
-    key.name = String.fromCharCode(s.charCodeAt(1) + 97 - 1);
+    key.name = metaCtrlKeyName;
   } else if (parts = fnKeyRe.exec(s)) {
     const segs = [...s];
     if (segs[0] === "\x1B" && segs[1] === "\x1B") {
@@ -8457,7 +8468,19 @@ class ProcessQueue {
 }
 
 // src/lib/tree-sitter/default-parsers.ts
+import { resolve, dirname } from "path";
 import { fileURLToPath } from "url";
+import javascript_highlights from "./assets/javascript/highlights.scm" with { type: "file" };
+import javascript_language from "./assets/javascript/tree-sitter-javascript.wasm" with { type: "file" };
+import typescript_highlights from "./assets/typescript/highlights.scm" with { type: "file" };
+import typescript_language from "./assets/typescript/tree-sitter-typescript.wasm" with { type: "file" };
+import markdown_highlights from "./assets/markdown/highlights.scm" with { type: "file" };
+import markdown_language from "./assets/markdown/tree-sitter-markdown.wasm" with { type: "file" };
+import markdown_injections from "./assets/markdown/injections.scm" with { type: "file" };
+import markdown_inline_highlights from "./assets/markdown_inline/highlights.scm" with { type: "file" };
+import markdown_inline_language from "./assets/markdown_inline/tree-sitter-markdown_inline.wasm" with { type: "file" };
+import zig_highlights from "./assets/zig/highlights.scm" with { type: "file" };
+import zig_language from "./assets/zig/tree-sitter-zig.wasm" with { type: "file" };
 var _cachedParsers;
 function getParsers() {
   if (!_cachedParsers) {
@@ -8466,25 +8489,25 @@ function getParsers() {
         filetype: "javascript",
         aliases: ["javascriptreact"],
         queries: {
-          highlights: [fileURLToPath(new URL("./assets/javascript/highlights.scm", import.meta.url))]
+          highlights: [resolve(dirname(fileURLToPath(import.meta.url)), javascript_highlights)]
         },
-        wasm: fileURLToPath(new URL("./assets/javascript/tree-sitter-javascript.wasm", import.meta.url))
+        wasm: resolve(dirname(fileURLToPath(import.meta.url)), javascript_language)
       },
       {
         filetype: "typescript",
         aliases: ["typescriptreact"],
         queries: {
-          highlights: [fileURLToPath(new URL("./assets/typescript/highlights.scm", import.meta.url))]
+          highlights: [resolve(dirname(fileURLToPath(import.meta.url)), typescript_highlights)]
         },
-        wasm: fileURLToPath(new URL("./assets/typescript/tree-sitter-typescript.wasm", import.meta.url))
+        wasm: resolve(dirname(fileURLToPath(import.meta.url)), typescript_language)
       },
       {
         filetype: "markdown",
         queries: {
-          highlights: [fileURLToPath(new URL("./assets/markdown/highlights.scm", import.meta.url))],
-          injections: [fileURLToPath(new URL("./assets/markdown/injections.scm", import.meta.url))]
+          highlights: [resolve(dirname(fileURLToPath(import.meta.url)), markdown_highlights)],
+          injections: [resolve(dirname(fileURLToPath(import.meta.url)), markdown_injections)]
         },
-        wasm: fileURLToPath(new URL("./assets/markdown/tree-sitter-markdown.wasm", import.meta.url)),
+        wasm: resolve(dirname(fileURLToPath(import.meta.url)), markdown_language),
         injectionMapping: {
           nodeTypes: {
             inline: "markdown_inline",
@@ -8507,16 +8530,16 @@ function getParsers() {
       {
         filetype: "markdown_inline",
         queries: {
-          highlights: [fileURLToPath(new URL("./assets/markdown_inline/highlights.scm", import.meta.url))]
+          highlights: [resolve(dirname(fileURLToPath(import.meta.url)), markdown_inline_highlights)]
         },
-        wasm: fileURLToPath(new URL("./assets/markdown_inline/tree-sitter-markdown_inline.wasm", import.meta.url))
+        wasm: resolve(dirname(fileURLToPath(import.meta.url)), markdown_inline_language)
       },
       {
         filetype: "zig",
         queries: {
-          highlights: [fileURLToPath(new URL("./assets/zig/highlights.scm", import.meta.url))]
+          highlights: [resolve(dirname(fileURLToPath(import.meta.url)), zig_highlights)]
         },
-        wasm: fileURLToPath(new URL("./assets/zig/tree-sitter-zig.wasm", import.meta.url))
+        wasm: resolve(dirname(fileURLToPath(import.meta.url)), zig_language)
       }
     ];
   }
@@ -8524,7 +8547,7 @@ function getParsers() {
 }
 
 // src/lib/tree-sitter/client.ts
-import { resolve, isAbsolute, parse } from "path";
+import { resolve as resolve2, isAbsolute, parse } from "path";
 import { existsSync } from "fs";
 
 // src/lib/bunfs.ts
@@ -8597,7 +8620,7 @@ class TreeSitterClient extends EventEmitter2 {
       worker_path = this.options.workerPath;
     } else {
       worker_path = new URL("./parser.worker.js", import.meta.url).href;
-      if (!existsSync(resolve(import.meta.dirname, "parser.worker.js"))) {
+      if (!existsSync(resolve2(import.meta.dirname, "parser.worker.js"))) {
         worker_path = new URL("./parser.worker.ts", import.meta.url).href;
       }
     }
@@ -8632,7 +8655,7 @@ class TreeSitterClient extends EventEmitter2 {
     if (this.initializePromise) {
       return this.initializePromise;
     }
-    this.initializePromise = new Promise((resolve2, reject) => {
+    this.initializePromise = new Promise((resolve3, reject) => {
       const timeoutMs = this.options.initTimeout ?? 1e4;
       const timeoutId = setTimeout(() => {
         const error = new Error("Worker initialization timed out");
@@ -8640,7 +8663,7 @@ class TreeSitterClient extends EventEmitter2 {
         this.initializeResolvers = undefined;
         reject(error);
       }, timeoutMs);
-      this.initializeResolvers = { resolve: resolve2, reject, timeoutId };
+      this.initializeResolvers = { resolve: resolve3, reject, timeoutId };
       this.worker?.postMessage({
         type: "INIT",
         dataPath: this.options.dataPath
@@ -8663,7 +8686,7 @@ class TreeSitterClient extends EventEmitter2 {
       return normalizeBunfsPath(parse(path).base);
     }
     if (!isAbsolute(path)) {
-      return resolve(path);
+      return resolve2(path);
     }
     return path;
   }
@@ -8681,8 +8704,8 @@ class TreeSitterClient extends EventEmitter2 {
   }
   async getPerformance() {
     const messageId = `performance_${this.messageIdCounter++}`;
-    return new Promise((resolve2) => {
-      this.messageCallbacks.set(messageId, resolve2);
+    return new Promise((resolve3) => {
+      this.messageCallbacks.set(messageId, resolve3);
       this.worker?.postMessage({ type: "GET_PERFORMANCE", messageId });
     });
   }
@@ -8695,8 +8718,8 @@ class TreeSitterClient extends EventEmitter2 {
       }
     }
     const messageId = `oneshot_${this.messageIdCounter++}`;
-    return new Promise((resolve2) => {
-      this.messageCallbacks.set(messageId, resolve2);
+    return new Promise((resolve3) => {
+      this.messageCallbacks.set(messageId, resolve3);
       this.worker?.postMessage({
         type: "ONESHOT_HIGHLIGHT",
         content,
@@ -8805,8 +8828,8 @@ class TreeSitterClient extends EventEmitter2 {
   }
   async preloadParser(filetype) {
     const messageId = `has_parser_${this.messageIdCounter++}`;
-    const response = await new Promise((resolve2) => {
-      this.messageCallbacks.set(messageId, resolve2);
+    const response = await new Promise((resolve3) => {
+      this.messageCallbacks.set(messageId, resolve3);
       this.worker?.postMessage({
         type: "PRELOAD_PARSER",
         filetype,
@@ -8833,8 +8856,8 @@ class TreeSitterClient extends EventEmitter2 {
     }
     this.buffers.set(id, { id, content, filetype, version, hasParser: false });
     const messageId = `init_${this.messageIdCounter++}`;
-    const response = await new Promise((resolve2) => {
-      this.messageCallbacks.set(messageId, resolve2);
+    const response = await new Promise((resolve3) => {
+      this.messageCallbacks.set(messageId, resolve3);
       this.worker?.postMessage({
         type: "INITIALIZE_PARSER",
         bufferId: id,
@@ -8890,9 +8913,9 @@ class TreeSitterClient extends EventEmitter2 {
       this.editQueues.delete(bufferId);
     }
     if (this.worker) {
-      await new Promise((resolve2) => {
+      await new Promise((resolve3) => {
         const messageId = `dispose_${bufferId}`;
-        this.messageCallbacks.set(messageId, resolve2);
+        this.messageCallbacks.set(messageId, resolve3);
         try {
           this.worker.postMessage({
             type: "DISPOSE_BUFFER",
@@ -8900,13 +8923,13 @@ class TreeSitterClient extends EventEmitter2 {
           });
         } catch (error) {
           console.error("Error disposing buffer", error);
-          resolve2(false);
+          resolve3(false);
         }
         setTimeout(() => {
           if (this.messageCallbacks.has(messageId)) {
             this.messageCallbacks.delete(messageId);
             console.warn({ bufferId }, "Timed out waiting for buffer to be disposed");
-            resolve2(false);
+            resolve3(false);
           }
         }, 3000);
       });
@@ -8963,12 +8986,12 @@ class TreeSitterClient extends EventEmitter2 {
     this.options.dataPath = dataPath;
     if (this.initialized && this.worker) {
       const messageId = `update_datapath_${this.messageIdCounter++}`;
-      return new Promise((resolve2, reject) => {
+      return new Promise((resolve3, reject) => {
         this.messageCallbacks.set(messageId, (response) => {
           if (response.error) {
             reject(new Error(response.error));
           } else {
-            resolve2();
+            resolve3();
           }
         });
         this.worker.postMessage({
@@ -8984,12 +9007,12 @@ class TreeSitterClient extends EventEmitter2 {
       throw new Error("Cannot clear cache: client is not initialized");
     }
     const messageId = `clear_cache_${this.messageIdCounter++}`;
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       this.messageCallbacks.set(messageId, (response) => {
         if (response.error) {
           reject(new Error(response.error));
         } else {
-          resolve2();
+          resolve3();
         }
       });
       this.worker.postMessage({
@@ -9515,13 +9538,26 @@ ${content}`);
   return "./" + path4.relative(path4.dirname(outputPath), queryPath);
 }
 async function generateDefaultParsersFile(parsers, outputPath) {
+  const imports = parsers.map((parser) => {
+    const safeFiletype = parser.filetype.replace(/[^a-zA-Z0-9]/g, "_");
+    const lines = [
+      `import ${safeFiletype}_highlights from "${parser.highlightsPath}" with { type: "file" }`,
+      `import ${safeFiletype}_language from "${parser.languagePath}" with { type: "file" }`
+    ];
+    if (parser.injectionsPath) {
+      lines.push(`import ${safeFiletype}_injections from "${parser.injectionsPath}" with { type: "file" }`);
+    }
+    return lines.join(`
+`);
+  }).join(`
+`);
   const parserDefinitions = parsers.map((parser) => {
     const safeFiletype = parser.filetype.replace(/[^a-zA-Z0-9]/g, "_");
     const queriesLines = [
-      `          highlights: [fileURLToPath(new URL("${parser.highlightsPath}", import.meta.url))],`
+      `          highlights: [resolve(dirname(fileURLToPath(import.meta.url)), ${safeFiletype}_highlights)],`
     ];
     if (parser.injectionsPath) {
-      queriesLines.push(`          injections: [fileURLToPath(new URL("${parser.injectionsPath}", import.meta.url))],`);
+      queriesLines.push(`          injections: [resolve(dirname(fileURLToPath(import.meta.url)), ${safeFiletype}_injections)],`);
     }
     const injectionMappingLine = parser.injectionMapping ? `        injectionMapping: ${JSON.stringify(parser.injectionMapping, null, 10)},` : "";
     const aliasesLine = parser.aliases?.length ? `        aliases: ${JSON.stringify(parser.aliases)},` : "";
@@ -9532,7 +9568,7 @@ ${aliasesLine ? aliasesLine + `
 ${queriesLines.join(`
 `)}
         },
-        wasm: fileURLToPath(new URL("${parser.languagePath}", import.meta.url)),${injectionMappingLine ? `
+        wasm: resolve(dirname(fileURLToPath(import.meta.url)), ${safeFiletype}_language),${injectionMappingLine ? `
 ` + injectionMappingLine : ""}
       }`;
   }).join(`,
@@ -9542,8 +9578,11 @@ ${queriesLines.join(`
 // Last generated: ${new Date().toISOString()}
 
 import type { FiletypeParserOptions } from "./types"
+import { resolve, dirname } from "path"
 import { fileURLToPath } from "url"
 
+${imports}
+
 // Cached parsers to avoid re-resolving paths on every call
 let _cachedParsers: FiletypeParserOptions[] | undefined
 
@@ -10435,7 +10474,7 @@ class TerminalPalette {
     const out = this.stdout;
     if (!out.isTTY || !this.stdin.isTTY)
       return false;
-    return new Promise((resolve3) => {
+    return new Promise((resolve4) => {
       const session = this.createQuerySession();
       let buffer = "";
       let settled = false;
@@ -10444,7 +10483,7 @@ class TerminalPalette {
           return;
         settled = true;
         session.cleanup();
-        resolve3(supported);
+        resolve4(supported);
       };
       const onData = (chunk) => {
         buffer += chunk.toString();
@@ -10467,7 +10506,7 @@ class TerminalPalette {
     if (!out.isTTY || !this.stdin.isTTY) {
       return results;
     }
-    return new Promise((resolve3) => {
+    return new Promise((resolve4) => {
       const session = this.createQuerySession();
       let buffer = "";
       let idleTimer = null;
@@ -10477,7 +10516,7 @@ class TerminalPalette {
           return;
         settled = true;
         session.cleanup();
-        resolve3(results);
+        resolve4(results);
       };
       const onData = (chunk) => {
         buffer += chunk.toString();
@@ -10518,7 +10557,7 @@ class TerminalPalette {
     if (!out.isTTY || !this.stdin.isTTY) {
       return results;
     }
-    return new Promise((resolve3) => {
+    return new Promise((resolve4) => {
       const session = this.createQuerySession();
       let buffer = "";
       let idleTimer = null;
@@ -10528,7 +10567,7 @@ class TerminalPalette {
           return;
         settled = true;
         session.cleanup();
-        resolve3(results);
+        resolve4(results);
       };
       const onData = (chunk) => {
         buffer += chunk.toString();
@@ -14610,6 +14649,8 @@ class Renderable extends BaseRenderable {
   _translateY = 0;
   _x = 0;
   _y = 0;
+  _screenX = 0;
+  _screenY = 0;
   _width;
   _height;
   _widthValue = 0;
@@ -14849,6 +14890,8 @@ class Renderable extends BaseRenderable {
     if (this._translateX === value)
       return;
     this._translateX = value;
+    const parentScreenX = this.parent ? this.parent._screenX : 0;
+    this._screenX = parentScreenX + this._x + this._translateX;
     if (this.parent)
       this.parent.childrenPrimarySortDirty = true;
     this.requestRender();
@@ -14860,10 +14903,20 @@ class Renderable extends BaseRenderable {
     if (this._translateY === value)
       return;
     this._translateY = value;
+    const parentScreenY = this.parent ? this.parent._screenY : 0;
+    this._screenY = parentScreenY + this._y + this._translateY;
     if (this.parent)
       this.parent.childrenPrimarySortDirty = true;
     this.requestRender();
   }
+  get screenX() {
+    const parentScreenX = this.parent ? this.parent._screenX : 0;
+    return parentScreenX + this._x + this._translateX;
+  }
+  get screenY() {
+    const parentScreenY = this.parent ? this.parent._screenY : 0;
+    return parentScreenY + this._y + this._translateY;
+  }
   get x() {
     if (this.parent) {
       return this.parent.x + this._x + this._translateX;
@@ -14971,8 +15024,8 @@ class Renderable extends BaseRenderable {
     const axis = dir === 2 || dir === 3 ? "x" : "y";
     const sorted = [...this._childrenInLayoutOrder];
     sorted.sort((a, b) => {
-      const va = axis === "y" ? a.y : a.x;
-      const vb = axis === "y" ? b.y : b.x;
+      const va = axis === "y" ? a.screenY : a.screenX;
+      const vb = axis === "y" ? b.screenY : b.screenX;
       return va - vb;
     });
     this.childrenSortedByPrimaryAxis = sorted;
@@ -15301,6 +15354,10 @@ class Renderable extends BaseRenderable {
     const oldHeight = this._heightValue;
     this._x = layout.left;
     this._y = layout.top;
+    const parentScreenX = this.parent ? this.parent._screenX : 0;
+    const parentScreenY = this.parent ? this.parent._screenY : 0;
+    this._screenX = parentScreenX + this._x + this._translateX;
+    this._screenY = parentScreenY + this._y + this._translateY;
     const newWidth = Math.max(layout.width, 1);
     const newHeight = Math.max(layout.height, 1);
     const sizeChanged = oldWidth !== newWidth || oldHeight !== newHeight;
@@ -15545,17 +15602,24 @@ class Renderable extends BaseRenderable {
         y: scissorRect.y,
         width: scissorRect.width,
         height: scissorRect.height,
-        screenX: this.x,
-        screenY: this.y
+        screenX: this._screenX,
+        screenY: this._screenY
       });
     }
-    const visibleChildren = this._getVisibleChildren();
-    for (const child of this._childrenInZIndexOrder) {
-      if (!visibleChildren.includes(child.num)) {
-        child.updateFromLayout();
-        continue;
+    if (!this._hasVisibleChildFilter()) {
+      for (const child of this._childrenInZIndexOrder) {
+        child.updateLayout(deltaTime, renderList);
+      }
+    } else {
+      const visibleChildren = this._getVisibleChildren();
+      const visibleChildSet = new Set(visibleChildren);
+      for (const child of this._childrenInZIndexOrder) {
+        if (!visibleChildSet.has(child.num)) {
+          child.updateFromLayout();
+          continue;
+        }
+        child.updateLayout(deltaTime, renderList);
       }
-      child.updateLayout(deltaTime, renderList);
     }
     if (shouldPushScissor) {
       renderList.push({ action: "popScissorRect" });
@@ -15576,20 +15640,25 @@ class Renderable extends BaseRenderable {
     if (this.renderAfter) {
       this.renderAfter.call(this, renderBuffer, deltaTime);
     }
+    const screenX = this._screenX;
+    const screenY = this._screenY;
     this.markClean();
-    this._ctx.addToHitGrid(this.x, this.y, this.width, this.height, this.num);
+    this._ctx.addToHitGrid(screenX, screenY, this.width, this.height, this.num);
     if (this.buffered && this.frameBuffer) {
-      buffer.drawFrameBuffer(this.x, this.y, this.frameBuffer);
+      buffer.drawFrameBuffer(screenX, screenY, this.frameBuffer);
     }
   }
+  _hasVisibleChildFilter() {
+    return this._getVisibleChildren !== Renderable.prototype._getVisibleChildren;
+  }
   _getVisibleChildren() {
     return this._childrenInZIndexOrder.map((child) => child.num);
   }
   onUpdate(deltaTime) {}
   getScissorRect() {
     return {
-      x: this.buffered ? 0 : this.x,
-      y: this.buffered ? 0 : this.y,
+      x: this.buffered ? 0 : this._screenX,
+      y: this.buffered ? 0 : this._screenY,
       width: this.width,
       height: this.height
     };
@@ -16590,6 +16659,41 @@ function mergeKeyBindings(defaults, custom) {
 function getKeyBindingKey(binding) {
   return `${binding.name}:${binding.ctrl ? 1 : 0}:${binding.shift ? 1 : 0}:${binding.meta ? 1 : 0}:${binding.super ? 1 : 0}`;
 }
+function getBaseCodeKeyName(baseCode) {
+  if (baseCode === undefined || baseCode < 32 || baseCode === 127) {
+    return;
+  }
+  try {
+    const name = String.fromCodePoint(baseCode);
+    if (name.length === 1 && name >= "A" && name <= "Z") {
+      return name.toLowerCase();
+    }
+    return name;
+  } catch {
+    return;
+  }
+}
+function getKeyBindingKeys(binding) {
+  const names = new Set([binding.name]);
+  const baseCodeName = getBaseCodeKeyName(binding.baseCode);
+  if (baseCodeName) {
+    names.add(baseCodeName);
+  }
+  return [...names].map((name) => getKeyBindingKey({ ...binding, name }));
+}
+function getKeyBindingAction(map, binding) {
+  for (const key of getKeyBindingKeys(binding)) {
+    const action = map.get(key);
+    if (action !== undefined) {
+      return action;
+    }
+  }
+  return;
+}
+function matchesKeyBinding(binding, match) {
+  const matchKey = getKeyBindingKey(match);
+  return getKeyBindingKeys(binding).includes(matchKey);
+}
 function buildKeyBindingsMap(bindings, aliasMap) {
   const map = new Map;
   const aliases = aliasMap || {};
@@ -16973,15 +17077,7 @@ class TerminalConsole extends EventEmitter8 {
       this.blur();
       return;
     }
-    const bindingKey = getKeyBindingKey({
-      name: event.name,
-      ctrl: event.ctrl,
-      shift: event.shift,
-      meta: event.meta,
-      super: event.super,
-      action: "scroll-up"
-    });
-    const action = this._keyBindingsMap.get(bindingKey);
+    const action = getKeyBindingAction(this._keyBindingsMap, event);
     if (action) {
       const handler = this._actionHandlers.get(action);
       if (handler) {
@@ -18351,8 +18447,10 @@ class EditBufferRenderable extends Renderable {
       return;
     if (this.isDestroyed)
       return;
+    const screenX = this._screenX;
+    const screenY = this._screenY;
     this.markClean();
-    this._ctx.addToHitGrid(this.x, this.y, this.width, this.height, this.num);
+    this._ctx.addToHitGrid(screenX, screenY, this.width, this.height, this.num);
     this.renderSelf(buffer);
     this.renderCursor(buffer);
   }
@@ -18363,8 +18461,10 @@ class EditBufferRenderable extends Renderable {
     if (!this._showCursor || !this._focused)
       return;
     const visualCursor = this.editorView.getVisualCursor();
-    const cursorX = this.x + visualCursor.visualCol + 1;
-    const cursorY = this.y + visualCursor.visualRow + 1;
+    const screenX = this._screenX;
+    const screenY = this._screenY;
+    const cursorX = screenX + visualCursor.visualCol + 1;
+    const cursorY = screenY + visualCursor.visualRow + 1;
     this._ctx.setCursorPosition(cursorX, cursorY, true);
     this._ctx.setCursorStyle({ ...this._cursorStyle, color: this._cursorColor });
   }
@@ -18564,8 +18664,8 @@ function getObjectsInViewport(viewport, objects, direction = "column", padding =
   while (lo <= hi) {
     const mid = lo + hi >> 1;
     const c = children[mid];
-    const start = isRow ? c.x : c.y;
-    const end = isRow ? c.x + c.width : c.y + c.height;
+    const start = isRow ? c.screenX : c.screenY;
+    const end = isRow ? c.screenX + c.width : c.screenY + c.height;
     if (end < vpStart) {
       lo = mid + 1;
     } else if (start > vpEnd) {
@@ -18584,7 +18684,7 @@ function getObjectsInViewport(viewport, objects, direction = "column", padding =
   let gapCount = 0;
   while (left - 1 >= 0) {
     const prev = children[left - 1];
-    const prevEnd = isRow ? prev.x + prev.width : prev.y + prev.height;
+    const prevEnd = isRow ? prev.screenX + prev.width : prev.screenY + prev.height;
     if (prevEnd <= vpStart) {
       gapCount++;
       if (gapCount >= maxLookBehind) {
@@ -18598,30 +18698,30 @@ function getObjectsInViewport(viewport, objects, direction = "column", padding =
   let right = candidate + 1;
   while (right < totalChildren) {
     const next = children[right];
-    if ((isRow ? next.x : next.y) >= vpEnd)
+    if ((isRow ? next.screenX : next.screenY) >= vpEnd)
       break;
     right++;
   }
   for (let i = left;i < right; i++) {
     const child = children[i];
-    const start = isRow ? child.x : child.y;
-    const end = isRow ? child.x + child.width : child.y + child.height;
+    const start = isRow ? child.screenX : child.screenY;
+    const end = isRow ? child.screenX + child.width : child.screenY + child.height;
     if (end <= vpStart)
       continue;
     if (start >= vpEnd)
       break;
     if (isRow) {
-      const childBottom = child.y + child.height;
+      const childBottom = child.screenY + child.height;
       if (childBottom < viewportTop)
         continue;
-      const childTop = child.y;
+      const childTop = child.screenY;
       if (childTop > viewportBottom)
         continue;
     } else {
-      const childRight = child.x + child.width;
+      const childRight = child.screenX + child.width;
       if (childRight < viewportLeft)
         continue;
-      const childLeft = child.x;
+      const childLeft = child.screenX;
       if (childLeft > viewportRight)
         continue;
     }
@@ -18852,7 +18952,7 @@ var rendererTracker = singleton("RendererTracker", () => {
 });
 async function createCliRenderer(config = {}) {
   if (process.argv.includes("--delay-start")) {
-    await new Promise((resolve3) => setTimeout(resolve3, 5000));
+    await new Promise((resolve4) => setTimeout(resolve4, 5000));
   }
   const stdin = config.stdin || process.stdin;
   const stdout = config.stdout || process.stdout;
@@ -19136,7 +19236,7 @@ Captured output:
     const useKittyForParsing = kittyConfig !== null;
     this._keyHandler = new InternalKeyHandler;
     this._keyHandler.on("keypress", (event) => {
-      if (this.exitOnCtrlC && event.name === "c" && event.ctrl) {
+      if (this.exitOnCtrlC && matchesKeyBinding(event, { name: "c", ctrl: true })) {
         process.nextTick(() => {
           this.destroy();
         });
@@ -19350,8 +19450,8 @@ Captured output:
     if (!this.isIdleNow())
       return;
     const resolvers = this.idleResolvers.splice(0);
-    for (const resolve3 of resolvers) {
-      resolve3();
+    for (const resolve4 of resolvers) {
+      resolve4();
     }
   }
   idle() {
@@ -19359,8 +19459,8 @@ Captured output:
       return Promise.resolve();
     if (this.isIdleNow())
       return Promise.resolve();
-    return new Promise((resolve3) => {
-      this.idleResolvers.push(resolve3);
+    return new Promise((resolve4) => {
+      this.idleResolvers.push(resolve4);
     });
   }
   get resolution() {
@@ -20630,7 +20730,7 @@ Captured output:
   }
 }
 
-export { __toESM, __commonJS, __export, __require, Edge, Gutter, MeasureMode, exports_src, isValidBorderStyle, parseBorderStyle, BorderChars, getBorderFromSides, getBorderSides, borderCharsToArray, BorderCharArrays, KeyEvent, PasteEvent, KeyHandler, InternalKeyHandler, RGBA, hexToRgb, rgbToHex, hsvToRgb, parseColor, fonts, measureText, getCharacterPositions, coordinateToCharacterIndex, renderFontToFrameBuffer, TextAttributes, ATTRIBUTE_BASE_BITS, ATTRIBUTE_BASE_MASK, getBaseAttributes, DebugOverlayCorner, TargetChannel, createTextAttributes, attributesWithLink, getLinkId, visualizeRenderableTree, isStyledText, StyledText, stringToStyledText, black, red, green, yellow, blue, magenta, cyan, white, brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite, bgBlack, bgRed, bgGreen, bgYellow, bgBlue, bgMagenta, bgCyan, bgWhite, bold, italic, underline, strikethrough, dim, reverse, blink, fg, bg, link, t, hastToStyledText, SystemClock, nonAlphanumericKeys, parseKeypress, LinearScrollAccel, MacOSScrollAccel, parseAlign, parseAlignItems, parseBoxSizing, parseDimension, parseDirection, parseDisplay, parseEdge, parseFlexDirection, parseGutter, parseJustify, parseLogLevel, parseMeasureMode, parseOverflow, parsePositionType, parseUnit, parseWrap, MouseParser, Selection, convertGlobalToLocalSelection, ASCIIFontSelectionHelper, envRegistry, registerEnvVar, clearEnvCache, generateEnvMarkdown, generateEnvColored, env, StdinParser, treeSitterToTextChunks, treeSitterToStyledText, addDefaultParsers, TreeSitterClient, DataPathsManager, getDataPaths, extensionToFiletype, basenameToFiletype, extToFiletype, pathToFiletype, infoStringToFiletype, main, getTreeSitterClient, ExtmarksController, createExtmarksController, TerminalPalette, createTerminalPalette, decodePasteBytes, stripAnsiSequences, detectLinks, TextBuffer, SpanInfoStruct, LogLevel2 as LogLevel, setRenderLibPath, resolveRenderLib, OptimizedBuffer, h, isVNode, maybeMakeRenderable, wrapWithDelegates, instantiate, delegate, isValidPercentage, LayoutEvents, RenderableEvents, isRenderable, BaseRenderable, Renderable, RootRenderable, EditBuffer, EditorView, ANSI, defaultKeyAliases, mergeKeyAliases, mergeKeyBindings, getKeyBindingKey, buildKeyBindingsMap, capture, ConsolePosition, TerminalConsole, getObjectsInViewport, EditBufferRenderableEvents, isEditBufferRenderable, EditBufferRenderable, buildKittyKeyboardFlags, MouseEvent, MouseButton, createCliRenderer, CliRenderEvents, RendererControlState, CliRenderer };
+export { __toESM, __commonJS, __export, __require, Edge, Gutter, MeasureMode, exports_src, isValidBorderStyle, parseBorderStyle, BorderChars, getBorderFromSides, getBorderSides, borderCharsToArray, BorderCharArrays, KeyEvent, PasteEvent, KeyHandler, InternalKeyHandler, RGBA, hexToRgb, rgbToHex, hsvToRgb, parseColor, fonts, measureText, getCharacterPositions, coordinateToCharacterIndex, renderFontToFrameBuffer, TextAttributes, ATTRIBUTE_BASE_BITS, ATTRIBUTE_BASE_MASK, getBaseAttributes, DebugOverlayCorner, TargetChannel, createTextAttributes, attributesWithLink, getLinkId, visualizeRenderableTree, isStyledText, StyledText, stringToStyledText, black, red, green, yellow, blue, magenta, cyan, white, brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite, bgBlack, bgRed, bgGreen, bgYellow, bgBlue, bgMagenta, bgCyan, bgWhite, bold, italic, underline, strikethrough, dim, reverse, blink, fg, bg, link, t, hastToStyledText, SystemClock, nonAlphanumericKeys, parseKeypress, LinearScrollAccel, MacOSScrollAccel, parseAlign, parseAlignItems, parseBoxSizing, parseDimension, parseDirection, parseDisplay, parseEdge, parseFlexDirection, parseGutter, parseJustify, parseLogLevel, parseMeasureMode, parseOverflow, parsePositionType, parseUnit, parseWrap, MouseParser, Selection, convertGlobalToLocalSelection, ASCIIFontSelectionHelper, envRegistry, registerEnvVar, clearEnvCache, generateEnvMarkdown, generateEnvColored, env, StdinParser, treeSitterToTextChunks, treeSitterToStyledText, addDefaultParsers, TreeSitterClient, DataPathsManager, getDataPaths, extensionToFiletype, basenameToFiletype, extToFiletype, pathToFiletype, infoStringToFiletype, main, getTreeSitterClient, ExtmarksController, createExtmarksController, TerminalPalette, createTerminalPalette, decodePasteBytes, stripAnsiSequences, detectLinks, TextBuffer, SpanInfoStruct, LogLevel2 as LogLevel, setRenderLibPath, resolveRenderLib, OptimizedBuffer, h, isVNode, maybeMakeRenderable, wrapWithDelegates, instantiate, delegate, isValidPercentage, LayoutEvents, RenderableEvents, isRenderable, BaseRenderable, Renderable, RootRenderable, EditBuffer, EditorView, ANSI, defaultKeyAliases, mergeKeyAliases, mergeKeyBindings, getKeyBindingAction, buildKeyBindingsMap, capture, ConsolePosition, TerminalConsole, getObjectsInViewport, EditBufferRenderableEvents, isEditBufferRenderable, EditBufferRenderable, buildKittyKeyboardFlags, MouseEvent, MouseButton, createCliRenderer, CliRenderEvents, RendererControlState, CliRenderer };
 
-//# debugId=B248918F8F174E3E64756E2164756E21
-//# sourceMappingURL=index-g2c8aqza.js.map
+//# debugId=F735FC939C22368E64756E2164756E21
+//# sourceMappingURL=index-c4vtensm.js.map