fix: 一些报错与卡死问题

Author: chenxuuu

llcomNext/LLCOM/Models/TerminalObject.cs

@@ -334,7 +334,7 @@ public List<List<TerminalBlock>> GetShowLines()
             {
                 //加几个空格，直到光标位置
                 if(allLength < PositionX)
-                    tempLine.Add(new TerminalBlock(new string(' ', allLength - PositionX)));
+                    tempLine.Add(new TerminalBlock(new string(' ', PositionX - allLength)));
                 tempLine.Add(new TerminalBlock(new string(' ', 1),-1,-1));
             }
             else

llcomNext/LLCOM/ViewModels/DataViews/TerminalViewModel.cs

@@ -37,10 +37,13 @@ private async Task Test()
         var testChars = "测试Test".ToCharArray();
         for(int i=0; i<1000; i++)
         {
-            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)]]); 
-            TerminalChangedEvent?.Invoke(this, TerminalObject.GetShowLines());
+            lock (TerminalObject)
+            {
+                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)]]); 
+                TerminalChangedEvent?.Invoke(this, TerminalObject.GetShowLines());
+            }
             await Task.Delay(1);
         }
     }
@@ -51,13 +54,23 @@ private async Task Test()
     //窗口大小变化
     public void ChangeWindowSize((int, int) size)
     {
-        TerminalObject.ChangeWindowSize(size.Item1, size.Item2);
+        lock(TerminalObject)
+            TerminalObject.ChangeWindowSize(size.Item1, size.Item2);
     }
 
     //滚轮事件
-    public double MoveUp(int delta) => TerminalObject.CurrentLineMoveUp(delta);
+    public double MoveUp(int delta)
+    {
+        lock(TerminalObject)
+            return TerminalObject.CurrentLineMoveUp(delta);
+    }
+    
     //滚动条变化
-    public void ScrollBarChanged(double value) => TerminalObject.ScrollBarChanged(value);
+    public void ScrollBarChanged(double value)
+    {
+        lock(TerminalObject)
+            TerminalObject.ScrollBarChanged(value);
+    }
     //接管更新事件
     public EventHandler<List<List<TerminalBlock>>>? TerminalChangedEvent;
 }

llcomNext/LLCOM/Views/DataViews/TerminalView.axaml

@@ -46,10 +46,15 @@
                 FontSize="{Binding TerminalFontSize, Source={x:Static services:Utils.Setting}}"
                 SelectionBrush="{Binding TerminalTheme.SelectionBackground, Source={x:Static services:Utils.Setting}}"
                 SelectionForegroundBrush="{Binding TerminalTheme.Background, Source={x:Static services:Utils.Setting}}" />
+            <Panel
+                Width="{Binding #MainScrollBar.Width}"
+                HorizontalAlignment="Right"
+                Background="{DynamicResource SemiColorBackground2}" />
             <ScrollBar
                 Name="MainScrollBar"
                 HorizontalAlignment="Right"
                 AllowAutoHide="False"
+                Background="{DynamicResource SemiColorBackground2}"
                 Scroll="MainScrollBar_OnScroll"
                 Visibility="Visible"
                 Value="100" />

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

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
+using System.Threading;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Documents;
@@ -20,9 +21,9 @@ namespace LLCOM.Views;
 
 public partial class TerminalView : UserControl
 {
-    private DispatcherTimer _updateTimer;
-    private bool _dataChanged = false;
-    readonly List<List<TerminalBlock>> _terminalBlocks = [];
+    private readonly CancellationTokenSource _cts = new CancellationTokenSource();
+    private readonly EventWaitHandle _dataChangeWaitHandle = new EventWaitHandle(false, EventResetMode.ManualReset);
+    private readonly List<List<TerminalBlock>> _terminalBlocks = [];
 
     public TerminalView()
     {
@@ -38,22 +39,23 @@ protected override void OnUnloaded(RoutedEventArgs e)
         MainArea.PropertyChanged -= MainArea_PropertyChanged;
         Utils.Setting.TerminalChangedEvent -= TerminalChangedEvent;
         ((TerminalViewModel)DataContext!).TerminalChangedEvent -= TerminalChangedEvent;
-        _updateTimer.Stop();
+        _cts.Cancel();
+        _dataChangeWaitHandle.Set();
         Debug.WriteLine("TerminalView unloaded.");
     }
 
     private void Control_OnLoaded(object? sender, RoutedEventArgs e)
     {
-        //搞个定时器来更新UI，防止阻塞
-        _updateTimer = new DispatcherTimer
+        //搞个单独线程来更新UI，防止阻塞
+        new Thread(() =>
         {
-            Interval = TimeSpan.FromMilliseconds(100)
-        };
-        _updateTimer.Tick += (s, e) =>
-        {
-            if (_dataChanged)
+            while (_cts.Token.IsCancellationRequested == false)
             {
-                _dataChanged = false; // 重置标记
+                _dataChangeWaitHandle.WaitOne();
+                _dataChangeWaitHandle.Reset();
+                if(_cts.Token.IsCancellationRequested)
+                    break;
+                
                 var tempLines = new List<List<TerminalBlock>>();
                 lock (_terminalBlocks)
                 {
@@ -62,28 +64,31 @@ private void Control_OnLoaded(object? sender, RoutedEventArgs e)
                 }
 
                 // 执行更新逻辑
-                //清空文本
-                MainTextBlock.Inlines!.Clear();
-                foreach (var line in tempLines)
-                {
-                    foreach (var block in line)
+                Dispatcher.UIThread.Post(() =>
+                {                
+                    //清空文本
+                    MainTextBlock.Inlines!.Clear();
+                    foreach (var line in tempLines)
                     {
-                        //添加块
-                        var run = new Run(block.Text)
+                        foreach (var block in line)
                         {
-                            [!Span.ForegroundProperty] = new Binding(block.ForegroundBindingName) { Source = Utils.Setting },
-                            [!Span.BackgroundProperty] = new Binding(block.BackgroundBindingName) { Source = Utils.Setting },
-                            FontWeight = block.IsBold ? FontWeight.Bold : FontWeight.Normal,
-                            FontStyle = block.IsItalic ? FontStyle.Italic : FontStyle.Normal,
-                            TextDecorations = block.IsUnderLine ? TextDecorations.Underline : null,
-                        };
-                        MainTextBlock.Inlines.Add(run);
+                            //添加块
+                            var run = new Run(block.Text)
+                            {
+                                [!Span.ForegroundProperty] = new Binding(block.ForegroundBindingName) { Source = Utils.Setting },
+                                [!Span.BackgroundProperty] = new Binding(block.BackgroundBindingName) { Source = Utils.Setting },
+                                FontWeight = block.IsBold ? FontWeight.Bold : FontWeight.Normal,
+                                FontStyle = block.IsItalic ? FontStyle.Italic : FontStyle.Normal,
+                                TextDecorations = block.IsUnderLine ? TextDecorations.Underline : null,
+                            };
+                            MainTextBlock.Inlines.Add(run);
+                        }
+                        MainTextBlock.Inlines.Add(new LineBreak());
                     }
-                    MainTextBlock.Inlines.Add(new LineBreak());
-                }
+                });
+                Thread.Sleep(150);
             }
-        };
-        _updateTimer.Start();
+        }).Start();
 
         Utils.Setting.TerminalChangedEvent += TerminalChangedEvent;
         ((TerminalViewModel)DataContext!).TerminalChangedEvent += TerminalChangedEvent;
@@ -132,7 +137,7 @@ private void TerminalChangedEvent(object? sender, List<List<TerminalBlock>> e)
             //克隆数据
             _terminalBlocks.AddRange(CloneAllLines(e));
         }
-        _dataChanged = true;
+        _dataChangeWaitHandle.Set();
     }
 
     private List<List<TerminalBlock>> CloneAllLines(List<List<TerminalBlock>> lines)