X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_sdl.c;h=1bf22cd08463c11279ddb3a70c93252a38994e9e;hp=715d094b40a1741da660426c38db63ad56d141bc;hb=1e01840681f92f425aa17e1a18c7dfcf3bf80e40;hpb=b37ba0237d90d4f2bbd02c0e0e2ea769f4418adb

diff --git a/sys_sdl.c b/sys_sdl.c
index 715d094b..1bf22cd0 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,5 +1,5 @@
-
 #ifdef WIN32
+#include <io.h> // Include this BEFORE darkplaces.h because it uses strncpy which trips DP_STATIC_ASSERT
 #include "conio.h"
 #else
 #include <unistd.h>
@@ -7,213 +7,231 @@
 #include <sys/time.h>
 #endif
 
-#include <signal.h>
+#ifdef __ANDROID__
+#include <android/log.h>
+#endif
 
-#include "quakedef.h"
+#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
-cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
+#ifdef _MSC_VER
+#pragma comment(lib, "sdl2.lib")
+#pragma comment(lib, "sdl2main.lib")
+#endif
 #endif
 
+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);
+	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
 #endif
 	fflush(stdout);
 	SDL_Quit();
 }
-	
 
+static qbool nocrashdialog;
 void Sys_Error (const char *error, ...)
 {
 	va_list argptr;
-	char string[1024];
+	char string[MAX_INPUTLINE];
 
 // change stdin to non blocking
 #ifndef WIN32
-	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
+	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
 #endif
 
 	va_start (argptr,error);
-	vsnprintf (string, sizeof (string), error, argptr);
+	dpvsnprintf (string, sizeof (string), error, argptr);
 	va_end (argptr);
-	fprintf(stderr, "Error: %s\n", string);
 
-	Con_Print ("Quake Error: ");
-	Con_Print (string);
-	Con_Print ("\n");
+	Con_Printf(CON_ERROR "Engine Error: %s\n", string);
+	
+	if(!nocrashdialog)
+		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Engine Error", string, NULL);
 
-	Host_Shutdown ();
+	//Host_Shutdown ();
 	exit (1);
 }
 
-void Sys_PrintToTerminal(const char *text)
-{
-	printf("%s", text);
-}
-
-double Sys_DoubleTime (void)
+void Sys_Print(const char *text)
 {
-	static int first = true;
-	static double oldtime = 0.0, curtime = 0.0;
-	double newtime;
-#ifdef WIN32
-	// LordHavoc: note to people modifying this code, DWORD is specifically defined as an unsigned 32bit number, therefore the 65536.0 * 65536.0 is fine.
-	if (!sys_usetimegettime.integer)
-	{
-		// QueryPerformanceCounter
-		// platform:
-		// Windows 95/98/ME/NT/2000/XP
-		// features:
-		// very accurate (CPU cycles)
-		// known issues:
-		// does not necessarily match realtime too well (tends to get faster and faster in win98)
-		// wraps around occasionally on some platforms (depends on CPU speed and probably other unknown factors)
-		double timescale;
-		LARGE_INTEGER PerformanceFreq;
-		LARGE_INTEGER PerformanceCount;
-
-		if (!QueryPerformanceFrequency (&PerformanceFreq))
-			Sys_Error ("No hardware timer available");
-		QueryPerformanceCounter (&PerformanceCount);
-
-		#ifdef __BORLANDC__
-		timescale = 1.0 / ((double) PerformanceFreq.u.LowPart + (double) PerformanceFreq.u.HighPart * 65536.0 * 65536.0);
-		newtime = ((double) PerformanceCount.u.LowPart + (double) PerformanceCount.u.HighPart * 65536.0 * 65536.0) * timescale;
-		#else
-		timescale = 1.0 / ((double) PerformanceFreq.LowPart + (double) PerformanceFreq.HighPart * 65536.0 * 65536.0);
-		newtime = ((double) PerformanceCount.LowPart + (double) PerformanceCount.HighPart * 65536.0 * 65536.0) * timescale;
-		#endif
-	} else
-#endif
-	newtime = (double) SDL_GetTicks() / 1000.0;
-
-
-	if (first)
+#ifdef __ANDROID__
+	if (developer.integer > 0)
 	{
-		first = false;
-		oldtime = newtime;
+		__android_log_write(ANDROID_LOG_DEBUG, sys.argv[0], text);
 	}
-
-	if (newtime < oldtime)
+#else
+	if(sys.outfd < 0)
+		return;
+#ifndef WIN32
+	// BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
+	// this is because both go to /dev/tty by default!
 	{
-		// 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);
+		int origflags = fcntl (sys.outfd, F_GETFL, 0);
+		fcntl (sys.outfd, F_SETFL, origflags & ~O_NONBLOCK);
+#endif
+#ifdef WIN32
+#define write _write
+#endif
+		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;
+		}
+#ifndef WIN32
+		fcntl (sys.outfd, F_SETFL, origflags);
 	}
-	else
-		curtime += newtime - oldtime;
-	oldtime = newtime;
-
-	return curtime;
+#endif
+	//fprintf(stdout, "%s", text);
+#endif
 }
 
 char *Sys_ConsoleInput(void)
 {
-	if (cls.state == ca_dedicated)
-	{
-		static char text[256];
-		int len = 0;
+	static char text[MAX_INPUTLINE];
+	int len = 0;
 #ifdef WIN32
-		int c;
+	int c;
 
-		// read a line out
-		while (_kbhit ())
+	// 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)
 		{
-			c = _getch ();
-			putch (c);
-			if (c == '\r')
+			if (len)
 			{
+				_putch (' ');
+				_putch (c);
+				len--;
 				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;
+			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))
+	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)
 		{
-			len = read (0, text, sizeof(text));
-			if (len >= 1)
-			{
-				// rip off the \n and terminate
-				text[len-1] = 0;
-				return text;
-			}
+			// rip off the \n and terminate
+			text[len-1] = 0;
+			return text;
 		}
-#endif
 	}
+#endif
 	return NULL;
 }
 
-void Sys_Sleep(int milliseconds)
+char *Sys_GetClipboardData (void)
 {
-	if (milliseconds < 1)
-		milliseconds = 1;
-	SDL_Delay(milliseconds);
+	char *data = NULL;
+	char *cliptext;
+
+	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;
 }
 
-int SDL_main (int argc, char *argv[])
+int main (int argc, char *argv[])
 {
-	double frameoldtime, framenewtime;
-
 	signal(SIGFPE, SIG_IGN);
 
-	com_argc = argc;
-	com_argv = argv;
-
-#ifndef WIN32
-	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
+#ifdef __ANDROID__
+	Sys_AllowProfiling(true);
 #endif
 
-	Sys_Shared_EarlyInit();
+	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(!Sys_CheckParm("-nocrashdialog"))
+		nocrashdialog = false;
+	// COMMANDLINEOPTION: sdl: -noterminal disables console output on stdout
+	if(Sys_CheckParm("-noterminal"))
+		sys.outfd = -1;
+	// COMMANDLINEOPTION: sdl: -stderr moves console output to stderr
+	else if(Sys_CheckParm("-stderr"))
+		sys.outfd = 2;
+	else
+		sys.outfd = 1;
 
-#ifdef WIN32
-	Cvar_RegisterVariable(&sys_usetimegettime);
+#ifndef WIN32
+	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NONBLOCK);
 #endif
 
-	Host_Init();
+	// we don't know which systems we'll want to init, yet...
+	SDL_Init(0);
 
-	Sys_Shared_LateInit();
-
-	frameoldtime = Sys_DoubleTime () - 0.1;
-	while (1)
-	{
-		// find time spent rendering last frame
-		framenewtime = Sys_DoubleTime ();
+	// used by everything
+	Memory_Init();
 
-		Host_Frame (framenewtime - frameoldtime);
+	Host_Main();
 
-		frameoldtime = framenewtime;
-	}
+	Sys_Quit(0);
+	
 	return 0;
 }
+
+qbool sys_supportsdlgetticks = true;
+unsigned int Sys_SDL_GetTicks (void)
+{
+	return SDL_GetTicks();
+}
+void Sys_SDL_Delay (unsigned int milliseconds)
+{
+	SDL_Delay(milliseconds);
+}