Next Attempt (2024)!

-Still lots todo! but I have a (mostly) working version up and running!

.gitignore

@@ -1,4 +1,5 @@
 build*/
+debug*/
 bin
 obj
 *.depend

src/frontend/qt_sdl/CMakeLists.txt

@@ -54,6 +54,8 @@ set(SOURCES_QT_SDL
 
     LANDialog.cpp
     NetplayDialog.cpp
+
+    LuaMain.cpp
 )
 
 if (APPLE)
@@ -84,6 +86,7 @@ endif()
 pkg_check_modules(SDL2 REQUIRED IMPORTED_TARGET sdl2)
 pkg_check_modules(LibArchive REQUIRED IMPORTED_TARGET libarchive)
 pkg_check_modules(Zstd REQUIRED IMPORTED_TARGET libzstd)
+pkg_search_module(Lua REQUIRED IMPORTED_TARGET lua-5.4 lua-5.3 lua>=5.3)
 
 fix_interface_includes(PkgConfig::SDL2 PkgConfig::LibArchive)
 
@@ -178,7 +181,7 @@ else()
     target_include_directories(melonDS PUBLIC ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 endif()
 target_link_libraries(melonDS PRIVATE core)
-target_link_libraries(melonDS PRIVATE PkgConfig::SDL2 PkgConfig::LibArchive PkgConfig::Zstd)
+target_link_libraries(melonDS PRIVATE PkgConfig::SDL2 PkgConfig::LibArchive PkgConfig::Zstd PkgConfig::Lua)
 target_link_libraries(melonDS PRIVATE ${QT_LINK_LIBS} ${CMAKE_DL_LIBS})
 
 if (WIN32)

src/frontend/qt_sdl/EmuInstance.h

@@ -136,6 +136,7 @@ class EmuInstance
     int getJoystickID() { return joystickID; }
     SDL_Joystick* getJoystick() { return joystick; }
 
+    std::vector<int> keyStrokes;
 private:
     static int lastSep(const std::string& path);
     std::string getAssetPath(bool gba, const std::string& configpath, const std::string& ext, const std::string& file);
@@ -205,6 +206,7 @@ class EmuInstance
     static void audioCallback(void* data, Uint8* stream, int len);
     static void micCallback(void* data, Uint8* stream, int len);
 
+
     void onKeyPress(QKeyEvent* event);
     void onKeyRelease(QKeyEvent* event);
     void keyReleaseAll();
@@ -254,6 +256,8 @@ class EmuInstance
     bool doLimitFPS;
     int maxFPS;
     bool doAudioSync;
+
+    melonDS::u32 getInputMask(){return inputMask;}
 private:
 
     std::unique_ptr<melonDS::Savestate> backupState;

src/frontend/qt_sdl/EmuInstanceInput.cpp

@@ -220,6 +220,7 @@ void EmuInstance::onKeyPress(QKeyEvent* event)
 {
     int keyHK = getEventKeyVal(event);
     int keyKP = keyHK;
+    keyStrokes.push_back(keyHK);
     if (event->modifiers() != Qt::KeypadModifier)
         keyKP &= ~event->modifiers();
 

src/frontend/qt_sdl/EmuThread.cpp

@@ -56,6 +56,8 @@
 
 #include "EmuInstance.h"
 
+#include "LuaMain.h"
+
 using namespace melonDS;
 
 
@@ -439,6 +441,11 @@ void EmuThread::run()
         }
 
         handleMessages();
+
+        //Lua Script Stuff (-for now happens at the end of each frame regardless of emuStatus)
+        LuaScript::createLuaState();//Create LuaState if needed
+        LuaScript::luaUpdate(); //"_Update()" gets called in current lua script
+
     }
 
     file = Platform::OpenLocalFile("rtc.bin", Platform::FileMode::Write);

src/frontend/qt_sdl/EmuThread.h

@@ -107,6 +107,12 @@ class EmuThread : public QThread
     void deinitContext();
     void updateVideoSettings() { videoSettingsDirty = true; }
 
+    void onLuaPrint(const QString&);
+    void onLuaClearConsole();
+    void onLuaLoadState(const QString&);
+    void onLuaSaveState(const QString&);
+    void onLuaLayoutChange();
+
     int FrontBuffer = 0;
     QMutex FrontBufferLock;
 
@@ -130,6 +136,11 @@ class EmuThread : public QThread
 
     void syncVolumeLevel();
 
+    void signalLuaPrint(const QString&);
+    void signalLuaClearConsole();
+    void signalLuaSaveState(const QString&);
+    void signalLuaLoadState(const QString&);
+
 private:
     void handleMessages();