X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sys_linux.c;h=637cf29e245ae2447641096ed976c2559b4bf379;hb=c8d0d28d9bd50783c125a44bbd44828963312f7a;hp=1df663ae20b5934b80c31eca8dad65aa7c0b8629;hpb=b37ba0237d90d4f2bbd02c0e0e2ea769f4418adb;p=xonotic%2Fdarkplaces.git

diff --git a/sys_linux.c b/sys_linux.c
index 1df663ae..637cf29e 100644
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -1,5 +1,6 @@
 
 #ifdef WIN32
+#include <io.h>
 #include "conio.h"
 #else
 #include <unistd.h>
@@ -13,7 +14,7 @@
 
 
 #ifdef WIN32
-cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
+cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1", "use windows timeGetTime function (which has issues on some motherboards) for timing rather than QueryPerformanceCounter timer (which has issues on multicore/multiprocessor machines and processors which are designed to conserve power)"};
 #endif
 
 
@@ -32,7 +33,7 @@ void Sys_Shutdown (void)
 void Sys_Error (const char *error, ...)
 {
 	va_list argptr;
-	char string[1024];
+	char string[MAX_INPUTLINE];
 
 // change stdin to non blocking
 #ifndef WIN32
@@ -40,13 +41,10 @@ void Sys_Error (const char *error, ...)
 #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 ("Quake Error: %s\n", string);
 
 	Host_Shutdown ();
 	exit (1);
@@ -54,7 +52,22 @@ void Sys_Error (const char *error, ...)
 
 void Sys_PrintToTerminal(const char *text)
 {
-	printf("%s", 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);
+#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;
+	}
+#ifndef WIN32
+	fcntl (1, F_SETFL, origflags);
+#endif
+	//fprintf(stdout, "%s", text);
 }
 
 double Sys_DoubleTime (void)
@@ -63,6 +76,7 @@ double Sys_DoubleTime (void)
 	static double oldtime = 0.0, curtime = 0.0;
 	double newtime;
 #ifdef WIN32
+#include <mmsystem.h>
 	// 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)
 	{
@@ -99,7 +113,12 @@ double Sys_DoubleTime (void)
 		LARGE_INTEGER PerformanceCount;
 
 		if (!QueryPerformanceFrequency (&PerformanceFreq))
-			Sys_Error ("No hardware timer available");
+		{
+			Con_Printf ("No hardware timer available\n");
+			// fall back to timeGetTime
+			Cvar_SetValueQuick(&sys_usetimegettime, true);
+			return Sys_DoubleTime();
+		}
 		QueryPerformanceCounter (&PerformanceCount);
 
 		#ifdef __BORLANDC__
@@ -139,8 +158,8 @@ char *Sys_ConsoleInput(void)
 {
 	if (cls.state == ca_dedicated)
 	{
-		static char text[256];
-		static int len = 0;
+		static char text[MAX_INPUTLINE];
+		static unsigned int len = 0;
 #ifdef WIN32
 		int c;
 
@@ -211,34 +230,26 @@ char *Sys_GetClipboardData (void)
 	return NULL;
 }
 
-int main (int argc, const char **argv)
+void Sys_InitConsole (void)
 {
-	double frameoldtime, framenewtime;
+}
 
+void Sys_Init_Commands (void)
+{
+}
+
+int main (int argc, char **argv)
+{
 	signal(SIGFPE, SIG_IGN);
 
 	com_argc = argc;
-	com_argv = argv;
+	com_argv = (const char **)argv;
 
 #ifndef WIN32
 	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
 #endif
 
-	Sys_Shared_EarlyInit();
-
-	Host_Init();
-
-	Sys_Shared_LateInit();
+	Host_Main();
 
-	frameoldtime = Sys_DoubleTime () - 0.1;
-	while (1)
-	{
-		// find time spent rendering last frame
-		framenewtime = Sys_DoubleTime ();
-
-		Host_Frame (framenewtime - frameoldtime);
-
-		frameoldtime = framenewtime;
-	}
 	return 0;
 }