Add new wineserver args to protontricks-launch

src/protontricks/cli/launch.py

@@ -66,11 +66,30 @@ def main(args=None):
         "--no-bwrap", action="store_true", default=False,
         help="Disable bwrap containerization when using Steam Runtime"
     )
+    parser.add_argument(
+        "--background-wineserver",
+        dest="background_wineserver",
+        action="store_true",
+        help=(
+            "Launch a background wineserver process to improve Wine command "
+            "startup time. Default if bwrap is enabled."
+        )
+    )
+    parser.add_argument(
+        "--no-background-wineserver",
+        dest="background_wineserver",
+        action="store_false",
+        help=(
+            "Do not launch a background wineserver process to improve Wine "
+            "command startup time. Default if bwrap is not enabled."
+        )
+    )
     parser.add_argument(
         "--appid", type=int, nargs="?", default=None
     )
     parser.add_argument("executable", type=str)
     parser.add_argument("exec_args", nargs=argparse.REMAINDER)
+    parser.set_defaults(background_wineserver=None)
 
     args = parser.parse_args(args)
 
@@ -136,6 +155,11 @@ def exit_(error):
     if args.no_bwrap:
         cli_args += ["--no-bwrap"]
 
+    if args.background_wineserver is True:
+        cli_args += ["--background-wineserver"]
+    elif args.background_wineserver is False:
+        cli_args += ["--no-background-wineserver"]
+
     inner_args = " ".join(
         ["wine", "'{}'".format(str(executable_path))]
         + exec_args

tests/cli/test_launch.py

@@ -120,6 +120,39 @@ def test_run_executable_passthrough_arguments(
         assert cli_args[4].endswith("test.exe'")
         assert cli_args[5] == "10"
 
+    @pytest.mark.parametrize("argument", [
+        None,
+        "--background-wineserver",
+        "--no-background-wineserver"
+    ])
+    def test_run_executable_passthrough_background_wineserver(
+            self, launch_cli, monkeypatch, steam_app_factory,
+            argument):
+        """
+        Try running an EXE file and apply given wineserver argument.
+        If the argument is set, it should also be passed to the main
+        entrypoint.
+        """
+        cli_args = []
+
+        monkeypatch.setattr(
+            "protontricks.cli.launch.cli_main",
+            cli_args.extend
+        )
+
+        steam_app_factory(name="Fake game", appid=10)
+
+        extra_args = [argument] if argument else []
+        launch_cli(extra_args + ["--appid", "10", "test.exe"])
+
+        if argument:
+            # Ensure the corresponding argument was passd to the main CLI
+            # entrypoint
+            assert argument in cli_args
+        else:
+            assert "--background-wineserver" not in cli_args
+            assert "--no-background-wineserver" not in cli_args
+
     def test_cli_error_handler_uncaught_exception(
             self, launch_cli, default_proton, steam_app_factory, monkeypatch,
             gui_provider):