Don't Mod_BuildTextureVectorsFromNormals if 2D. 5-10% performance improvement

[xonotic/darkplaces.git] / sys_linux.c

diff --git a/sys_linux.c b/sys_linux.c
index 167121a83bd9381f4fc1541de1268b826b3e3bfe..24ea6482d515ced9dc5262055acfb2bd64e5990e 100644 (file)
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -1,4 +1,3 @@
-#include "quakedef.h"
 
 #ifdef WIN32
 #include <windows.h>
@@ -6,22 +5,23 @@
 #include <io.h>
 #include "conio.h"
 #else
+#include <sys/time.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <time.h>
 #endif
 
 #include <signal.h>
 
+#include "quakedef.h"
+
+sys_t sys;
 
 // =======================================================================
 // General routines
 // =======================================================================
 void Sys_Shutdown (void)
 {
-#ifdef FNDELAY
-       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
-#endif
+       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NDELAY);
        fflush(stdout);
 }
 
@@ -31,15 +31,13 @@ void Sys_Error (const char *error, ...)
        char string[MAX_INPUTLINE];
 
 // change stdin to non blocking
-#ifdef FNDELAY
-       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
-#endif
+       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NDELAY);
 
        va_start (argptr,error);
        dpvsnprintf (string, sizeof (string), error, argptr);
        va_end (argptr);
 
-       Con_Printf ("Quake Error: %s\n", string);
+       Con_Printf(CON_ERROR "Engine Error: %s\n", string);
 
        Host_Shutdown ();
        exit (1);
@@ -47,24 +45,25 @@ void Sys_Error (const char *error, ...)
 
 void Sys_PrintToTerminal(const char *text)
 {
-#ifdef FNDELAY
+       if(sys.outfd < 0)
+               return;
        // 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
+       // this is because both go to /dev/tty by default!
+       {
+               int origflags = fcntl (sys.outfd, F_GETFL, 0);
+               fcntl (sys.outfd, F_SETFL, origflags & ~O_NDELAY);
 #ifdef WIN32
 #define write _write
 #endif
-       while(*text)
-       {
-               fs_offset_t written = (fs_offset_t)write(1, text, strlen(text));
-               if(written <= 0)
-                       break; // sorry, I cannot do anything about this error - without an output
-               text += written;
+               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;
+               }
+               fcntl (sys.outfd, F_SETFL, origflags);
        }
-#ifdef FNDELAY
-       fcntl (1, F_SETFL, origflags);
-#endif
        //fprintf(stdout, "%s", text);
 }
 
@@ -143,14 +142,21 @@ void Sys_InitConsole (void)
 int main (int argc, char **argv)
 {
        signal(SIGFPE, SIG_IGN);
-
-       com_argc = argc;
-       com_argv = (const char **)argv;
+       sys.selffd = -1;
+       sys.argc = argc;
+       sys.argv = (const char **)argv;
        Sys_ProvideSelfFD();
 
-#ifdef FNDELAY
-       fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
-#endif
+       // COMMANDLINEOPTION: sdl: -noterminal disables console output on stdout
+       if(COM_CheckParm("-noterminal"))
+               sys.outfd = -1;
+       // COMMANDLINEOPTION: sdl: -stderr moves console output to stderr
+       else if(COM_CheckParm("-stderr"))
+               sys.outfd = 2;
+       else
+               sys.outfd = 1;
+
+       fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NDELAY);
 
        Host_Main();