refactor: clean up mouse variables

This commit is contained in:
Martin Wimpress 2024-05-12 23:38:12 +01:00 committed by Martin Wimpress
parent 7f877d108b
commit 2d4157f4c1
1 changed files with 9 additions and 12 deletions

View File

@ -485,7 +485,7 @@ function vm_boot() {
fi fi
if [ "${guest_os}" == "freebsd" ] || [ "${guest_os}" == "ghostbsd" ]; then if [ "${guest_os}" == "freebsd" ] || [ "${guest_os}" == "ghostbsd" ]; then
MOUSE="usb" mouse="usb"
elif [ "${guest_os}" == "batocera" ] || [ "${guest_os}" == "freedos" ] || [ "${guest_os}" == "haiku" ]; then elif [ "${guest_os}" == "batocera" ] || [ "${guest_os}" == "freedos" ] || [ "${guest_os}" == "haiku" ]; then
MACHINE_TYPE="pc" MACHINE_TYPE="pc"
NET_DEVICE="rtl8139" NET_DEVICE="rtl8139"
@ -1047,21 +1047,20 @@ function vm_boot() {
# setup mouse # setup mouse
# @INFO: must be set after usb-controller # @INFO: must be set after usb-controller
[ -z "${MOUSE}" ] && MOUSE="$mouse" if [ "${mouse}" == "usb" ]; then
if [ "${MOUSE}" == "usb" ]; then
# shellcheck disable=SC2054 # shellcheck disable=SC2054
args+=(-device usb-mouse,bus=input.0) args+=(-device usb-mouse,bus=input.0)
elif [ "${MOUSE}" == "tablet" ]; then elif [ "${mouse}" == "tablet" ]; then
# shellcheck disable=SC2054 # shellcheck disable=SC2054
args+=(-device usb-tablet,bus=input.0) args+=(-device usb-tablet,bus=input.0)
elif [ "${MOUSE}" == "virtio" ]; then elif [ "${mouse}" == "virtio" ]; then
# shellcheck disable=SC2054 # shellcheck disable=SC2054
args+=(-device virtio-mouse) args+=(-device virtio-mouse)
elif [ "${MOUSE}" == "ps2" ] || [ -z "${MOUSE}" ]; then elif [ "${mouse}" == "ps2" ]; then
# add nothing, default is ps/2 mouse # add nothing, default is ps/2 mouse
: :
else else
echo "WARNING! Unknown mouse value: '${MOUSE}; Fallback to ps2'" echo "WARNING! Unknown mouse value: '${mouse}; Fallback to ps2'"
fi fi
# $bridge backwards compatibility for Quickemu <= 4.0 # $bridge backwards compatibility for Quickemu <= 4.0
@ -1567,7 +1566,7 @@ usb_controller="ehci"
keyboard="usb" keyboard="usb"
keyboard_layout="en-us" keyboard_layout="en-us"
# options: ps2, usb, tablet, virtio # options: ps2, usb, tablet, virtio
mouse="tablet" mouse="${mouse:-tablet}"
# options: intel-hda, ac97, es1370, sb16, none # options: intel-hda, ac97, es1370, sb16, none
sound_card="intel-hda" sound_card="intel-hda"
@ -1605,7 +1604,6 @@ SERIAL_TELNET_PORT=""
SERIAL_TELNET_HOST="" SERIAL_TELNET_HOST=""
KEYBOARD="" KEYBOARD=""
KEYBOARD_LAYOUT="" KEYBOARD_LAYOUT=""
MOUSE=""
USB_CONTROLLER="" USB_CONTROLLER=""
SOUND_CARD="" SOUND_CARD=""
@ -1751,9 +1749,8 @@ else
shift; shift;
shift;; shift;;
-mouse|--mouse) -mouse|--mouse)
MOUSE="${2}" mouse="${2}"
shift; shift 2;;
shift;;
-usb-controller|--usb-controller) -usb-controller|--usb-controller)
USB_CONTROLLER="${2}" USB_CONTROLLER="${2}"
shift; shift;