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

diff --git a/sys_sdl.c b/sys_sdl.c
index 13be11ea..757d9d8f 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,9 +1,5 @@
 
 #ifdef WIN32
-#ifdef _MSC_VER
-#pragma comment(lib, "sdl.lib")
-#pragma comment(lib, "sdlmain.lib")
-#endif
 #include <io.h>
 #include "conio.h"
 #else
@@ -12,10 +8,25 @@
 #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"
 
 // =======================================================================
@@ -24,6 +35,9 @@
 
 void Sys_Shutdown (void)
 {
+#ifdef __ANDROID__
+	Sys_AllowProfiling(false);
+#endif
 #ifndef WIN32
 	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
 #endif
@@ -31,7 +45,7 @@ void Sys_Shutdown (void)
 	SDL_Quit();
 }
 
-
+static qboolean nocrashdialog;
 void Sys_Error (const char *error, ...)
 {
 	va_list argptr;
@@ -46,7 +60,10 @@ 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);
@@ -55,6 +72,12 @@ void Sys_Error (const char *error, ...)
 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
@@ -69,7 +92,7 @@ void Sys_PrintToTerminal(const char *text)
 #endif
 		while(*text)
 		{
-			fs_offset_t written = (fs_offset_t)write(outfd, text, strlen(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;
@@ -79,6 +102,7 @@ void Sys_PrintToTerminal(const char *text)
 	}
 #endif
 	//fprintf(stdout, "%s", text);
+#endif
 }
 
 char *Sys_ConsoleInput(void)
@@ -143,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)
@@ -178,10 +190,22 @@ 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;