event loop

Signed-off-by: Pavel Kalugin <[email protected]>

Author: p4vook

include/buffer.hpp

@@ -7,6 +7,8 @@
 
 namespace fs = std::filesystem;
 
+namespace rang
+{
 class buffer
 {
       public:
@@ -32,4 +34,5 @@ class directory_listing : public buffer
 
         void update();
 };
+} // namespace rang
 #endif

include/evloop.hpp

@@ -0,0 +1,40 @@
+#ifndef __EVLOOP_HPP
+#define __EVLOOP_HPP
+
+#include <boost/asio.hpp>
+#include <functional>
+#include <string>
+#include <vector>
+
+#undef timeout
+
+namespace rang
+{
+class event_loop
+{
+      private:
+        boost::asio::io_context io_context;
+        boost::asio::signal_set signals;
+        boost::asio::posix::stream_descriptor input;
+
+      public:
+        event_loop();
+
+        template <class duration>
+        void add_regular_job(const std::function<void()> callback,
+                             const duration &interval); // TODO implementation
+
+        template <class time_point>
+        void add_job(const std::function<void()> callback, time_point &time); // TODO implementation
+
+        void set_input_reaction(const std::function<void(int)> callback);
+
+        void run();
+
+        void stop();
+
+      private:
+        void handle_input(const std::function<void(int)> &callback);
+};
+} // namespace rang
+#endif

include/rwindow.hpp

@@ -1,9 +1,11 @@
-#ifndef __NWINDOW_HPP
-#define __NWINDOW_HPP
+#ifndef __RWINDOW_HPP
+#define __RWINDOW_HPP
 
 #include "buffer.hpp"
 #include "console_io.hpp"
 
+namespace rang
+{
 class window
 {
       private:
@@ -18,5 +20,6 @@ class window
 
         void scroll_viewport(int shift);
 };
+} // namespace rang
 
 #endif

src/CMakeLists.txt

@@ -1,7 +1,9 @@
 add_subdirectory(console_io)
 
-add_executable (rang rang.cpp buffer.cpp rwindow.cpp)
+add_executable (rang evloop.cpp buffer.cpp rwindow.cpp rang.cpp)
+
+find_package(Boost 1.70.0 REQUIRED COMPONENTS system thread)
 
 target_compile_features(rang PUBLIC cxx_std_17)
 target_include_directories(rang PUBLIC ${CURSES_INCLUDE_DIRS})
-target_link_libraries(rang PUBLIC ${CURSES_LIBRARIES} console_io)
+target_link_libraries(rang PUBLIC ${CURSES_LIBRARIES} ${Boost_LIBRARIES} console_io)

src/buffer.cpp

@@ -1,6 +1,8 @@
 #include "buffer.hpp"
 #include <algorithm>
 
+using namespace rang;
+
 directory_listing::directory_listing(fs::path _directory) : directory(_directory)
 {
 }

src/console_io/include/console_io.hpp

@@ -2,4 +2,6 @@
 #define __CONSOLE_IO_HPP
 #include "base.hpp"
 #include "window.hpp"
+
+#undef timeout
 #endif

src/console_io/include/window.hpp

@@ -45,6 +45,8 @@ class window
         void outputln(int y, std::string s) const;
 
         window subwindow(int _size_x, int _size_y, int offset_x, int offset_y);
+
+        int set_keypad(bool value) const;
 };
 } // namespace console_io
 

src/console_io/src/window.cpp

@@ -98,3 +98,8 @@ window window::subwindow(int _size_x, int _size_y, int offset_x, int offset_y)
         subwindows.push_back(result);
         return result;
 }
+
+int window::set_keypad(bool value) const
+{
+        return keypad(win_ptr, (value ? TRUE : FALSE));
+}

src/evloop.cpp

@@ -0,0 +1,41 @@
+#include "evloop.hpp"
+#include <iostream>
+#include <ncurses.h>
+
+#undef timeout
+
+using namespace rang;
+
+event_loop::event_loop()
+    : signals(io_context, SIGINT, SIGTERM), // handle SIGINT and SIGTERM signals
+      input(io_context, STDIN_FILENO)       // take input from stdin stream
+{
+        signals.async_wait([&](auto, auto) { io_context.stop(); });
+}
+
+void event_loop::run()
+{
+        io_context.run();
+}
+
+void event_loop::stop()
+{
+        io_context.stop();
+}
+
+void event_loop::set_input_reaction(const std::function<void(int)> callback)
+{
+        input.cancel();
+        handle_input(callback);
+}
+
+void event_loop::handle_input(const std::function<void(int)> &callback)
+{
+        input.async_wait(boost::asio::posix::stream_descriptor::wait_read,
+                         [this, callback](auto error) {
+                                 if (!error) {
+                                         callback(getch());
+                                 }
+                                 handle_input(callback);
+                         });
+}

src/rang.cpp

@@ -1,48 +1,53 @@
 #include "buffer.hpp"
 #include "console_io.hpp"
+#include "evloop.hpp"
 #include "rwindow.hpp"
 #include <algorithm>
 #include <iostream>
 #include <ncurses.h>
 
 int main(int argc, char *argv[])
 {
-        int width;
-        int height;
-
         console_io::ncurses root;
-        cbreak();             /* Line buffering disabled, Pass on
-                               * everty thing to me 		*/
-        keypad(stdscr, TRUE); /* I need that nifty F1 	*/
+        cbreak();              /* Line buffering disabled, Pass on
+                                *everty thing to me */
+        root.set_keypad(true); /* I need that nifty F1 	*/
+        keypad(stdscr, TRUE);
         noecho();
         curs_set(0);
         root.refresh();
         console_io::window mywin =
             root.subwindow(root.get_size_x() - 2, root.get_size_y() - 2, 1, 1);
-        directory_listing lst(".");
+        rang::directory_listing lst(".");
         lst.update();
-        window main(std::move(mywin), lst);
+        rang::window main(std::move(mywin), lst);
         root.refresh();
         int ch;
         main.refresh();
-        while ((ch = getch()) != KEY_F(1)) {
+        rang::event_loop loop;
+        std::function<void(int)> reaction_func = [&](int ch) {
+                if (ch == KEY_F(1)) {
+                        loop.stop();
+                        return;
+                }
                 try {
                         switch (ch) {
-                        case 'j':
                         case KEY_DOWN:
+                        case 'j':
                                 main.scroll_viewport(1);
                                 break;
-                        case 'k':
                         case KEY_UP:
+                        case 'k':
                                 main.scroll_viewport(-1);
                                 break;
+                        default:
+                                return;
                         }
-                        root.outputln(root.get_size_y() - 1, "OK");
-                } catch (int) {
-                        root.outputln(root.get_size_y() - 1, "Error found");
+                        main.refresh();
+                } catch (error_t) {
                 }
-                root.refresh();
-                main.refresh();
-        }
+        };
+        loop.set_input_reaction(reaction_func);
+        loop.run();
         return 0;
 }

src/rwindow.cpp

@@ -1,5 +1,7 @@
 #include "rwindow.hpp"
 
+using namespace rang;
+
 window::window(console_io::window &&_win, buffer &_tied_buf) : win(_win), tied_buf(_tied_buf)
 {
 }