@fairyhunter13/opentui-core 0.1.120 → 0.1.121

package/3d.js

@@ -6,7 +6,7 @@ import {
   __export,
   __require,
   __toESM
-} from "./index-g2c8aqza.js";
+} from "./index-7xsz0ndw.js";
 
 // ../../node_modules/.bun/omggif@1.0.10/node_modules/omggif/omggif.js
 var require_omggif = __commonJS((exports) => {

package/{index-g2c8aqza.js → index-7xsz0ndw.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") {
@@ -16590,6 +16601,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 +17019,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) {
@@ -19136,7 +19174,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();
         });
@@ -20630,7 +20668,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=4A1F7F558505C98564756E2164756E21
+//# sourceMappingURL=index-7xsz0ndw.js.map