fix: 更正一些cmd命令的处理方式，使测试htop数据正常显示

Author: chenxuuu

llcomNext/LLCOM/Models/TerminalCommand.cs

@@ -71,7 +71,7 @@ public enum TerminalCommand
     MultipleStyle,
 }
 
-public class TerminalCommandCheck
+public static class TerminalCommandCheck
 {
     /// <summary>
     /// 分析给定的字符切片，判断是否为终端命令
@@ -95,6 +95,9 @@ public static ((TerminalCommand, (int, int)), int) Do(ReadOnlySpan<char> slice)
         {
             return ((singleCmd, (0,0)), 1);
         }
+        //判断下是不是\x1b(?或\x1b)?
+        if(slice.Length >= 3 && slice[0] == '\x1b' && (slice[1] == '(' || slice[1] == ')'))
+            return ((TerminalCommand.Unknown, (0,0)), 3); //先当成未知命令处理
         //判断是否为转义字符
         if(slice[0] != '\x1b' || slice[1] != '[' || slice.Length < 3)
         {
@@ -113,9 +116,10 @@ public static ((TerminalCommand, (int, int)), int) Do(ReadOnlySpan<char> slice)
         int code = 0;
         char cmd = '\0';
         int i = 2; //从第三个字符开始分析，最多分析到第10个字符
-        while (i < slice.Length && i < 10 && char.IsDigit(slice[i]))
+        while (i < slice.Length && i < 10 && (char.IsDigit(slice[i]) || slice[i] == '?'))
         {
-            code = code * 10 + (slice[i] - '0'); //将数字字符转换为数字
+            if(slice[i] != '?')
+                code = code * 10 + (slice[i] - '0'); //将数字字符转换为数字
             i++;
         }
         if (i < slice.Length)
@@ -181,10 +185,10 @@ public static ((TerminalCommand, (int, int)), int) Do(ReadOnlySpan<char> slice)
                     1 => TerminalCommand.Bold, //加粗
                     4 => TerminalCommand.Underline, //下划线
                     7 => TerminalCommand.Reverse, //反转颜色
-                    _ when code >= 30 && code <= 37 => TerminalCommand.ForegroundColor, //前景色
-                    _ when code >= 90 && code <= 97 => TerminalCommand.ForegroundColor, //前景色
-                    _ when code >= 40 && code <= 47 => TerminalCommand.BackgroundColor, //背景色
-                    _ when code >= 100 && code <= 107 => TerminalCommand.BackgroundColor, //背景色
+                    _ when code is >= 30 and <= 37 => TerminalCommand.ForegroundColor, //前景色
+                    _ when code is >= 90 and <= 97 => TerminalCommand.ForegroundColor, //前景色
+                    _ when code is >= 40 and <= 47 => TerminalCommand.BackgroundColor, //背景色
+                    _ when code is >= 100 and <= 107 => TerminalCommand.BackgroundColor, //背景色
                     _ => TerminalCommand.None //不匹配
                 };
                 if (mr != TerminalCommand.None)

llcomNext/LLCOM/Models/TerminalObject.cs

@@ -27,10 +27,11 @@ private void TerminalChanged()
 
     /// 用于存放终端数据的缓存
     private List<List<TerminalBlock>> CacheLines { get; } = [];
-    
+
     //当前光标位置
     /// X从0开始，最大可到达窗口宽度（再增加就需要换行了）
     private int PositionX { get; set; } = 0;
+
     /// Y从0开始，最大可到达窗口高度-1
     private int PositionY { get; set; } = 0;
 
@@ -95,6 +96,8 @@ private void AddText(char[] texts)//TODO)) 保持private
             {
                 //获取实际的字符宽度
                 var length = UnicodeCalculator.GetWidth(chars[0]);
+                if (length < 0)
+                    length = 0;
                 //挖去可用空间
                 space -= length;
                 if(space < 0)//剩余空间不足，别添加了
@@ -687,9 +690,9 @@ public void AddChars(ReadOnlySpan<char> chars)
                     break;
                 case TerminalCommand.MoveCursorTo:
                     //光标移动到指定位置
-                    //p1表示行数，p2表示列数
-                    PositionX = p1 - 1;
-                    PositionY = p2 - 1;
+                    //p1表示列数，p2表示行数
+                    PositionY = p1 - 1;
+                    PositionX = p2 - 1;
                     if(PositionX < 0)
                         PositionX = 0; //不能小于0
                     if(PositionX >= _windowWidth)
@@ -723,41 +726,58 @@ public void AddChars(ReadOnlySpan<char> chars)
                     break;
                 case TerminalCommand.Reverse:
                     //反转颜色
-                    (CurrentState.Foreground, CurrentState.Background) = (CurrentState.Background, CurrentState.Foreground);
+                    CurrentState.Background = -1;
+                    CurrentState.Foreground = -1;
                     break;
                 case TerminalCommand.ForegroundColor:
                     //前景色
                     //p1表示颜色代码
-                    if (p1 is >= 30 and <= 37)
-                    {
-                        //设置前景色
-                        CurrentState.Foreground = p1 - 30;
-                    }
-                    else if (p1 == 39)
-                    {
-                        //重置前景色
+                    if (p1 == 39) //重置前景色
                         CurrentState.Foreground = -1;
-                    }
+                    else//设置前景色
+                        CurrentState.Foreground = p1;
                     break;
                 case TerminalCommand.BackgroundColor:
                     //背景色
                     //p1表示颜色代码
-                    if (p1 is >= 40 and <= 47)
+                    if (p1 == 49) //重置背景色
+                        CurrentState.Background = -1;
+                    else//设置背景色
+                        CurrentState.Background = p1;
+                    break;
+                case TerminalCommand.MultipleStyle:
+                    //多重样式
+                    switch (p1)
                     {
-                        //设置背景色
-                        CurrentState.Background = p1 - 40;
+                        case 0://重置样式
+                            CurrentState = new TerminalBlock("");
+                            break;
+                        case 1://加粗
+                            CurrentState.IsBold = true;
+                            break;
+                        case 4://下划线
+                            CurrentState.IsUnderLine = true;
+                            break;
+                        case 7://反转颜色
+                            CurrentState.Background = -1;
+                            CurrentState.Foreground = -1;
+                            break;
                     }
-                    else if (p1 == 49)
+                    if(p2 is >= 30 and <= 37) CurrentState.Foreground = p2; //前景色
+                    if(p2 is >= 90 and <= 97) CurrentState.Foreground = p2; //前景色
+                    if(p2 is >= 40 and <= 47 )CurrentState.Background = p2; //背景色
+                    if(p2 is >= 100 and <= 107)CurrentState.Background = p2; //背景色
+                    if(p2 == 1) CurrentState.IsBold = true; //加粗
+                    if(p2 == 4) CurrentState.IsUnderLine = true; //下划
+                    if (p2 == 7)    //反转颜色
                     {
-                        //重置背景色
                         CurrentState.Background = -1;
+                        CurrentState.Foreground = -1;
                     }
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
-            //指针往后挪
-            ptr += len;
         }
 
         //如果最后还有未处理的文本