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

refactor: clean up keyboard variables

This commit is contained in:
Martin Wimpress 2024-05-12 23:52:14 +01:00 committed by Martin Wimpress
parent 49b1397350
commit 10ccf892cd
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
quickemu
View File

@ -516,7 +516,7 @@ function vm_boot() {
case ${guest_os} in case ${guest_os} in
kolibrios) NET_DEVICE="rtl8139";; kolibrios) NET_DEVICE="rtl8139";;
reactos) NET_DEVICE="e1000" reactos) NET_DEVICE="e1000"
KEYBOARD="ps2";; keyboard="ps2";;
esac esac
;; ;;
macos) macos)
@ -1016,18 +1016,17 @@ function vm_boot() {
# setup keyboard # setup keyboard
# @INFO: must be set after usb-controller # @INFO: must be set after usb-controller
[ -z "${KEYBOARD}" ] && KEYBOARD="$keyboard" if [ "${keyboard}" == "usb" ]; then
if [ "${KEYBOARD}" == "usb" ]; then
# shellcheck disable=SC2054 # shellcheck disable=SC2054
args+=(-device usb-kbd,bus=input.0) args+=(-device usb-kbd,bus=input.0)
elif [ "${KEYBOARD}" == "virtio" ]; then elif [ "${keyboard}" == "virtio" ]; then
# shellcheck disable=SC2054 # shellcheck disable=SC2054
args+=(-device virtio-keyboard) args+=(-device virtio-keyboard)
elif [ "${KEYBOARD}" == "ps2" ] || [ -z "${KEYBOARD}" ]; then elif [ "${keyboard}" == "ps2" ]; then
# add nothing, default is ps/2 keyboard # add nothing, default is ps/2 keyboard
: :
else else
echo "WARNING! Unknown keyboard value: '${KEYBOARD}'; Fallback to ps2" echo "WARNING! Unknown keyboard value: '${keyboard}'; Fallback to ps2"
fi fi
# setup keyboard_layout # setup keyboard_layout
@ -1562,7 +1561,7 @@ serial_telnet_host="localhost"
# options: ehci(USB2.0), xhci(USB3.0) # options: ehci(USB2.0), xhci(USB3.0)
usb_controller="${usb_controller:-ehci}" usb_controller="${usb_controller:-ehci}"
# options: ps2, usb, virtio # options: ps2, usb, virtio
keyboard="usb" keyboard="${keyboard:-usb}"
keyboard_layout="en-us" keyboard_layout="en-us"
# options: ps2, usb, tablet, virtio # options: ps2, usb, tablet, virtio
mouse="${mouse:-tablet}" mouse="${mouse:-tablet}"
@ -1601,7 +1600,6 @@ VM_SERIAL_SOCKETPATH=""
SERIAL="" SERIAL=""
SERIAL_TELNET_PORT="" SERIAL_TELNET_PORT=""
SERIAL_TELNET_HOST="" SERIAL_TELNET_HOST=""
KEYBOARD=""
KEYBOARD_LAYOUT="" KEYBOARD_LAYOUT=""
# shellcheck disable=SC2155 # shellcheck disable=SC2155
@ -1738,9 +1736,8 @@ else
shift; shift;
shift;; shift;;
-keyboard|--keyboard) -keyboard|--keyboard)
KEYBOARD="${2}" keyboard="${2}"
shift; shift 2;;
shift;;
-keyboard_layout|--keyboard_layout) -keyboard_layout|--keyboard_layout)
KEYBOARD_LAYOUT="${2}" KEYBOARD_LAYOUT="${2}"
shift; shift;