Commit bb883183 authored by Jeffrey Armstrong's avatar Jeffrey Armstrong

Removal of special cases for FreeMiNT color settings. Added blocking of X11 queries on FreeMiNT.

parent 29714e18
...@@ -2828,6 +2828,10 @@ get_resolution() { ...@@ -2828,6 +2828,10 @@ get_resolution() {
[[ "$refresh_rate" == "off" ]] && resolution="${resolution/ @*}" [[ "$refresh_rate" == "off" ]] && resolution="${resolution/ @*}"
;; ;;
"FreeMiNT")
# Need to block X11 queries
;;
*) *)
if type -p xrandr >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then if type -p xrandr >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then
case $refresh_rate in case $refresh_rate in
...@@ -3712,10 +3716,6 @@ get_cols() { ...@@ -3712,10 +3716,6 @@ get_cols() {
unset -v blocks blocks2 cols unset -v blocks blocks2 cols
# TosWin2 on FreeMiNT is terrible at this,
# so we'll reset colors arbitrarily.
[[ "$term" == "TosWin2" ]] && printf '\e[30;47m'
# Tell info() that we printed manually. # Tell info() that we printed manually.
prin=1 prin=1
} }
...@@ -6766,8 +6766,7 @@ EOF ...@@ -6766,8 +6766,7 @@ EOF
;; ;;
"FreeMiNT"*) "FreeMiNT"*)
# Don't explicitly set colors since set_colors 7
# TosWin2 doesn't reset well.
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} ## ${c1} ##
## ######### ## #########
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment