Merge pull request #243 from flagarde/options

Simplify setOptions()

Author: staxfur

cpp-terminal/io.cpp

@@ -8,7 +8,7 @@ namespace Term
 {
 static char termbuf[sizeof(Term::Terminal)];
 Terminal&   terminal = reinterpret_cast<Term::Terminal&>(termbuf);
-}  // namespace Term
+}  // namespace Term */
 
 int Term::TerminalInitializer::m_counter{0};
 

cpp-terminal/options.cpp

@@ -2,14 +2,12 @@
 
 #include <algorithm>
 
-Term::Options::Options(const std::vector<Option>& options) : m_Options(options) {}
-
-std::vector<Term::Options::Option> Term::Options::getOptions() { return m_Options; }
+void Term::Options::set(const Term::Option& option) { m_Options.push_back(option); }
 
 // Return true is the option is set and not its opposite (* + No* = false)
 bool Term::Options::has(const Option& option)
 {
-  if(std::find(m_Options.begin(), m_Options.end(), option) != m_Options.end() && std::find(m_Options.begin(), m_Options.end(), static_cast<Options::Option>(-1 * static_cast<std::int16_t>(option))) == m_Options.end()) return true;
+  if(std::find(m_Options.begin(), m_Options.end(), option) != m_Options.end() && std::find(m_Options.begin(), m_Options.end(), static_cast<Option>(-1 * static_cast<std::int16_t>(option))) == m_Options.end()) return true;
   else
     return false;
 }

cpp-terminal/options.hpp

@@ -6,32 +6,30 @@
 namespace Term
 {
 
+enum class Option : int
+{
+  // Don't use 0!
+  Default       = 0,
+  Raw           = 1,
+  Cooked        = -1,
+  ClearScreen   = 2,
+  NoClearScreen = -2,
+  SignalKeys    = 3,
+  NoSignalKeys  = -3,
+  Cursor        = 4,
+  NoCursor      = -4,
+};
+
 class Options
 {
 public:
-  enum class Option : int
-  {
-    // Don't use 0!
-    Default       = 0,
-    Raw           = 1,
-    Cooked        = -1,
-    ClearScreen   = 2,
-    NoClearScreen = -2,
-    SignalKeys    = 3,
-    NoSignalKeys  = -3,
-    Cursor        = 4,
-    NoCursor      = -4,
-  };
   Options() = default;
-  explicit Options(const std::vector<Option>& options);
-  bool has(const Option& option);
-  ~Options() {}
-  std::vector<Option> getOptions();
+  bool has(const Option&);
+  void set(const Option&);
+  ~Options() = default;
 
 private:
   std::vector<Option> m_Options;
 };
 
-typedef Term::Options::Option Option;
-
 }  // namespace Term

cpp-terminal/prompt.cpp

@@ -12,7 +12,7 @@
 
 Term::Result Term::prompt(const std::string& message, const std::string& first_option, const std::string& second_option, const std::string& prompt_indicator, bool immediate)
 {
-  Term::terminal.setOptions({Option::NoClearScreen, Option::NoSignalKeys, Option::Cursor, Term::Option::Raw});
+  Term::terminal.setOptions(Option::NoClearScreen, Option::NoSignalKeys, Option::Cursor, Term::Option::Raw);
   std::cout << message << " [" << first_option << '/' << second_option << ']' << prompt_indicator << ' ' << std::flush;
 
   if(!Term::is_stdin_a_tty())

cpp-terminal/terminal.cpp

@@ -1,9 +1,9 @@
 #include "cpp-terminal/terminal.hpp"
 
 #include "cpp-terminal/cursor.hpp"
+#include "cpp-terminal/options.hpp"
 #include "cpp-terminal/screen.hpp"
 #include "cpp-terminal/style.hpp"
-#include "options.hpp"
 
 Term::Terminal::Terminal()
 {
@@ -21,9 +21,10 @@ Term::Terminal::~Terminal()
   detachConsole();
 }
 
-void Term::Terminal::setOptions(const std::vector<Term::Options::Option>& options)
+void Term::Terminal::setOptions() { applyOptions(); }
+
+void Term::Terminal::applyOptions()
 {
-  m_options = Options(options);
   if(m_options.has(Option::ClearScreen)) clog << screen_save() << clear_buffer() << style(Style::RESET) << cursor_move(1, 1);
   if(m_options.has(Option::NoCursor)) clog << cursor_off();
   if(m_options.has(Option::Raw)) setRawMode();

cpp-terminal/terminal.hpp

@@ -21,21 +21,28 @@ class Terminal
 public:
   Terminal();
   ~Terminal();
-  void                           setOptions(const std::vector<Term::Options::Option>& options = {});
+
+  template<typename Arg1 = Term::Option, typename... Args> void setOptions(Arg1 arg1, Args... args)
+  {
+    m_options.set(arg1);
+    setOptions(args...);
+  }
+
   template<typename T> Terminal& operator<<(const T& dt)
   {
     clog << dt;
     return *this;
   }
   template<typename T> std::istream& operator>>(T& dt)
   {
-    if(m_options.has(Options::Option::Raw))
+    if(m_options.has(Option::Raw))
     {
-      std::vector<Term::Options::Option> option = m_options.getOptions();
+      Options options = m_options;
       store_and_restore();
       this->cin >> dt;
       store_and_restore();
-      setOptions(option);
+      m_options = options;
+      applyOptions();
       return this->cin;
     }
     else
@@ -51,6 +58,8 @@ class Terminal
   }
 
 private:
+  void           setOptions();
+  void           applyOptions();
   std::ofstream  cout;
   std::ofstream  cerr;
   std::ofstream  clog;

examples/cin.cpp

@@ -5,7 +5,7 @@
 
 int main()
 {
-  Term::terminal.setOptions({Term::Option::Raw});
+  Term::terminal.setOptions(Term::Option::Raw);
   Term::terminal << "This should be printed" << std::flush << " only in terminal" << std::endl;
   std::cout << "This should be printed in terminal if stdout is not redirected" << std::endl;
   Term::terminal << "Now type a number and then a string !" << std::endl;

examples/keys.cpp

@@ -14,8 +14,8 @@ int main()
   try
   {
     // check if the terminal is capable of handling input
+    Term::terminal.setOptions(Term::Option::NoClearScreen, Term::Option::NoSignalKeys, Term::Option::Cursor, Term::Option::Raw);
     if(!Term::is_stdin_a_tty()) throw Term::Exception("The terminal is not attached to a TTY and therefore can't catch user input. Exiting...");
-    Term::terminal.setOptions({Term::Option::NoClearScreen, Term::Option::NoSignalKeys, Term::Option::Cursor, Term::Option::Raw});
 
     Term::Cursor cursor{Term::cursor_position()};
     Term::terminal << "Cursor position : " << cursor.row() << " " << cursor.column() << std::endl;

examples/kilo.cpp

@@ -926,7 +926,7 @@ int main(int argc, char* argv[])
       std::cout << "The terminal is not attached to a TTY and therefore can't catch user input. Exiting...\n";
       return 1;
     }
-    Term::terminal.setOptions({Term::Option::ClearScreen, Term::Option::NoSignalKeys, Term::Option::NoCursor, Term::Option::Raw});
+    Term::terminal.setOptions(Term::Option::ClearScreen, Term::Option::NoSignalKeys, Term::Option::NoCursor, Term::Option::Raw);
     initEditor();
     if(argc >= 2) { editorOpen(argv[1]); }
 

examples/menu.cpp

@@ -69,8 +69,8 @@ int main()
   try
   {
     // check if the terminal is capable of handling input
+    Term::terminal.setOptions(Term::Option::ClearScreen, Term::Option::NoSignalKeys, Term::Option::NoCursor, Term::Option::Raw);
     if(!Term::is_stdin_a_tty()) throw Term::Exception("The terminal is not attached to a TTY and therefore can't catch user input. Exiting...");
-    Term::terminal.setOptions({Term::Option::ClearScreen, Term::Option::NoSignalKeys, Term::Option::NoCursor, Term::Option::Raw});
     Term::Screen term_size = Term::screen_size();
     int          pos       = 5;
     int          h         = 10;