X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=9a91c15536cd306582fb511081e0f44697fa3d19;hb=320b43dcc126fa57ea6674ce2b99c04dcee1869d;hp=4a908537cce4c72f4c56ac3efae71c0481a0c43e;hpb=abc8a1eeeedc13556c83ba40d5d33d996a66dddd;p=xonotic%2Fdarkplaces.git

diff --git a/sys_sdl.c b/sys_sdl.c
index 4a908537..9a91c155 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,4 +1,3 @@
-#include "quakedef.h"
 
 #ifdef WIN32
 #include <io.h>
@@ -9,16 +8,38 @@
 #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"
+
+sys_t sys;
+
 // =======================================================================
 // 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 +47,7 @@ void Sys_Shutdown (void)
 	SDL_Quit();
 }
 
-
+static qboolean nocrashdialog;
 void Sys_Error (const char *error, ...)
 {
 	va_list argptr;
@@ -41,7 +62,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, "Engine Error", string, NULL);
 
 	Host_Shutdown ();
 	exit (1);
@@ -49,60 +73,42 @@ void Sys_Error (const char *error, ...)
 
 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, sys.argv[0], text);
+	}
 #else
+	if(sys.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 (sys.outfd, F_GETFL, 0);
+		fcntl (sys.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(sys.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 (sys.outfd, F_SETFL, origflags);
 	}
-#ifndef WIN32
-	fcntl (1, F_SETFL, origflags);
 #endif
 	//fprintf(stdout, "%s", text);
-}
-
-double Sys_DoubleTime (void)
-{
-	static int first = true;
-	static double oldtime = 0.0, curtime = 0.0;
-	double newtime;
-	newtime = (double) SDL_GetTicks() / 1000.0;
-
-
-	if (first)
-	{
-		first = false;
-		oldtime = newtime;
-	}
-
-	if (newtime < oldtime)
-	{
-		// warn if it's significant
-		if (newtime - oldtime < -0.01)
-			Con_Printf("Sys_DoubleTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime);
-	}
-	else if (newtime > oldtime + 1800)
-	{
-		Con_Printf("Sys_DoubleTime: time stepped forward (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime);
-	}
-	else
-		curtime += newtime - oldtime;
-	oldtime = newtime;
-
-	return curtime;
+#endif
 }
 
 char *Sys_ConsoleInput(void)
 {
-	if (cls.state == ca_dedicated)
+//	if (cls.state == ca_dedicated)
 	{
 		static char text[MAX_INPUTLINE];
 		int len = 0;
@@ -160,54 +166,56 @@ char *Sys_ConsoleInput(void)
 	return NULL;
 }
 
-void Sys_Sleep(int microseconds)
-{
-	SDL_Delay(microseconds / 1000);
-}
-
 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 = min(MAX_INPUTLINE, 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)
 {
 }
 
-void Sys_Init_Commands (void)
-{
-}
-
 int main (int argc, char *argv[])
 {
 	signal(SIGFPE, SIG_IGN);
 
-	com_argc = argc;
-	com_argv = (const char **)argv;
+#ifdef __ANDROID__
+	Sys_AllowProfiling(true);
+#endif
+
+	sys.selffd = -1;
+	sys.argc = argc;
+	sys.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"))
+		sys.outfd = -1;
+	// COMMANDLINEOPTION: sdl: -stderr moves console output to stderr
+	else if(COM_CheckParm("-stderr"))
+		sys.outfd = 2;
+	else
+		sys.outfd = 1;
 
 #ifndef WIN32
 	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
@@ -220,3 +228,13 @@ int main (int argc, char *argv[])
 
 	return 0;
 }
+
+qboolean sys_supportsdlgetticks = true;
+unsigned int Sys_SDL_GetTicks (void)
+{
+	return SDL_GetTicks();
+}
+void Sys_SDL_Delay (unsigned int milliseconds)
+{
+	SDL_Delay(milliseconds);
+}