X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=sys_linux.c;h=1edb74ddcf42ed8421f6eb18dfda882372626fab;hb=d3e2f7e92ec8883147b70a7bc0971a7b4561d3d5;hp=1d77ae238524bef9dfec71ef94344f65629b42ba;hpb=f7e37f88d839aaf88b304e2cfc000bf10ca9ed83;p=xonotic%2Fdarkplaces.git

diff --git a/sys_linux.c b/sys_linux.c
index 1d77ae23..1edb74dd 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
@@ -51,7 +52,22 @@ void Sys_Error (const char *error, ...)
 
 void Sys_PrintToTerminal(const char *text)
 {
-	fprintf(stdout, "%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)
@@ -141,7 +157,7 @@ char *Sys_ConsoleInput(void)
 {
 	if (cls.state == ca_dedicated)
 	{
-		static char text[256];
+		static char text[MAX_INPUTLINE];
 		static unsigned int len = 0;
 #ifdef WIN32
 		int c;