fix crash del from itself, added local event handler in lua apps

Author: paxo-rch

lib/lua/src/lua_events.cpp

@@ -84,7 +84,7 @@ LuaTimeInterval::LuaTimeInterval(LuaFile* lua, sol::protected_function func, uin
     this->lua = lua;
     this->func = func;
     this->interval = interval;
-    this->id = eventHandlerApp.setInterval(std::function<void(void)>(std::bind(&LuaTimeInterval::call, this)), interval);
+    this->id = lua->eventHandler.setInterval(std::function<void(void)>(std::bind(&LuaTimeInterval::call, this)), interval);
 }
 
 
@@ -93,8 +93,8 @@ uint32_t LuaTimeEvent::addEventListener(LuaFile* lua, sol::protected_function co
     this->condition = condition;
     this->callback = callback;
 //    this->interval = interval;
-    // this->id = eventHandlerApp.setInterval(std::function<void(void)>(std::bind(&LuaTimeInterval::call, this)),);
-    return  0; //eventHandlerApp.addEventListener( (Function *) condition, (Function *) callback);
+    // this->id = eventHandler.setInterval(std::function<void(void)>(std::bind(&LuaTimeInterval::call, this)),);
+    return  0; //eventHandler.addEventListener( (Function *) condition, (Function *) callback);
 }
 
 
@@ -123,15 +123,15 @@ void LuaTimeInterval::call()
 
 LuaTimeInterval::~LuaTimeInterval()
 {
-    eventHandlerApp.removeInterval(id);
+    lua->eventHandler.removeInterval(id);
 }
 
 LuaTimeTimeout::LuaTimeTimeout(LuaFile* lua, sol::protected_function func, uint32_t timeout)
 {
     this->lua = lua;
     this->func = func;
     this->timeout = timeout;
-    this->id = eventHandlerApp.setTimeout(new Callback<>(std::function<void(void)>(std::bind(&LuaTimeTimeout::call, this))), timeout);
+    this->id = lua->eventHandler.setTimeout(new Callback<>(std::function<void(void)>(std::bind(&LuaTimeTimeout::call, this))), timeout);
 }
 
 int LuaTimeTimeout::getId()
@@ -158,12 +158,12 @@ void LuaTimeTimeout::call()
 LuaTimeTimeout::~LuaTimeTimeout()
 {
     if(!done)
-        eventHandlerApp.removeTimeout(id);
+        lua->eventHandler.removeTimeout(id);
 }
 
 void LuaTime::update()
 {
-    eventHandlerApp.update();
+    lua->eventHandler.update();
 
     for (int it = 0; it < timeouts.size(); it++)
     {

lib/lua/src/lua_file.hpp

@@ -7,6 +7,7 @@
 #include <filestream.hpp>
 #include <path.hpp>
 #include <hardware.hpp>
+#include <threads.hpp>
 
 #include "lua_gui.hpp"
 #include "lua_hardware.hpp"
@@ -86,6 +87,7 @@ class LuaFile {
     storage::Path filename;
     Window* current_root;
 
+    EventHandler eventHandler;
     LuaHardware lua_hardware;
     LuaGui lua_gui;
     LuaStorage lua_storage;

lib/lua/src/lua_gui.cpp

@@ -141,10 +141,14 @@ LuaWindow* LuaGui::window()
 
 void LuaGui::del(LuaWidget* widget)
 {
-    delete widget;
-    if(mainWindow == widget)
-        mainWindow = nullptr;
-    widget = nullptr;
+    // prevent a widget to remove itself during its execution
+    lua->eventHandler.setTimeout(new Callback<>(std::function<void(void)>([&]()
+    {
+        delete widget;
+        if(mainWindow == widget)
+            mainWindow = nullptr;
+        widget = nullptr;
+    })), 0);    // run it as soon as possible
 }
 
 void LuaGui::update()

src/main.cpp

@@ -141,67 +141,6 @@ void mainLoop(void* data) {
 
         StandbyMode::wait();
     }
-/*
-    // Main loop
-    while (true) {
-        // Update inputs
-        hardware::input::update();
-        std::cout << "Update inputs" << std::endl;
-
-        // Update running apps
-        AppManager::update();
-
-        // Don't show anything
-        if (libsystem::getDeviceMode() == libsystem::SLEEP) {
-            if (getButtonDown(hardware::input::HOME)) {
-                setDeviceMode(libsystem::NORMAL);
-            }
-
-            continue;
-        }
-
-        if (AppManager::isAnyVisibleApp()) {
-            if (getButtonDown(hardware::input::HOME)) {
-                AppManager::quitApp();
-            }
-        } else {
-            // If home button pressed on the launcher
-            // Put the device in sleep
-            if (getButtonDown(hardware::input::HOME)) {
-                // Free the launcher resources
-                applications::launcher::free();
-
-                setDeviceMode(libsystem::SLEEP);
-                continue;
-            }
-
-            std::cout << "Update launcher" << std::endl;
-
-            // Update, show and allocate launcher
-            applications::launcher::update();
-
-            // Icons interactions
-            if (applications::launcher::iconTouched()) {
-                const std::shared_ptr<AppManager::App> app = applications::launcher::getApp();
-
-                // Free the launcher resources
-                applications::launcher::free();
-
-                // Launch the app
-                try {
-                    app->run(false);
-                } catch (std::runtime_error& e) {
-                    std::cerr << "Erreur: " << e.what() << std::endl;
-                    // Affichage du msg d'erreur
-                    guiManager.showErrorMessage(e.what());
-                    // on kill l'application ?!?
-                    //AppManager::appList[i].kill();
-                }
-            }
-        }
-
-        AppManager::loop();
-    }*/
 }
 
 void setup()