backport commit r4639 - add platform-independent message dialog

Author: inactive123

libretro/libretro.cpp

@@ -1,3 +1,4 @@
+#include <stdarg.h>
 #include "libretro.h"
 
 #include "MMU.h"
@@ -15,6 +16,7 @@
 
 //
 
+static retro_log_printf_t log_cb = NULL;
 static retro_video_refresh_t video_cb = NULL;
 static retro_input_poll_t poll_cb = NULL;
 static retro_input_state_t input_cb = NULL;
@@ -251,8 +253,62 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
     info->timing.sample_rate = 44100.0;
 }
 
+//====================== Message box
+#define MSG_ARG \
+	char msg_buf[1024] = {0}; \
+	{ \
+		va_list args; \
+		va_start (args, fmt); \
+		vsprintf (msg_buf, fmt, args); \
+		va_end (args); \
+	}
+
+void msgWndInfo(const char *fmt, ...)
+{
+	MSG_ARG;
+   if (log_cb)
+      log_cb(RETRO_LOG_INFO, "%s.\n", msg_buf);
+}
+
+bool msgWndConfirm(const char *fmt, ...)
+{
+	MSG_ARG;
+   if (log_cb)
+      log_cb(RETRO_LOG_INFO, "%s.\n", msg_buf);
+   return true;
+}
+
+void msgWndError(const char *fmt, ...)
+{
+	MSG_ARG;
+   if (log_cb)
+      log_cb(RETRO_LOG_ERROR, "%s.\n", msg_buf);
+}
+
+void msgWndWarn(const char *fmt, ...)
+{
+	MSG_ARG;
+   if (log_cb)
+      log_cb(RETRO_LOG_WARN, "%s.\n", msg_buf);
+}
+
+msgBoxInterface msgBoxWnd = {
+	msgWndInfo,
+	msgWndConfirm,
+	msgWndError,
+	msgWndWarn,
+};
+//====================== Dialogs end
+
+
 void retro_init (void)
 {
+   struct retro_log_callback log;
+   if (environ_cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log))
+      log_cb = log.log;
+   else
+      log_cb = NULL;
+
     colorMode = RETRO_PIXEL_FORMAT_RGB565;
     if(!environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &colorMode))
         colorMode = RETRO_PIXEL_FORMAT_0RGB1555;
@@ -274,6 +330,8 @@ void retro_init (void)
     NDS_CreateDummyFirmware(&fw_config);
     NDS_3D_ChangeCore(0);
     backup_setManualBackupType(MC_TYPE_AUTODETECT);
+
+    msgbox = &msgBoxWnd;
 }
 
 void retro_deinit(void)

src/common.cpp

@@ -16,12 +16,9 @@
 */
 
 //TODO - move this into ndssystem where it belongs probably
-
+#include <stdarg.h>
 #include <string.h>
-
-#ifdef __LIBRETRO__ // Need ctype.h
 #include <ctype.h>
-#endif
 
 #include <string>
 #include "common.h"
@@ -57,3 +54,42 @@ char *removeSpecialChars(char *s)
 	*buf = 0;
 	return s;
 }
+
+// ===============================================================================
+// Message dialogs
+// ===============================================================================
+#define MSG_PRINT { \
+	va_list args; \
+	va_start (args, fmt); \
+	vprintf (fmt, args); \
+	va_end (args); \
+}
+void msgFakeInfo(const char *fmt, ...)
+{
+	MSG_PRINT;
+}
+
+bool msgFakeConfirm(const char *fmt, ...)
+{
+	MSG_PRINT;
+	return true;
+}
+
+void msgFakeError(const char *fmt, ...)
+{
+	MSG_PRINT;
+}
+
+void msgFakeWarn(const char *fmt, ...)
+{
+	MSG_PRINT;
+}
+
+msgBoxInterface msgBoxFake = {
+	msgFakeInfo,
+	msgFakeConfirm,
+	msgFakeError,
+	msgFakeWarn,
+};
+
+msgBoxInterface *msgbox = &msgBoxFake;

src/common.h

@@ -82,5 +82,19 @@ char *intToBin(T val)
 extern char *trim(char *s, int len=-1);
 extern char *removeSpecialChars(char *s);
 
+// ===============================================================================
+// Message dialogs
+// ===============================================================================
+#define CALL_CONVENTION
+typedef struct
+{
+	void (CALL_CONVENTION*  info)	(const char *fmt, ...);
+	bool (CALL_CONVENTION*  confirm)(const char *fmt, ...);
+	void (CALL_CONVENTION*  error)	(const char *fmt, ...);
+	void (CALL_CONVENTION*  warn)	(const char *fmt, ...);
+} msgBoxInterface;
+
+extern msgBoxInterface *msgbox;
+
 #endif
 

src/mc.cpp

@@ -460,10 +460,7 @@ void BackupDevice::reset_command()
 			{
 			case 0:
 			case 1:
-				printf("Catastrophic error while autodetecting save type.\nIt will need to be specified manually\n");
-				#ifdef _WINDOWS
-				MessageBox(0,"Catastrophic Error Code: Camel;\nyour save type has not been autodetected correctly;\nplease report to developers",0,0);
-				#endif
+            msgbox->error("Catastrophic error while autodetecting save type.\nIt will need to be specified manually\n");
 				addr_size = 1; //choose 1 just to keep the busted savefile from growing too big
 				break;
 			case 2:

src/saves.cpp

@@ -1107,11 +1107,7 @@ bool savestate_load(EMUFILE* is)
 
 	if(!x && !SAV_silent_fail_flag)
 	{
-		printf("Error loading savestate. It failed halfway through;\nSince there is no savestate backup system, your current game session is wrecked");
-#ifdef _WINDOWS
-		//HACK! we really need a better way to handle this kind of feedback
-		MessageBox(0,"Error loading savestate. It failed halfway through;\nSince there is no savestate backup system, your current game session is wrecked",0,0);
-#endif
+      msgbox->error("Error loading savestate. It failed halfway through;\nSince there is no savestate backup system, your current game session is wrecked");
 		return false;
 	}