mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 21:06:09 +00:00
feat(library): pick the game resolution for games started without Steam (#2520)
This commit is contained in:
1 parent
1b732c1b65
commit
bb05e20d1b
43 files changed
+332
-2
No files matched your search
@@ -511,6 +511,12 @@ if [ -z "${BL_INSIDE:-}" ]; then
|
||||
echo "== gamescope: games at ${nested}x${nested_h} stretched to the ${width}x${height} output"
|
||||
fi
|
||||
fi
|
||||
if [ "$mode" = run ] && [ "${BL_GAME_WIDTH:-0}" -gt 0 ] && [ "${BL_GAME_HEIGHT:-0}" -gt 0 ]; then
|
||||
nested=$BL_GAME_WIDTH
|
||||
nested_h=$BL_GAME_HEIGHT
|
||||
game_size=1
|
||||
echo "== gamescope: the game runs at ${nested}x${nested_h}, scaled to the ${width}x${height} output with its proportions kept"
|
||||
fi
|
||||
backend=${BL_GAMESCOPE_BACKEND:-wayland}
|
||||
case "$backend" in
|
||||
wayland) ;;
|
||||
@@ -528,7 +534,7 @@ if [ -z "${BL_INSIDE:-}" ]; then
|
||||
echo "== gamescope: composites every frame (Mali bridge: the Steam UI flickers on separate planes)"
|
||||
fi
|
||||
args=(--backend "$backend" --expose-wayland -f -W "$width" -H "$height" -w "$nested" -h "$nested_h")
|
||||
if [ "$nested" != "$width" ] || [ "$nested_h" != "$height" ]; then
|
||||
if [ "${game_size:-0}" != 1 ] && { [ "$nested" != "$width" ] || [ "$nested_h" != "$height" ]; }; then
|
||||
args+=(-S stretch)
|
||||
export BL_STRETCHED=1
|
||||
fi
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
import os
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
|
||||
SESSION = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-session'
|
||||
|
||||
|
||||
class GameResolutionTest(unittest.TestCase):
|
||||
def launch(self, mode, **overrides):
|
||||
source = SESSION.read_text()
|
||||
start = source.index(' width=${BL_WIDTH:-1280}')
|
||||
end = source.index('\nfi\n\nbl_displays()', start)
|
||||
block = source[start:end].replace('/usr/local/bin/droiddeck-pipewire', 'pipewire_stub')
|
||||
with tempfile.TemporaryDirectory() as directory:
|
||||
env = dict(os.environ, XDG_RUNTIME_DIR=directory, BL_REFRESH='60', BL_MANGOAPP='0',
|
||||
BL_WIDTH='2560', BL_HEIGHT='1600')
|
||||
for name in ('BL_GAME_WIDTH', 'BL_GAME_HEIGHT', 'BL_FOLLOW_OUTPUT', 'BL_GAMESCOPE_STRETCH_16X9'):
|
||||
env.pop(name, None)
|
||||
env.update(overrides)
|
||||
fake = Path(directory) / 'gamescope'
|
||||
fake.write_text('#!/bin/bash\nprintf "ARG:%s\\n" "$@"\n')
|
||||
fake.chmod(0o755)
|
||||
env['PATH'] = directory + os.pathsep + env['PATH']
|
||||
script = f'''
|
||||
set -u
|
||||
mode={mode}
|
||||
pipewire_stub() {{ return 1; }}
|
||||
run_gamescope() {{ printf 'ARG:%s\n' "$@"; }}
|
||||
''' + block
|
||||
result = subprocess.run(['bash', '-c', script], env=env, capture_output=True, text=True, timeout=5)
|
||||
self.assertEqual(0, result.returncode, result.stderr)
|
||||
return [line.removeprefix('ARG:') for line in result.stdout.splitlines() if line.startswith('ARG:')]
|
||||
|
||||
def test_a_game_started_without_steam_runs_at_its_resolution_with_proportions_kept(self):
|
||||
args = self.launch('run', BL_GAME_WIDTH='1280', BL_GAME_HEIGHT='720')
|
||||
self.assertEqual(['2560', '1600'], [args[args.index('-W') + 1], args[args.index('-H') + 1]])
|
||||
self.assertEqual(['1280', '720'], [args[args.index('-w') + 1], args[args.index('-h') + 1]])
|
||||
self.assertNotIn('-S', args)
|
||||
|
||||
def test_without_a_game_resolution_the_game_matches_the_output(self):
|
||||
args = self.launch('run')
|
||||
self.assertEqual(['2560', '1600'], [args[args.index('-w') + 1], args[args.index('-h') + 1]])
|
||||
|
||||
def test_steam_ignores_the_game_resolution(self):
|
||||
args = self.launch('steam', BL_GAME_WIDTH='1280', BL_GAME_HEIGHT='720')
|
||||
self.assertEqual(['2560', '1600'], [args[args.index('-w') + 1], args[args.index('-h') + 1]])
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
Reference in new issue
Block a user