arch-msx/msxbuild
2
0
Fork 0
Code Issues Pull requests 3 Actions Activity

Moved normal exit to headless control script.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in -9s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-06-30 13:56:18 +02:00
parent ab02b54175
commit 94f532ffa9
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/make/mb_autoexec.mk
View file

@ -24,7 +24,7 @@ define mb_autoexec_append_stop_fail
endef endef
define mb_autoexec_append_exit define mb_autoexec_append_exit
$(if $(filter on,$(MB_FLIGHT_SCREEN)),$(call mb_autoexec_append_save_screenshot,$(1))) $(if $(filter on,$(MB_FLIGHT_SCREEN)),$(call mb_autoexec_append_save_screenshot,$(1)))
$(call mb_autoexec_append_cmd,$(1),omsxctl boot_exec_exit) $(call mb_autoexec_append_cmd,$(1),omsxctl headless_exit)
endef endef
define mb_autoexec_append_joyporta_mouse define mb_autoexec_append_joyporta_mouse
$(call mb_autoexec_append_cmd,$(1),omsxctl plug joyporta mouse) $(call mb_autoexec_append_cmd,$(1),omsxctl plug joyporta mouse)

8
lib/openmsx/share/scripts/boot_exec.tcl
View file

@ -2,9 +2,6 @@
# #
# Adds the following command to openMSX; # Adds the following command to openMSX;
# #
# 'boot_exec_exit'
# Requested delayed shutdown of openMSX.
#
# 'boot_exec_color_dark' # 'boot_exec_color_dark'
# Sets the VDP colors to dark color tones. # Sets the VDP colors to dark color tones.
# #
@ -12,11 +9,6 @@
# Displays machine and openMSX version on one line. # Displays machine and openMSX version on one line.
# #
proc boot_exec_exit {} {
after time 1 "exit 0"
return "Shutdown openMSX"
}
proc boot_exec_color_dark {} { proc boot_exec_color_dark {} {
setcolor 4 000 setcolor 4 000
setcolor 15 777 setcolor 15 777

8
lib/openmsx/share/scripts/headless.tcl
View file

@ -4,6 +4,9 @@
# #
# Adds the following command to openMSX; # Adds the following command to openMSX;
# #
# 'headless_exit'
# A normal exit of the openMSX emulator.
#
# 'headless_show_gui' # 'headless_show_gui'
# Enables the renderer and throttle from the inside. # Enables the renderer and throttle from the inside.
# #
@ -27,6 +30,11 @@
set boot_env_renderer_type 0 set boot_env_renderer_type 0
proc headless_exit {} {
after time 1 "exit 0"
return "Shutdown openMSX"
}
proc headless_show_gui {} { proc headless_show_gui {} {
global renderer global renderer
global throttle global throttle