mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-20 13:26:02 +00:00
fix: RetroArch fills the screen from the emulator rail (#1194)
This commit is contained in:
1 parent
4f799ea59c
commit
e308224391
2 files changed
+49
No files matched your search
@@ -303,6 +303,9 @@ case $mode in
|
||||
taskset -cp "$cores" $$ >/dev/null 2>&1 || true
|
||||
fi
|
||||
python3 /usr/local/bin/droiddeck-pad-defaults 2>&1 || true
|
||||
if [ -n "${GAMESCOPE_WAYLAND_DISPLAY:-}" ]; then
|
||||
export WAYLAND_DISPLAY= XDG_SESSION_TYPE=x11
|
||||
fi
|
||||
run_program() {
|
||||
local rc=0 child sig forwarded=0
|
||||
{ trap - INT QUIT; exec "$@"; } <&0 &
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
import os
|
||||
import re
|
||||
import shutil
|
||||
import subprocess
|
||||
import tempfile
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
|
||||
SESSION = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-session"
|
||||
|
||||
|
||||
def run_case():
|
||||
return re.search(r"^ run\)\n.*?^ ;;\n", SESSION.read_text(), re.M | re.S).group(0)
|
||||
|
||||
|
||||
class SessionRunDisplayTest(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.dir = Path(tempfile.mkdtemp())
|
||||
self.addCleanup(shutil.rmtree, self.dir, True)
|
||||
self.target = self.dir / "target.sh"
|
||||
self.target.write_text("printf '%s\\n' \"${WAYLAND_DISPLAY-unset}\" \"${XDG_SESSION_TYPE-unset}\""
|
||||
" > \"$1\"\n")
|
||||
|
||||
def display(self, **env):
|
||||
base = {k: v for k, v in os.environ.items()
|
||||
if k not in ("GAMESCOPE_WAYLAND_DISPLAY", "WAYLAND_DISPLAY", "XDG_SESSION_TYPE",
|
||||
"BL_LAUNCH_DIR")}
|
||||
seen = self.dir / "seen"
|
||||
script = ("program_cores() { :; }\nmode=run\ncase $mode in\n" + run_case() + "esac\n"
|
||||
+ "echo unreachable\n")
|
||||
run = subprocess.run(["bash", "-c", script, "droiddeck-session", str(self.target), str(seen)],
|
||||
env={**base, **env}, capture_output=True, text=True, timeout=30)
|
||||
self.assertEqual(0, run.returncode, run.stderr)
|
||||
self.assertNotIn("unreachable", run.stdout)
|
||||
return seen.read_text().splitlines()
|
||||
|
||||
def test_programs_under_gamescope_cannot_reach_a_wayland_server(self):
|
||||
self.assertEqual(["", "x11"], self.display(GAMESCOPE_WAYLAND_DISPLAY="gamescope-0",
|
||||
WAYLAND_DISPLAY="gamescope-0", XDG_SESSION_TYPE="wayland"))
|
||||
|
||||
def test_without_gamescope_the_display_is_left_alone(self):
|
||||
self.assertEqual(["wayland-0", "wayland"], self.display(WAYLAND_DISPLAY="wayland-0", XDG_SESSION_TYPE="wayland"))
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
Reference in new issue
Block a user