From 7283efcb03129df6c5d3db99ae7dd9c519e1f9c4 Mon Sep 17 00:00:00 2001
From: NPO <77460082+NPO-197@users.noreply.github.com>
Date: Wed, 16 Oct 2024 19:36:22 -0400
Subject: [PATCH] Fixed some broken functions, added Lua test script to tools

Note I only plan to add files to the tools folder that are helpful for quickly testing the implemented Lua functions. (they aren't used in the build.)
---
 src/frontend/qt_sdl/EmuInstance.h        |   1 +
 src/frontend/qt_sdl/EmuInstanceInput.cpp |  14 +++
 src/frontend/qt_sdl/LuaMain.cpp          |  42 +++++--
 tools/LuaScripts/Lua-Logo_128x128.png    | Bin 0 -> 9338 bytes
 tools/LuaScripts/LuaScriptTest.lua       | 153 +++++++++++++++++++++++
 5 files changed, 203 insertions(+), 7 deletions(-)
 create mode 100644 tools/LuaScripts/Lua-Logo_128x128.png
 create mode 100644 tools/LuaScripts/LuaScriptTest.lua

diff --git a/src/frontend/qt_sdl/EmuInstance.h b/src/frontend/qt_sdl/EmuInstance.h
index 0a18e03d6e..426457e852 100644
--- a/src/frontend/qt_sdl/EmuInstance.h
+++ b/src/frontend/qt_sdl/EmuInstance.h
@@ -258,6 +258,7 @@ class EmuInstance
     bool doAudioSync;
 
     melonDS::u32 getInputMask(){return inputMask;}
+    std::map<melonDS::u8,bool> KeyboardMask; //For Lua Scripts
 private:
 
     std::unique_ptr<melonDS::Savestate> backupState;
diff --git a/src/frontend/qt_sdl/EmuInstanceInput.cpp b/src/frontend/qt_sdl/EmuInstanceInput.cpp
index 87b52e1fe1..f535749994 100644
--- a/src/frontend/qt_sdl/EmuInstanceInput.cpp
+++ b/src/frontend/qt_sdl/EmuInstanceInput.cpp
@@ -71,6 +71,10 @@ void EmuInstance::inputInit()
     hotkeyMask = 0;
     lastHotkeyMask = 0;
 
+    for (int i=0;i<256;i++){
+        KeyboardMask[i]=false;
+    }
+
     joystick = nullptr;
     controller = nullptr;
     hasRumble = false;
@@ -218,6 +222,11 @@ int getEventKeyVal(QKeyEvent* event)
 
 void EmuInstance::onKeyPress(QKeyEvent* event)
 {
+    if (event->key()<256)
+        KeyboardMask[event->key()]=true;
+    if ((event->key()&0x01000000)>0 && (event->key()&0xff)<0x41) //special keys (there is probably a less messy way to write this...)
+            KeyboardMask[0xff - (event->key()&0xff)]=true;
+
     int keyHK = getEventKeyVal(event);
     int keyKP = keyHK;
     keyStrokes.push_back(keyHK);
@@ -235,6 +244,11 @@ void EmuInstance::onKeyPress(QKeyEvent* event)
 
 void EmuInstance::onKeyRelease(QKeyEvent* event)
 {
+    if (event->key()<256)
+        KeyboardMask[event->key()]=false;
+    if ((event->key()&0x01000000)>0 && (event->key()&0xff)<0x41)//special keys
+        KeyboardMask[0xff - (event->key()&0xff)]=false;
+    
     int keyHK = getEventKeyVal(event);
     int keyKP = keyHK;
     if (event->modifiers() != Qt::KeypadModifier)
diff --git a/src/frontend/qt_sdl/LuaMain.cpp b/src/frontend/qt_sdl/LuaMain.cpp
index 600a9c4f70..4b9a0e1ebd 100644
--- a/src/frontend/qt_sdl/LuaMain.cpp
+++ b/src/frontend/qt_sdl/LuaMain.cpp
@@ -361,18 +361,20 @@ AddLuaFunction(Lua_Reads32,Reads32);
 
 int Lua_NDSTapDown(lua_State* L)
 {
+    LuaBundle* bundle = get_bundle(L);
+    melonDS::NDS* nds = bundle->getEmuInstance()->getNDS();
     int x = luaL_checkinteger(L,1);
     int y = luaL_checkinteger(L,2);
-    //TODO
-    //NDS::TouchScreen(x,y);
+    nds->TouchScreen(x,y);
     return 0;
 }
 AddLuaFunction(Lua_NDSTapDown,NDSTapDown);
 
 int Lua_NDSTapUp(lua_State* L)
 {
-    //TODO
-    //NDS::ReleaseScreen();
+    LuaBundle* bundle = get_bundle(L);
+    melonDS::NDS* nds = bundle->getEmuInstance()->getNDS();
+    nds->ReleaseScreen();
     return 0;
 }
 AddLuaFunction(Lua_NDSTapUp,NDSTapUp);
@@ -424,6 +426,19 @@ int Lua_getMouse(lua_State* L)
 }
 AddLuaFunction(Lua_getMouse,GetMouse);
 
+int Lua_KeyboardMask(lua_State* L)
+{
+    LuaBundle* bundle = get_bundle(L);
+
+    lua_createtable(L,0,256);
+    for (int i=0;i<256;i++){
+        lua_pushboolean(L,bundle->getEmuInstance()->KeyboardMask[i]);
+        lua_seti(L,-2,i);
+    }
+    return 1;
+}
+AddLuaFunction(Lua_KeyboardMask,KeyboardMask);
+
 /*--------------------------------------------------------------------------------------------------
                             Front-end lua function definitions
 --------------------------------------------------------------------------------------------------*/
@@ -472,7 +487,7 @@ int Lua_Flip(lua_State* L)
 }
 AddLuaFunction(Lua_Flip,Flip);
 
-//text(int x, int y, string message, [u32 color = 'black'], [int fontsize = 9], [string fontfamily = Franklin Gothic Medium])
+//Text(int x, int y, string message, [u32 color = 'black'], [int fontsize = 9], [string fontfamily = Franklin Gothic Medium])
 int Lua_text(lua_State* L) 
 {
     LuaBundle* bundle = get_bundle(L);
@@ -538,6 +553,21 @@ int Lua_fillrect(lua_State* L)
 }
 AddLuaFunction(Lua_fillrect,FillRect);
 
+int Lua_Ellipse(lua_State* L)
+{
+    LuaBundle* bundle = get_bundle(L);
+    melonDS::u32 color = luaL_checknumber(L,5);
+    int x = luaL_checknumber(L,1);
+    int y = luaL_checknumber(L,2);
+    int width = luaL_checknumber(L,3);
+    int height = luaL_checknumber(L,4);
+    QPainter painter(bundle->luaCanvas->imageBuffer);
+    painter.setPen(color);
+    painter.drawEllipse(x,y,width,height);
+    return 0;
+}
+AddLuaFunction(Lua_Ellipse,Ellipse);
+
 int Lua_keystrokes(lua_State* L)
 {
     LuaBundle* bundle = get_bundle(L);
@@ -548,7 +578,6 @@ int Lua_keystrokes(lua_State* L)
         lua_seti(L,-2,i);
     }
     bundle->getEmuInstance()->keyStrokes.clear();
-    lua_createtable(L,0,1);
     return 1;
 }
 AddLuaFunction(Lua_keystrokes,Keys);
@@ -590,7 +619,6 @@ AddLuaFunction(Lua_clearImageHash,ClearHash);
 
 int Lua_getJoy(lua_State* L)
 {
-    //TODO:
     LuaBundle* bundle = get_bundle(L);
     melonDS::u32 buttonMask=bundle->getEmuInstance()->getInputMask();//current button state.
     const char* keys[12] =
diff --git a/tools/LuaScripts/Lua-Logo_128x128.png b/tools/LuaScripts/Lua-Logo_128x128.png
new file mode 100644
index 0000000000000000000000000000000000000000..4bdf7a9109a548c3b1fd786d68fc0452008120fc
GIT binary patch
literal 9338
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

literal 0
HcmV?d00001

diff --git a/tools/LuaScripts/LuaScriptTest.lua b/tools/LuaScripts/LuaScriptTest.lua
new file mode 100644
index 0000000000..d2eea703cc
--- /dev/null
+++ b/tools/LuaScripts/LuaScriptTest.lua
@@ -0,0 +1,153 @@
+-- Simple Script to test most of the different Lua Functions for MelonDS
+-- Written by NPO197
+
+MelonClear()
+
+MelonPrint("This text Should be cleared")
+
+MelonClear()
+
+MelonPrint("Running Test...")
+
+u32Data = Readu32(0x00000000)
+
+MelonPrint(string.format("DataZero: %x",u32Data))
+
+NDSTapDown(0,0)
+
+NDSTapUp()
+
+--StateSave("SaveState_Auto")
+
+--StateLoad("SaveState_Auto")
+
+canvas = MakeCanvas(0,0,500,500)
+
+SetCanvas(canvas)
+
+ClearOverlay()
+
+FillRect(0,0,55,11,0xffffffff)
+
+Text(0,9,"Test Message")
+
+Line(0,10,55,10,0x00ff00ff)
+
+Rect(0,0,55,11,0xff00ff00)
+
+DrawImage("Lua-Logo_128x128.png",0,60)
+
+Text(0,200,"WASD to move \"lua Stylus\", Q to tap screen",0xffffff)
+
+--ClearHash()
+
+Flip()
+
+
+-------- Main Loop ----------
+
+typed = ""
+keys = {}
+joys = {}
+
+--protected ints -> string
+function pInts2Str(ints)
+    str = ""
+    for _,i in pairs(ints) do
+        if pcall(string.char,i) then
+            str = str..string.char(i)
+        else
+            MelonPrint("NonAscii:"..i)
+            typed = ""
+        end    
+    end
+    return str
+end
+
+
+textFunctions = {
+    --MousePosText 
+    [1] = function()
+        mouse = GetMouse()
+        return "MousePos:"..mouse.X..","..mouse.Y
+    end,
+    --MouseButtonText 
+    [2] = function()
+        mouse = GetMouse()
+        str = ""
+        for k,v in pairs(mouse) do
+            if k~="X" and k~="Y" and v then
+                str = str..k
+            end
+        end
+        return "MouseBtn:"..str
+    end,
+    --KeysText
+    [3] = function()
+        keys = Keys()
+        temp = pInts2Str(keys)
+        typed = typed..temp
+        return "Keys:"..typed
+    end,
+    --JoyText
+    [4] = function()
+        joys = GetJoy()
+        str = ""
+        for k,v in pairs(joys) do
+            if v then
+                str = str..k
+            end
+        end
+        return "Joy:"..str
+    end
+}
+
+function TextLoop()
+    SetCanvas(textCanvas)
+    ClearOverlay()
+    y = 0
+    for _,tfunct in ipairs(textFunctions) do
+        y = y+10
+        Text(0,y,tfunct(),0xffffff)
+    end
+    Flip()
+end
+
+Stylus = {
+    x = 0,
+    y = 0,
+}
+
+function Stylus:Loop()
+    move = {
+        --Key = {dx,dy}
+        ["W"] = {0,-1},
+        ["A"] = {-1,0},
+        ["S"] = {0,1},
+        ["D"] = {1,0}
+    }
+    mask = KeyboardMask()
+    for tkey,dir in pairs(move) do
+        if mask[string.byte(tkey)] then
+            self.x=self.x+dir[1]
+            self.y=self.y+dir[2]
+        end
+    end
+    if mask[string.byte("Q")] then
+        NDSTapDown(self.x,self.y)
+    else
+        NDSTapUp()
+    end
+    SetCanvas(vstylusCanvas)
+    ClearOverlay()
+    Ellipse(self.x-5,self.y-5,10,10,0xffffffff)
+    Ellipse(self.x-2,self.y-2,4,4,0x00000000)    
+    Flip()
+end
+
+textCanvas = MakeCanvas(0,12,500,100)
+vstylusCanvas = MakeCanvas(0,0,256,192,1) -- bottom screen
+function _Update()
+    TextLoop()
+    Stylus:Loop()
+end