fix: 光标位置显示不正确的问题

Author: chenxuuu

llcomNext/LLCOM/Models/TerminalObject.cs

@@ -317,13 +317,18 @@ public List<List<TerminalBlock>> GetShowLines()
             //添加空行
             cacheLines.Add([]);
         }
+        
         //把当前光标位置背景和前景色反色处理
-        if (PositionY < cacheLines.Count)
+        
+        //实际光标在哪一行，会跟随currentLine变化
+        var lineIndex = PositionY + CurrentLine;
+        
+        if (PositionY < cacheLines.Count && lineIndex < cacheLines.Count)
         {
             //这里需要处理光标位置
             //复制一个新的行来替换掉现有的行用来展示
             var tempLine = new List<TerminalBlock>();
-            foreach (var block in cacheLines[PositionY])
+            foreach (var block in cacheLines[lineIndex])
             {
                 tempLine.Add((TerminalBlock)block.Clone());
             }
@@ -371,7 +376,7 @@ public List<List<TerminalBlock>> GetShowLines()
             //优化当前这一行数据块
             TerminalBlock.OptimizeBlocks(tempLine);
             //替换掉当前行
-            cacheLines[PositionY] = tempLine;
+            cacheLines[lineIndex] = tempLine;
         }
 
         return cacheLines;
@@ -381,7 +386,19 @@ public List<List<TerminalBlock>> GetShowLines()
     public void ChangeWindowSize(int width, int height)
     {
         _windowWidth = width;
+        var oldHeight = _windowHeight;
         _windowHeight = height;
+        
+        //高度变化后，光标位置需要重新计算
+        if (oldHeight != _windowHeight)
+        {
+            PositionY += _windowHeight - oldHeight;
+            //如果光标位置超过了最大高度，设置为最大高度
+            if (PositionY >= _windowHeight)
+                PositionY = _windowHeight - 1;
+            if (PositionY < 0)
+                PositionY = 0;
+        }
         TerminalChanged();
     }
 

llcomNext/LLCOM/ViewModels/DataViews/TerminalViewModel.cs

@@ -35,11 +35,11 @@ private async Task Test()
     {
         var random = new Random();
         var testChars = "测试Test".ToCharArray();
-        for(int i=0; i<1000; i++)
+        for(int i=0; i<100; i++)
         {
             lock (TerminalObject)
             {
-                TerminalObject.ChangeStyle(random.Next(30,38),random.Next(30,38));
+                //TerminalObject.ChangeStyle(random.Next(30,38),random.Next(30,38));
                 TerminalObject.ChangePosition(random.Next(0,TerminalObject.WindowWidth), random.Next(0,TerminalObject.WindowHeight));
                 TerminalObject.AddText([testChars[random.Next(0, testChars.Length)]]); 
                 TerminalRefreshEvent?.Invoke(this, EventArgs.Empty);

llcomNext/LLCOM/Views/DataViews/TerminalView.axaml.cs

@@ -23,6 +23,7 @@ public partial class TerminalView : UserControl
 {
     private readonly CancellationTokenSource _cts = new CancellationTokenSource();
     private readonly EventWaitHandle _dataChangeWaitHandle = new EventWaitHandle(false, EventResetMode.ManualReset);
+    private Func<List<List<TerminalBlock>>>? _getShowLines = null;
 
     public TerminalView()
     {
@@ -45,6 +46,7 @@ protected override void OnUnloaded(RoutedEventArgs e)
 
     private void Control_OnLoaded(object? sender, RoutedEventArgs e)
     {
+        _getShowLines = ((TerminalViewModel)DataContext!).GetShowLines;
         //搞个单独线程来更新UI，防止阻塞
         new Thread(() =>
         {
@@ -55,10 +57,10 @@ private void Control_OnLoaded(object? sender, RoutedEventArgs e)
                 if(_cts.Token.IsCancellationRequested)
                     break;
 
+                var tempLines = _getShowLines();
                 // 执行更新逻辑
                 Dispatcher.UIThread.Post(() =>
-                {         
-                    var tempLines = ((TerminalViewModel)DataContext!).GetShowLines();       
+                {
                     //清空文本
                     MainTextBlock.Inlines!.Clear();
                     foreach (var line in tempLines)
@@ -79,7 +81,7 @@ private void Control_OnLoaded(object? sender, RoutedEventArgs e)
                         MainTextBlock.Inlines.Add(new LineBreak());
                     }
                 });
-                Thread.Sleep(150);
+                Thread.Sleep(100);
             }
         }).Start();