TerminalAppGen3 v0.3.2 src

Author: rforzachamp821

CommandFiles/CPUStress.cpp

@@ -132,11 +132,13 @@ void CpuBenchmark(short int nSingleOrMulti, long long int nArgNum = -1) {
 			colour(sColourGlobal, sColourGlobalBack);
 		}
 	}
+
 	// Multi Core
 	else if (nSingleOrMulti == 2) {
 
 		// Make std::vector array for threads in next step
 		std::vector<std::thread> vThreads(nLogicalCoreCount);
+		unsigned long long int nPreviousReiterationNum = 0;
 
 		// Start timer and call the cpu benchmark worker nLogicalCoreCount times
 		std::cout << "Starting multi-core benchmark with " << nReiterationCount << " reiterations, " << nLogicalCoreCount << " logical cores.\n";
@@ -149,15 +151,22 @@ void CpuBenchmark(short int nSingleOrMulti, long long int nArgNum = -1) {
 		}
 
 		while (true) {
+
 			if (_kbhit()) {
 				bCpuStressKeyboardTermination = true;
 				break;
 			}
 			else if (nCurrentReiterationNum >= nReiterationCount) {
 				break;
 			}
-			// Output progress
-			std::cout << "Progress: " << (nCurrentReiterationNum * 100) / nReiterationCount << "%    \r";
+
+
+			if (nPreviousReiterationNum < nCurrentReiterationNum) { // <-- Speed is required to make the percentage output operation accurate,
+				nPreviousReiterationNum = nCurrentReiterationNum;   // <-- so these two lines were put right next to each other to make that possible.
+				// Output progress
+				std::cout << "Progress: " << (nPreviousReiterationNum * 100) / nReiterationCount << "%    \r";
+			}
+
 		}
 
 		StopCpuStress = true;

CommandFiles/CommandFileAssets.cpp

@@ -223,6 +223,7 @@ int MessageBoxButtonSwitch(std::string sButtonName) {
 	return 0;
 }
 
+
 /* MessageBox Codes */
 //////////////////////
 /* Message box codes are the following for icons:

CommandFiles/CommandsFile.cpp

@@ -9,6 +9,7 @@ void Exiting();
 long double num(std::string);
 void SetCursorAttributes();
 void colourSubheading();
+void ColourTypeSwitch();
 
 extern bool bDisplayDirections;
 extern bool bDisplayVerboseMessages;
@@ -369,6 +370,12 @@ void AnsiSettings(short int nChoice = 0) {
 	if (nChoice == 1) {
 		if (EnableVTMode() != false) {
 			bAnsiVTSequences = true;
+
+			// Set new colours
+			ColourTypeSwitch();
+			colour(sColourGlobal, sColourGlobalBack);
+			cls(); // Set colours to whole screen
+
 			colour(LGRN, sColourGlobalBack);
 			std::cout << "ANSI VT sequences successfully enabled.\n";
 			colour(sColourGlobal, sColourGlobalBack);
@@ -386,12 +393,18 @@ void AnsiSettings(short int nChoice = 0) {
 	}
 	else if (nChoice == 2) {
 		colour(YLW, sColourGlobalBack);
-		std::cout << wordWrap("WARNING: This WILL disable ALL colours AND text formatting from the point of this message.") << '\n';
+		std::cout << wordWrap("WARNING: This WILL disable RGB colours AND text formatting from the point of this message.") << '\n';
 
-		if (YesNo(wordWrap("Would you like to proceed? [y/n] > "))) {
-			colour(sColourGlobal, sColourGlobalBack);
+		if (YesNo(wordWrap("Would you like to proceed? [y/n] > "))) 
+		{
 			bAnsiVTSequences = false;
-			colour(YLW, sColourGlobalBack);
+
+			// Set new colours
+			ColourTypeSwitch();
+			colour(sColourGlobal, sColourGlobalBack);
+			cls(); // Set to whole screen
+
+			colour(LGRN, sColourGlobalBack);
 			std::cout << "ANSI VT sequences successfully disabled.\n";
 			colour(sColourGlobal, sColourGlobalBack);
 
@@ -470,15 +483,6 @@ void WordWrapSettings(short int nChoice = 0) {
 
 void CursorSettings(short int nChoice = 0, short int nChoiceBlink = 0, short int nChoiceShow = 0, short int nChoiceShape = 0) {
 
-	// Doesn't work without ANSI (might support Get/SetConsoleCursorInfo in the future for legacy consoles)
-	if (!bAnsiVTSequences) {
-		colour(RED, sColourGlobalBack);
-		std::cout << wordWrap("Sorry, but this setting cannot be modified without terminal ANSI VT support.") << '\n';
-		Exiting();
-		colour(sColourGlobal, sColourGlobalBack);
-		return;
-	}
-
 	if (nChoice == 0) {
 		OptionSelectEngine oseCursor;
 		oseCursor.nSizeOfOptions = 3;
@@ -489,7 +493,22 @@ void CursorSettings(short int nChoice = 0, short int nChoiceBlink = 0, short int
 		};
 		oseCursor.sOptions = sOptions;
 
-		nChoice = oseCursor.OptionSelect("Please select your desired option for the Cursor settings:", " ___CURSOR SETTINGS___ ");
+		while (true) {
+			nChoice = oseCursor.OptionSelect("Please select your desired option for the Cursor settings:", " ___CURSOR SETTINGS___ ");
+
+			if (nChoice == 1 || nChoice == 3) {
+
+				// Doesn't work without ANSI
+				if (!bAnsiVTSequences) {
+					colour(RED, sColourGlobalBack);
+					std::cout << wordWrap("Sorry, but this setting cannot be modified without terminal ANSI VT support.") << '\n';
+					Exiting();
+					colour(sColourGlobal, sColourGlobalBack);
+				}
+				else break;
+			}
+			else break;
+		}
 	}
 
 	// Enable/Disable Cursor blinking

CommandFiles/Settings.cpp

@@ -1,24 +1,24 @@
 #pragma once
 
 // Normal colour definitions
-#define BLK "0;0;0"
-#define RED "255;0;0"
-#define GRN "22;198;12"
-#define YLW "231;186;0"
-#define BLU "0;0;255"
-#define MAG "136;23;152"
-#define CYN "58;150;221"
-#define WHT "242;242;242"
+std::string BLK = "0;0;0";
+std::string RED = "255;0;0";
+std::string GRN = "22;198;12";
+std::string YLW = "231;186;0";
+std::string BLU = "0;0;255";
+std::string MAG = "136;23;152";
+std::string CYN = "58;150;221";
+std::string WHT = "242;242;242";
 
 // Bright colour definitions
-#define GRAY "118;118;118"
-#define LRED "231;72;86"
-#define LGRN "0;255;0"
-#define LYLW "255;255;0"
-#define LBLU "59;120;255"
-#define LMAG "180;0;158"
-#define LCYN "97;214;214"
-#define LWHT "255;255;255"
+std::string GRAY = "118;118;118";
+std::string LRED = "231;72;86";
+std::string LGRN = "0;255;0";
+std::string LYLW = "255;255;0";
+std::string LBLU = "59;120;255";
+std::string LMAG = "180;0;158";
+std::string LCYN = "97;214;214";
+std::string LWHT = "255;255;255";
 
 // Text formatting definitions
 #define ULINE 4

Definitions.h

@@ -416,7 +416,7 @@ class MultimediaEngine {
 				// Get position
 				dCurrentPosition = BASS_ChannelBytes2Seconds(stream, BASS_ChannelGetPosition(stream, BASS_POS_BYTE));
 				// Output position
-				std::cout << "Media file: ";
+				std::cout << "Audio file: ";
 				colour(LCYN, sColourGlobalBack);
 				std::cout << dCurrentPosition;
 				colour(sColourGlobal, sColourGlobalBack);

Engine/MultimediaEngine.cpp

@@ -120,7 +120,7 @@ class OptionSelectEngine {
 			sHighlightBuffer = ">> " + sOptions[nIndex - 1] + " <<";
 
 			// 2. Get length of sBuffer. Put into nHighlightBuffer
-			int nHighlightBuffer = sHighlightBuffer.length();
+			size_t nHighlightBuffer = sHighlightBuffer.length();
 
 			// Only redraw options on first load - CPU optimisation, reduces flickering
 			if (bReiterated == false) 
@@ -221,8 +221,8 @@ class OptionSelectEngine {
 				// exit with code -1 if ESC is pressed
 				else if (nKey == 27) {
 
-					// Break if ESC pressed immediately, without any reiterations
-					if (bReiterated == false) break;
+					// Break if ESC pressed immediately, without any reiterations - for consoles with windows terminal bug #14774
+					if (bReiterated == false && bConsoleBugGCSBI == true) break;
 
 					// Darken the index highlight to indicate that this OptionSelect session isn't being used anymore
 					GetConsoleScreenBufferInfo(hOptionSelect, &csbiOptionSelect);

Engine/OptionSelectEngine.cpp

@@ -9,8 +9,8 @@ class TableEngine {
 	// GetLargestTableMemberSize - Gets the largest string out of an array of members passed into the function
 	// Arguments: sMembers is for the array of members that are to be checked. 
 	// The biggest size is returned if successful, otherwise -1 is returned if an error occured.
-	int GetColumnSize(std::vector<std::string> vsMembers) {
-		int nLargestSize = 0;
+	size_t GetColumnSize(std::vector<std::string> vsMembers) {
+		size_t nLargestSize = 0;
 
 		for (int i = 0; i < vsMembers.size(); i++) {
 			if (vsMembers[i].size() > nLargestSize) {