X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=757d9d8fdd08f3b60828a1c58f45f69d30f9451e;hb=ceb1f2c61e7baf03ec86aa002c663dad9592f5a8;hp=d0efa8353c0c62a05fd7653370374f17ceaa17ac;hpb=913039faa5b22651954fe10a148ff1e87e4b84fd;p=xonotic%2Fdarkplaces.git

diff --git a/sys_sdl.c b/sys_sdl.c
index d0efa835..757d9d8f 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,4 +1,3 @@
-#include "quakedef.h"
 
 #ifdef WIN32
 #include <io.h>
@@ -9,16 +8,36 @@
 #include <sys/time.h>
 #endif
 
+#ifdef __ANDROID__
+#include <android/log.h>
+
+#ifndef FNDELAY
+#define FNDELAY		O_NDELAY
+#endif
+#endif
+
 #include <signal.h>
 
 #include <SDL.h>
 
+#ifdef WIN32
+#ifdef _MSC_VER
+#pragma comment(lib, "sdl2.lib")
+#pragma comment(lib, "sdl2main.lib")
+#endif
+#endif
+
+#include "quakedef.h"
+
 // =======================================================================
 // General routines
 // =======================================================================
 
 void Sys_Shutdown (void)
 {
+#ifdef __ANDROID__
+	Sys_AllowProfiling(false);
+#endif
 #ifndef WIN32
 	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
 #endif
@@ -26,7 +45,7 @@ void Sys_Shutdown (void)
 	SDL_Quit();
 }
 
-
+static qboolean nocrashdialog;
 void Sys_Error (const char *error, ...)
 {
 	va_list argptr;
@@ -41,37 +60,54 @@ void Sys_Error (const char *error, ...)
 	dpvsnprintf (string, sizeof (string), error, argptr);
 	va_end (argptr);
 
-	Con_Printf ("Quake Error: %s\n", string);
+	Con_Errorf ("Engine Error: %s\n", string);
+	
+	if(!nocrashdialog)
+		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Quake Error", string, NULL);
 
 	Host_Shutdown ();
 	exit (1);
 }
 
+static int outfd = 1;
 void Sys_PrintToTerminal(const char *text)
 {
-#ifndef WIN32
-	// BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
-	int origflags = fcntl (1, F_GETFL, 0);
-	fcntl (1, F_SETFL, origflags & ~FNDELAY);
+#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)
-	{
-		int written = (int)write(1, text, (int)strlen(text));
-		if(written <= 0)
-			break; // sorry, I cannot do anything about this error - without an output
-		text += written;
+		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);
 	}
-#ifndef WIN32
-	fcntl (1, F_SETFL, origflags);
 #endif
 	//fprintf(stdout, "%s", text);
+#endif
 }
 
 char *Sys_ConsoleInput(void)
 {
-	if (cls.state == ca_dedicated)
+//	if (cls.state == ca_dedicated)
 	{
 		static char text[MAX_INPUTLINE];
 		int len = 0;
@@ -131,31 +167,19 @@ char *Sys_ConsoleInput(void)
 
 char *Sys_GetClipboardData (void)
 {
-#ifdef WIN32
 	char *data = NULL;
 	char *cliptext;
 
-	if (OpenClipboard (NULL) != 0)
-	{
-		HANDLE hClipboardData;
-
-		if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
-		{
-			if ((cliptext = (char *)GlobalLock (hClipboardData)) != 0)
-			{
-				size_t allocsize;
-				allocsize = GlobalSize (hClipboardData) + 1;
-				data = (char *)Z_Malloc (allocsize);
-				strlcpy (data, cliptext, allocsize);
-				GlobalUnlock (hClipboardData);
-			}
-		}
-		CloseClipboard ();
+	cliptext = SDL_GetClipboardText();
+	if (cliptext != NULL) {
+		size_t allocsize;
+		allocsize = strlen(cliptext) + 1;
+		data = (char *)Z_Malloc (allocsize);
+		strlcpy (data, cliptext, allocsize);
+		SDL_free(cliptext);
 	}
+
 	return data;
-#else
-	return NULL;
-#endif
 }
 
 void Sys_InitConsole (void)
@@ -166,9 +190,31 @@ int main (int argc, char *argv[])
 {
 	signal(SIGFPE, SIG_IGN);
 
+#ifdef __ANDROID__
+	Sys_AllowProfiling(true);
+#endif
+
 	com_argc = argc;
 	com_argv = (const char **)argv;
 
+	// Sys_Error this early in startup might screw with automated
+	// workflows or something if we show the dialog by default.
+	nocrashdialog = true;
+
+	Sys_ProvideSelfFD();
+
+	// COMMANDLINEOPTION: -nocrashdialog disables "Engine Error" crash dialog boxes
+	if(!COM_CheckParm("-nocrashdialog"))
+		nocrashdialog = false;
+	// 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