feat: remove Force game windows fullscreen now that games run on their own Xwayland (#349)

This commit is contained in:
Kurt Himebauch authored and GitHub committed 2026-10-06 18:04:22 +00:00
1 parent 9d0989374b
commit 1d93626453
18 files changed
+23 -113

No files matched your search

@@ -155,7 +155,6 @@ class MainActivity : ComponentActivity() {
private var showPhantomGate by mutableStateOf(false)
private var directAudio by mutableStateOf(false)
private var clientDirectAudio by mutableStateOf(false)
private var forceFullscreen by mutableStateOf(false)
private var stretch16x9 by mutableStateOf(false)
private var launcherFullscreen by mutableStateOf(true)
private var animationsEnabled by mutableStateOf(true)
@@ -1152,7 +1151,6 @@ class MainActivity : ComponentActivity() {
backActionsInverted = backActionsInverted,
directAudio = if (mode == SessionService.MODE_STEAM) directAudio else null,
clientDirectAudio = clientDirectAudio,
forceFullscreen = if (mode == SessionService.MODE_STEAM) forceFullscreen else null,
stretch16x9 = if (mode == SessionService.MODE_STEAM) stretch16x9 else null,
mic = if (mode == SessionService.MODE_STEAM) mic else null,
renderer = if (mode == SessionService.MODE_DESKTOP) renderer else null,
@@ -1213,7 +1211,6 @@ class MainActivity : ComponentActivity() {
},
onDirectAudio = { on -> SessionPrefs.setDirectAudio(this, on); directAudio = on },
onClientDirectAudio = { on -> SessionPrefs.setClientDirectAudio(this, on); clientDirectAudio = on },
onForceFullscreen = { on -> SessionPrefs.setForceFullscreen(this, on); forceFullscreen = on },
onStretch16x9 = { on -> SessionPrefs.setStretch16x9(this, on); stretch16x9 = on },
onMic = { on ->
SessionPrefs.setMicEnabled(this, on)
@@ -1378,7 +1375,6 @@ class MainActivity : ComponentActivity() {
backActionsInverted = SessionPrefs.backActionsInverted(this)
directAudio = SessionPrefs.directAudio(this)
clientDirectAudio = SessionPrefs.clientDirectAudio(this)
forceFullscreen = SessionPrefs.forceFullscreen(this)
stretch16x9 = SessionPrefs.stretch16x9(this)
mic = SessionPrefs.micEnabled(this)
refreshWifiDiscovery()
@@ -229,7 +229,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
/** The on-screen PC keyboard (ui/PcKeyboard): real key presses, Esc and F1 included. */
private var pcKeyboardOpen by mutableStateOf(false)
private var hudOn by mutableStateOf(true)
private var fillScreen by mutableStateOf(true)
private var upscaler by mutableStateOf(0)
private var upscaleSharpness by mutableStateOf(75)
private var effects by mutableStateOf(ScreenEffects.OFF)
@@ -501,7 +500,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
isHomeApp = isHomeApp,
androidApps = androidApps,
hudOn = hudOn,
fillScreen = if (SessionState.mode == SessionService.MODE_STEAM) fillScreen else null,
upscaler = upscaler, upscaleSharpness = upscaleSharpness,
effects = effects, textureAnisotropy = textureAnisotropy, textureLodBias = textureLodBias,
frameGen = frameGen,
@@ -513,7 +511,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
secondScreenDisplays = secondScreenDisplays,
selectedSecondScreenDisplay = selectedSecondScreenDisplay,
onHud = { on -> SessionPrefs.setHudEnabled(this@SessionActivity, on); hudOn = on; hud.refresh() },
onFillScreen = { on -> SessionPrefs.setForceFullscreen(this@SessionActivity, on); fillScreen = on },
onUpscaler = { m ->
SessionPrefs.setUpscaler(this@SessionActivity, m); upscaler = m
WaylandCompositor.nativeSetUpscaler(m)
@@ -765,7 +762,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
private fun readPrefs() {
pipAutoEnter = SessionPrefs.pipAutoEnter(this)
hudOn = SessionPrefs.hudEnabled(this)
fillScreen = SessionPrefs.forceFullscreen(this)
upscaler = SessionPrefs.upscaler(this)
upscaleSharpness = SessionPrefs.upscaleSharpness(this)
effects = SessionPrefs.screenEffects(this)
@@ -166,7 +166,6 @@ object DeviceReport {
k("proot fast path", SessionPrefs.prootFastPath(context))
k("Guest host name", SessionPrefs.guestHostname(context))
k("DirectAudio for games", SessionPrefs.directAudio(context))
k("Stretch games to fill", SessionPrefs.forceFullscreen(context))
k("Stretch 16:9 to panel", SessionPrefs.stretch16x9(context))
k("Client audio", if (SessionPrefs.clientDirectAudio(context)) "DirectAudio" else "classic")
k("Microphone", SessionPrefs.micEnabled(context))
@@ -165,40 +165,12 @@ object SessionPrefs {
prefs(context).edit().putBoolean("clientDirectAudio", on).apply()
}
/**
* Steam only: gamescope makes every game window the size of the screen. A game that resizes
* its own window when it loses focus (FlatOut) otherwise comes back smaller, drawn in a
* corner; a game that sets its own resolution and never looks at its window again (Quake 3)
* instead draws small in the bottom-left of the stretched one. A game whose resolution differs
* from the screen's (DiRT 3 at 1280x720) fights it: it rebuilds its swapchain on every forced
* resize and the picture flickers between its own size and the screen's, often from the first
* menu, before the player can reach its resolution setting. Off unless turned on.
*/
fun forceFullscreen(context: Context): Boolean = prefs(context).getBoolean("forceFullscreen", false)
fun setForceFullscreen(context: Context, on: Boolean) {
prefs(context).edit().putBoolean("forceFullscreen", on).apply()
writeForceFullscreenFlag(context)
}
fun stretch16x9(context: Context): Boolean = prefs(context).getBoolean("stretch16x9", false)
fun setStretch16x9(context: Context, on: Boolean) {
prefs(context).edit().putBoolean("stretch16x9", on).apply()
}
/**
* The same choice as a file the running session watches, so the drawer can change it live:
* the session hands every change to gamescope, which reads GAMESCOPE_FORCE_WINDOWS_FULLSCREEN
* off its root window whenever it changes. Written again at every session start so a file left
* by an earlier session never disagrees with the setting.
*/
fun writeForceFullscreenFlag(context: Context) {
runCatching {
java.io.File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context), "root/.droiddeck-fill")
.writeText(if (forceFullscreen(context)) "1\n" else "0\n")
}
}
/**
* DirectAudio for games: their Wine audio driver talks to the relay helper on this side. On
@@ -607,9 +607,7 @@ class SessionService : Service() {
if (SessionState.mode == MODE_STEAM) guest.add("BL_MANGOAPP=" + (if (SessionPrefs.mangoapp(this)) "1" else "0"))
if (steamHere) guest.add("BL_STEAM_CHANNEL=" + SessionPrefs.steamChannel(this))
if (SessionState.mode == MODE_STEAM) {
guest.add("BL_GAMESCOPE_FORCE_FULLSCREEN=" + (if (SessionPrefs.forceFullscreen(this)) "1" else "0"))
guest.add("BL_GAMESCOPE_STRETCH_16X9=" + (if (SessionPrefs.stretch16x9(this)) "1" else "0"))
SessionPrefs.writeForceFullscreenFlag(this)
}
// Proton's own gate for its xalia helper (its `proton` script reads this, and sets
// XALIA_SUPPORTED_ONLY itself otherwise). Skipped by default: under FEX it costs every game
@@ -74,8 +74,6 @@ class ModeSettings(
val forceSsbs: Boolean = false,
/** Steam only: SessionPrefs.SYNC_* chosen for Proton games; null outside Steam. */
val syncBackend: String? = null,
/** Steam only: forces game windows fullscreen (null = not a Steam page). */
val forceFullscreen: Boolean? = null,
val stretch16x9: Boolean? = null,
/** Steam only: the client branch forced on the command line. */
val steamChannel: String? = null,
@@ -135,7 +133,6 @@ class ModeSettingsActions(
val onFexPreset: (String) -> Unit = {},
val onForceSsbs: (Boolean) -> Unit = {},
val onSyncBackend: (String) -> Unit = {},
val onForceFullscreen: (Boolean) -> Unit = {},
val onStretch16x9: (Boolean) -> Unit = {},
val onSteamChannel: (String) -> Unit = {},
val onSteamRepair: () -> Unit = {},
@@ -413,10 +410,6 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) {
}
}
}
if ((tab == ModeSettingsTab.GAMES || (!steam && tab == ModeSettingsTab.DISPLAY)) && s.forceFullscreen != null) SettingsGroup(stringResource(R.string.display_window_compatibility)) {
ToggleRow(host, "fill", stringResource(R.string.display_force_fullscreen),
stringResource(R.string.display_force_fullscreen_hint), s.forceFullscreen, onChange = a.onForceFullscreen)
}
if (steam && tab == ModeSettingsTab.GAMES && s.addedGamesDirs != null) SettingsGroup(stringResource(R.string.mode_added_games)) {
for (dir in s.addedGamesDirs) {
val n = s.addedGames.count { it.folderPath.startsWith("$dir/") }
@@ -195,8 +195,6 @@ class DrawerActions(
val touchMode: String,
val touchAuto: String,
val fexPreset: String,
/** Steam only: forces game windows fullscreen, changed live (null = not Steam). */
val fillScreen: Boolean? = null,
val upscaler: Int = 0,
val upscaleSharpness: Int = 75,
/** The compositor's post chain (gpu/ScreenEffects), changed live. */
@@ -226,7 +224,6 @@ class DrawerActions(
val onBackActionsInverted: (Boolean) -> Unit,
val onTouch: (String) -> Unit,
val onFexPreset: (String) -> Unit,
val onFillScreen: (Boolean) -> Unit = {},
val onUpscaler: (Int) -> Unit = {},
val onUpscaleSharpness: (Int) -> Unit = {},
val onEffects: (ScreenEffects) -> Unit = {},
@@ -407,11 +404,6 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont
stringResource(R.string.display_sharpness), null, a.upscaleSharpness, 0..100, step = 5,
format = { "$it%" }, modifier = focus.track(page, "upscale-sharpness"), onChange = a.onUpscaleSharpness)
}
if (a.fillScreen != null) SettingsGroup(stringResource(R.string.display_window_compatibility)) {
ToggleRow(host, "fill", stringResource(R.string.display_force_fullscreen),
stringResource(R.string.display_force_fullscreen_live), a.fillScreen,
chipModifier = focus.track(page, "fill"), onChange = a.onFillScreen)
}
}
SessionDrawerPage.EFFECTS -> {
ScreenEffectsGroup(host, a, advancedEffectsExpanded,
-3
View File
@@ -285,8 +285,6 @@
<string name="mode_added_launches_in">Inicia %1$s · en %2$s</string>
<string name="mode_added_choose">Elegir otro archivo…</string>
<string name="mode_added_exe_note">Por defecto, el .exe con el nombre de la carpeta o, si no, el más grande.</string>
<string name="mode_fill">Estirar juegos para llenar la pantalla</string>
<string name="mode_fill_hint">Mantiene a pantalla completa los juegos que se redimensionan solos. Desactívalo si un juego se ve pequeño. Se aplica en la próxima sesión.</string>
<string name="mode_stretch169">Estirar juegos 16:9</string>
<string name="mode_stretch169_hint">En pantallas más cuadradas que 16:9, estira los juegos para llenar en lugar de mostrar barras. Se aplica en la próxima sesión.</string>
<string name="mode_audio">Audio</string>
@@ -444,7 +442,6 @@
<string name="drawer_prev_page">Página anterior</string>
<string name="drawer_next_page">Página siguiente</string>
<string name="drawer_hud">HUD de rendimiento</string>
<string name="drawer_fill">Estirar juegos para llenar</string>
<string name="drawer_scaling">Modo de escalado</string>
<string name="drawer_scaling_sharpness">Nitidez del escalado</string>
<string name="drawer_effects">Efectos de pantalla</string>
-3
View File
@@ -279,8 +279,6 @@
<string name="mode_added_launches_in">Lancer %1$s · dans %2$s</string>
<string name="mode_added_choose">Choisir un autre fichier…</string>
<string name="mode_added_exe_note">Utilise par défaut le .exe portant le même nom que le dossier, sinon le .exe le plus volumineux.</string>
<string name="mode_fill">Étirer le jeu pour remplir l\'écran</string>
<string name="mode_fill_hint">Maintient en plein écran les jeux capables de se redimensionner. Désactivez cette option si le jeu s\'affiche en petit. Prendra effet à la prochaine session.</string>
<string name="mode_stretch169">Étirer les jeux 16:9</string>
<string name="mode_stretch169_hint">Sur les écrans dont le rapport d\'aspect est inférieur à 16:9, étire le jeu pour remplir l\'écran au lieu d\'afficher des bandes noires. Prendra effet à la prochaine session.</string>
<string name="mode_audio">Audio</string>
@@ -442,7 +440,6 @@
<string name="drawer_prev_page">Page précédente</string>
<string name="drawer_next_page">Page suivante</string>
<string name="drawer_hud">HUD de performance</string>
<string name="drawer_fill">Étirer le jeu pour remplir l\'écran</string>
<string name="drawer_touch_auto">Auto (%1$s)</string>
<string name="drawer_keyboard">Clavier</string>
<string name="drawer_pc_keyboard">Clavier PC</string>
-3
View File
@@ -279,8 +279,6 @@
<string name="mode_added_launches_in">%1$sを起動 · %2$s内</string>
<string name="mode_added_choose">別のファイルを選択…</string>
<string name="mode_added_exe_note">デフォルトではフォルダと同じ名前の.exeを使用し、ない場合は最大の.exeを使用します。</string>
<string name="mode_fill">ゲームを引き伸ばして画面を埋める</string>
<string name="mode_fill_hint">自身でサイズ変更できるゲームを全画面に保ちます。ゲームが小さく表示される場合はこれをオフにしてください。次回のセッションで有効になります。</string>
<string name="mode_stretch169">16:9ゲームを引き伸ばす</string>
<string name="mode_stretch169_hint">アスペクト比が16:9未満の画面で、黒帯を表示する代わりにゲームを引き伸ばして画面を埋めます。次回のセッションで有効になります。</string>
<string name="mode_audio">オーディオ</string>
@@ -442,7 +440,6 @@
<string name="drawer_prev_page">前のページ</string>
<string name="drawer_next_page">次のページ</string>
<string name="drawer_hud">パフォーマンスHUD</string>
<string name="drawer_fill">ゲームを引き伸ばして画面を埋める</string>
<string name="drawer_touch_auto">自動(%1$s)</string>
<string name="drawer_keyboard">キーボード</string>
<string name="drawer_pc_keyboard">PCキーボード</string>
-3
View File
@@ -279,8 +279,6 @@
<string name="mode_added_launches_in">%1$s 실행 · %2$s에 위치</string>
<string name="mode_added_choose">다른 파일 선택…</string>
<string name="mode_added_exe_note">기본적으로 폴더와 이름이 같은 .exe를 사용하고, 없으면 가장 큰 .exe를 사용합니다.</string>
<string name="mode_fill">게임을 늘려 화면 채우기</string>
<string name="mode_fill_hint">자체적으로 크기를 조절하는 게임을 전체 화면으로 유지합니다. 게임이 작게 표시되면 이 옵션을 끄세요. 다음 세션에 적용됩니다.</string>
<string name="mode_stretch169">16:9 게임 늘리기</string>
<string name="mode_stretch169_hint">가로세로 비율이 16:9 미만인 화면에서 검은색 여백 대신 게임을 늘려 화면을 채웁니다. 다음 세션에 적용됩니다.</string>
<string name="mode_audio">오디오</string>
@@ -442,7 +440,6 @@
<string name="drawer_prev_page">이전 페이지</string>
<string name="drawer_next_page">다음 페이지</string>
<string name="drawer_hud">성능 HUD</string>
<string name="drawer_fill">게임을 늘려 화면 채우기</string>
<string name="drawer_touch_auto">자동(%1$s)</string>
<string name="drawer_keyboard">키보드</string>
<string name="drawer_pc_keyboard">PC 키보드</string>
-3
View File
@@ -279,8 +279,6 @@
<string name="mode_added_launches_in">Запустить %1$s · в %2$s</string>
<string name="mode_added_choose">Выбрать другой файл…</string>
<string name="mode_added_exe_note">По умолчанию используется .exe с именем папки, иначе самый большой .exe.</string>
<string name="mode_fill">Растянуть игру на весь экран</string>
<string name="mode_fill_hint">Сохраняет полноэкранный режим для игр, поддерживающих изменение размера. Отключите, если игра отображается мелко. Вступит в силу в следующей сессии.</string>
<string name="mode_stretch169">Растянуть игры 16:9</string>
<string name="mode_stretch169_hint">На экранах с соотношением сторон менее 16:9 растягивает игру на весь экран вместо черных полос. Вступит в силу в следующей сессии.</string>
<string name="mode_audio">Аудио</string>
@@ -444,7 +442,6 @@
<string name="drawer_prev_page">Предыдущая страница</string>
<string name="drawer_next_page">Следующая страница</string>
<string name="drawer_hud">HUD производительности</string>
<string name="drawer_fill">Растянуть игру на весь экран</string>
<string name="drawer_touch_auto">Авто (%1$s)</string>
<string name="drawer_keyboard">Клавиатура</string>
<string name="drawer_pc_keyboard">Клавиатура ПК</string>
@@ -301,8 +301,6 @@
<string name="mode_added_launches_in">启动 %1$s · 位于 %2$s</string>
<string name="mode_added_choose">选择其他文件…</string>
<string name="mode_added_exe_note">默认为与文件夹同名的 .exe,否则为最大的那个。</string>
<string name="mode_fill">拉伸游戏以填满屏幕</string>
<string name="mode_fill_hint">使会自行缩放的游戏保持全屏。若游戏显示过小,请关闭此项。将在下次会话生效。</string>
<string name="mode_stretch169">拉伸 16:9 比例的游戏</string>
<string name="mode_stretch169_hint">在比 16:9 更方的屏幕上,拉伸游戏填满屏幕而不是显示黑边。将在下次会话生效。</string>
<string name="mode_audio">音频</string>
@@ -479,7 +477,6 @@
<string name="drawer_prev_page">上一页</string>
<string name="drawer_next_page">下一页</string>
<string name="drawer_hud">性能 HUD</string>
<string name="drawer_fill">拉伸游戏填满屏幕</string>
<string name="drawer_scaling">缩放模式</string>
<string name="drawer_scaling_sharpness">缩放锐度</string>
<string name="drawer_effects">屏幕效果</string>
@@ -279,8 +279,6 @@
<string name="mode_added_launches_in">啟動 %1$s · 位於 %2$s</string>
<string name="mode_added_choose">選擇其他檔案…</string>
<string name="mode_added_exe_note">默認使用與文件夾同名的 .exe,否則使用最大的 .exe。</string>
<string name="mode_fill">拉伸遊戲以填滿屏幕</string>
<string name="mode_fill_hint">讓支持自行調整大小的遊戲保持全屏幕。如果遊戲顯示得很小,請關閉此項。下次會話生效。</string>
<string name="mode_stretch169">拉伸 16:9 遊戲</string>
<string name="mode_stretch169_hint">在寬高比小於 16:9 的屏幕上,將遊戲拉伸以填滿屏幕,而不是顯示黑邊。下次會話生效。</string>
<string name="mode_audio">音頻</string>
@@ -442,7 +440,6 @@
<string name="drawer_prev_page">上一頁</string>
<string name="drawer_next_page">下一頁</string>
<string name="drawer_hud">性能 HUD</string>
<string name="drawer_fill">拉伸遊戲以填滿屏幕</string>
<string name="drawer_touch_auto">自動(%1$s)</string>
<string name="drawer_keyboard">鍵盤</string>
<string name="drawer_pc_keyboard">電腦鍵盤</string>
@@ -279,8 +279,6 @@
<string name="mode_added_launches_in">啟動 %1$s · 位於 %2$s</string>
<string name="mode_added_choose">選擇其他檔案…</string>
<string name="mode_added_exe_note">預設使用與資料夾同名的 .exe,否則使用最大的 .exe。</string>
<string name="mode_fill">拉伸遊戲以填滿螢幕</string>
<string name="mode_fill_hint">讓支援自行調整大小的遊戲保持全螢幕。如果遊戲顯示得很小,請關閉此項。下次工作階段生效。</string>
<string name="mode_stretch169">拉伸 16:9 遊戲</string>
<string name="mode_stretch169_hint">在長寬比小於 16:9 的螢幕上,將遊戲拉伸以填滿螢幕,而不是顯示黑邊。下次工作階段生效。</string>
<string name="mode_audio">音訊</string>
@@ -442,7 +440,6 @@
<string name="drawer_prev_page">上一頁</string>
<string name="drawer_next_page">下一頁</string>
<string name="drawer_hud">效能 HUD</string>
<string name="drawer_fill">拉伸遊戲以填滿螢幕</string>
<string name="drawer_touch_auto">自動(%1$s)</string>
<string name="drawer_keyboard">鍵盤</string>
<string name="drawer_pc_keyboard">電腦鍵盤</string>
-7
View File
@@ -329,8 +329,6 @@
<string name="wincomp_downloaded">Downloaded</string>
<string name="wincomp_download_size">%1$s download</string>
<string name="wincomp_next_launch">Takes effect the next time the game starts.</string>
<string name="mode_fill">Stretch games to fill the screen</string>
<string name="mode_fill_hint">Keeps self-resizing games full screen. Turn off if a game shows up small. Applies next session.</string>
<string name="mode_stretch169">Stretch 16:9 games</string>
<string name="mode_stretch169_hint">On screens squarer than 16:9, stretches games to fill instead of showing bars. Applies next session.</string>
<string name="mode_audio">Audio</string>
@@ -509,7 +507,6 @@
<string name="drawer_prev_page">Previous page</string>
<string name="drawer_next_page">Next page</string>
<string name="drawer_hud">Performance HUD</string>
<string name="drawer_fill">Stretch games to fill</string>
<string name="drawer_scaling">Scaling mode</string>
<string name="drawer_scaling_sharpness">Scaling sharpness</string>
<string name="drawer_effects">Screen effects</string>
@@ -1061,10 +1058,6 @@
<string name="display_filter_note">FSR, GSR and NIS apply when enlarging the session image. Sharpen only also works without enlargement.</string>
<string name="display_sharpness">Filter sharpness</string>
<string name="display_frame_rate">Frame rate</string>
<string name="display_window_compatibility">Game window compatibility</string>
<string name="display_force_fullscreen">Force game windows fullscreen</string>
<string name="display_force_fullscreen_hint">Makes every game window the size of the screen. Turn on if a game comes back small or in a corner after switching apps; leave off if a game flickers between sizes. Applies live during a session.</string>
<string name="display_force_fullscreen_live">Turn on if a game comes back small after switching; off if it flickers. Applies live.</string>
<string name="display_look_filter">%1$s Sets scaling to %2$s.</string>
<string name="display_match_screen">Match screen (%1$d×%2$d)</string>
<string name="mode_tab_steam">Steam</string>