Clean LuaMain

Round 1-2 of code clean up

src/frontend/qt_sdl/LuaMain.cpp

@@ -54,8 +54,7 @@ LuaConsoleDialog::LuaConsoleDialog(QWidget* parent) : QDialog(parent)
 {
     QWidget* w = parent;
     MainWindow* mainWindow;
-    //Yoinked from ScreenPanel in Screen.cpp
+    for (;;) //copied from ScreenPanel in Screen.cpp
-    for (;;)
     {
         mainWindow = qobject_cast<MainWindow*>(w);
         if (mainWindow) break;
@@ -90,8 +89,7 @@ void LuaConsoleDialog::closeEvent(QCloseEvent *event)
 void LuaConsoleDialog::onOpenScript()
 {
     QFileInfo file = QFileInfo(QFileDialog::getOpenFileName(this, "Load Lua Script",QDir::currentPath()));
-    if (!file.exists())
+    if (!file.exists()) return;
-        return;
     currentScript = file;
     bundle->flagNewLua = true;
 }
@@ -113,7 +111,6 @@ void LuaConsole::onClear()
     this->clear();
 }
 
-
 LuaFunction::LuaFunction(luaFunctionPointer cf,const char* n,std::vector<LuaFunction*>* container)
 {
     this->cfunction = cf;
@@ -123,7 +120,8 @@ LuaFunction::LuaFunction(luaFunctionPointer cf,const char* n,std::vector<LuaFunc
 
 static_assert(sizeof(LuaBundle*) <= LUA_EXTRASPACE,"LUA_EXTRASPACE too small");
 
-LuaBundle* get_bundle(lua_State * L) {
+LuaBundle* get_bundle(lua_State * L)
+{
 	LuaBundle* pBundle;
 	std::memcpy(&pBundle, lua_getextraspace(L), sizeof(LuaBundle*));
 	return pBundle;
@@ -137,17 +135,14 @@ void luaHookFunction(lua_State* L, lua_Debug *arg)
         luaL_error(L, "Force Stopped");
 }
 
-
 std::vector<LuaFunction*> definedLuaFunctions;//List of all defined lua functions
 
 void LuaBundle::createLuaState()
 {
-    if(!flagNewLua)
+    if (!flagNewLua) return;
-        return;
     overlays->clear();
     flagNewLua = false;
     luaState = nullptr;
-    QString qfilename = luaDialog->currentScript.fileName();
     std::string fileName = luaDialog->currentScript.fileName().toStdString();
     std::string filedir = luaDialog->currentScript.dir().path().toStdString();
     lua_State* L = luaL_newstate();
@@ -170,8 +165,7 @@ void LuaBundle::createLuaState()
 
 void LuaConsoleDialog::onStop()
 {
-    lua_State* L = bundle->getLuaState();
+    if (bundle->getLuaState()) 
-    if(L)
         bundle->flagStop = true;
 }
 
@@ -183,8 +177,7 @@ void LuaConsoleDialog::onPausePlay()
 //Gets Called once a frame
 void LuaBundle::luaUpdate()
 {
-    if(!luaState || flagPause)
+    if (!luaState || flagPause) return;
-        return;
     if (lua_getglobal(luaState,"_Update")!=LUA_TFUNCTION)
     {
         emuThread->onLuaPrint("No \"_Update\" Function found, pausing script...");
@@ -238,6 +231,7 @@ void LuaBundle::luaResetOSD()
     }
 }
 
+//TODO: Organize lua functions into different named tables similar to bizhawk.
 /*--------------------------------------------------------------------------------------------------
                             Start of lua function definitions
 --------------------------------------------------------------------------------------------------*/
@@ -429,13 +423,13 @@ 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++){
+    for (int i=0;i<256;i++)
+    {
         lua_pushboolean(L,bundle->getEmuInstance()->KeyboardMask[i]);
         lua_seti(L,-2,i);
     }
-    return 1;
+    return 1;//returns table of 256 booleans describing the current state of the keyboard.
 }
 AddLuaFunction(Lua_KeyboardMask,KeyboardMask);
 
@@ -467,6 +461,7 @@ int Lua_SetCanvas(lua_State* L) //SetCanvas(int index)
 {
     LuaBundle* bundle = get_bundle(L);
     int index = luaL_checknumber(L,1);
+
     bundle->luaCanvas = &bundle->overlays->at(index);
     return 0;
 }
@@ -497,6 +492,7 @@ int Lua_text(lua_State* L)
     melonDS::u32 color = luaL_optnumber(L,4,0x00000000);
     const char* FontFamily = luaL_optlstring(L,6,"Helvetica",NULL);
     int size = luaL_optnumber(L,5,9);
+
     QPainter painter(bundle->luaCanvas->imageBuffer);
     QFont font(FontFamily,size,0,false);
     //font.setStyleStrategy(QFont::NoAntialias);
@@ -516,6 +512,7 @@ int Lua_line(lua_State* L)
     int x2 = luaL_checknumber(L,3);
     int y2 = luaL_checknumber(L,4);
     melonDS::u32 color = luaL_checknumber(L,5);
+
     QPainter painter(bundle->luaCanvas->imageBuffer);
     painter.setPen(color);
     painter.drawLine(x1,y1,x2,y2);
@@ -531,6 +528,7 @@ int Lua_rect(lua_State* L)
     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.drawRect(x,y,width,height);
@@ -546,6 +544,7 @@ int Lua_fillrect(lua_State* L)
     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.fillRect(x,y,width,height,color);
@@ -561,6 +560,7 @@ int Lua_Ellipse(lua_State* L)
     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);
@@ -593,6 +593,7 @@ int Lua_drawImage(lua_State* L)
     int sy = luaL_optinteger(L,5,0);
     int sw = luaL_optinteger(L,6,-1);
     int sh = luaL_optinteger(L,7,-1);
+
     QPainter painter(bundle->luaCanvas->imageBuffer);
     QImage image;
     if (bundle->imageHash->contains(path))
@@ -638,7 +639,9 @@ int Lua_getJoy(lua_State* L)
 AddLuaFunction(Lua_getJoy,GetJoy);
 
 /*
-int Lua_setPadding(lua_State* L) //TODO: Currently only works well with force integer scaling
+//TODO: Currently only works well with force integer scaling
+//TODO: Consider alternative ways to provide extra drawing space for lua scripts?
+int Lua_setPadding(lua_State* L) 
 {
     LeftPadding = abs(luaL_checkinteger(L,1));
     TopPadding = abs(luaL_checkinteger(L,2));

src/frontend/qt_sdl/LuaMain.h

@@ -62,7 +62,7 @@ struct OverlayCanvas
     bool isActive = true; // only active overlays are drawn
     unsigned int GLTexture; // used by GL rendering
     bool GLTextureLoaded;
-    OverlayCanvas(int x, int y,int w, int h, LuaCanvasTarget target = LuaCanvasTarget::canvasTarget_OSD);
+    OverlayCanvas(int x, int y,int w, int h, LuaCanvasTarget target = canvasTarget_OSD);
     void flip();//used to swap buffers / update canvas
     bool flipped; //used to signal update to graphics.
 };