add Instant Play to fix nast opkrun bug, change menu label and reorder exit menu

Signed-off-by: Michel-FK <[email protected]>

Author: Michel-FK

CMakeLists.txt

@@ -27,6 +27,7 @@ set(DinguxCommander_SRCS
   dialog.cpp
   fileLister.cpp
   fileutils.cpp
+  fk_instant_play.c
   fk_menu.c
   keyboard.cpp
   main.cpp

fk_instant_play.c

@@ -0,0 +1,74 @@
+/*
+    FK - FunKey retro gaming console library
+    Copyright (C) 2020-2021 Vincent Buso
+    Copyright (C) 2020-2021 Michel Stempin
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Vincent Buso
+    [email protected]
+    Michel Stempin
+    [email protected]
+*/
+
+/**
+ *  @file FK_Instant_Play.c
+ *  This is the Instant Play API for the FunKey retro gaming console library
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include "fk_menu.h"
+#include "fk_instant_play.h"
+
+#ifndef SHELL_CMD_POWERDOWN
+#define SHELL_CMD_POWERDOWN                 "shutdown_funkey"
+#define SHELL_CMD_SCHEDULE_POWERDOWN        "sched_shutdown"
+#define SHELL_CMD_CANCEL_SCHED_POWERDOWN    "cancel_sched_powerdown"
+#endif
+
+/* Handler for SIGUSR1, caused by closing the console */
+static void handle_sigusr1(int signal)
+{
+    printf("Caught signal USR1(%d)\n", signal);
+
+    /* Exit menu if it was launched */
+    FK_EndMenu();
+
+    /* Send command to cancel any previously scheduled powerdown */
+    if (popen(SHELL_CMD_CANCEL_SCHED_POWERDOWN, "r") == NULL)
+    {
+        /* Countdown is still ticking, so better do nothing
+           than start writing and get interrupted!
+        */
+        printf("Failed to cancel scheduled shutdown\n");
+        exit(0);
+    }
+
+    /* Perform Instant Play save and shutdown */
+    execlp(SHELL_CMD_POWERDOWN, SHELL_CMD_POWERDOWN);
+
+    /* Should not be reached */
+    printf("Failed to perform shutdown\n");
+
+    /* Exit application */
+    exit(0);
+}
+
+void FK_InitInstantPlay(void)
+{
+    signal(SIGUSR1, handle_sigusr1); 
+}
+

fk_instant_play.h

@@ -0,0 +1,48 @@
+/*
+    FK - FunKey retro gaming console library
+    Copyright (C) 2020-2021 Vincent Buso
+    Copyright (C) 2020-2021 Michel Stempin
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Vincent Buso
+    [email protected]
+    Michel Stempin
+    [email protected]
+*/
+
+/**
+ *  @file FK_Instant_Play.h
+ *  This is the Instant Play API for the FunKey retro gaming console library
+ */
+
+#ifndef _FK_instant_play_h
+#define _FK_instant_play_h
+
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <signal.h>
+
+extern void FK_InitInstantPlay(void);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _FK_instant_play_h */

fk_menu.c

@@ -341,8 +341,14 @@ static void add_menu_zone(ENUM_MENU_TYPE menu_type)
 		SDL_BlitSurface(text_surface, NULL, surface, &text_pos);
 		break;
 #endif
-#ifdef HAS_MENU_POWERDOWN
+#ifdef HAS_MENU_RO_RW
 	case MENU_TYPE_RO_RW:
+		MENU_DEBUG_PRINTF("Init MENU_TYPE_RO_RW\n");
+		/// ------ Text ------
+		text_surface = TTF_RenderText_Blended(menu_title_font, "SET SYSTEM:", text_color);
+		text_pos.x = (surface->w - MENU_ZONE_WIDTH)/2 + (MENU_ZONE_WIDTH - text_surface->w)/2;
+		text_pos.y = surface->h - MENU_ZONE_HEIGHT/2 - text_surface->h/2 - padding_y_from_center_menu_zone*2;
+		SDL_BlitSurface(text_surface, NULL, surface, &text_pos);
 	    break;
 #endif
 	default:
@@ -371,6 +377,9 @@ static void init_menu_zones(void)
 #ifdef HAS_MENU_ASPECT_RATIO
 	add_menu_zone(MENU_TYPE_ASPECT_RATIO);
 #endif
+#ifdef HAS_MENU_RO_RW
+	add_menu_zone(MENU_TYPE_RO_RW);
+#endif
 #ifdef HAS_MENU_EXIT
 	add_menu_zone(MENU_TYPE_EXIT);
 #endif
@@ -386,9 +395,6 @@ static void init_menu_zones(void)
 #ifdef HAS_MENU_POWERDOWN
 	add_menu_zone(MENU_TYPE_POWERDOWN);
 #endif
-#ifdef HAS_MENU_RO_RW
-	add_menu_zone(MENU_TYPE_RO_RW);
-#endif
 }
 
 
@@ -795,7 +801,7 @@ static void menu_screen_refresh(SDL_Surface *screen, int menuItem, int prevItem,
 #endif
 #ifdef HAS_MENU_RO_RW
 		case MENU_TYPE_RO_RW:
-			sprintf(text_tmp, "SYS %s", read_write?"READ-ONLY":"READ-WRITE");
+			sprintf(text_tmp, "%s", read_write?"READ-ONLY":"READ-WRITE");
 			text_surface = TTF_RenderText_Blended(menu_title_font, text_tmp, text_color);
 			text_pos.x = (screen->w - MENU_ZONE_WIDTH)/2 + (MENU_ZONE_WIDTH - text_surface->w)/2;
 			text_pos.y = screen->h - MENU_ZONE_HEIGHT/2 - text_surface->h/2;
@@ -1303,7 +1309,7 @@ int FK_RunMenu(SDL_Surface *screen)
 #endif
 #ifdef HAS_MENU_RO_RW
 						    if(idx_menus[menuItem] == MENU_TYPE_RO_RW){
-							MENU_DEBUG_PRINTF("SYSTEM %s\n", read_write?"RO":"RW");
+							MENU_DEBUG_PRINTF("%s\n", read_write?"RO":"RW");
 							if(menu_confirmation){
 								MENU_DEBUG_PRINTF("SYSTEM %s - confirmed\n", read_write?"RO":"RW");
 								/// ----- Refresh screen ----

main.cpp

@@ -14,6 +14,7 @@
 #include "screen.h"
 #include "sdlutils.h"
 #include "fk_menu.h"
+#include "fk_instant_play.h"
 
 // Globals
 const SDL_Color Globals::g_colorTextNormal = {COLOR_TEXT_NORMAL};
@@ -67,6 +68,9 @@ int main(int argc, char** argv)
     // Init menu
     FK_InitMenu();
 
+    // Init Instant Play
+    FK_InitInstantPlay();
+
     // Create instances
     CResourceManager::instance();