From 97088650d4a1239d8d3fa98b9bdb8c6e3bf079b0 Mon Sep 17 00:00:00 2001
From: Willem <willemtsade.git.2022@distributedrebirth.love>
Date: Sat, 29 Jun 2024 05:07:15 +0200
Subject: [PATCH] Split headless and renderer vars.

---
 README.md                              |  8 ++++----
 lib/make/mb_openmsx.mk                 |  6 +++---
 lib/openmsx/share/scripts/boot_env.tcl | 16 ++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index b1f57aa..6493fec 100644
--- a/README.md
+++ b/README.md
@@ -55,15 +55,15 @@ When you want to see whats happening do a debug run;
 		real    0m3.223s
 	
 	debug run at 11 Mhz;
-		time MB_OPENMSX_RENDERER=on MB_OPENMSX_THROTTLE=on make assert-all
-		real    0m49.609s
+		time MB_OPENMSX_HEADLESS=off MB_OPENMSX_THROTTLE=on make assert-all
+		real    1m4.856s
 	
 	debug run real msx speed;
-		time MB_OPENMSX_RENDERER=on MB_OPENMSX_THROTTLE=on MB_OPENMSX_SPEED=100 make assert-all
+		time MB_OPENMSX_HEADLESS=off MB_OPENMSX_THROTTLE=on MB_OPENMSX_SPEED=100 make assert-all
 		real    2m37.379s
 	
 	debug run with video recorder and merge to one video file;
-		time MB_OPENMSX_RENDERER=on MB_OPENMSX_RECORDER=on make -s assert-all-video
+		time MB_OPENMSX_HEADLESS=off MB_OPENMSX_RECORDER=on make -s assert-all-video
 		real    0m7.136s
 	
 	build parallel;
diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk
index 5ed92e1..9d858fc 100644
--- a/lib/make/mb_openmsx.mk
+++ b/lib/make/mb_openmsx.mk
@@ -11,8 +11,8 @@ MB_OPENMSX_EXTRA_HDD     ?= -ext ide-nextor
 MB_OPENMSX_HDD_SIZE      ?= 4m
 MB_OPENMSX_SCALE_FACTOR  ?= 3
 MB_OPENMSX_THROTTLE      ?= off
-MB_OPENMSX_RENDERER      ?= off
-MB_OPENMSX_RENDERER_TYPE ?= SDL
+MB_OPENMSX_HEADLESS      ?= on
+MB_OPENMSX_RENDERER      ?= SDL
 MB_OPENMSX_RECORDER      ?= off
 MB_OPENMSX_CTLCACHE      ?= $(MB_CACHE)/msxbuild/omsxctl
 
@@ -45,8 +45,8 @@ define _mb_openmsx_run
 	BOOT_HDD_IMAGE="$(1)-omsx/persistent/ide-nextor/untitled1/hd.dsk" \
 	SCALE_FACTOR=$(MB_OPENMSX_SCALE_FACTOR) \
 	SPEED=$(MB_OPENMSX_SPEED) \
+	HEADLESS=$(MB_OPENMSX_HEADLESS) \
 	RENDERER=$(MB_OPENMSX_RENDERER) \
-	RENDERER_TYPE=$(MB_OPENMSX_RENDERER_TYPE) \
 	THROTTLE=$(MB_OPENMSX_THROTTLE) \
 	RECORDER=$(if $(filter on,$(MB_OPENMSX_RECORDER)),msxbuild-) \
 	OPENMSX_HOME="$(1)-omsx" \
diff --git a/lib/openmsx/share/scripts/boot_env.tcl b/lib/openmsx/share/scripts/boot_env.tcl
index 46394ba..bdcc87c 100644
--- a/lib/openmsx/share/scripts/boot_env.tcl
+++ b/lib/openmsx/share/scripts/boot_env.tcl
@@ -9,11 +9,11 @@
 #
 # Supported environment variables by this script;
 #
-# RENDERER=on|off
+# HEADLESS=on|off
 # Override video output from command line.
 #
-# RENDERER_TYPE=SDL
-# Select video renderer type.
+# RENDERER=SDL
+# Select video renderer type for gui mode or in none headless mode.
 #
 # SCALE_FACTOR=3
 # Override video scale factor for SDL renderer.
@@ -37,7 +37,7 @@ proc boot_gui_mode {} {
 		set renderer $boot_env_renderer_type
 		set throttle on
 	} else {
-		puts stderr "error: Requested boot_gui_mode but env.RENDERER_TYPE is missing."
+		puts stderr "error: Requested boot_gui_mode but env.RENDERER is missing."
 		exit 1
 	}
 }
@@ -45,13 +45,13 @@ proc boot_gui_mode {} {
 # Globals
 set boot_env_renderer_type 0
 
-if {[info exists ::env(RENDERER_TYPE)] && ([string trim $::env(RENDERER_TYPE)] != "")} {
-	set boot_env_renderer_type [string trim $::env(RENDERER_TYPE)]
+if {[info exists ::env(RENDERER)] && ([string trim $::env(RENDERER)] != "")} {
+	set boot_env_renderer_type [string trim $::env(RENDERER)]
 }
 
-if {[info exists ::env(RENDERER)] && ([string trim $::env(RENDERER)] == "on")} {
+if {[info exists ::env(HEADLESS)] && ([string trim $::env(HEADLESS)] != "on")} {
 	if {[catch {set renderer $boot_env_renderer_type} err_msg]} {
-		puts stderr "error: env.RENDERER value $err_msg"
+		puts stderr "error: env.HEADLESS value $err_msg"
 		exit 1
 	}
 }