From 99c6f5df144d0530fe43225d353dee881cfdf26a Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Sat, 24 Jan 2015 13:23:55 +0100
Subject: Moved Terminal and TerminalLogger to own classes in new frontent
 folder

---
 src/core/frontend/Terminal.cpp | 58 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 src/core/frontend/Terminal.cpp

(limited to 'src/core/frontend/Terminal.cpp')

diff --git a/src/core/frontend/Terminal.cpp b/src/core/frontend/Terminal.cpp
new file mode 100644
index 0000000..447e595
--- /dev/null
+++ b/src/core/frontend/Terminal.cpp
@@ -0,0 +1,58 @@
+/*
+    Ousía
+    Copyright (C) 2014  Benjamin Paaßen, Andreas Stöckel
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <sstream>
+
+#include "Terminal.hpp"
+
+namespace ousia {
+
+std::string Terminal::color(int color, bool bright) const
+{
+	if (!useColor) {
+		return std::string{};
+	}
+	std::stringstream ss;
+	ss << "\x1b[";
+	if (bright) {
+		ss << "1;";
+	}
+	ss << color << "m";
+	return ss.str();
+}
+
+std::string Terminal::bright() const
+{
+	if (!useColor) {
+		return std::string{};
+	}
+	std::stringstream ss;
+	ss << "\x1b[1m";
+	return ss.str();
+}
+
+std::string Terminal::reset() const
+{
+	if (!useColor) {
+		return std::string{};
+	}
+	return "\x1b[0m";
+}
+
+}
+
-- 
cgit v1.2.3


From 7e722fdd45496e6c8dd115faa7fab265e13b2e93 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Sat, 24 Jan 2015 14:23:24 +0100
Subject: Support for italic and underline in logger (yay, toys!)

---
 src/core/frontend/Terminal.cpp | 20 +++++++++++++++++---
 src/core/frontend/Terminal.hpp | 14 ++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

(limited to 'src/core/frontend/Terminal.cpp')

diff --git a/src/core/frontend/Terminal.cpp b/src/core/frontend/Terminal.cpp
index 447e595..5664564 100644
--- a/src/core/frontend/Terminal.cpp
+++ b/src/core/frontend/Terminal.cpp
@@ -41,9 +41,23 @@ std::string Terminal::bright() const
 	if (!useColor) {
 		return std::string{};
 	}
-	std::stringstream ss;
-	ss << "\x1b[1m";
-	return ss.str();
+	return "\x1b[1m";
+}
+
+std::string Terminal::italic() const
+{
+	if (!useColor) {
+		return std::string{};
+	}
+	return "\x1b[3m";
+}
+
+std::string Terminal::underline() const
+{
+	if (!useColor) {
+		return std::string{};
+	}
+	return "\x1b[4m";
 }
 
 std::string Terminal::reset() const
diff --git a/src/core/frontend/Terminal.hpp b/src/core/frontend/Terminal.hpp
index 730853d..90a2e6f 100644
--- a/src/core/frontend/Terminal.hpp
+++ b/src/core/frontend/Terminal.hpp
@@ -111,6 +111,20 @@ public:
 	 */
 	std::string bright() const;
 
+	/**
+	 * Makes the text italic.
+	 *
+	 * @return a control string to be included in the output stream.
+	 */
+	std::string italic() const;
+
+	/**
+	 * Underlines the text.
+	 *
+	 * @return a control string to be included in the output stream.
+	 */
+	std::string underline() const;
+
 	/**
 	 * Returns a control string for switching to the default mode.
 	 *
-- 
cgit v1.2.3