fix for windows

Author: flagarde

cpp-terminal/private/signals.cpp

@@ -9,7 +9,7 @@
 
 #include "cpp-terminal/private/signals.hpp"
 
-#include "cpp-terminal/terminal_impl.hpp"
+#include "cpp-terminal/terminal.hpp"
 #include "signals.hpp"
 
 #include <algorithm>
@@ -28,14 +28,19 @@ static BOOL WINAPI consoleHandler(DWORD signal)
     case CTRL_C_EVENT:
     case CTRL_BREAK_EVENT:
     {
-      Term::Private::Signals::reset_and_raise(Term::terminal);
+      Term::Private::Signals::clean_terminal();
       return false;
     }
     default: return false;
   }
 }
 #endif
 
+void Term::Private::Signals::clean_terminal() noexcept
+{
+    Term::terminal.clean();
+}
+
 const std::size_t Term::Private::Signals::m_signals_number{NSIG - 1};
 
 void Term::Private::Signals::setHandler(const sighandler_t& handler) noexcept
@@ -72,10 +77,9 @@ Term::Private::Signals::Signals() noexcept
   }
 }
 
-void Term::Private::Signals::reset_and_raise(Term::Terminal& term) noexcept { term.clean(); }
-
-void Term::Private::Signals::reset_and_raise(int sign, Term::Terminal& term) noexcept
+void Term::Private::Signals::reset_and_raise(const int& sign) noexcept
 {
+  clean_terminal();
   const static std::vector<int> termin{
 #if defined(SIGHUP)
     SIGHUP,
@@ -166,7 +170,6 @@ void Term::Private::Signals::reset_and_raise(int sign, Term::Terminal& term) noe
   {
     sighandler_t old = std::signal(sign, m_handlers[sign]);
     old              = std::signal(sign, m_handlers[sign]);
-    term.clean();
     std::raise(sign);
   }
 }

cpp-terminal/private/signals.hpp

@@ -15,7 +15,6 @@ using sighandler_t = void (*)(int);
 
 namespace Term
 {
-class Terminal;
 
 namespace Private
 {
@@ -26,8 +25,8 @@ class Signals
   Signals() noexcept;
   ~Signals() noexcept = default;
   void        setHandler(const sighandler_t& handler) noexcept;
-  void        reset_and_raise(int sign, Term::Terminal&) noexcept;
-  static void reset_and_raise(Term::Terminal&) noexcept;
+  void        reset_and_raise(const int &sign) noexcept;
+  static      void clean_terminal() noexcept;
 
 private:
   const static std::size_t  m_signals_number;

cpp-terminal/terminal_initializer.cpp

@@ -26,7 +26,7 @@ try
     static const Private::FileInitializer files_init;
     new(&Term::terminal) Terminal();
     static Term::Private::Signals signals;
-    sighandler_t                  handler = [](int signum) { signals.reset_and_raise(signum, Term::terminal); };
+    sighandler_t                  handler = [](int signum) { signals.reset_and_raise(signum); };
     signals.setHandler(handler);
   }
   ++m_counter;