gui/apps/editor/EditorWidget.cpp

@@ -10,12 +10,10 @@
 #include "EditorWidget.h"
 #include <ctype.h>
 #include <luna/PathParser.h>
-#include <luna/RefString.h>
 #include <luna/Utf8.h>
 #include <os/File.h>
 #include <os/FileSystem.h>
 #include <ui/App.h>
-#include <ui/Dialog.h>
 
 EditorWidget::EditorWidget(SharedPtr<ui::Font> font) : ui::TextInput(), m_font(font)
 {
@@ -29,8 +27,7 @@ Result<void> EditorWidget::load_file(const os::Path& path)
 
     if (!rc.has_error() && !S_ISREG(st.st_mode))
     {
-        auto message = TRY(RefString::format("%s is not a regular file", path.name().chars()));
-        ui::Dialog::show_message("Error", message.view());
+        os::eprintln("editor: not loading %s as it is not a regular file", path.name().chars());
         return {};
     }
 
@@ -44,9 +41,9 @@ Result<void> EditorWidget::load_file(const os::Path& path)
 
     m_cursor = m_data.size();
 
-    m_path = TRY(String::from_string_view(path.name()));
+    m_path = path;
 
-    auto basename = TRY(PathParser::basename(m_path.view()));
+    auto basename = TRY(PathParser::basename(m_path.name()));
 
     String title = TRY(String::format("Text Editor - %s"_sv, basename.chars()));
     window()->set_title(title.view());
@@ -129,38 +126,15 @@ Result<ui::EventResult> EditorWidget::handle_key_event(const ui::KeyEventRequest
     return ui::EventResult::DidHandle;
 }
 
-Result<void> EditorWidget::save_file_as()
-{
-    ui::Dialog::show_input_dialog(
-        "Save file as...", "Please enter the path to save this file to:", [this](StringView path) {
-            m_path = String::from_string_view(path).release_value();
-            auto rc = save_file();
-            if (rc.has_error())
-            {
-                os::eprintln("Failed to save file %s: %s", m_path.chars(), rc.error_string());
-                ui::Dialog::show_message("Error", "Failed to save file");
-            }
-            else
-            {
-                auto basename = PathParser::basename(m_path.view()).release_value();
-
-                String title = String::format("Text Editor - %s"_sv, basename.chars()).release_value();
-                window()->set_title(title.view());
-            }
-        });
-
-    return {};
-}
-
 Result<void> EditorWidget::save_file()
 {
-    if (m_path.is_empty())
+    if (m_path.is_empty_path())
     {
-        TRY(save_file_as());
+        os::eprintln("editor: no file to save buffer to!");
         return err(ENOENT);
     }
 
-    auto file = TRY(os::File::open_or_create(m_path.view(), os::File::WriteOnly));
+    auto file = TRY(os::File::open(m_path, os::File::WriteOnly));
     return file->write(m_data);
 }
 

gui/apps/editor/EditorWidget.h

@@ -21,15 +21,14 @@ class EditorWidget : public ui::TextInput
     Result<void> load_file(const os::Path& path);
 
     Result<void> save_file();
-    Result<void> save_file_as();
 
     Result<ui::EventResult> handle_key_event(const ui::KeyEventRequest& request) override;
 
     Result<void> draw(ui::Canvas& canvas) override;
 
-    os::Path path()
+    os::Path& path()
     {
-        return m_path.view();
+        return m_path;
     }
 
   private:
@@ -42,7 +41,7 @@ class EditorWidget : public ui::TextInput
     };
     Vector<Line> m_lines;
 
-    String m_path;
+    os::Path m_path { AT_FDCWD };
 
     Result<void> recalculate_lines();
     void recalculate_cursor_position();

gui/apps/editor/main.cpp

@@ -11,7 +11,6 @@
 #include <os/ArgumentParser.h>
 #include <os/File.h>
 #include <ui/App.h>
-#include <ui/Dialog.h>
 
 Result<int> luna_main(int argc, char** argv)
 {
@@ -33,20 +32,15 @@ Result<int> luna_main(int argc, char** argv)
 
     auto* editor = TRY(make<EditorWidget>(ui::Font::default_font()));
     window->set_main_widget(*editor);
-    if (!path.is_empty()) editor->load_file(path);
+    if (!path.is_empty()) TRY(editor->load_file(path));
 
     TRY(window->add_keyboard_shortcut({ moon::K_CH26, ui::Mod_Ctrl }, true, [&](ui::Shortcut) {
         auto result = editor->save_file();
-        if (result.has_error())
-        {
-            os::eprintln("Failed to save file %s: %s", editor->path().name().chars(), result.error_string());
-            ui::Dialog::show_message("Error", "Failed to save file");
-        }
+        if (result.has_error()) os::eprintln("editor: failed to save file: %s", result.error_string());
+        else
+            os::println("editor: buffer saved to %s successfully", editor->path().name().chars());
     }));
 
-    TRY(window->add_keyboard_shortcut({ moon::K_CH26, ui::Mod_Ctrl | ui::Mod_Shift }, true,
-                                      [&](ui::Shortcut) { editor->save_file_as(); }));
-
     window->draw();
 
     return app.run();

gui/libui/CMakeLists.txt

@@ -19,7 +19,6 @@ set(SOURCES
     src/Label.cpp
     src/InputField.cpp
     src/TextInput.cpp
-    src/Dialog.cpp
 )
 
 add_library(ui ${SOURCES})

gui/libui/include/ui/Dialog.h

@@ -1,22 +0,0 @@
-/**
- * @file Window.h
- * @author apio (cloudapio.eu)
- * @brief UI window dialogs.
- *
- * @copyright Copyright (c) 2024, the Luna authors.
- *
- */
-
-#pragma once
-#include <os/Action.h>
-#include <ui/Window.h>
-
-namespace ui
-{
-    namespace Dialog
-    {
-        Result<void> show_message(StringView title, StringView message);
-
-        Result<void> show_input_dialog(StringView title, StringView message, os::Function<StringView> callback);
-    }
-}

gui/libui/src/Dialog.cpp

@@ -1,82 +0,0 @@
-/**
- * @file Dialog.cpp
- * @author apio (cloudapio.eu)
- * @brief UI window dialogs.
- *
- * @copyright Copyright (c) 2024, the Luna authors.
- *
- */
-
-#include <luna/Alloc.h>
-#include <ui/App.h>
-#include <ui/Dialog.h>
-#include <ui/InputField.h>
-#include <ui/Label.h>
-#include <ui/Layout.h>
-
-namespace ui::Dialog
-{
-    Result<void> show_message(StringView title, StringView message)
-    {
-        auto rect = ui::App::the().main_window()->canvas().rect();
-        int text_length = (int)message.length() * ui::Font::default_font()->width();
-        int text_height = ui::Font::default_font()->height();
-
-        ui::Rect dialog_rect = { 0, 0, text_length + 20, text_height + 20 };
-
-        auto* dialog = TRY(ui::Window::create(
-            ui::align(rect, dialog_rect, ui::VerticalAlignment::Center, ui::HorizontalAlignment::Center)));
-
-        dialog->set_background(ui::GRAY);
-        dialog->set_title(title);
-
-        ui::Label* text = TRY(make<ui::Label>(message));
-        text->set_color(ui::BLACK);
-        dialog->set_main_widget(*text);
-
-        dialog->on_close([text] { delete text; });
-
-        dialog->draw();
-
-        return {};
-    }
-
-    Result<void> show_input_dialog(StringView title, StringView message, os::Function<StringView> callback)
-    {
-        auto rect = ui::App::the().main_window()->canvas().rect();
-        int text_length = (int)message.length() * ui::Font::default_font()->width();
-        int text_height = ui::Font::default_font()->height();
-
-        ui::Rect dialog_rect = { 0, 0, max(text_length + 20, 300), text_height * 2 + 30 };
-
-        auto* dialog = TRY(ui::Window::create(
-            ui::align(rect, dialog_rect, ui::VerticalAlignment::Center, ui::HorizontalAlignment::Center)));
-
-        dialog->set_background(ui::GRAY);
-        dialog->set_title(title);
-
-        ui::VerticalLayout* layout = TRY(make<ui::VerticalLayout>());
-        dialog->set_main_widget(*layout);
-
-        ui::Label* text = TRY(make<ui::Label>((message)));
-        text->set_color(ui::BLACK);
-        layout->add_widget(*text);
-
-        ui::InputField* input = TRY(make<ui::InputField>(ui::Font::default_font()));
-        input->on_submit([dialog, callback](StringView s) {
-            callback(s);
-            dialog->close();
-        });
-        layout->add_widget(*input);
-
-        dialog->on_close([layout, text, input] {
-            delete text;
-            delete input;
-            delete layout;
-        });
-
-        dialog->draw();
-
-        return {};
-    }
-}

libos/src/Timer.cpp

@@ -110,10 +110,6 @@ namespace os
 
     Timer::~Timer()
     {
-        if (m_timerid >= 0)
-        {
-            if (!m_stopped) stop();
-            timer_delete(m_timerid);
-        }
+        if (m_timerid >= 0) timer_delete(m_timerid);
     }
 }