X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=702cfaf881a85c7c801c72b22e476723f89af3af;hb=8134091f354d83612fd0e4bd27e14eb243aa8401;hp=bdefa12255a10eb0e7698774f034dffd80f527cb;hpb=182f5dd46097dc11b3643dc2376b4dd6a4fa42c7;p=xonotic%2Fdarkplaces.git

diff --git a/sys_sdl.c b/sys_sdl.c
index bdefa122..702cfaf8 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,5 +1,6 @@
 
 #ifdef WIN32
+#include <io.h>
 #include "conio.h"
 #else
 #include <unistd.h>
@@ -30,7 +31,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,11 +41,8 @@ void Sys_Error (const char *error, ...)
 	va_start (argptr,error);
 	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);
@@ -52,7 +50,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)
@@ -86,7 +99,7 @@ char *Sys_ConsoleInput(void)
 {
 	if (cls.state == ca_dedicated)
 	{
-		static char text[256];
+		static char text[MAX_INPUTLINE];
 		int len = 0;
 #ifdef WIN32
 		int c;
@@ -163,8 +176,10 @@ char *Sys_GetClipboardData (void)
 		{
 			if ((cliptext = GlobalLock (hClipboardData)) != 0)
 			{
-				data = malloc (GlobalSize(hClipboardData)+1);
-				strcpy (data, cliptext);
+				size_t allocsize;
+				allocsize = GlobalSize (hClipboardData) + 1;
+				data = Z_Malloc (allocsize);
+				strlcpy (data, cliptext, allocsize);
 				GlobalUnlock (hClipboardData);
 			}
 		}
@@ -186,8 +201,6 @@ void Sys_Init_Commands (void)
 
 int main (int argc, char *argv[])
 {
-	double frameoldtime, framenewtime;
-
 	signal(SIGFPE, SIG_IGN);
 
 	com_argc = argc;
@@ -197,17 +210,10 @@ int main (int argc, char *argv[])
 	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
 #endif
 
-	Host_Init();
+	// we don't know which systems we'll want to init, yet...
+	SDL_Init(0);
 
-	frameoldtime = Sys_DoubleTime () - 0.1;
-	while (1)
-	{
-		// find time spent rendering last frame
-		framenewtime = Sys_DoubleTime ();
+	Host_Main();
 
-		Host_Frame (framenewtime - frameoldtime);
-
-		frameoldtime = framenewtime;
-	}
 	return 0;
 }