RomanNum3ral
/
quickemu
mirror of https://github.com/quickemu-project/quickemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: display requested resolution. closes #1196

This commit is contained in:
Martin Wimpress 2024-05-10 19:05:24 +01:00 committed by Martin Wimpress
parent f51697593a
commit 7b915d691c
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
quickemu
View File

@ -720,7 +720,12 @@ function vm_boot() {
if [ "${guest_os}" == "linux" ]; then if [ "${guest_os}" == "linux" ]; then
local X_RES=1152 local X_RES=1152
local Y_RES=648 local Y_RES=648
if [ "${XDG_SESSION_TYPE}" == "x11" ] || [ "${XDG_SESSION_TYPE}" == "wayland" ]; then
# If the user has specified a resolution, use that via config or command line.
if [ -n "${WIDTH}" ] && [ -n "${HEIGHT}" ]; then
X_RES="${WIDTH}"
Y_RES="${HEIGHT}"
elif [ "${XDG_SESSION_TYPE}" == "x11" ] || [ "${XDG_SESSION_TYPE}" == "wayland" ]; then
if [ -z "${SCREEN}" ]; then if [ -z "${SCREEN}" ]; then
X_RES=$(xrandr --listmonitors | grep -v Monitors | cut -d' ' -f4 | cut -d'/' -f1 | sort | head -n1) X_RES=$(xrandr --listmonitors | grep -v Monitors | cut -d' ' -f4 | cut -d'/' -f1 | sort | head -n1)
Y_RES=$(xrandr --listmonitors | grep -v Monitors | cut -d' ' -f4 | cut -d'/' -f2 | cut -d'x' -f2 | sort | head -n1) Y_RES=$(xrandr --listmonitors | grep -v Monitors | cut -d' ' -f4 | cut -d'/' -f2 | cut -d'x' -f2 | sort | head -n1)
@ -793,9 +798,9 @@ function vm_boot() {
else else
DISPLAY_DEVICE="${DISPLAY_DEVICE},virgl=on" DISPLAY_DEVICE="${DISPLAY_DEVICE},virgl=on"
fi fi
echo " - Display: ${OUTPUT^^}, ${DISPLAY_DEVICE}, GL (${gl}), VirGL (on)" echo -n " - Display: ${OUTPUT^^}, ${DISPLAY_DEVICE}, GL (${gl}), VirGL (on)"
else else
echo " - Display: ${OUTPUT^^}, ${DISPLAY_DEVICE}, GL (${gl}), VirGL (off)" echo -n " - Display: ${OUTPUT^^}, ${DISPLAY_DEVICE}, GL (${gl}), VirGL (off)"
fi fi
# Build the video configuration # Build the video configuration
@ -803,11 +808,10 @@ function vm_boot() {
# Try and coerce the display resolution for Linux guests only. # Try and coerce the display resolution for Linux guests only.
if [ "${guest_os}" == "linux" ]; then if [ "${guest_os}" == "linux" ]; then
if [ -n "${WIDTH}" ] && [ -n "${HEIGHT}" ]; then VIDEO="${VIDEO},xres=${X_RES},yres=${Y_RES}"
VIDEO="${VIDEO},xres=${WIDTH},yres=${HEIGHT}" echo " @ (${X_RES} x ${Y_RES})"
else else
VIDEO="${VIDEO},xres=${X_RES},yres=${Y_RES}" echo " "
fi
fi fi
# Allocate VRAM to VGA devices # Allocate VRAM to VGA devices