clean

Author: flagarde

cpp-terminal/private/signals.cpp

@@ -9,7 +9,7 @@
 
 #include "cpp-terminal/private/signals.hpp"
 
-#include "cpp-terminal/terminal.hpp"
+#include "cpp-terminal/terminal_impl.hpp"
 #include "signals.hpp"
 
 #include <algorithm>
@@ -36,10 +36,7 @@ static BOOL WINAPI consoleHandler(DWORD signal)
 }
 #endif
 
-void Term::Private::Signals::clean_terminal() noexcept
-{
-    Term::terminal.clean();
-}
+void Term::Private::Signals::clean_terminal() noexcept { const_cast<Term::Terminal*>(m_term)->clean(); }
 
 const std::size_t Term::Private::Signals::m_signals_number{NSIG - 1};
 
@@ -58,8 +55,11 @@ void Term::Private::Signals::setHandler(const sighandler_t& handler) noexcept
 #endif
 }
 
-Term::Private::Signals::Signals() noexcept
+const Term::Terminal* Term::Private::Signals::m_term{nullptr};
+
+Term::Private::Signals::Signals(const Terminal& terminal) noexcept
 {
+  m_term = &terminal;
   m_handlers.reserve(m_signals_number);
   for(std::size_t signal = 0; signal != m_signals_number; ++signal)
   {

cpp-terminal/private/signals.hpp

@@ -16,21 +16,24 @@ using sighandler_t = void (*)(int);
 namespace Term
 {
 
+class Terminal;
+
 namespace Private
 {
 
 class Signals
 {
 public:
-  Signals() noexcept;
+  Signals(const Terminal&) noexcept;
   ~Signals() noexcept = default;
   void        setHandler(const sighandler_t& handler) noexcept;
-  void        reset_and_raise(const int &sign) noexcept;
-  static      void clean_terminal() noexcept;
+  void        reset_and_raise(const int& sign) noexcept;
+  static void clean_terminal() noexcept;
 
 private:
-  const static std::size_t  m_signals_number;
-  std::vector<sighandler_t> m_handlers;
+  const static std::size_t     m_signals_number;
+  std::vector<sighandler_t>    m_handlers;
+  const static Term::Terminal* m_term;
 };
 
 }  // namespace Private

cpp-terminal/terminal_initializer.cpp

@@ -13,6 +13,7 @@
 #include "cpp-terminal/private/file_initializer.hpp"
 #include "cpp-terminal/private/signals.hpp"
 #include "cpp-terminal/terminal.hpp"
+#include "terminal.hpp"
 
 #include <new>
 
@@ -25,7 +26,7 @@ try
   {
     static const Private::FileInitializer files_init;
     new(&Term::terminal) Terminal();
-    static Term::Private::Signals signals;
+    static Term::Private::Signals signals(Term::terminal);
     sighandler_t                  handler = [](int signum) { signals.reset_and_raise(signum); };
     signals.setHandler(handler);
   }

examples/signal.cpp

@@ -20,7 +20,7 @@ int main()
 {
   Term::terminal.setOptions(Term::Option::Raw, Term::Option::SignalKeys, Term::Option::ClearScreen);
   std::signal(SIGINT,
-              [](int sig)
+              [](int)
               {
                 std::ofstream outfile("cpp_terminal_signal.txt");
                 outfile << "my text here!" << std::endl;