good

Author: asturur

.DS_Store

@@ -51,7 +51,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "menu.h"
 #include "support/zaparoo/alt_launcher.h"
 #include "support/zaparoo/alt_launcher_menu.h"
-#include "support/zaparoo/display_menu.h"
+#include "support/zaparoo/launcher_pages.h"
 #include "support/zaparoo/menu_rbf.h"
 #include "user_io.h"
 #include "debug.h"
@@ -87,9 +87,13 @@ enum MENU
 	MENU_MISC2,
 
 	// Right-side companion to System Settings on the alt-launcher menu core.
-	// Hosts H/V offset adjustment and the CRT mode toggle.
-	MENU_ZAPAROO_DISPLAY1,
-	MENU_ZAPAROO_DISPLAY2,
+	// Top "Zaparoo Launcher" page lists sub-pages (Video) and an exit row;
+	// the Video sub-page hosts CRT mode + H/V centering offsets and binds
+	// left/right arrows to value adjustment.
+	MENU_ZAPAROO_LAUNCHER1,
+	MENU_ZAPAROO_LAUNCHER2,
+	MENU_ZAPAROO_VIDEO1,
+	MENU_ZAPAROO_VIDEO2,
 
 	MENU_SELECT_INI1,
 	MENU_SELECT_INI2,
@@ -6896,29 +6900,29 @@ void HandleUI(void)
 		}
 		else if (right && alt_launcher_configured())
 		{
-			menustate = MENU_ZAPAROO_DISPLAY1;
+			menustate = MENU_ZAPAROO_LAUNCHER1;
 			menusub = 0;
 		}
 
 		if (!hold_cnt && reboot_req) fpga_load_rbf(menu_rbf_name());
 		break;
 
 		/******************************************************************/
-		/* zaparoo display centering page (right-side sibling of System)  */
+		/* zaparoo launcher pages (right-side sibling of System)          */
 		/******************************************************************/
-	case MENU_ZAPAROO_DISPLAY1:
+	case MENU_ZAPAROO_LAUNCHER1:
 		if (!alt_launcher_configured())
 		{
 			menustate = MENU_NONE1;
 			break;
 		}
 		helptext_idx = 0;
 		parentstate = menustate;
-		display_menu_render(menusub, &menumask);
-		menustate = MENU_ZAPAROO_DISPLAY2;
+		launcher_page_render(menusub, &menumask);
+		menustate = MENU_ZAPAROO_LAUNCHER2;
 		break;
 
-	case MENU_ZAPAROO_DISPLAY2:
+	case MENU_ZAPAROO_LAUNCHER2:
 		if (menu)
 		{
 			menustate = MENU_NONE1;
@@ -6930,20 +6934,61 @@ void HandleUI(void)
 			menusub = 0;
 			break;
 		}
-		if (plus || minus)
+		if (right && menusub == 0)
 		{
-			display_menu_adjust(menusub, plus ? +1 : -1);
-			menustate = MENU_ZAPAROO_DISPLAY1;
+			menustate = MENU_ZAPAROO_VIDEO1;
+			menusub = 0;
 			break;
 		}
 		if (select)
 		{
-			if (!display_menu_handle_select(menusub))
+			int act = launcher_page_handle_select(menusub);
+			if (act == 1)
+			{
+				menustate = MENU_ZAPAROO_VIDEO1;
+				menusub = 0;
+			}
+			else if (act == 0)
 			{
 				menustate = MENU_NONE1;
+			}
+		}
+		break;
+
+	case MENU_ZAPAROO_VIDEO1:
+		if (!alt_launcher_configured())
+		{
+			menustate = MENU_NONE1;
+			break;
+		}
+		helptext_idx = 0;
+		parentstate = menustate;
+		video_page_render(menusub, &menumask);
+		menustate = MENU_ZAPAROO_VIDEO2;
+		break;
+
+	case MENU_ZAPAROO_VIDEO2:
+		if (menu)
+		{
+			menustate = MENU_ZAPAROO_LAUNCHER1;
+			menusub = 0;
+			break;
+		}
+		if (left || right || plus || minus)
+		{
+			video_page_adjust(menusub, (right || plus) ? +1 : -1);
+			menustate = MENU_ZAPAROO_VIDEO1;
+			break;
+		}
+		if (select)
+		{
+			if (!video_page_handle_select(menusub))
+			{
+				menustate = MENU_ZAPAROO_LAUNCHER1;
+				menusub = 0;
 				break;
 			}
-			menustate = MENU_ZAPAROO_DISPLAY1;
+			menustate = MENU_ZAPAROO_VIDEO1;
 		}
 		break;
 

menu.cpp

@@ -15,6 +15,7 @@
 #include "file_io.h"
 #include "hardware.h"
 #include "input.h"
+#include "menu.h"
 #include "shmem.h"
 #include "user_io.h"
 #include "video.h"
@@ -349,6 +350,11 @@ static void spawn(void)
 		input_switch(0);
 		user_io_status_set("[9]", 1);
 	}
+
+	// The launcher grabs input as soon as it starts. If the OSD is still
+	// up (e.g. user toggled CRT mode or hit Reboot from System Settings),
+	// it would trap input with no way to dismiss it — drop it now.
+	if (menu_present()) MenuHide();
 }
 
 bool alt_launcher_active(void)
@@ -439,6 +445,18 @@ void alt_launcher_poll(void)
 			int sig = WIFSIGNALED(status) ? WTERMSIG(status) : 0;
 			bool escaped = (exited && exit_status == 0) || sig == SIGTERM || sig == SIGINT;
 			bool crashed = !escaped && (sig != 0 || (exited && exit_status != 0));
+			// Any exit while in CRT mode drops back to HDMI / no launcher
+			// for the rest of this session — respawning into CRT after the
+			// user already left it is a UX trap. The persisted CRT
+			// preference is intentionally untouched (return_to_normal_mode
+			// only clears the in-memory s_native_crt), so the next reboot
+			// honors whatever the user last set in System Settings.
+			if (s_native_crt)
+			{
+				printf("alt_launcher: exited while in CRT mode, dropping to HDMI normal mode\n");
+				return_to_normal_mode();
+				return;
+			}
 			if (escaped)
 			{
 				printf("alt_launcher: exited, returning to normal mode until restart\n");

support/.DS_Store

@@ -23,10 +23,10 @@ int alt_launcher_render_system_menu(int menusub, uint64_t *menumask,
 	char s[256];
 	int m = 0;
 
-	// Right arrow indicates a sibling page (Display Centering) accessible
-	// via the right-arrow key — see MENU_ZAPAROO_DISPLAY1 in menu.cpp.
+	// Right arrow indicates a sibling page (Zaparoo Launcher) accessible
+	// via the right-arrow key — see MENU_ZAPAROO_LAUNCHER1 in menu.cpp.
 	OsdSetTitle("System Settings", OSD_ARROW_LEFT | OSD_ARROW_RIGHT);
-	*menumask = 0xF;
+	*menumask = 0x1F;
 
 	OsdWrite(m++);
 	sprintf(s, "       MiSTer v%s", version + 5);
@@ -61,15 +61,16 @@ int alt_launcher_render_system_menu(int menusub, uint64_t *menumask,
 
 	OsdWrite(m++, " Remap keyboard            \x16", menusub == 0);
 	OsdWrite(m++, " Define joystick buttons   \x16", menusub == 1);
+	OsdWrite(m++, " Scripts                   \x16", menusub == 2);
 
 	OsdWrite(m++, "");
 	int cr = m;
-	OsdWrite(m++, " Reboot (hold \x16 cold reboot)", menusub == 2);
+	OsdWrite(m++, " Reboot (hold \x16 cold reboot)", menusub == 3);
 	*sysinfo_timer = 0;
 	*reboot_req = 0;
 
 	while (m < OsdGetSize() - 1) OsdWrite(m++, "");
-	OsdWrite(15, ALT_STD_EXIT, menusub == 3);
+	OsdWrite(15, ALT_STD_EXIT, menusub == 4);
 
 	return cr;
 }
@@ -79,14 +80,15 @@ int alt_launcher_translate_system_select(int menusub)
 	if (!alt_launcher_configured()) return menusub;
 
 	// Maps trimmed-menu menusub to upstream MENU_SYSTEM2 dispatch index:
-	// 0 Remap -> 1, 1 Define joy -> 2, 2 Reboot -> 5, 3 Exit -> 6.
-	// CRT mode lives on the Display Centering page now, not here.
-	static const int map[] = { 1, 2, 5, 6 };
+	// 0 Remap -> 1, 1 Define joy -> 2, 2 Scripts -> 3, 3 Reboot -> 5,
+	// 4 Exit -> 6. CRT mode lives on the Zaparoo Launcher's Video
+	// sub-page now, not here.
+	static const int map[] = { 1, 2, 3, 5, 6 };
 	if (menusub < 0 || menusub >= (int)(sizeof(map) / sizeof(map[0]))) return -1;
 	return map[menusub];
 }
 
 bool alt_launcher_system_holding_reboot(int menusub)
 {
-	return alt_launcher_configured() && menusub == 2;
+	return alt_launcher_configured() && menusub == 3;
 }

support/zaparoo/alt_launcher.cpp

@@ -4,10 +4,10 @@
 #include <stdint.h>
 
 // Trimmed System Settings menu for alt-launcher mode. The launcher is
-// the only "core" running on top of menu.rbf, so storage toggle,
-// scripts and the bundled help PDF are irrelevant — this layout
-// hides them and exposes only Remap(0), Define joy(1), CRT mode(2),
-// Reboot(3), Exit(4).
+// the only "core" running on top of menu.rbf, so storage toggle and
+// the bundled help PDF are irrelevant — this layout hides them and
+// exposes Remap(0), Define joy(1), Scripts(2), Reboot(3), Exit(4).
+// CRT mode lives on the Zaparoo Launcher's Video sub-page.
 //
 // All three helpers are no-ops / return safe defaults when
 // alt_launcher_configured() is false, so menu.cpp's hook sites can

support/zaparoo/alt_launcher_menu.cpp

@@ -1,44 +1,76 @@
-#include "display_menu.h"
+#include "launcher_pages.h"
 #include "alt_launcher.h"
 #include "osd.h"
 
 #include <stdio.h>
 
-#define DISPLAY_STD_EXIT "            exit"
+// Mirrors menu.cpp's STD_EXIT (a local #define there, kept in sync
+// here rather than re-exporting it via a header touch).
+#define LAUNCHER_STD_EXIT "            exit"
 
-void display_menu_render(int menusub, uint64_t *menumask)
+void launcher_page_render(int menusub, uint64_t *menumask)
 {
 	OsdSetSize(16);
-	OsdSetTitle("Display Centering", OSD_ARROW_LEFT);
-	*menumask = 0xF; // 4 entries: H, V, CRT, Exit
+	OsdSetTitle("Zaparoo Launcher", OSD_ARROW_LEFT);
+	*menumask = 0x3; // Video, Exit
+
+	int m = 0;
+	OsdWrite(m++);
+	OsdWrite(m++, "");
+	OsdWrite(m++, "");
+	OsdWrite(m++, "");
+	OsdWrite(m++, "");
+
+	OsdWrite(m++, " Video                     \x16", menusub == 0);
+
+	while (m < OsdGetSize() - 1) OsdWrite(m++, "");
+	OsdWrite(15, LAUNCHER_STD_EXIT, menusub == 1);
+}
+
+int launcher_page_handle_select(int menusub)
+{
+	switch (menusub)
+	{
+	case 0: return 1;
+	case 1: return 0;
+	default: return -1;
+	}
+}
+
+void video_page_render(int menusub, uint64_t *menumask)
+{
+	OsdSetSize(16);
+	// No arrow flags: left/right are bound to value adjustment on this
+	// page, not sibling navigation.
+	OsdSetTitle("Video", 0);
+	*menumask = 0xF; // CRT, H Offset, V Offset, Exit
 
 	char s[64];
 	int m = 0;
 
 	OsdWrite(m++);
 	OsdWrite(m++, "");
 	OsdWrite(m++, "");
-	OsdWrite(m++, "");
 
-	sprintf(s, " H Offset: %+3d  (-/+)", alt_launcher_h_offset());
+	sprintf(s, " CRT mode: %-15s", alt_launcher_native_crt() ? "On" : "Off");
 	OsdWrite(m++, s, menusub == 0);
 
-	sprintf(s, " V Offset: %+3d  (-/+)", alt_launcher_v_offset());
+	OsdWrite(m++, "");
+	sprintf(s, " H Offset: %+3d", alt_launcher_h_offset());
 	OsdWrite(m++, s, menusub == 1);
 
-	OsdWrite(m++, "");
-	sprintf(s, " CRT mode: %-15s", alt_launcher_native_crt() ? "On" : "Off");
+	sprintf(s, " V Offset: %+3d", alt_launcher_v_offset());
 	OsdWrite(m++, s, menusub == 2);
 
 	while (m < OsdGetSize() - 1) OsdWrite(m++, "");
-	OsdWrite(15, DISPLAY_STD_EXIT, menusub == 3);
+	OsdWrite(15, LAUNCHER_STD_EXIT, menusub == 3);
 }
 
-bool display_menu_handle_select(int menusub)
+bool video_page_handle_select(int menusub)
 {
 	switch (menusub)
 	{
-	case 2:
+	case 0:
 		alt_launcher_toggle_crt();
 		return true;
 	case 3:
@@ -48,16 +80,19 @@ bool display_menu_handle_select(int menusub)
 	}
 }
 
-void display_menu_adjust(int menusub, int dir)
+void video_page_adjust(int menusub, int dir)
 {
 	if (dir == 0) return;
 	int8_t step = (int8_t)(dir > 0 ? 1 : -1);
 	switch (menusub)
 	{
 	case 0:
-		alt_launcher_set_h_offset((int8_t)(alt_launcher_h_offset() + step));
+		alt_launcher_toggle_crt();
 		break;
 	case 1:
+		alt_launcher_set_h_offset((int8_t)(alt_launcher_h_offset() + step));
+		break;
+	case 2:
 		alt_launcher_set_v_offset((int8_t)(alt_launcher_v_offset() + step));
 		break;
 	default:

support/zaparoo/alt_launcher_menu.h

@@ -3,18 +3,38 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-// Right-side companion to the trimmed System Settings menu. Hosts the
-// display centering controls (H/V offset) and the CRT mode toggle that
-// used to live next to Reboot in alt_launcher_render_system_menu.
+// Right-side companion to the trimmed System Settings menu, reachable
+// via the right arrow when alt_launcher_configured() is true. This file
+// hosts both pages of that companion: the top-level "Zaparoo Launcher"
+// page and the nested "Video" sub-page that owns the CRT mode toggle
+// plus the H/V centering offsets.
 //
-// menusub layout: 0 = H offset, 1 = V offset, 2 = CRT mode, 3 = Exit.
+// The Video page binds left/right arrows to value adjustment instead of
+// sibling navigation, which is why it lives behind a sub-page rather
+// than directly under System Settings.
 
-void display_menu_render(int menusub, uint64_t *menumask);
+// Top "Zaparoo Launcher" page. menusub layout: 0 = Video, 1 = Exit.
+void launcher_page_render(int menusub, uint64_t *menumask);
 
-// Returns true if the press was consumed (re-render required without
-// dispatching to MENU_NONE1). Caller checks this before exiting.
-bool display_menu_handle_select(int menusub);
+// Translates a select press on the Launcher page.
+//   1 -> entered Video sub-page
+//   0 -> Exit pressed (close OSD)
+//  -1 -> no-op
+int launcher_page_handle_select(int menusub);
 
-// Adjust the highlighted offset row by `dir` (-1 / +1). No-op when the
-// current row is not an offset row.
-void display_menu_adjust(int menusub, int dir);
+// Video sub-page. menusub layout: 0 = CRT mode, 1 = H Offset,
+// 2 = V Offset, 3 = Exit.
+//
+// The OSD is closed automatically by the launcher spawn path (see
+// MenuHide() in spawn() in alt_launcher.cpp) when CRT toggling
+// triggers a respawn — these helpers don't need to signal that.
+void video_page_render(int menusub, uint64_t *menumask);
+
+// Returns true if the press was consumed (re-render only); false when
+// Exit was selected (caller pops back to the Launcher page).
+bool video_page_handle_select(int menusub);
+
+// Adjust the highlighted row by `dir` (-1 / +1). Toggles CRT mode on
+// the CRT row regardless of sign; ±1 on the H/V offset rows; no-op
+// elsewhere.
+void video_page_adjust(int menusub, int dir);