wip

Author: sleepy-monax

src/apps/hideo-colorpicker/main.cpp

@@ -67,7 +67,7 @@ struct HsvPicker : public Ui::View<HsvPicker> {
         g.restore();
     }
 
-    void event(Events::Event &e) override {
+    void event(Async::Event &e) override {
         _mouseListener.listen(*this, e);
 
         if (_mouseListener.isPress() and e.is<Events::MouseEvent>()) {

src/apps/hideo-spreadsheet/table.cpp

@@ -52,7 +52,7 @@ struct Table : public Ui::View<Table> {
 
     /* --- Events --- */
 
-    void event(Events::Event &e) override {
+    void event(Async::Event &e) override {
         e.handle<Events::MouseEvent>([&](Events::MouseEvent const &m) {
             auto pos = m.pos - bound().topStart();
             if (bound().contains(m.pos)) {

src/impls/impl-efi/ui.cpp

@@ -38,13 +38,13 @@ struct EfiHost :
         Efi::Key key = {};
         _stip->readKeyStroke(_stip, &key).unwrap();
         auto e = key.toKeyEvent();
-        event(e);
+        event<Events::KeyboardEvent>(*this, e);
     }
 
     void wait(TimeSpan) override {
     }
 
-    void bubble(Events::Event &e) override {
+    void bubble(Async::Event &e) override {
         Ui::Host::bubble(e);
     }
 };

src/impls/impl-sdl/ui.cpp

@@ -201,7 +201,7 @@ struct SdlHost :
         SDL_WaitEventTimeout(nullptr, span.toMSecs());
     }
 
-    void bubble(Events::Event &e) override {
+    void bubble(Async::Event &e) override {
         if (e.is<Ui::DragEvent>()) {
             auto &dragEvent = e.unwrap<Ui::DragEvent>();
             if (dragEvent.type == Ui::DragEvent::START) {

src/impls/impl-skift/ui.cpp

@@ -31,7 +31,7 @@ struct Host :
     void wait(TimeSpan) override {
     }
 
-    void bubble(Events::Event &e) override {
+    void bubble(Async::Event &e) override {
         Ui::Host::bubble(e);
     }
 };

src/kernel/loader/menu.cpp

@@ -112,16 +112,16 @@ Ui::Child alert(String title, String subtitle) {
            Ui::spacing(64);
 }
 
-void intent(Ui::Node &n, Events::Event &e) {
+void intent(Ui::Node &n, Async::Event &e) {
     if (auto *k = e.is<Events::KeyboardEvent>()) {
         if (k->key == Events::Key::LEFT) {
-            Ui::dispatchAction<Action>(n, MoveSelectionAction{-1});
+            Ui::bubble<Action>(n, MoveSelectionAction{-1});
             e.accept();
         } else if (k->key == Events::Key::RIGHT) {
-            Ui::dispatchAction<Action>(n, MoveSelectionAction{1});
+            Ui::bubble<Action>(n, MoveSelectionAction{1});
             e.accept();
         } else if (k->key == Events::Key::ENTER) {
-            Ui::dispatchAction<Action>(n, SelectAction{});
+            Ui::bubble<Action>(n, SelectAction{});
             e.accept();
         }
     }

src/libs/karm-async/async.cpp

@@ -7,52 +7,35 @@ namespace Karm::Async {
 /* --- Sink --- */
 
 void Loop::_post(Sink &sink, Box<Event> event) {
-    _queued.emplaceBack(sink, std::move(event));
+    _queued.emplaceBack(&sink, std::move(event));
 }
 
-void Loop::_move(Sink &from, Sink &to) {
+void Loop::_move(Sink &from, Sink *to) {
     for (auto &q : _queued) {
         if (q.sink == &from) {
-            q.sink = &to;
+            q.sink = to;
         }
     }
 
     for (auto &s : _sources) {
         if (s.sink == &from) {
-            s.sink = &to;
+            s.sink = to;
         }
     }
 }
 
-void Loop::_dtor(Sink &sink) {
-    for (auto &q : _queued) {
-        if (q.sink == &sink)
-            q.sink = nullptr;
-    }
-
-    for (auto &s : _sources) {
-        if (s.sink == &sink)
-            s.sink = nullptr;
-    }
-}
-
 /* --- Source --- */
 
 void Loop::_bind(Source &source, Sink &sink) {
-    _sources.emplaceBack(source, sink);
-}
-
-void Loop::_move(Source &from, Source &to) {
-    for (auto &s : _sources) {
-        if (s.source == &from)
-            s.source = &to;
-    }
+    sink._attachedOnce = true;
+    _sources.emplaceBack(&source, &sink);
 }
 
-void Loop::_dtor(Source *source) {
+void Loop::_move(Source &from, Source *to) {
     for (auto &s : _sources) {
-        if (s.source == source)
-            s.source = nullptr;
+        if (s.source == &from) {
+            s.source = to;
+        }
     }
 }