Merge pull request #5636 from Tyriar/win32__kitty

Move kitty input mode into a class to avoid init cost

Author: Tyriar

src/browser/services/KeyboardService.ts

@@ -5,7 +5,7 @@
 
 import { IKeyboardService } from 'browser/services/Services';
 import { evaluateKeyboardEvent } from 'common/input/Keyboard';
-import { evaluateKeyboardEventKitty, KittyKeyboardEventType, KittyKeyboardFlags, shouldUseKittyProtocol } from 'common/input/KittyKeyboard';
+import { KittyKeyboard, KittyKeyboardEventType, KittyKeyboardFlags } from 'common/input/KittyKeyboard';
 import { Win32InputMode } from 'common/input/Win32InputMode';
 import { isMac } from 'common/Platform';
 import { ICoreService, IOptionsService } from 'common/services/Services';
@@ -15,6 +15,7 @@ export class KeyboardService implements IKeyboardService {
   public serviceBrand: undefined;
 
   private _win32InputMode: Win32InputMode | undefined;
+  private _kittyKeyboard: KittyKeyboard | undefined;
 
   constructor(
     @ICoreService private readonly _coreService: ICoreService,
@@ -29,14 +30,21 @@ export class KeyboardService implements IKeyboardService {
     return this._win32InputMode;
   }
 
+  private _getKittyKeyboard(): KittyKeyboard {
+    if (!this._kittyKeyboard) {
+      this._kittyKeyboard = new KittyKeyboard();
+    }
+    return this._kittyKeyboard;
+  }
+
   public evaluateKeyDown(event: KeyboardEvent): IKeyboardResult {
     // Win32 input mode takes priority (most raw)
     if (this.useWin32InputMode) {
       return this._getWin32InputMode().evaluateKeyboardEvent(event, true);
     }
     const kittyFlags = this._coreService.kittyKeyboard.flags;
     return this.useKitty
-      ? evaluateKeyboardEventKitty(event, kittyFlags, event.repeat ? KittyKeyboardEventType.REPEAT : KittyKeyboardEventType.PRESS)
+      ? this._getKittyKeyboard().evaluate(event, kittyFlags, event.repeat ? KittyKeyboardEventType.REPEAT : KittyKeyboardEventType.PRESS)
       : evaluateKeyboardEvent(event, this._coreService.decPrivateModes.applicationCursorKeys, isMac, this._optionsService.rawOptions.macOptionIsMeta);
   }
 
@@ -47,14 +55,14 @@ export class KeyboardService implements IKeyboardService {
     }
     const kittyFlags = this._coreService.kittyKeyboard.flags;
     if (this.useKitty && (kittyFlags & KittyKeyboardFlags.REPORT_EVENT_TYPES)) {
-      return evaluateKeyboardEventKitty(event, kittyFlags, KittyKeyboardEventType.RELEASE);
+      return this._getKittyKeyboard().evaluate(event, kittyFlags, KittyKeyboardEventType.RELEASE);
     }
     return undefined;
   }
 
   public get useKitty(): boolean {
     const kittyFlags = this._coreService.kittyKeyboard.flags;
-    return !!(this._optionsService.rawOptions.vtExtensions?.kittyKeyboard && shouldUseKittyProtocol(kittyFlags));
+    return !!(this._optionsService.rawOptions.vtExtensions?.kittyKeyboard && KittyKeyboard.shouldUseProtocol(kittyFlags));
   }
 
   public get useWin32InputMode(): boolean {