Skip to content

Launch Workdir Fix and some detailed improvements #711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kingokksa wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Launch Workdir Fix and some detailed improvements #711

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
af409c4
fix(launch): set guest working dir via Wine-mapped host path
kingokksa Aug 29, 2026
0fea7e5
chore: remove on-screen locale/codepage manifest warning prompt
kingokksa Aug 27, 2026
8663de6
fix: guard renderDrawerMenu against uninitialized gestureProfileManager
kingokksa Aug 27, 2026
db23a0f
fix(pip): guard enterPictureInPictureMode against exceptions
kingokksa Aug 28, 2026
98bdad8
chore: drop unused locale/codepage manifest warning code
kingokksa Sep 2, 2026
f0c848f
fix(pip): clamp aspect ratio and simplify comment
kingokksa Sep 2, 2026
5e869ba
fix(launch): document working-dir host->Wine->host round-trip
kingokksa Sep 2, 2026
b99f0e2
fix(launch): re-derive custom game working dir from exe path
kingokksa Sep 2, 2026
f41eef7
Merge branch 'main' into feature/launch-workdir
maxjivi05 Sep 3, 2026
7d464a7
fix(launch): re-derive custom game working dir from exe path
kingokksa Sep 2, 2026
41e4746
Merge remote-tracking branch 'upstream/main' into feature/launch-workdir
kingokksa Oct 6, 2026
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
52 changes: 47 additions & 5 deletions app/src/main/runtime/display/XServerDisplayActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7104,7 +7104,19 @@ private boolean handleDrawerAction(int itemId) {
renderDrawerMenu();
break;
case R.id.main_menu_pip_mode:
enterPictureInPictureMode(new android.app.PictureInPictureParams.Builder().build());
// OEM builds can throw when entering PiP; guard so the button never crashes the session.
try {
android.graphics.Point pipSize = new android.graphics.Point();
getWindowManager().getDefaultDisplay().getSize(pipSize);
float pipRatio = Math.max(1.0f / 2.39f, Math.min((float) pipSize.x / pipSize.y, 2.39f));
android.app.PictureInPictureParams pipParams =
new android.app.PictureInPictureParams.Builder()
.setAspectRatio(new android.util.Rational((int) (pipRatio * 1000), 1000))
.build();
enterPictureInPictureMode(pipParams);
} catch (Throwable t) {
Log.w("XServerDisplayActivity", "Failed to enter PiP mode", t);
}
closeDrawerMenu();
break;
case R.id.main_menu_magnifier:
Expand Down Expand Up @@ -11493,7 +11505,7 @@ && new File(storeInstallPath).exists()) {
dir = "F:\\";
}

File nativeDir = com.winlator.cmod.runtime.wine.WineUtils.getNativePath(imageFs, dir);
File nativeDir = com.winlator.cmod.runtime.wine.WineUtils.getNativePath(this.container, imageFs, dir);
if (nativeDir != null && nativeDir.exists()) {
launcherComponent.setWorkingDir(nativeDir);
Log.d("XServerDisplayActivity", "Set native working dir for store process: " + nativeDir.getPath());
Expand All @@ -11515,9 +11527,39 @@ && new File(storeInstallPath).exists()) {
} else if (path != null) {
String nativeDirPath = getActiveGameDirectoryPath();
if (nativeDirPath != null) {
File nativeDir = new File(nativeDirPath);
launcherComponent.setWorkingDir(nativeDir);
Log.d("XServerDisplayActivity", "Set native working dir for Custom process: " + nativeDir.getPath());
File nativeDir = null;
// Round-trip host -> Wine -> host to re-resolve through this container's dosdevices symlinks.
String winDir =
com.winlator.cmod.runtime.wine.WineUtils
.hostPathToRootWinePath(container, nativeDirPath);
if (winDir != null && !winDir.isEmpty()) {
nativeDir =
com.winlator.cmod.runtime.wine.WineUtils
.getNativePath(container, imageFs, winDir);
}
String exeName = null;
int lastSlash = path.lastIndexOf("\\");
if (lastSlash > 0 && lastSlash + 1 < path.length()) exeName = path.substring(lastSlash + 1);
if (nativeDir == null || !nativeDir.isDirectory()
|| (exeName != null && !new File(nativeDir, exeName).isFile())) {
File exeDir = null;
if (lastSlash > 0) {
exeDir =
com.winlator.cmod.runtime.wine.WineUtils
.getNativePath(container, imageFs, path.substring(0, lastSlash));
}
if (exeDir != null && exeDir.isDirectory()) {
nativeDir = exeDir;
} else if (new File(nativeDirPath).isDirectory()) {
nativeDir = new File(nativeDirPath);
} else {
nativeDir = null;
}
}
if (nativeDir != null && nativeDir.isDirectory()) {
launcherComponent.setWorkingDir(nativeDir);
Log.d("XServerDisplayActivity", "Set native working dir for Custom process: " + nativeDir.getPath());
}
} else {
int lastBackslash = path.lastIndexOf("\\");
if (lastBackslash >= 0) {
Expand Down
Loading