Lua Tidying

src/drivers/Qt/LuaControl.cpp

@@ -539,3 +539,8 @@ int LuaKillMessageBox(void)
 	return luaKillMsgBoxRetVal;
 }
 //----------------------------------------------------
+bool LuaArgCompat = true;
+
+// TODO: stub. scriptArgs->text().toLocal8Bit().constData() ?
+bool GetLuaArgs(char *dst, int len) { dst[0] = 0; return true; }
+//----------------------------------------------------

src/drivers/Qt/LuaControl.h

@@ -53,9 +53,17 @@ private slots:
 	void stopLuaScript(void);
 };
 
+void WinLuaOnStart(intptr_t hDlgAsInt);
+
+void WinLuaOnStop(intptr_t hDlgAsInt);
+
 // Formatted print
 int LuaPrintfToWindowConsole( __FCEU_PRINTF_FORMAT const char *format, ...) __FCEU_PRINTF_ATTRIBUTE( 1, 2 );
 
 void PrintToWindowConsole(intptr_t hDlgAsInt, const char *str);
 
 int LuaKillMessageBox(void);
+
+bool GetLuaArgs(char *dst, int len);
+
+extern bool LuaArgCompat;

src/drivers/win/args.cpp

@@ -28,6 +28,7 @@ char* MovieToLoad = 0;		//Loads a movie file on startup
 char* StateToLoad = 0;		//Loads a savestate on startup (after a movie is loaded, if any)
 char* ConfigToLoad = 0;		//Loads a specific .cfg file (loads before any other commandline options
 char* LuaToLoad = 0;		//Loads a specific lua file
+char* LuaArgs = 0;          //Arguments to the lua script
 char* PaletteToLoad = 0;	//Loads a specific palette file
 char* AviToLoad = 0;		//Starts an avi capture at startup
 char* DumpInput = 0; //Dumps all polled input to a binary file. Probably only useful with -playmovie. This is a rickety system, only useful in limited cases.
@@ -53,6 +54,7 @@ char *ParseArgies(int argc, char *argv[])
         {"-nothrottle",  0,                       &eoptions,              0x8000|EO_NOTHROTTLE},
         {"-playmovie",   0,                       &MovieToLoad,           0x4001},
 	    {"-lua",         0,                       &LuaToLoad,             0x4001},
+	    {"-luaargs",     0,                       &LuaArgs,               0x4001},
 	    {"-palette",     0,                       &PaletteToLoad,         0x4001},
         {"-loadstate",   0,                       &StateToLoad,           0x4001},
         {"-readonly",    0,                       &replayReadOnlySetting, 0},

src/drivers/win/args.h

@@ -2,6 +2,7 @@ extern char* MovieToLoad;	//Contains the filename of the savestate specified in
 extern char* StateToLoad;	//Contains the filename of the movie file specified in the command line arguments
 extern char* ConfigToLoad;	//Contains the filename of the config file specified in the command line arguments
 extern char* LuaToLoad;		//Contains the filename of the lua script specified in the command line arguments
+extern char* LuaArgs;       //Contains the argument string to be tokenized and passed to the lua script
 extern char* PaletteToLoad; //Contains the filename of the palette file specified in the command line arguments
 extern char* AviToLoad;		//Contains the filename of the Avi to be captured specified in the command line arguments
 extern char* DumpInput;

src/drivers/win/luaconsole.cpp

@@ -8,6 +8,7 @@
 extern HWND hAppWnd;
 
 void UpdateLuaConsole(const char* fname);
+bool GetLuaArgs(char *dst, int len);
 
 HWND LuaConsoleHWnd = NULL;
 HFONT hFont = NULL;
@@ -39,14 +40,18 @@ static ControlLayoutInfo controlLayoutInfos [] = {
 	{IDC_EDIT_LUAARGS, ControlLayoutInfo::RESIZE_END, ControlLayoutInfo::NONE},
 	{IDC_BUTTON_LUARUN, ControlLayoutInfo::MOVE_START, ControlLayoutInfo::NONE},
 	{IDC_BUTTON_LUASTOP, ControlLayoutInfo::MOVE_START, ControlLayoutInfo::NONE},
+	{IDC_LUACONSOLE_CLEAR, ControlLayoutInfo::MOVE_START, ControlLayoutInfo::NONE},
 };
 static const int numControlLayoutInfos = sizeof(controlLayoutInfos)/sizeof(*controlLayoutInfos);
 
 struct {
 	int width; int height;
+	int minTrackWidth; int minTrackHeight;
 	ControlLayoutState layoutState [numControlLayoutInfos];
 } windowInfo;
 
+bool LuaArgCompat = false;
+
 void PrintToWindowConsole(intptr_t hDlgAsInt, const char* str)
 {
 	HWND hDlg = (HWND)hDlgAsInt;
@@ -121,6 +126,9 @@ INT_PTR CALLBACK DlgLuaScriptDialog(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
 		GetClientRect(hDlg, &r3);
 		windowInfo.width = r3.right - r3.left;
 		windowInfo.height = r3.bottom - r3.top;
+		GetWindowRect(hDlg, &r3); // consider the initial size to be the minimum size
+		windowInfo.minTrackWidth = r3.right - r3.left;
+		windowInfo.minTrackHeight = r3.bottom - r3.top;
 		for(int i = 0; i < numControlLayoutInfos; i++) {
 			ControlLayoutState& layoutState = windowInfo.layoutState[i];
 			layoutState.valid = false;
@@ -130,8 +138,19 @@ INT_PTR CALLBACK DlgLuaScriptDialog(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
 		SetDlgItemText(hDlg, IDC_EDIT_LUAPATH, FCEU_GetLuaScriptName());
 
 		SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(LOGFONT), &LuaConsoleLogFont, 0); // reset with an acceptable font
+
+		HMENU hmenu = GetMenu(hDlg);
+		CheckMenuItem(hmenu, IDC_LUACONSOLE_ARGCOMPAT, LuaArgCompat ? MF_CHECKED : MF_UNCHECKED);
+		return true;
+	}
+
+	case WM_GETMINMAXINFO:
+	{
+		auto info = (MINMAXINFO*)lParam;
+		info->ptMinTrackSize.x = windowInfo.minTrackWidth;
+		info->ptMinTrackSize.y = windowInfo.minTrackHeight;
 		return true;
-	}	break;
+	}
 
 	case WM_SIZE:
 	{
@@ -187,7 +206,7 @@ INT_PTR CALLBACK DlgLuaScriptDialog(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
 				default: break;
 			}
 
-			SetWindowPos(hCtrl, 0, x,y, width,height, 0);
+			SetWindowPos(hCtrl, HWND_TOP, x,y, width,height, SWP_NOREDRAW);
 
 			layoutState.x = x;
 			layoutState.y = y;
@@ -199,29 +218,33 @@ INT_PTR CALLBACK DlgLuaScriptDialog(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
 		windowInfo.width = dlgWidth;
 		windowInfo.height = dlgHeight;
 
-		RedrawWindow(hDlg, NULL, NULL, RDW_INVALIDATE);
-	}	break;
+		RedrawWindow(hDlg, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN | RDW_ERASE);
+		return true;
+	}
 
 	case WM_COMMAND:
 		switch (LOWORD(wParam)) {
-			case IDOK:
-			case IDCANCEL: {
-				EndDialog(hDlg, true); // goto case WM_CLOSE;
-			}	break;
+			case IDCANCEL:
+			{
+				goto close;
+			}
 
 			case IDC_BUTTON_LUARUN:
+			case IDOK:
 			{
 				char filename[MAX_PATH];
 				char args[MAX_PATH];
 				GetDlgItemText(hDlg, IDC_EDIT_LUAPATH, filename, MAX_PATH);
 				GetDlgItemText(hDlg, IDC_EDIT_LUAARGS, args, MAX_PATH);
 				FCEU_LoadLuaCode(filename, args);
-			}	break;
+				return true;
+			}
 
 			case IDC_BUTTON_LUASTOP:
 			{
 				FCEU_LuaStop();
-			}	break;
+				return true;
+			}
 
 			case IDC_BUTTON_LUAEDIT:
 			{
@@ -232,7 +255,8 @@ INT_PTR CALLBACK DlgLuaScriptDialog(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
 				if((intptr_t)ShellExecute(NULL, "edit", Str_Tmp, NULL, NULL, SW_SHOWNORMAL) == SE_ERR_NOASSOC)
 					if((intptr_t)ShellExecute(NULL, "open", Str_Tmp, NULL, NULL, SW_SHOWNORMAL) == SE_ERR_NOASSOC)
 						ShellExecute(NULL, NULL, "notepad", Str_Tmp, NULL, SW_SHOWNORMAL);
-			}	break;
+				return true;
+			}
 
 			case IDC_BUTTON_LUABROWSE:
 			{
@@ -254,7 +278,7 @@ INT_PTR CALLBACK DlgLuaScriptDialog(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
 					SetWindowText(GetDlgItem(hDlg, IDC_EDIT_LUAPATH), szFileName);
 				}
 				return true;
-			}	break;
+			}
 
 			case IDC_EDIT_LUAPATH:
 			{
@@ -264,7 +288,8 @@ INT_PTR CALLBACK DlgLuaScriptDialog(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
 				EnableWindow(GetDlgItem(hDlg, IDOK), file != NULL);
 				if(file)
 					fclose(file);
-			}	break;
+				return true;
+			}
 
 			case IDC_LUACONSOLE_CHOOSEFONT:
 			{
@@ -284,28 +309,40 @@ INT_PTR CALLBACK DlgLuaScriptDialog(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
 					if (hFont)
 						SendDlgItemMessage(hDlg, IDC_LUACONSOLE, WM_SETFONT, (WPARAM)hFont, 0);
 				}
-			}	break;
+				return true;
+			}
 
 			case IDC_LUACONSOLE_CLEAR:
 			{
 				SetWindowText(GetDlgItem(hDlg, IDC_LUACONSOLE), "");
-			}	break;
+				return true;
+			}
+
+			case IDC_LUACONSOLE_ARGCOMPAT:
+			{
+				HMENU hmenu = GetMenu(hDlg);
+				CheckMenuItem(hmenu, IDC_LUACONSOLE_ARGCOMPAT, (LuaArgCompat = !LuaArgCompat) ? MF_CHECKED : MF_UNCHECKED);
+				return true;
+			}
 		}
 		break;
 
+
+close:
 	case WM_CLOSE: {
 		FCEU_LuaStop();
 		DragAcceptFiles(hDlg, FALSE);
 		if (hFont) {
 			DeleteObject(hFont);
 			hFont = NULL;
 		}
+		EndDialog(hDlg, true);
 		LuaConsoleHWnd = NULL;
-	}	break;
+		return true;
+	}
 
 	case WM_DROPFILES: {
 		HDROP hDrop;
-		//UINT fileNo;
 		UINT fileCount;
 		char filename[MAX_PATH];
 
@@ -317,7 +354,7 @@ INT_PTR CALLBACK DlgLuaScriptDialog(HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
 		}
 		DragFinish(hDrop);
 		return true;
-	}	break;
+	}
 
 	}
 
@@ -330,4 +367,12 @@ void UpdateLuaConsole(const char* fname)
 	if (!LuaConsoleHWnd) return;
 
 	SetWindowText(GetDlgItem(LuaConsoleHWnd, IDC_EDIT_LUAPATH), fname);
-}
+}
+
+bool GetLuaArgs(char *dst, int len)
+{
+	if (!LuaConsoleHWnd)
+		return dst[0] = 0;
+
+	return GetDlgItemText(LuaConsoleHWnd, IDC_EDIT_LUAARGS, dst, len) || !GetLastError();
+}

src/drivers/win/luaconsole.h

@@ -0,0 +1,14 @@
+#ifndef LUACONSOLE_H
+#define LUACONSOLE_H
+
+extern HWND LuaConsoleHWnd;
+extern bool LuaArgCompat;
+
+void PrintToWindowConsole(intptr_t hDlgAsInt, const char* str);
+void WinLuaOnStart(intptr_t hDlgAsInt);
+void WinLuaOnStop(intptr_t hDlgAsInt);
+INT_PTR CALLBACK DlgLuaScriptDialog(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);
+void UpdateLuaConsole(const char* fname);
+bool GetLuaArgs(char *args, int len);
+
+#endif

src/drivers/win/main.cpp

@@ -894,9 +894,11 @@ int main(int argc,char *argv[])
 	}
 	if(GameInfo && LuaToLoad)
 	{
-		FCEU_LoadLuaCode(LuaToLoad);
+		FCEU_LoadLuaCode(LuaToLoad, LuaArgs); // TODO: Would be cool to send these args to the textbox
 		free(LuaToLoad);
+		free(LuaArgs);
 		LuaToLoad = NULL;
+		LuaArgs = NULL;
 	}
 
 	//Initiates AVI capture mode, will set up proper settings, and close FCUEX once capturing is finished

src/drivers/win/res.rc

@@ -1471,6 +1471,7 @@ BEGIN
     EDITTEXT        IDC_LUACONSOLE,7,80,256,60,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
     LTEXT           "Arguments:",IDC_STATIC,7,52,40,8
     EDITTEXT        IDC_EDIT_LUAARGS,47,50,216,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "&Clear",IDC_LUACONSOLE_CLEAR,213,66,50,13
 END
 
 VIDEOCONFIG DIALOGEX 65520, 76, 511, 170
@@ -3006,10 +3007,13 @@ END
 
 LUAWINDOW_MENU MENU
 BEGIN
-    POPUP "Console"
+    POPUP "Options"
     BEGIN
-        MENUITEM "&Font...",                    IDC_LUACONSOLE_CHOOSEFONT
-        MENUITEM "Clear",                       IDC_LUACONSOLE_CLEAR
+        POPUP "Console"
+        BEGIN
+            MENUITEM "&Font...",                    IDC_LUACONSOLE_CHOOSEFONT
+        END
+        MENUITEM "Old-Style Args",              IDC_LUACONSOLE_ARGCOMPAT
     END
 END
 

src/drivers/win/resource.h

@@ -928,6 +928,7 @@
 #define MENU_INSERT_COIN2               40013
 #define MENU_SERVICE                    40014
 #define MENU_SERVICE_BUTTON             40015
+#define IDC_LUACONSOLE_ARGCOMPAT        40017
 #define MENU_NETWORK                    40040
 #define MENU_PALETTE                    40041
 #define MENU_SOUND                      40042
@@ -1229,8 +1230,8 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        313
-#define _APS_NEXT_COMMAND_VALUE         40016
+#define _APS_NEXT_RESOURCE_VALUE        314
+#define _APS_NEXT_COMMAND_VALUE         40018
 #define _APS_NEXT_CONTROL_VALUE         1050
 #define _APS_NEXT_SYMED_VALUE           101
 #endif