Version 0.16a, made the following changes:

thedjnK · thedjnK · commit c12c14d1fc48 · 2023-07-23T12:17:39.000+01:00
- Fixed issue with reworked scroll edit not adding newline
 - Fixed issue with scroll edit adding escape characters when not
   in VT100 decode mode
 - Fixed missing variable increment in escape code
 - Improve efficiency of escape code by replacing escape sequences
   instead of inserting then removing
diff --git a/AuTerm/AutEscape.cpp b/AuTerm/AutEscape.cpp
@@ -41,40 +41,38 @@ AutEscape::escape_characters(
 {
     //Escapes character sequences
     qint32 next = data->indexOf("\\");
+
     while (next != -1)
     {
         QChar cur_char;
 
-        if (data->length() <= next)
+        if (data->length() <= (next + 1))
         {
             //No more string length, ignore
             break;
         }
 
-        cur_char = data->at(next + 1);
+        cur_char = QChar(data->at(next + 1)).toLower();
 
         if (cur_char == '\\')
         {
             //This is a \\ so remove one of the slashes and ignore the conversion
             data->remove(next, 1);
         }
-        else if (cur_char == 'r' || cur_char == 'R')
+        else if (cur_char == 'r')
         {
             //This is a \r or \R
-            data->insert(next, "\r");
-            data->remove((next + 1), 2);
+            data->replace(next, 2, "\r");
         }
-        else if (cur_char == 'n' || cur_char == 'N')
+        else if (cur_char == 'n')
         {
             //This is a \n or \N
-            data->insert(next, "\n");
-            data->remove((next + 1), 2);
+            data->replace(next, 2, "\n");
         }
-        else if (cur_char == 't' || cur_char == 'T')
+        else if (cur_char == 't')
         {
             //This is a \t or \T
-            data->insert(next, "\t");
-            data->remove((next + 1), 2);
+            data->replace(next, 2, "\t");
         }
         else if (data->length() <= (next + 2))
         {
@@ -83,13 +81,13 @@ AutEscape::escape_characters(
         }
         else
         {
-            QChar next_char = data->at(next + 2);
+            QChar next_char = QChar(data->at(next + 2)).toLower();
 
-            if (((cur_char >= '0' && cur_char <= '9') || (cur_char >= 'a' && cur_char <= 'f') || (cur_char >= 'A' && cur_char <= 'F')) && ((next_char >= '0' && next_char <= '9') || (next_char >= 'a' && next_char <= 'f') || (next_char >= 'A' && next_char <= 'F')))
+            if (((cur_char >= '0' && cur_char <= '9') || (cur_char >= 'a' && cur_char <= 'f')) && ((next_char >= '0' && next_char <= '9') || (next_char >= 'a' && next_char <= 'f')))
             {
                 //Character to escape
-                data->insert(next, (char)data->mid((next + 1), 2).toInt(NULL, 16));
-                data->remove((next + 1), 3);
+                char replacement = (char)data->mid((next + 1), 2).toInt(NULL, 16);
+                data->replace(next, 3, &replacement, sizeof(char));
             }
         }
 
diff --git a/AuTerm/AutScrollEdit.cpp b/AuTerm/AutScrollEdit.cpp
@@ -58,6 +58,7 @@ AutScrollEdit::AutScrollEdit(QWidget *parent) : QPlainTextEdit(parent)
     mbSliderShown = false;
     dat_out_updated = false;
     dat_in_new_len = 0;
+    had_dat_in_data = false;
 
     mstrDatIn.reserve(32768);
 
@@ -815,7 +816,7 @@ void AutScrollEdit::add_dat_in_text(QByteArray *baDat, bool apply_formatting)
     //Adds data to the DatIn buffer
     bool added = false;
 
-    if (mstrDatIn.isEmpty() == true)
+    if (had_dat_in_data == false)
     {
         //Remove first newline
         uint32_t i = 0;
@@ -828,7 +829,7 @@ void AutScrollEdit::add_dat_in_text(QByteArray *baDat, bool apply_formatting)
         if (i > 0)
         {
 //TODO: a better way to deal with this "hack"
-            if (apply_formatting == false)
+            if (apply_formatting == false && vt100_control_mode == VT100_MODE_DECODE)
             {
                 mstrDatIn += "\x1b[0m";
             }
@@ -839,13 +840,14 @@ void AutScrollEdit::add_dat_in_text(QByteArray *baDat, bool apply_formatting)
 
     if (added == false)
     {
-        if (apply_formatting == false)
+        if (apply_formatting == false && vt100_control_mode == VT100_MODE_DECODE)
         {
             mstrDatIn += "\x1b[0m";
         }
         mstrDatIn += baDat->replace("\r\n", "\n").replace("\r", "\n");
     }
 
+    had_dat_in_data = true;
     this->update_display();
 }
 
@@ -885,6 +887,7 @@ void AutScrollEdit::clear_dat_in()
 
     this->clear();
     dat_out_updated = true;
+    had_dat_in_data = false;
 
     this->moveCursor(QTextCursor::End);
     this->update_display();
diff --git a/AuTerm/AutScrollEdit.h b/AuTerm/AutScrollEdit.h
@@ -133,6 +133,7 @@ class AutScrollEdit : public QPlainTextEdit
     int32_t dat_in_new_len; //Holds position of QString-version of mstrDatIn where the mstrDatIn ends
     QTextCharFormat last_format; //Last format applied to dat out data
     vt100_mode vt100_control_mode; //VT100 control code mode
+    bool had_dat_in_data; //True if there is current data displayed from the dat in buffer
 
 public:
     bool mbLocalEcho; //True if local echo is enabled
diff --git a/AuTerm/UwxMainWindow.h b/AuTerm/UwxMainWindow.h
@@ -103,7 +103,7 @@
 // Constants
 /******************************************************************************/
 //Constants for version and functions
-const QString UwVersion                         = "0.16"; //Version string
+const QString UwVersion                         = "0.16a"; //Version string
 //Constants for timeouts and streaming
 const qint16 FileReadBlock                      = 512;     //Number of bytes to read per block when streaming files
 const qint16 StreamProgress                     = 10000;   //Number of bytes between streaming progress updates
diff --git a/AuTerm/version.rc b/AuTerm/version.rc
@@ -1,8 +1,8 @@
     #include <windows.h>
 
     VS_VERSION_INFO     VERSIONINFO
-    FILEVERSION         0, 16, 0, 0
-    PRODUCTVERSION      0, 16, 0, 0
+    FILEVERSION         0, 16, 1, 0
+    PRODUCTVERSION      0, 16, 1, 0
     FILEFLAGSMASK       0x3fL
     FILEFLAGS           0
     FILEOS              VOS_NT_WINDOWS32
@@ -19,12 +19,12 @@
             BEGIN
                 VALUE   "CompanyName",      "thedjnK\0"
                 VALUE   "FileDescription",  "AuTerm\0"
-                VALUE   "FileVersion",      "0.16.0.0\0"
+                VALUE   "FileVersion",      "0.16.1.0\0"
                 VALUE   "InternalName",     "AuTerm\0"
                 VALUE   "LegalCopyright",   "Copyright 2023 thedjnK\0"
                 VALUE   "OriginalFilename", "AuTerm.exe\0"
                 VALUE   "ProductName",      "AuTerm\0"
-                VALUE   "ProductVersion",   "0.16.0.0\0"
+                VALUE   "ProductVersion",   "0.16.1.0\0"
             END
         END
     END

Original file line number	Diff line number	Diff line change
`@@ -41,40 +41,38 @@ AutEscape::escape_characters(`
`41`	`41`	`{`
`42`	`42`	`//Escapes character sequences`
`43`	`43`	`qint32 next = data->indexOf("\\");`
	`44`	`+`
`44`	`45`	`while (next != -1)`
`45`	`46`	`{`
`46`	`47`	`QChar cur_char;`
`47`	`48`
`48`		`- if (data->length() <= next)`
	`49`	`+ if (data->length() <= (next + 1))`
`49`	`50`	`{`
`50`	`51`	`//No more string length, ignore`
`51`	`52`	`break;`
`52`	`53`	`}`
`53`	`54`
`54`		`- cur_char = data->at(next + 1);`
	`55`	`+ cur_char = QChar(data->at(next + 1)).toLower();`
`55`	`56`
`56`	`57`	`if (cur_char == '\\')`
`57`	`58`	`{`
`58`	`59`	`//This is a \\ so remove one of the slashes and ignore the conversion`
`59`	`60`	`data->remove(next, 1);`
`60`	`61`	`}`
`61`		`- else if (cur_char == 'r' \|\| cur_char == 'R')`
	`62`	`+ else if (cur_char == 'r')`
`62`	`63`	`{`
`63`	`64`	`//This is a \r or \R`
`64`		`- data->insert(next, "\r");`
`65`		`- data->remove((next + 1), 2);`
	`65`	`+ data->replace(next, 2, "\r");`
`66`	`66`	`}`
`67`		`- else if (cur_char == 'n' \|\| cur_char == 'N')`
	`67`	`+ else if (cur_char == 'n')`
`68`	`68`	`{`
`69`	`69`	`//This is a \n or \N`
`70`		`- data->insert(next, "\n");`
`71`		`- data->remove((next + 1), 2);`
	`70`	`+ data->replace(next, 2, "\n");`
`72`	`71`	`}`
`73`		`- else if (cur_char == 't' \|\| cur_char == 'T')`
	`72`	`+ else if (cur_char == 't')`
`74`	`73`	`{`
`75`	`74`	`//This is a \t or \T`
`76`		`- data->insert(next, "\t");`
`77`		`- data->remove((next + 1), 2);`
	`75`	`+ data->replace(next, 2, "\t");`
`78`	`76`	`}`
`79`	`77`	`else if (data->length() <= (next + 2))`
`80`	`78`	`{`
`@@ -83,13 +81,13 @@ AutEscape::escape_characters(`
`83`	`81`	`}`
`84`	`82`	`else`
`85`	`83`	`{`
`86`		`- QChar next_char = data->at(next + 2);`
	`84`	`+ QChar next_char = QChar(data->at(next + 2)).toLower();`
`87`	`85`
`88`		`- if (((cur_char >= '0' && cur_char <= '9') \|\| (cur_char >= 'a' && cur_char <= 'f') \|\| (cur_char >= 'A' && cur_char <= 'F')) && ((next_char >= '0' && next_char <= '9') \|\| (next_char >= 'a' && next_char <= 'f') \|\| (next_char >= 'A' && next_char <= 'F')))`
	`86`	`+ if (((cur_char >= '0' && cur_char <= '9') \|\| (cur_char >= 'a' && cur_char <= 'f')) && ((next_char >= '0' && next_char <= '9') \|\| (next_char >= 'a' && next_char <= 'f')))`
`89`	`87`	`{`
`90`	`88`	`//Character to escape`
`91`		`- data->insert(next, (char)data->mid((next + 1), 2).toInt(NULL, 16));`
`92`		`- data->remove((next + 1), 3);`
	`89`	`+ char replacement = (char)data->mid((next + 1), 2).toInt(NULL, 16);`
	`90`	`+ data->replace(next, 3, &replacement, sizeof(char));`
`93`	`91`	`}`
`94`	`92`	`}`
`95`	`93`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ AutScrollEdit::AutScrollEdit(QWidget *parent) : QPlainTextEdit(parent)`
`58`	`58`	`mbSliderShown = false;`
`59`	`59`	`dat_out_updated = false;`
`60`	`60`	`dat_in_new_len = 0;`
	`61`	`+ had_dat_in_data = false;`
`61`	`62`
`62`	`63`	`mstrDatIn.reserve(32768);`
`63`	`64`
`@@ -815,7 +816,7 @@ void AutScrollEdit::add_dat_in_text(QByteArray *baDat, bool apply_formatting)`
`815`	`816`	`//Adds data to the DatIn buffer`
`816`	`817`	`bool added = false;`
`817`	`818`
`818`		`- if (mstrDatIn.isEmpty() == true)`
	`819`	`+ if (had_dat_in_data == false)`
`819`	`820`	`{`
`820`	`821`	`//Remove first newline`
`821`	`822`	`uint32_t i = 0;`
`@@ -828,7 +829,7 @@ void AutScrollEdit::add_dat_in_text(QByteArray *baDat, bool apply_formatting)`
`828`	`829`	`if (i > 0)`
`829`	`830`	`{`
`830`	`831`	`//TODO: a better way to deal with this "hack"`
`831`		`- if (apply_formatting == false)`
	`832`	`+ if (apply_formatting == false && vt100_control_mode == VT100_MODE_DECODE)`
`832`	`833`	`{`
`833`	`834`	`mstrDatIn += "\x1b[0m";`
`834`	`835`	`}`
`@@ -839,13 +840,14 @@ void AutScrollEdit::add_dat_in_text(QByteArray *baDat, bool apply_formatting)`
`839`	`840`
`840`	`841`	`if (added == false)`
`841`	`842`	`{`
`842`		`- if (apply_formatting == false)`
	`843`	`+ if (apply_formatting == false && vt100_control_mode == VT100_MODE_DECODE)`
`843`	`844`	`{`
`844`	`845`	`mstrDatIn += "\x1b[0m";`
`845`	`846`	`}`
`846`	`847`	`mstrDatIn += baDat->replace("\r\n", "\n").replace("\r", "\n");`
`847`	`848`	`}`
`848`	`849`
	`850`	`+ had_dat_in_data = true;`
`849`	`851`	`this->update_display();`
`850`	`852`	`}`
`851`	`853`
`@@ -885,6 +887,7 @@ void AutScrollEdit::clear_dat_in()`
`885`	`887`
`886`	`888`	`this->clear();`
`887`	`889`	`dat_out_updated = true;`
	`890`	`+ had_dat_in_data = false;`
`888`	`891`
`889`	`892`	`this->moveCursor(QTextCursor::End);`
`890`	`893`	`this->update_display();`