build escape sequence state machine at startup

poderosaproject · Dec 1, 2024 · b5a38de · b5a38de
1 parent ceec928
commit b5a38de
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/TerminalEmulator/EscapeSequenceEngine.cs b/TerminalEmulator/EscapeSequenceEngine.cs
@@ -1309,6 +1309,17 @@ public EscapeSequenceEngine(
                 Action<IEscapeSequenceContext> incompleteHandler,
                 Action<Exception, IEscapeSequenceContext> exceptionHandler
         ) {
+            BuildStateMachine();
+            _currentState = _root;
+            _completedHandler = completedHandler;
+            _incompleteHandler = incompleteHandler;
+            _exceptionHandler = exceptionHandler;
+        }
+
+        /// <summary>
+        /// Build global instance of the state machine
+        /// </summary>
+        public static void BuildStateMachine() {
             lock (_initializeSync) {
                 if (!_initialized) {
 #if DEBUG
@@ -1327,10 +1338,6 @@ Action<Exception, IEscapeSequenceContext> exceptionHandler
 #endif
                 }
             }
-            _currentState = _root;
-            _completedHandler = completedHandler;
-            _incompleteHandler = incompleteHandler;
-            _exceptionHandler = exceptionHandler;
         }
 
         /// <summary>

diff --git a/TerminalEmulator/TerminalEmulatorPlugin.cs b/TerminalEmulator/TerminalEmulatorPlugin.cs
@@ -143,6 +143,9 @@ public override void InitializePlugin(IPoderosaWorld poderosa) {
 
             // Initialize Unicode table
             Poderosa.Document.Unicode.Initialize();
+
+            // Prepare EscapeSequenceEngine for XTerm
+            EscapeSequence.EscapeSequenceEngine<XTerm>.BuildStateMachine();
         }
 
 #if UNITTEST