@neuroplastio/xterm-addon-hotty 0.1.0-next.6 → 0.1.0-next.7

package/README.md

@@ -114,10 +114,13 @@ runs programs for whoever connects.
   selection works as usual. A right click leaves focus where the browser
   put it, so the context menu's Copy copies the surface's selection.
 - **A text field's keys** (SPEC §10.2, §10.4) are the program's keymap.
-  Each key goes through xterm.js's keyboard handling, with what it would
-  send the program kept back, and is named from that, so a field sees the
-  key the program would read, in the encoding the program enabled. The
-  field's keymap (the default, then each `data-keys` from the root to the
+  A key that types no text (not a character, or a character with Control
+  or Meta) is offered first as pressed, named from the DOM's event, before
+  xterm.js translates it: on a Mac, Option+Left is Alt+ArrowLeft, not the
+  ESC b the program would read. Otherwise the key goes through xterm.js's
+  keyboard handling, with what it would send the program kept back, and
+  is named from that, so a field sees the key the program would read, in
+  the encoding the program enabled. The field's keymap (the default, then each `data-keys` from the root to the
   field) decides: an action, which the addon does itself on the field's
   text with the editing commands, so the browser sends `input` and
   `change` as for typing; a character, which the browser types; or the

package/dist/hotty-xterm.js

@@ -1251,6 +1251,12 @@ function resolve(multiline, ...values) {
     ["PageUp", "page-up"],
     ["PageDown", "page-down"],
     ["Control+a", "select-all"],
+    ["Meta+ArrowLeft", "line-start"],
+    ["Meta+ArrowRight", "line-end"],
+    ["Meta+ArrowUp", "input-start"],
+    ["Meta+ArrowDown", "input-end"],
+    ["Meta+Backspace", "delete-to-line-start"],
+    ["Meta+a", "select-all"],
     ["Enter", multiline ? "newline" : "submit"]
   ])
     m.bind(k, a);
@@ -2047,7 +2053,10 @@ var Surface = class {
     return el === this.masked ? (this.resolver.get(el, "type") ?? "").toLowerCase() : el.type;
   }
   /**
-   * A key in a text field. It is named as the program would read it: from
+   * A key in a text field, offered at most twice (SPEC §10.4). A key that
+   * types no text is offered first as pressed, named from the DOM's event,
+   * before xterm.js translates it (on a Mac, Option+ArrowLeft is ESC b to
+   * the program). Otherwise it is named as the program would read it: from
    * what xterm.js would send the program for it, in the encoding the
    * program enabled, read as SPEC §10.4 says. The field's keymap (the
    * default, then each `data-keys` from the root to the field) says what
@@ -2056,9 +2065,11 @@ var Surface = class {
    */
   fieldKey(e, el, multiline) {
     if (this.host.browserKey(e)) return;
-    const data = this.host.encodeKey(e);
-    const keys = data === null ? [{ key: domKeyName(e), data: "" }] : inputKeys(data);
     const keymap = this.keymapOf(el, multiline);
+    const pressed = typesNoText(e) ? domKeyName(e) : null;
+    const first = pressed !== null && keymap.lookup(pressed) !== null;
+    const data = first ? "" : this.host.encodeKey(e);
+    const keys = first ? [{ key: pressed, data: "" }] : data === null ? [{ key: domKeyName(e), data: "" }] : inputKeys(data);
     const uses = keys.map((k) => k.key === null ? null : keymap.lookup(k.key));
     const extend = keys.map((k) => k.key !== null && keymap.selects(k.key));
     if (uses.every((u) => u === null)) {
@@ -3177,6 +3188,12 @@ function keyText(key) {
   const v = key.endsWith("++") ? "+" : key.slice(key.lastIndexOf("+") + 1);
   return v === "Space" ? " " : v;
 }
+function typesNoText(e) {
+  if (e.getModifierState?.("AltGraph")) return false;
+  if ([...e.key].length === 1) return e.ctrlKey || e.metaKey;
+  return !NOT_KEYS.has(e.key);
+}
+var NOT_KEYS = /* @__PURE__ */ new Set(["Unidentified", "Dead", "Process", "Compose", "Shift", "Control", "Alt", "AltGraph", "Meta", "OS", "Super", "Hyper", "Fn", "FnLock", "CapsLock", "NumLock", "ScrollLock", "Symbol", "SymbolLock"]);
 function domKeyName(e) {
   const char = [...e.key].length === 1;
   const mods = [e.ctrlKey && "Control", e.altKey && "Alt", e.metaKey && "Meta", e.shiftKey && !char && "Shift"].filter(Boolean);