X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=574f1355aacedb76cb10b57d497f29c910effe8b;hb=49e68945aaf75a9ead362b814b6452783c414a3e;hp=88369e1f9760fd5384e682165de39bcf6735906c;hpb=282a21e5c300c702fe833851f61d1e591e709e99;p=xonotic%2Fdarkplaces.git

diff --git a/sys_sdl.c b/sys_sdl.c
index 88369e1f..574f1355 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,25 +1,11 @@
-
-#ifdef WIN32
-#include <io.h>
-#include "conio.h"
-#else
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/time.h>
-#endif
-
-#ifdef __ANDROID__
-#include <android/log.h>
-
-#ifndef FNDELAY
-#define FNDELAY		O_NDELAY
-#endif
-#endif
-
-#include <signal.h>
-
+/*
+ * Include this BEFORE darkplaces.h because it breaks wrapping
+ * _Static_assert. Cloudwalk has no idea how or why so don't ask.
+ */
 #include <SDL.h>
 
+#include "darkplaces.h"
+
 #ifdef WIN32
 #ifdef _MSC_VER
 #pragma comment(lib, "sdl2.lib")
@@ -27,146 +13,26 @@
 #endif
 #endif
 
-#include "quakedef.h"
 
 // =======================================================================
 // General routines
 // =======================================================================
 
-void Sys_Shutdown (void)
+void Sys_SDL_Shutdown(void)
 {
-#ifdef __ANDROID__
-	Sys_AllowProfiling(false);
-#endif
-#ifndef WIN32
-	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
-#endif
-	fflush(stdout);
 	SDL_Quit();
 }
 
-
-void Sys_Error (const char *error, ...)
-{
-	va_list argptr;
-	char string[MAX_INPUTLINE];
-
-// change stdin to non blocking
-#ifndef WIN32
-	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
-#endif
-
-	va_start (argptr,error);
-	dpvsnprintf (string, sizeof (string), error, argptr);
-	va_end (argptr);
-
-	Con_Printf ("Engine Error: %s\n", string);
-
-#ifdef WIN32
-	MessageBox(NULL, string, "Engine Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
-#endif
-
-	Host_Shutdown ();
-	exit (1);
-}
-
-static int outfd = 1;
-void Sys_PrintToTerminal(const char *text)
-{
-#ifdef __ANDROID__
-	if (developer.integer > 0)
-	{
-		__android_log_write(ANDROID_LOG_DEBUG, com_argv[0], text);
-	}
-#else
-	if(outfd < 0)
-		return;
-#ifdef FNDELAY
-	// BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
-	// this is because both go to /dev/tty by default!
-	{
-		int origflags = fcntl (outfd, F_GETFL, 0);
-		fcntl (outfd, F_SETFL, origflags & ~FNDELAY);
-#endif
-#ifdef WIN32
-#define write _write
-#endif
-		while(*text)
-		{
-			fs_offset_t written = (fs_offset_t)write(outfd, text, (int)strlen(text));
-			if(written <= 0)
-				break; // sorry, I cannot do anything about this error - without an output
-			text += written;
-		}
-#ifdef FNDELAY
-		fcntl (outfd, F_SETFL, origflags);
-	}
-#endif
-	//fprintf(stdout, "%s", text);
-#endif
-}
-
-char *Sys_ConsoleInput(void)
+// Sys_Error early in startup might screw with automated
+// workflows or something if we show the dialog by default.
+static qbool nocrashdialog = true;
+void Sys_SDL_Dialog(const char *title, const char *string)
 {
-//	if (cls.state == ca_dedicated)
-	{
-		static char text[MAX_INPUTLINE];
-		int len = 0;
-#ifdef WIN32
-		int c;
-
-		// read a line out
-		while (_kbhit ())
-		{
-			c = _getch ();
-			_putch (c);
-			if (c == '\r')
-			{
-				text[len] = 0;
-				_putch ('\n');
-				len = 0;
-				return text;
-			}
-			if (c == 8)
-			{
-				if (len)
-				{
-					_putch (' ');
-					_putch (c);
-					len--;
-					text[len] = 0;
-				}
-				continue;
-			}
-			text[len] = c;
-			len++;
-			text[len] = 0;
-			if (len == sizeof (text))
-				len = 0;
-		}
-#else
-		fd_set fdset;
-		struct timeval timeout;
-		FD_ZERO(&fdset);
-		FD_SET(0, &fdset); // stdin
-		timeout.tv_sec = 0;
-		timeout.tv_usec = 0;
-		if (select (1, &fdset, NULL, NULL, &timeout) != -1 && FD_ISSET(0, &fdset))
-		{
-			len = read (0, text, sizeof(text));
-			if (len >= 1)
-			{
-				// rip off the \n and terminate
-				text[len-1] = 0;
-				return text;
-			}
-		}
-#endif
-	}
-	return NULL;
+	if(!nocrashdialog)
+		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, title, string, NULL);
 }
 
-char *Sys_GetClipboardData (void)
+char *Sys_SDL_GetClipboardData (void)
 {
 	char *data = NULL;
 	char *cliptext;
@@ -174,53 +40,27 @@ char *Sys_GetClipboardData (void)
 	cliptext = SDL_GetClipboardText();
 	if (cliptext != NULL) {
 		size_t allocsize;
-		allocsize = strlen(cliptext) + 1;
+		allocsize = min(MAX_INPUTLINE, strlen(cliptext) + 1);
 		data = (char *)Z_Malloc (allocsize);
-		strlcpy (data, cliptext, allocsize);
+		dp_strlcpy (data, cliptext, allocsize);
 		SDL_free(cliptext);
 	}
 
 	return data;
 }
 
-void Sys_InitConsole (void)
-{
-}
-
-int main (int argc, char *argv[])
+void Sys_SDL_Init(void)
 {
-	signal(SIGFPE, SIG_IGN);
-
-#ifdef __ANDROID__
-	Sys_AllowProfiling(true);
-#endif
-
-	com_argc = argc;
-	com_argv = (const char **)argv;
-	Sys_ProvideSelfFD();
-
-	// COMMANDLINEOPTION: sdl: -noterminal disables console output on stdout
-	if(COM_CheckParm("-noterminal"))
-		outfd = -1;
-	// COMMANDLINEOPTION: sdl: -stderr moves console output to stderr
-	else if(COM_CheckParm("-stderr"))
-		outfd = 2;
-	else
-		outfd = 1;
-
-#ifndef WIN32
-	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
-#endif
-
 	// we don't know which systems we'll want to init, yet...
-	SDL_Init(0);
-
-	Host_Main();
+	if (SDL_Init(0) < 0)
+		Sys_Error("SDL_Init failed: %s\n", SDL_GetError());
 
-	return 0;
+	// COMMANDLINEOPTION: sdl: -nocrashdialog disables "Engine Error" crash dialog boxes
+	if(!Sys_CheckParm("-nocrashdialog"))
+		nocrashdialog = false;
 }
 
-qboolean sys_supportsdlgetticks = true;
+qbool sys_supportsdlgetticks = true;
 unsigned int Sys_SDL_GetTicks (void)
 {
 	return SDL_GetTicks();
@@ -229,3 +69,8 @@ void Sys_SDL_Delay (unsigned int milliseconds)
 {
 	SDL_Delay(milliseconds);
 }
+
+int main(int argc, char *argv[])
+{
+	return Sys_Main(argc, argv);
+}