Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions rare/components/tabs/settings/widgets/proton.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ def showEvent(self, a0: QShowEvent) -> None:
tools = steam.find_tools()
for tool in tools:
self.tool_combo.addItem(tool.name, tool)
if not tools:
self._on_tool_changed(0)
try:
wrapper = next(
filter(
Expand Down Expand Up @@ -142,8 +144,8 @@ def showEvent(self, a0: QShowEvent) -> None:
return super().showEvent(a0)

@Slot(int)
def _on_tool_changed(self, index):
steam_tool: Union[steam.ProtonTool, steam.CompatibilityTool] = self.tool_combo.itemData(index, Qt.ItemDataRole.UserRole)
def _on_tool_changed(self, index: int):
steam_tool: Union[steam.ProtonTool, steam.CompatibilityTool, None] = self.tool_combo.itemData(index, Qt.ItemDataRole.UserRole)

steam_environ = steam.get_steam_environment(steam_tool, self.compat_edit.text())
library_paths = steam_environ["STEAM_COMPAT_LIBRARY_PATHS"] if "STEAM_COMPAT_LIBRARY_PATHS" in steam_environ else ""
Expand Down
87 changes: 87 additions & 0 deletions rare/utils/compat/miniproton.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
#!/usr/bin/env python3

import os
import subprocess
import sys
from getpass import getuser
from pathlib import Path
from typing import Any, Dict, List


def log(msg: Any):
sys.stderr.write(str(msg) + "\n")
sys.stderr.flush()


def run_proc(args: List, env: Dict):
return subprocess.call(args, env=env, stderr=sys.stderr, stdout=sys.stdout)


if __name__ == "__main__":
if "STEAM_COMPAT_DATA_PATH" not in os.environ:
log("No compat data path?")
sys.exit(1)

wine_bin = "/usr/bin/wine"
wineserver_bin = "/usr/bin/wineserver"

compat_data = Path(os.environ["STEAM_COMPAT_DATA_PATH"]).resolve(strict=False)
compat_data.mkdir(parents=True, exist_ok=True)
compat_data.joinpath("creation_sync_guard").touch(exist_ok=True)
compat_data.joinpath("tracked_files").touch(exist_ok=True)

wine_prefix = compat_data.joinpath("pfx").resolve(strict=False)
if not wine_prefix.exists():
wine_prefix.mkdir(parents=True, exist_ok=True)

dlls = {
"d3d8": "n,b",
"d3d9": "n,b",
"dxgi": "n,b",
"d3d10core": "n,b",
"d3d11": "n,b",
"d3d12": "n,b;",
"d3d12core": "n,b",
}
dlloverrides = ";".join(("=".join((k , v)) for k, v in dlls.items()))
dlloverrides = ";".join((os.environ.get("WINEDLLOVERRIDES", ""), dlloverrides))

env = {
"WINE": wine_bin,
"WINEPREFIX": wine_prefix.as_posix(),
"WINEDLLOVERRIDES": dlloverrides,
}
log(env)

local_env = os.environ.copy()
local_env.update(env)

#determine mode
rc = 0
if sys.argv[1] == "run":
#start target app
rc = run_proc([wine_bin] + sys.argv[2:], local_env)
elif sys.argv[1] == "waitforexitandrun":
#wait for wineserver to shut down
run_proc([wineserver_bin, "-w"], local_env)
#then run
rc = run_proc([wine_bin] + sys.argv[2:], local_env)
elif sys.argv[1] == "runinprefix":
rc = run_proc([wine_bin] + sys.argv[2:], local_env)
elif sys.argv[1] == "getcompatpath":
#linux -> windows path
path = subprocess.check_output([wine_bin, "winepath", "-w", sys.argv[2]], env=local_env, stderr=sys.stderr)
sys.stdout.buffer.write(path)
sys.stdout.buffer.flush()
sys.stderr.buffer.flush()
elif sys.argv[1] == "getnativepath":
#windows -> linux path
path = subprocess.check_output([wine_bin, "winepath", sys.argv[2]], env=local_env, stderr=sys.stderr)
sys.stdout.buffer.write(path)
sys.stdout.buffer.flush()
sys.stderr.buffer.flush()
else:
log("Need a verb.")
sys.exit(1)

sys.exit(rc)