libui: Make App::process_events() private

Previously this was public as some applications (mainly terminal) needed to run some code in-between events, but this is no longer needed, due to the EventLoop providing these services (timers and file descriptor notifiers)

libos/include/os/Timer.h

@@ -22,15 +22,21 @@ namespace os
         static Result<OwnedPtr<Timer>> create_singleshot(unsigned int milliseconds, Action&& action);
         static Result<OwnedPtr<Timer>> create_repeating(unsigned int milliseconds, Action&& action);
 
+        void restart();
+        void reset(unsigned int milliseconds);
+        void stop();
+
         ~Timer();
 
       private:
         timer_t m_timerid { -1 };
         bool m_repeating;
+        bool m_stopped { false };
         struct timespec m_interval;
         Action m_action;
 
         void check_if_should_invoke_action();
+        void readd_if_necessary();
 
         Timer() = default;
 

libos/src/EventLoop.cpp

@@ -44,6 +44,7 @@ namespace os
         return *s_the;
     }
 
+    // FIXME: Support lambdas (by using os::Action). This means that os::Action needs variable parameter support.
     Result<void> EventLoop::register_fd_listener(int fd, void (*listener)(int, int))
     {
         TRY(m_fd_listeners.try_set(fd, listener));

libos/src/Timer.cpp

@@ -54,21 +54,45 @@ namespace os
         return timer;
     }
 
+    void Timer::restart()
+    {
+        struct itimerspec itimer = { .it_interval = { .tv_sec = 0, .tv_nsec = 0 }, .it_value = m_interval };
+
+        timer_settime(m_timerid, 0, &itimer, nullptr);
+
+        readd_if_necessary();
+    }
+
+    void Timer::reset(unsigned int milliseconds)
+    {
+        m_interval = { .tv_sec = milliseconds / 1000, .tv_nsec = (milliseconds % 1000) * 1'000'000 };
+        restart();
+    }
+
+    void Timer::stop()
+    {
+        EventLoop::the().m_timer_list.remove(this);
+        m_stopped = true;
+
+        struct itimerspec itimer;
+        memset(&itimer, 0, sizeof(itimer));
+        timer_settime(m_timerid, 0, &itimer, nullptr);
+    }
+
     void Timer::check_if_should_invoke_action()
     {
         struct itimerspec remaining;
         if (timer_gettime(m_timerid, &remaining) < 0) return;
 
-        if (!remaining.it_value.tv_sec && !remaining.it_value.tv_nsec)
+        if (!remaining.it_value.tv_sec && !remaining.it_value.tv_nsec && !m_stopped)
         {
             // Timer expired!
             m_action();
 
             if (!m_repeating)
             {
-                timer_delete(m_timerid);
                 EventLoop::the().m_timer_list.remove(this);
-                m_timerid = -1;
+                m_stopped = true;
             }
             else
             {
@@ -79,6 +103,15 @@ namespace os
         }
     }
 
+    void Timer::readd_if_necessary()
+    {
+        if (m_stopped)
+        {
+            m_stopped = false;
+            EventLoop::the().m_timer_list.append(this);
+        }
+    }
+
     Timer::~Timer()
     {
         if (m_timerid >= 0) timer_delete(m_timerid);

libui/include/ui/App.h

@@ -53,8 +53,6 @@ namespace ui
 
         Result<void> handle_ipc_event(u8 id);
 
-        bool process_events();
-
         static App& the();
 
       private:
@@ -65,6 +63,10 @@ namespace ui
         bool m_should_close { false };
         os::EventLoop m_loop;
 
+        bool process_events();
+
         Window* find_window(int id);
+
+        friend void handle_socket_event(int, int);
     };
 }

libui/src/App.cpp

@@ -19,14 +19,14 @@ Result<void> handle_ipc_client_event(os::LocalClient&, u8 id)
     return ui::App::the().handle_ipc_event(id);
 }
 
-void handle_socket_event(int, int status)
-{
-    if (status & POLLHUP) ui::App::the().set_should_close(true);
-    if (status & POLLIN) { ui::App::the().process_events(); }
-}
-
 namespace ui
 {
+    void handle_socket_event(int, int status)
+    {
+        if (status & POLLHUP) ui::App::the().set_should_close(true);
+        if (status & POLLIN) { ui::App::the().process_events(); }
+    }
+
     App* App::s_app { nullptr };
 
     App::App()

terminal/TerminalWidget.cpp

@@ -29,20 +29,14 @@ static constexpr auto BRIGHT_MAGENTA = ui::Color::from_u32(0xffff00ff);
 static constexpr auto BRIGHT_CYAN = ui::Color::from_u32(0xff00ffff);
 static constexpr auto BRIGHT_GRAY = ui::Color::from_u32(0xffffffff);
 
-static long get_time_in_milliseconds()
-{
-    struct timespec ts;
-    check(clock_gettime(CLOCK_REALTIME, &ts) == 0);
-
-    return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
-}
-
 static void sigchld_handler(int)
 {
     wait(NULL);
     ui::App::the().set_should_close(true);
 }
 
+TerminalWidget* s_main = nullptr;
+
 Result<void> TerminalWidget::init(char* const* args)
 {
     m_font = ui::Font::default_font();
@@ -51,6 +45,8 @@ Result<void> TerminalWidget::init(char* const* args)
     m_terminal_canvas = ui::App::the().main_window()->canvas();
     m_terminal_canvas.fill(ui::BLACK);
 
+    m_cursor_timer = TRY(os::Timer::create_repeating(500, [this]() { this->tick_cursor(); }));
+
     signal(SIGCHLD, sigchld_handler);
 
     int master;
@@ -64,11 +60,18 @@ Result<void> TerminalWidget::init(char* const* args)
 
     m_pty = master;
 
-    fcntl(master, F_SETFL, O_NONBLOCK);
+    fcntl(m_pty, F_SETFL, O_NONBLOCK);
+
+    // FIXME: Find a better solution for this. What if the caller needs several TerminalWidgets in one app? We can't
+    // just use a singleton, can we?
+    os::EventLoop::the().register_fd_listener(m_pty, [](int, int) {
+        check(s_main);
+        s_main->process();
+    });
 
     m_child_pid = child;
 
-    m_last_cursor_tick = get_time_in_milliseconds();
+    s_main = this;
 
     return {};
 }
@@ -91,7 +94,7 @@ Result<void> TerminalWidget::draw(ui::Canvas&)
     return {};
 }
 
-Result<bool> TerminalWidget::process()
+Result<void> TerminalWidget::process()
 {
     char buffer[BUFSIZ];
     ssize_t nread = read(m_pty, buffer, BUFSIZ);
@@ -102,8 +105,6 @@ Result<bool> TerminalWidget::process()
             return err(errno);
     }
 
-    bool should_update_cursor = tick_cursor();
-
     ssize_t drawn = 0;
 
     for (ssize_t i = 0; i < nread; i++)
@@ -112,32 +113,23 @@ Result<bool> TerminalWidget::process()
         if (did_draw) drawn++;
     }
 
-    if (should_update_cursor || drawn > 0) ui::App::the().main_window()->draw();
+    if (drawn > 0) ui::App::the().main_window()->draw();
 
-    return nread == 0;
+    return {};
 }
 
-bool TerminalWidget::tick_cursor()
+void TerminalWidget::tick_cursor()
 {
-    if (!m_cursor_enabled) return false;
+    if (!m_cursor_enabled) return;
 
-    long now = get_time_in_milliseconds();
+    m_cursor_timer->restart();
-    long diff = now - m_last_cursor_tick;
-    m_last_cursor_tick = now;
-
-    m_current_cursor_timeout -= (int)diff;
-    if (m_current_cursor_timeout <= 0)
-    {
-        m_current_cursor_timeout = CURSOR_TIMEOUT;
     m_cursor_activated = !m_cursor_activated;
 
     if (m_cursor_activated) draw_cursor();
     else
         erase_current_char();
-        return true;
-    }
 
-    return false;
+    ui::App::the().main_window()->draw();
 }
 
 void TerminalWidget::draw_glyph(wchar_t c, int x, int y)
@@ -471,7 +463,7 @@ bool TerminalWidget::put_code_point(wchar_t c)
 
     if (should_draw_cursor)
     {
-        m_current_cursor_timeout = CURSOR_TIMEOUT;
+        m_cursor_timer->restart();
         m_cursor_activated = true;
         draw_cursor();
     }

terminal/TerminalWidget.h

@@ -2,6 +2,7 @@
 #include <luna/EscapeSequence.h>
 #include <luna/Utf8.h>
 #include <luna/Vector.h>
+#include <os/Timer.h>
 #include <stdio.h>
 #include <termios.h>
 #include <ui/Font.h>
@@ -16,8 +17,6 @@ class TerminalWidget : public ui::Widget
 
     Result<void> draw(ui::Canvas& canvas) override;
 
-    Result<bool> process();
-
   private:
     ui::Canvas m_terminal_canvas;
     Vector<u8> m_line_buffer;
@@ -29,9 +28,7 @@ class TerminalWidget : public ui::Widget
     SharedPtr<ui::Font> m_font;
     SharedPtr<ui::Font> m_bold_font;
 
-    static constexpr int CURSOR_TIMEOUT = 500;
+    OwnedPtr<os::Timer> m_cursor_timer;
-
-    int m_current_cursor_timeout = CURSOR_TIMEOUT;
     bool m_cursor_activated = false;
     bool m_cursor_enabled = true;
 
@@ -45,7 +42,7 @@ class TerminalWidget : public ui::Widget
     ui::Color m_foreground_color { ui::WHITE };
     ui::Color m_background_color { ui::BLACK };
 
-    bool tick_cursor();
+    void tick_cursor();
 
     Utf8StateDecoder m_decoder;
     Option<EscapeSequenceParser> m_escape_parser;
@@ -63,4 +60,5 @@ class TerminalWidget : public ui::Widget
     bool handle_escape_sequence(wchar_t c);
     Result<bool> putchar(char c);
     bool put_code_point(wchar_t c);
+    Result<void> process();
 };

terminal/main.cpp

@@ -20,11 +20,5 @@ Result<int> luna_main(int argc, char** argv)
 
     window->draw();
 
-    while (app.process_events())
+    return app.run();
-    {
-        bool should_sleep = TRY(terminal.process());
-        if (should_sleep) usleep(10000);
-    }
-
-    return 0;
 }