@xterm/xterm 6.1.0-beta.216 → 6.1.0-beta.217

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xterm/xterm",
   "description": "Full xterm terminal, in your browser",
-  "version": "6.1.0-beta.216",
+  "version": "6.1.0-beta.217",
   "main": "lib/xterm.js",
   "module": "lib/xterm.mjs",
   "style": "css/xterm.css",
@@ -119,5 +119,5 @@
     "ws": "^8.2.3",
     "xterm-benchmark": "^0.3.1"
   },
-  "commit": "6ba731d73bfbe074e84b57abb62080bed2f4db03"
+  "commit": "c5c6fc2a64dab42fad108493e2a33d6aa9cd4405"
 }

package/src/common/Version.ts

@@ -6,4 +6,4 @@
 /**
  * The xterm.js version. This is updated by the publish script from package.json.
  */
-export const XTERM_VERSION = '6.1.0-beta.216';
+export const XTERM_VERSION = '6.1.0-beta.217';

package/src/common/input/KittyKeyboard.ts

@@ -471,30 +471,34 @@ export class KittyKeyboard {
       return result;
     }
 
-    const isFunc = this._functionalKeyCodes[ev.key] !== undefined || this._getNumpadKeyCode(ev) !== undefined;
+    // Special handling for Enter/Tab/Backspace.
+    const specialKey = keyCode === 13 || keyCode === 9 || keyCode === 127;
 
-    let useCsiU = false;
-
-    if (flags & KittyKeyboardFlags.REPORT_ALL_KEYS_AS_ESCAPE_CODES) {
-      useCsiU = true;
-    } else if (reportEventTypes) {
-      useCsiU = true;
-    } else if (flags & KittyKeyboardFlags.DISAMBIGUATE_ESCAPE_CODES) {
-      // Per spec, Enter/Tab/Backspace "still generate the same bytes as in legacy
-      // mode" and consider space to be a text-generating key, so these skip the isFunc fast-path
-      // and only get CSI u when modifiers are present (handled below).
-      const isDisambiguateLegacy = keyCode === 13 || keyCode === 9 || keyCode === 127;
-      if (isFunc && !isDisambiguateLegacy) {
-        useCsiU = true;
-      } else if (modifiers > 0) {
-        if (ev.shiftKey && !ev.ctrlKey && !ev.altKey && !ev.metaKey && ev.key.length === 1) {
-          useCsiU = false;
-        } else {
-          useCsiU = true;
-        }
-      }
+    // Per spec, Enter/Tab/Backspace will not have release events unless "Report all keys as escape
+    // codes" is also set.
+    if (specialKey && eventType === KittyKeyboardEventType.RELEASE && !(flags & KittyKeyboardFlags.REPORT_ALL_KEYS_AS_ESCAPE_CODES)) {
+      return result;
     }
 
+    const isFunc = this._functionalKeyCodes[ev.key] !== undefined || this._getNumpadKeyCode(ev) !== undefined;
+
+    const useCsiU = !!(
+      flags & KittyKeyboardFlags.REPORT_ALL_KEYS_AS_ESCAPE_CODES ||
+      (reportEventTypes && eventType === KittyKeyboardEventType.RELEASE) ||
+      (flags & KittyKeyboardFlags.DISAMBIGUATE_ESCAPE_CODES &&
+        (
+          // Per spec, Enter/Tab/Backspace "still generate the same bytes as in legacy mode" and
+          // consider space to be a text-generating key, so these skip the isFunc fast-path and only
+          // get CSI u when modifiers are present (handled below).
+          (isFunc && !specialKey) ||
+          (
+            (modifiers > 0 && ev.key.length !== 1) ||
+            modifiers - 1 > KittyKeyboardModifiers.SHIFT
+          )
+        )
+      )
+    );
+
     if (useCsiU) {
       result.key = this._buildCsiUSequence(ev, keyCode, modifiers, eventType, flags, isFunc, isMod);
       result.cancel = true;