X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=sys_unix.c;h=eccf986e3791149cbf604cb3f3506b7852430cd9;hb=93ea3eb0edb917080adabff49424e43394a379d5;hp=24ea6482d515ced9dc5262055acfb2bd64e5990e;hpb=62d48f29bb1ae6d13983bc0c324a700e4ac28dec;p=xonotic%2Fdarkplaces.git

diff --git a/sys_unix.c b/sys_unix.c
index 24ea6482..eccf986e 100644
--- a/sys_unix.c
+++ b/sys_unix.c
@@ -12,7 +12,7 @@
 
 #include <signal.h>
 
-#include "quakedef.h"
+#include "darkplaces.h"
 
 sys_t sys;
 
@@ -21,7 +21,9 @@ sys_t sys;
 // =======================================================================
 void Sys_Shutdown (void)
 {
-	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NDELAY);
+#ifndef WIN32
+	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
+#endif
 	fflush(stdout);
 }
 
@@ -31,15 +33,16 @@ void Sys_Error (const char *error, ...)
 	char string[MAX_INPUTLINE];
 
 // change stdin to non blocking
-	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NDELAY);
-
+#ifndef WIN32
+	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
+#endif
 	va_start (argptr,error);
 	dpvsnprintf (string, sizeof (string), error, argptr);
 	va_end (argptr);
 
 	Con_Printf(CON_ERROR "Engine Error: %s\n", string);
 
-	Host_Shutdown ();
+	//Host_Shutdown ();
 	exit (1);
 }
 
@@ -50,9 +53,10 @@ void Sys_PrintToTerminal(const char *text)
 	// BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
 	// this is because both go to /dev/tty by default!
 	{
+#ifndef WIN32
 		int origflags = fcntl (sys.outfd, F_GETFL, 0);
-		fcntl (sys.outfd, F_SETFL, origflags & ~O_NDELAY);
-#ifdef WIN32
+		fcntl (sys.outfd, F_SETFL, origflags & ~O_NONBLOCK);
+#else
 #define write _write
 #endif
 		while(*text)
@@ -62,71 +66,70 @@ void Sys_PrintToTerminal(const char *text)
 				break; // sorry, I cannot do anything about this error - without an output
 			text += written;
 		}
+#ifndef WIN32
 		fcntl (sys.outfd, F_SETFL, origflags);
+#endif
 	}
 	//fprintf(stdout, "%s", text);
 }
 
 char *Sys_ConsoleInput(void)
 {
-	//if (cls.state == ca_dedicated)
-	{
-		static char text[MAX_INPUTLINE];
-		static unsigned int len = 0;
+	static char text[MAX_INPUTLINE];
+	static unsigned int len = 0;
 #ifdef WIN32
-		int c;
+	int c;
 
-		// read a line out
-		while (_kbhit ())
+	// read a line out
+	while (_kbhit ())
+	{
+		c = _getch ();
+		if (c == '\r')
 		{
-			c = _getch ();
-			if (c == '\r')
-			{
-				text[len] = '\0';
-				_putch ('\n');
-				len = 0;
-				return text;
-			}
-			if (c == '\b')
-			{
-				if (len)
-				{
-					_putch (c);
-					_putch (' ');
-					_putch (c);
-					len--;
-				}
-				continue;
-			}
-			if (len < sizeof (text) - 1)
+			text[len] = '\0';
+			_putch ('\n');
+			len = 0;
+			return text;
+		}
+		if (c == '\b')
+		{
+			if (len)
 			{
 				_putch (c);
-				text[len] = c;
-				len++;
+				_putch (' ');
+				_putch (c);
+				len--;
 			}
+			continue;
+		}
+		if (len < sizeof (text) - 1)
+		{
+			_putch (c);
+			text[len] = c;
+			len++;
 		}
+	}
 #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) - 1);
+		if (len >= 1)
 		{
-			len = read (0, text, sizeof(text) - 1);
-			if (len >= 1)
-			{
-				// rip off the \n and terminate
-				// div0: WHY? console code can deal with \n just fine
-				// this caused problems with pasting stuff into a terminal window
-				// so, not ripping off the \n, but STILL keeping a NUL terminator
-				text[len] = 0;
-				return text;
-			}
+			// rip off the \n and terminate
+			// div0: WHY? console code can deal with \n just fine
+			// this caused problems with pasting stuff into a terminal window
+			// so, not ripping off the \n, but STILL keeping a NUL terminator
+			text[len] = 0;
+			return text;
 		}
-#endif
 	}
+#endif
 	return NULL;
 }
 
@@ -148,22 +151,28 @@ int main (int argc, char **argv)
 	Sys_ProvideSelfFD();
 
 	// COMMANDLINEOPTION: sdl: -noterminal disables console output on stdout
-	if(COM_CheckParm("-noterminal"))
+	if(Sys_CheckParm("-noterminal"))
 		sys.outfd = -1;
 	// COMMANDLINEOPTION: sdl: -stderr moves console output to stderr
-	else if(COM_CheckParm("-stderr"))
+	else if(Sys_CheckParm("-stderr"))
 		sys.outfd = 2;
 	else
 		sys.outfd = 1;
+#ifndef WIN32
+	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NONBLOCK);
+#endif
 
-	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NDELAY);
+	// used by everything
+	Memory_Init();
 
 	Host_Main();
 
+	Sys_Quit(0);
+
 	return 0;
 }
 
-qboolean sys_supportsdlgetticks = false;
+qbool sys_supportsdlgetticks = false;
 unsigned int Sys_SDL_GetTicks (void)
 {
 	Sys_Error("Called Sys_SDL_GetTicks on non-SDL target");