From 12edf97c5da67779958cc7b799a327857cdce22a Mon Sep 17 00:00:00 2001
From: Martin Wimpress <martin@wimpress.org>
Date: Sun, 12 May 2024 18:56:39 +0100
Subject: [PATCH] feat: improve macOS and *BSD default display device support

The display resolution can be set using `--width` and`--height` for macOS and *BSD.
- close #926
- close #1202
---
 quickemu | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/quickemu b/quickemu
index efd8d7e4f1..e8c916971f 100755
--- a/quickemu
+++ b/quickemu
@@ -735,29 +735,28 @@ function vm_boot() {
     fi
 
     # https://www.kraxel.org/blog/2019/09/display-devices-in-qemu/
-    if [ "${guest_os}" == "linux_old" ]; then
-        DISPLAY_DEVICE="vmware-svga"
-    elif [ "${guest_os}" == "linux" ]; then
-        case ${OUTPUT} in
-            none|spice|spice-app) DISPLAY_DEVICE="virtio-gpu";;
-            *) DISPLAY_DEVICE="virtio-vga";;
-        esac
-    elif [ "${guest_os}" == "macos" ]; then
-        # qxl-vga supports seamless mouse and sane resolutions if only one scanout
-        # is used. Which is whay '-vga none' is added to the QEMU command line.
-        DISPLAY_DEVICE="qxl-vga"
-    elif [ "${guest_os}" == "windows" ] || [ "${guest_os}" == "windows-server" ]; then
-        case ${OUTPUT} in
-            # virtio-gpu "works" with gtk but is limited to 1024x1024 and exhibits other issues.
+    case ${guest_os} in
+        *bsd) DISPLAY_DEVICE="VGA";;
+        linux_old|solaris) DISPLAY_DEVICE="vmware-svga";;
+        linux)
+            case ${OUTPUT} in
+                none|spice|spice-app) DISPLAY_DEVICE="virtio-gpu";;
+                *) DISPLAY_DEVICE="virtio-vga";;
+            esac;;
+        macos)
+            # qxl-vga and VGA supports seamless mouse and sane resolutions if only
+            # one scanout is used. '-vga none' is added to the QEMU command line
+            # to avoid having two scanouts.
+            DISPLAY_DEVICE="VGA";;
+        windows|windows-server)
+            # virtio-gpu "works" with gtk but is limited to 1024x1024 and exhibits other issues
             # https://kevinlocke.name/bits/2021/12/10/windows-11-guest-virtio-libvirt/#video
-            gtk|none|spice) DISPLAY_DEVICE="qxl-vga";;
-            sdl|spice-app)  DISPLAY_DEVICE="virtio-vga";;
-        esac
-    elif [ "${guest_os}" == "solaris" ]; then
-        DISPLAY_DEVICE="vmware-svga"
-    else
-        DISPLAY_DEVICE="qxl-vga"
-    fi
+            case ${OUTPUT} in
+                gtk|none|spice) DISPLAY_DEVICE="qxl-vga";;
+                sdl|spice-app)  DISPLAY_DEVICE="virtio-vga";;
+            esac;;
+        *) DISPLAY_DEVICE="qxl-vga";;
+    esac
 
     # Map Quickemu OUTPUT to QEMU -display
     case ${OUTPUT} in