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

fix(darwin): allow display of 'none'

This commit is contained in:
Martin Wimpress 2024-05-15 13:15:37 +01:00 committed by Martin Wimpress
parent 5ab447e18e
commit d7fe13356c
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
quickemu
View File

@ -849,16 +849,11 @@ function configure_display() {
gtk|none|spice) DISPLAY_DEVICE="qxl-vga";; gtk|none|spice) DISPLAY_DEVICE="qxl-vga";;
cocoa|sdl|spice-app) DISPLAY_DEVICE="virtio-vga";; cocoa|sdl|spice-app) DISPLAY_DEVICE="virtio-vga";;
esac;; esac;;
*) if [ "${OS_KERNEL}" == "Darwin" ]; then *) DISPLAY_DEVICE="qxl-vga";;
DISPLAY_DEVICE="VGA"
else
DISPLAY_DEVICE="qxl-vga"
fi;;
esac esac
# Map Quickemu $display to QEMU -display # Map Quickemu $display to QEMU -display
case ${display} in case ${display} in
cocoa) DISPLAY_RENDER="${display}";;
gtk) DISPLAY_RENDER="${display},grab-on-hover=on,zoom-to-fit=off,gl=${gl}";; gtk) DISPLAY_RENDER="${display},grab-on-hover=on,zoom-to-fit=off,gl=${gl}";;
none|spice) DISPLAY_RENDER="none";; none|spice) DISPLAY_RENDER="none";;
sdl) DISPLAY_RENDER="${display},gl=${gl}";; sdl) DISPLAY_RENDER="${display},gl=${gl}";;
@ -1585,10 +1580,9 @@ function display_param_check() {
fi fi
if [ "${OS_KERNEL}" == "Darwin" ]; then if [ "${OS_KERNEL}" == "Darwin" ]; then
if [ "${display}" != "cocoa" ]; then if [ "${display}" != "cocoa" ] && [ "${display}" != "none" ]; then
echo "WARNING! Requested output '${display}' but only 'cocoa' is avalible on macOS." echo "ERROR! Requested output '${display}' but only 'cocoa' and 'none' are avalible on macOS."
echo " Setting display to 'cocoa'." exit 1
display="cocoa"
fi fi
else else
if [ "${display}" != "gtk" ] && [ "${display}" != "none" ] && [ "${display}" != "sdl" ] && [ "${display}" != "spice" ] && [ "${display}" != "spice-app" ]; then if [ "${display}" != "gtk" ] && [ "${display}" != "none" ] && [ "${display}" != "sdl" ] && [ "${display}" != "spice" ] && [ "${display}" != "spice-app" ]; then