Terminal: enableAnsi

Author: MorganCaron

modules/Terminal/Canvas.mpp

@@ -33,7 +33,7 @@ export namespace CppUtils::Terminal
 			{
 				if (m_size.width() == 0 or m_size.height() == 0)
 					return;
-				std::print("{}", std::string(m_size.height() - 1, '\n'));
+				std::print("{}", std::string(m_size.height(), '\n'));
 				update();
 			}
 
@@ -101,10 +101,13 @@ export namespace CppUtils::Terminal
 			using Area::draw;
 
 		public:
-			inline Canvas(const Container::Size2& size = getTerminalSize(), const std::optional<Viewport>& viewportOpt = std::nullopt):
-				Area{size, viewportOpt.value_or(Viewport{size, {0, 0}})},
+			inline Canvas(const Container::Size2& size = getTerminalSize(), const std::optional<Viewport>& optionalViewport = std::nullopt):
+				Area{size, optionalViewport.value_or(Viewport{size, {0, 0}})},
 				m_previousBuffer{size}
-			{}
+			{
+				setConsoleOutputUTF8();
+				enableAnsi();
+			}
 
 			inline auto applyDifferences() noexcept -> void
 			{
@@ -125,7 +128,7 @@ export namespace CppUtils::Terminal
 					if (needUpdateText or needUpdateTextStyle or needUpdateTextColor or needUpdateBackgroundColor)
 					{
 						if (std::empty(stringBuffer))
-							setCursorPosition(Container::Size2{position.x(), terminalSize.height() - m_viewport.getSize().height() + position.y() - 1});
+							setCursorPosition({position.x(), terminalSize.height() - m_viewport.getSize().height() + position.y()});
 						if (needUpdateTextStyle)
 						{
 							stringBuffer += TextStyle::getTextStyleCode(currentChar.textStyle);
@@ -160,7 +163,7 @@ export namespace CppUtils::Terminal
 				}
 				if (needFlush)
 					std::fflush(stdout);
-				setCursorPosition(getTerminalSize());
+				setCursorPosition({0, getTerminalSize().height()});
 			}
 
 			inline auto print() noexcept -> void
@@ -190,7 +193,7 @@ export namespace CppUtils::Terminal
 				m_stopEvent.wait();
 			}
 
-			inline auto stop() noexcept -> void
+			inline auto close() noexcept -> void
 			{
 				m_stopEvent.notify();
 			}

modules/Terminal/Cursor.mpp

@@ -33,7 +33,7 @@ export namespace CppUtils::Terminal
 		const auto response = rawTerminal.read('R');
 		auto rows = 0, columns = 0;
 		if (std::sscanf(response.c_str(), "\x1b[%d;%d", std::addressof(rows), std::addressof(columns)) == 2)
-			return Container::Size2{columns - 1, rows - 1};
+			return Container::Size2{columns, rows};
 		return std::unexpected{"Cursor position retrieval failure"sv};
 	}
 #endif
@@ -46,7 +46,7 @@ export namespace CppUtils::Terminal
 #elif defined(OS_LINUX) or defined(OS_MACOS)
 	inline auto setCursorPosition([[maybe_unused]] Container::Size2 position) -> void
 	{
-		std::print("\x1b[{};{}H", position.y() + 1, position.x() + 1);
+		std::print("\x1b[{};{}H", position.y(), position.x());
 	}
 #endif
 }

modules/Terminal/Utility.mpp

@@ -4,12 +4,31 @@ module;
 
 export module CppUtils.Terminal.Utility;
 
+import CppUtils.System.Type;
+import CppUtils.System.Error;
+import CppUtils.Terminal.Handle;
+
 export namespace CppUtils::Terminal
 {
 	inline auto setConsoleOutputUTF8() -> void
 	{
 #if defined(OS_WINDOWS)
 		SetConsoleOutputCP(CP_UTF8);
+#endif
+	}
+
+	inline auto enableAnsi() -> void
+	{
+#if defined(OS_WINDOWS)
+		auto outputHandle = getTerminalHandle(stdout);
+		if (outputHandle == System::InvalidHandle)
+			return;
+
+		auto mode = DWORD{0};
+		if (not GetConsoleMode(outputHandle, std::addressof(mode)))
+			throwLastError("CppUtils::Terminal::enableAnsi: GetConsoleMode failed");
+
+		SetConsoleMode(outputHandle, mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
 #endif
 	}
 }

tests/Terminal/Canvas.mpp

@@ -55,7 +55,7 @@ export namespace CppUtils::UnitTest::Terminal::Canvas
 					frame = 0;
 					if (++loop == 5)
 					{
-						canvas.stop();
+						canvas.close();
 						return;
 					}
 				}