libui/include/ui/Window.h

@@ -62,7 +62,7 @@ namespace ui
         int m_id;
         Canvas m_canvas;
         Widget* m_main_widget { nullptr };
-        Option<Color> m_background {};
+        Color m_background { ui::BLACK };
         Option<int> m_old_mouse_buttons;
     };
 }

libui/src/Window.cpp

@@ -74,7 +74,7 @@ namespace ui
 
     Result<void> Window::draw()
     {
-        if (m_background.has_value()) m_canvas.fill(*m_background);
+        m_canvas.fill(m_background);
         if (m_main_widget) TRY(m_main_widget->draw(m_canvas));
         update();
         return {};

terminal/TerminalWidget.cpp

@@ -46,8 +46,10 @@ Result<void> TerminalWidget::init(char* const* args)
     m_font = ui::Font::default_font();
     m_bold_font = ui::Font::default_bold_font();
 
-    m_terminal_canvas = ui::App::the().main_window()->canvas();
+    m_terminal_canvas = ui::Canvas { .width = m_rect.width,
-    m_terminal_canvas.fill(ui::BLACK);
+                                     .height = m_rect.height,
+                                     .stride = m_rect.width,
+                                     .ptr = (u8*)TRY(calloc_impl(m_rect.width, m_rect.height * sizeof(u32), false)) };
 
     signal(SIGCHLD, sigchld_handler);
 
@@ -211,12 +213,13 @@ Result<ui::EventResult> TerminalWidget::handle_key_event(const ui::KeyEventReque
     return ui::EventResult::DidHandle;
 }
 
-Result<void> TerminalWidget::draw(ui::Canvas&)
+Result<void> TerminalWidget::draw(ui::Canvas& canvas)
 {
+    canvas.fill((u32*)m_terminal_canvas.ptr, m_terminal_canvas.stride);
     return {};
 }
 
-Result<bool> TerminalWidget::process()
+Result<void> TerminalWidget::process()
 {
     char buffer[BUFSIZ];
     ssize_t nread = read(m_pty, buffer, BUFSIZ);
@@ -235,7 +238,7 @@ Result<bool> TerminalWidget::process()
 
     if (should_update_cursor || nread > 0) ui::App::the().main_window()->draw();
 
-    return nread == 0;
+    return {};
 }
 
 bool TerminalWidget::tick_cursor()

terminal/TerminalWidget.h

@@ -16,7 +16,7 @@ class TerminalWidget : public ui::Widget
 
     Result<void> draw(ui::Canvas& canvas) override;
 
-    Result<bool> process();
+    Result<void> process();
 
     void quit();
 

terminal/main.cpp

@@ -11,6 +11,7 @@ Result<int> luna_main(int argc, char** argv)
 
     auto* window = TRY(ui::Window::create(ui::Rect { 150, 150, 640, 400 }));
     app.set_main_window(window);
+    window->set_background(ui::BLACK);
     window->set_title("Terminal");
 
     TerminalWidget terminal;
@@ -23,8 +24,8 @@ Result<int> luna_main(int argc, char** argv)
 
     while (app.process_events())
     {
-        bool should_sleep = TRY(terminal.process());
+        TRY(terminal.process());
-        if (should_sleep) usleep(10000);
+        usleep(10000);
     }
 
     terminal.quit();