完善terminal的输入和输出

解决了terminal下Backspace和delete操作的输入和显示异常。增加了ins pgup pgdn的输入控制（不见得有用）
tumuyan · Aug 27, 2020 · 3ec5171 · 3ec5171 · tumuyan · Aug 27, 2020
1 parent fe590f6
commit 3ec5171
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 1 deletion.
diff --git a/SerialTool/include/version.h b/SerialTool/include/version.h
@@ -1,7 +1,7 @@
 #ifndef __VERSION_H
 #define __VERSION_H
 
-#define MAIN_VERSION        1.4.1(T)
+#define MAIN_VERSION        1.4.2(T)
 
 #define SOFTWARE_NAME       "SerialTool"
 #define COPYRIGHT           "Copyleft 2017-2018, Wenliang Guan"

diff --git a/SerialTool/src/views/terminal/qvterminal/qvterminal.cpp b/SerialTool/src/views/terminal/qvterminal/qvterminal.cpp
@@ -50,12 +50,17 @@ void QVTerminal::appendData(const QByteArray &data)
 
     setUpdatesEnabled(false);
     QByteArray::const_iterator it = data.cbegin();
+
+    qDebug() << "appendData="+data;
+
     while (it != data.cend()) {
         QChar c = *it;
         switch (_state) {
         case QVTerminal::Text:
             switch (c.unicode()) {
             case '\033':
+                // \033即\x1B即ASCII 27，ESC
+                // 匹配ESC[，即CSI	，Control Sequence Introducer
                 appendString(text);
                 text.clear();
                 _state = QVTerminal::Escape;
@@ -113,6 +118,9 @@ void QVTerminal::appendData(const QByteArray &data)
                     } else {
                         _state = QVTerminal::Text;
                     }
+                }else if(c=='J') {
+                    reduceString(-1);
+                    _state = QVTerminal::Text;
                 } else {
                     formatChar(c);
                     _state = QVTerminal::Text;
@@ -127,6 +135,7 @@ void QVTerminal::appendData(const QByteArray &data)
         it++;
     }
     appendString(text);
+
     verticalScrollBar()->setRange(0, _ch * (_layout->lineCount() + 1) - viewport()->size().height());
     verticalScrollBar()->setValue(verticalScrollBar()->maximum());
     setUpdatesEnabled(true);
@@ -201,13 +210,24 @@ void QVTerminal::read()
 
 void QVTerminal::appendString(QString str)
 {
+//      qDebug() << "appendString="+str;
     foreach (QChar c, str) {
         QVTChar termChar(c, _curentFormat);
         _layout->lineAt(_cursorPos.y()).append(termChar, _cursorPos.x());
         _cursorPos.setX(_cursorPos.x() + 1);
     }
 }
 
+void QVTerminal::reduceString(int mode)
+{
+    if(mode>0)
+         _layout->lineAt(_cursorPos.y()).reduce(_cursorPos.x()+1);
+    else{
+        _layout->lineAt(_cursorPos.y()).reduce(_cursorPos.x());
+    //   _cursorPos.setX(_cursorPos.x() -1);
+    }
+}
+
 void QVTerminal::toggleCursor()
 {
     _cvisible = !_cvisible;
@@ -299,6 +319,20 @@ void QVTerminal::keyPressEvent(QKeyEvent *event)
     case Qt::Key_Backspace:
         data.append('\b');
         break;
+    // ref.PC-Style Function Keys
+    // https://invisible-island.net/xterm/ctlseqs/ctlseqs.html
+    case Qt::Key_Delete:
+        data.append("\033[3~");
+        break;
+    case Qt::Key_Insert:
+        data.append("\033[2~");
+        break;
+    case Qt::Key_PageUp:
+        data.append("\033[5~");
+        break;
+    case Qt::Key_PageDown:
+        data.append("\033[6~");
+        break;
     case Qt::Key_Return:
         data.append('\n');
         break;

diff --git a/SerialTool/src/views/terminal/qvterminal/qvterminal.h b/SerialTool/src/views/terminal/qvterminal/qvterminal.h
@@ -39,6 +39,7 @@ public slots:
 protected slots:
     void read();
     void appendString(QString str);
+    void reduceString(int position);
     void toggleCursor();
     void clearToEnd();
 

diff --git a/SerialTool/src/views/terminal/qvterminal/qvtline.cpp b/SerialTool/src/views/terminal/qvterminal/qvtline.cpp
@@ -20,6 +20,13 @@ void QVTLine::append(const QVTChar &c, int position)
     }
 }
 
+void QVTLine::reduce(int position)
+{
+    if (position >= 0 && position < _chars.count()) {
+        _chars.remove(position,1);
+    }
+}
+
 const QVector<QVTChar> &QVTLine::chars() const
 {
     return _chars;

diff --git a/SerialTool/src/views/terminal/qvterminal/qvtline.h b/SerialTool/src/views/terminal/qvterminal/qvtline.h
@@ -10,6 +10,7 @@ class QVTLine
     QVTLine();
 
     void append(const QVTChar &c, int position = -1);
+    void reduce(int position);
     void reserve(int size);
     const QVector<QVTChar> &chars() const;
     int size() const;