update

Author: restran

ShellCat/BatchCmdForm.Designer.cs

@@ -34,6 +34,8 @@ public BatchCmdForm(MainForm mainForm)
 
             rtbInput.Font = new Font(rtbInput.Font.FontFamily, 10.5f);
             rtbOutput.Font = new Font(rtbOutput.Font.FontFamily, 10.5f);
+            rtbInput.SelectionFont = new Font(rtbInput.Font.FontFamily, 10.5f);
+            rtbOutput.SelectionFont = new Font(rtbInput.Font.FontFamily, 10.5f);
 
             rtbInput.AppendText("You are using bath cmd mode, all your shell cmd will send to all selected servers.");
             rtbInput.AppendText("\n$ ");
@@ -105,13 +107,17 @@ public void AppendOutputText(string content)
             {
                 var rtbSet = new DelegateRichTextBox(delegate (RichTextBox tb, string cnt)
                 {
+                    // 设置插入点的字体
+                    tb.SelectionFont = new Font(tb.Font.FontFamily, 10.5f);
                     tb.AppendText(cnt);
                     tb.ScrollToCaret(); //让滚动条拉到最底处   
                 });
                 rtbOutput.Invoke(rtbSet, rtbOutput, content);
             }
             else
             {
+                // 设置插入点的字体
+                rtbOutput.SelectionFont = new Font(rtbOutput.Font.FontFamily, 10.5f);
                 rtbOutput.AppendText(content);
                 rtbOutput.ScrollToCaret(); //让滚动条拉到最底处  
             }
@@ -149,7 +155,7 @@ private void rtbInput_KeyUp(object sender, KeyEventArgs e)
                     if (lvwIP.Items[i].Checked)
                     {
                         var remote = lvwIP.Items[i].SubItems[1].Text;
-                        _mainForm._server.SendMessageToClient(remote, cmd + "\n");
+                        _mainForm._server.SendMessageToClient(remote, cmd);
                     }
                 }
 

ShellCat/BatchCmdForm.cs

@@ -281,10 +281,10 @@ private void OnReadComplete(IAsyncResult ar)
 
                 lock (_mainForm._lockObject)
                 {
-                    if (_mainForm._showingBatchCmdForm)
+                    if (_mainForm._showingBatchCmdForm && !_mainForm._batchCmdForm.IsDisposed)
                     {
                         _mainForm._batchCmdForm.AppendOutputText("......................\n");
-                        _mainForm._batchCmdForm.AppendOutputText($"{_remoteEndPoint}: \n");
+                        _mainForm._batchCmdForm.AppendOutputText($"{_remoteEndPoint}\n");
                         _mainForm._batchCmdForm.AppendOutputText(msg);
                         _mainForm._batchCmdForm.AppendOutputText("\n");
                     }

ShellCat/MainForm.Designer.cs

@@ -21,9 +21,18 @@ public ShellTab(RemoteClient client)
                 BackColor = Color.Black,
                 ForeColor = Color.LimeGreen,
             };
-            RtbShell.Font = new Font(RtbShell.Font.FontFamily, 10.5f);
+            try
+            {
+                RtbShell.Font = new Font("Consolas", 10.5f);
+            } 
+            catch
+            {
+
+            }
+            
+            RtbShell.SelectionFont = new Font(RtbShell.Font.FontFamily, 10.5f);
             this.Controls.Add(RtbShell);
-            RtbShell.KeyDown += new System.Windows.Forms.KeyEventHandler(this.RtbShell_KeyDown);
+            RtbShell.KeyUp += new System.Windows.Forms.KeyEventHandler(this.RtbShell_KeyUp);
             //RtbShell.KeyUp += new System.Windows.Forms.KeyEventHandler(this.RtbShell_KeyUp);
             RtbShell.TextChanged += new System.EventHandler(this.RtbShell_TextChanged);
         }
@@ -36,6 +45,8 @@ public void AppendText(string content)
             {
                 var rtbSet = new DelegateRichTextBox(delegate(RichTextBox tb, string cnt)
                 {
+                    // 设置插入点的字体
+                    tb.SelectionFont = new Font(tb.Font.FontFamily, 10.5f);
                     tb.AppendText(cnt);
                     tb.ScrollToCaret(); //让滚动条拉到最底处   
                     _oldLength = tb.TextLength; // 获取richtextbox中已有内容长度
@@ -44,6 +55,8 @@ public void AppendText(string content)
             }
             else
             {
+                // 设置插入点的字体
+                RtbShell.SelectionFont = new Font(RtbShell.Font.FontFamily, 10.5f);
                 RtbShell.AppendText(content);
                 RtbShell.ScrollToCaret(); //让滚动条拉到最底处  
                 _oldLength = RtbShell.TextLength; // 获取richtextbox中已有内容长度 
@@ -65,15 +78,15 @@ private void RtbShell_TextChanged(object sender, EventArgs e)
             }
         }
 
-        private void RtbShell_KeyDown(object sender, KeyEventArgs e)
+        private void RtbShell_KeyUp(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
             {
                 if (!ConnectionLost)
                 {
                     var cmd = RtbShell.Text.Substring(_oldLength);
                     _oldLength = RtbShell.TextLength;
-                    _client.SendMessage(cmd + "\n");
+                    _client.SendMessage(cmd);
                 }
             }
         }