enable dosbox config setting

Author: xsro

package.json

@@ -238,6 +238,17 @@
             "SDL.output": "opengl"
           },
           "markdownDescription": "%config.boxconfig.description%"
+        },
+        "masmtasm.dosboxX.config": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "default": {
+            "SDL.windowresolution": "1024x640",
+            "SDL.output": "opengl"
+          },
+          "markdownDescription": "%config.boxXconfig.description%"
         }
       }
     },

package.nls.json

@@ -3,38 +3,20 @@
 	"editor.runAsm": "Run ASM code",
 	"editor.debugAsm": "Debug ASM code",
 	"command.cleanalldianose": "MASM/TASM: Clean all diagnose information generated by the extension",
-	"command.dosboxhere": "DOSBox here: Open DosBox and prepare the environment",
-	"config.toolspath.mddescription": "the path of your tools folder for assembly, used to replace the built-in one",
-	"config.masmortasm.description": "use TASM or MASM to operate your assembly codes",
-	"config.masmortasm.enum1": "use MASM toolset, including masm.exe,link.exe,debug.exe...",
-	"config.masmortasm.enum2": "use TASM toolset, including tasm.exe,tlink.exe,td.exe...",
+	"config.assembler.description": "use TASM or MASM to operate your assembly codes",
 	"config.emulator.description": "DOS environment emulator",
 	"config.emulator.jsdos": "Use jsdos(wdosbox), run in webview",
-	"config.emulator.dosbox": "Use DOSBox(most stable),need to install dosbox by yourself",
-	"config.emulator.player": "Use MSDOS-player for most cases(use dosbox for TD),this may be more quiet",
-	"config.emulator.auto": "use MSDOS-player to compile,use dosbox to run，use dosbox for TD.exe,MSDOS player for debug.exe",
+	"config.emulator.dosbox": "Use DOSBox",
+	"config.emulator.dosboxX": "Use DOSBox-x",
+	"config.emulator.player": "Use MSDOS-player",
 	"config.savefirst": "Save the file before Open dosbox, run and debug ASM codes",
 	"config.boxrun.description": "What to do after run code in dosbox",
 	"config.boxrun.enum1": "do nothing, manually input exit or click 'x' or press 'Ctrl+F9' to exit",
 	"config.boxrun.enum2": "exit DOSBox automatically",
 	"config.boxrun.enum3": "pause and then exit",
 	"config.boxrun.choose": "use choose command to decide keep dosbox or not",
-	"config.boxcommand": "If defined, the extension will use this command to open dosbox instead of default command",
-	"config.boxconsole.description": "what to do with the console window",
-	"config.boxconsole.min": "- For windows, use command like `start/min dosbox`, this will **Minimize** the console window\n- for other OS, will not process the console information",
-	"config.boxconsole.normal": "- For windows, use command like `dosbox`, this will **Create** a console window by dosbox\n- for other OS, will not process the console information",
-	"config.boxconsole.noconsole": "don't show console\n\n- For windows, use command like `dosbox -noconsole` to redirect the console stdout and stderr to files\n- for other OS, will not process the console information",
-	"config.boxconsole.redirect-show": "Redirect the console stdout and stderr to VSCode output channel, and show. For windows it will not display in real time",
-	"config.boxconsole.redirect": "Redirect the console stdout and stderr to VSCode output channel. For windows it will not display in real time",
-	"config.boxconfig.description": "dosbox configurations that will be used, see [link](https://www.dosbox.com/wiki/Dosbox.conf),use property like `\"AUTOEXEC\":\"echo hi\\ndir\"` if need to use *AUTOEXEC*",
+	"config.boxconfig.description": "configuration for DOSBox, use format like the default value, see [dosbox](https://www.dosbox.com/wiki/Dosbox.conf),Please don't set `autoexec` here",
+	"config.boxXconfig.description": "configuration for DOSBox-X, use format like the default value, see [dosbox-x](https://dosbox-x.com/wiki/), Please don't set `autoexec `here",
 	"config.hover": "Display Hover information or not, restart VSCode to apply",
-	"config.PLF": "Experimental programmatic language features like outline,jump to definition/reference. Restart needed",
-	"config.separateSpace": "Use a Separate space to keep the workspace clean. This will cause problem with multi-file assembly. \n\n- The extension will copy source code file to this space\n- When the emulator's fileSystem do not support your file path, this will be enabled by default",
-	"config.clean": "clean related files before action",
-	"config.jsdos.viewColumn": "the view Column where the jsdos webview will create. See [ViewColumn](https://code.visualstudio.com/api/references/vscode-api#ViewColumn)",
-	"config.jsdos.viewColumn.Active": "Active panel",
-	"config.jsdos.viewColumn.Besides": "Besides panel",
-	"config.dosbox.more": "The commands to use when in dosbox mode.\n\n- The extension will mount tools folder to dosbox's disk C, the file's folder to disk D\n- a separate space as dosbox's disk X,the extension will read file X:\\ASM.LOG to process assembler's message\n",
-	"config.jsdos.more": "The commands to use when in wdosbox(jsdos mode)",
-	"config.msdos.more": "The commands to use when in msdos player or auto mode"
+	"config.PLF": "Experimental programmatic language features like outline,jump to definition/reference. Restart needed"
 }

package.nls.zh-cn.json

@@ -15,7 +15,8 @@
 	"config.boxrun.enum2": "运行程序之后直接关闭DOSBOX",
 	"config.boxrun.enum3": "运行程序之后先停顿一下，输入任意字符后关闭DOSBOX窗口",
 	"config.boxrun.choose": "使用choose命令，来选择是否关闭dosbox",
-	"config.boxconfig.description": "dosbox的配置信息，将会写到插件专用的配置文件中, 参见 [dosbox官网的说明](https://www.dosbox.com/wiki/Dosbox.conf),如果需要设置AUTOEXEC,可以使用格式如`\"AUTOEXEC\":\"echo hi\\ndir\"`",
+	"config.boxconfig.description": "dosbox的配置信息，将会写到插件专用的配置文件中, 参见 [dosbox官网的说明](https://www.dosbox.com/wiki/Dosbox.conf),请勿设置`autoexec`",
+	"config.boxXconfig.description": "dosbox-x的配置信息，将会写到插件专用的配置文件中, 参见 [dosbox-x官网的说明](https://dosbox-x.com/wiki/),请勿设置`autoexec`",
 	"config.hover": "是否显示悬浮提示(hover)，可能需要重启vscode来应用变更",
 	"config.PLF": "使用提供大纲，跳到定义，查找引用等programmatic features"
 }

src/ASM/main.ts

@@ -109,28 +109,40 @@ export async function activate(context: vscode.ExtensionContext) {
                 autoexec.push(...action.debug.map(cb));
             }
 
-            autoexec.push("exit");
-
             const box = conf.extConf.emulator === conf.DosEmulatorType.dosboxX ? api.dosboxX : api.dosbox;
             await box.fromBundle(bundle, assemblyToolsFolder);
 
-            switch (vscode.workspace.getConfiguration('masm-tasm').get('dosbox.run')) {
-                case "keep":
-                    break;
-                case "exit":
-                    autoexec.push('exit');
-                    break;
-                case 'pause':
-                    autoexec.push('pause', 'exit');
-                    break;
-                case "choose":
-                default:
-                    autoexec.push(
-                        "@choice Do you need to keep the DOSBox",
-                        "@IF ERRORLEVEL 2 exit",
-                        "@IF ERRORLEVEL 1 echo on"
-                    );
-                    break;
+            if (act !== conf.actionType.open) {
+                switch (vscode.workspace.getConfiguration('masm-tasm').get('dosbox.run')) {
+                    case "keep":
+                        break;
+                    case "exit":
+                        autoexec.push('exit');
+                        break;
+                    case 'pause':
+                        autoexec.push('pause', 'exit');
+                        break;
+                    case "choose":
+                    default:
+                        autoexec.push(
+                            "@choice Do you need to keep the DOSBox",
+                            "@IF ERRORLEVEL 2 exit",
+                            "@IF ERRORLEVEL 1 echo on"
+                        );
+                        break;
+                }
+            }
+
+            const dosboxConf: { [id: string]: string } | undefined =
+                conf.extConf.emulator === conf.DosEmulatorType.dosboxX
+                    ? vscode.workspace.getConfiguration("masmtasm").get("dosbox.config")
+                    : vscode.workspace.getConfiguration("masmtasm").get("dosboxX.config");
+            if (dosboxConf) {
+                for (const id in dosboxConf) {
+                    const [section, key] = id.toLowerCase().split('.');
+                    const value = dosboxConf[id];
+                    box.updateConf(section, key, value);
+                }
             }
 
             box.updateAutoexec(autoexec);