Rename q3shaderinfo_t to shader_t, to be in line with other engines

[xonotic/darkplaces.git] / sys_sdl.c

diff --git a/sys_sdl.c b/sys_sdl.c
index 819848614080f06cbe5d79d6c05568bf38c30590..9285f55dadf29ba177c00ddec7beb718438f2ad2 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -10,10 +10,6 @@
 
 #ifdef __ANDROID__
 #include <android/log.h>
-
-#ifndef FNDELAY
-#define FNDELAY                O_NDELAY
-#endif
 #endif
 
 #include <signal.h>
@@ -29,6 +25,8 @@
 
 #include "quakedef.h"
 
+sys_t sys;
+
 // =======================================================================
 // General routines
 // =======================================================================
@@ -39,7 +37,7 @@ void Sys_Shutdown (void)
        Sys_AllowProfiling(false);
 #endif
 #ifndef WIN32
-       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
+       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NDELAY);
 #endif
        fflush(stdout);
        SDL_Quit();
@@ -53,14 +51,14 @@ void Sys_Error (const char *error, ...)
 
 // change stdin to non blocking
 #ifndef WIN32
-       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
+       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NDELAY);
 #endif
 
        va_start (argptr,error);
        dpvsnprintf (string, sizeof (string), error, argptr);
        va_end (argptr);
 
-       Con_Errorf ("Engine Error: %s\n", string);
+       Con_Printf(CON_ERROR "Engine Error: %s\n", string);
        
        if(!nocrashdialog)
                SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Engine Error", string, NULL);
@@ -69,36 +67,35 @@ void Sys_Error (const char *error, ...)
        exit (1);
 }
 
-static int outfd = 1;
 void Sys_PrintToTerminal(const char *text)
 {
 #ifdef __ANDROID__
        if (developer.integer > 0)
        {
-               __android_log_write(ANDROID_LOG_DEBUG, com_argv[0], text);
+               __android_log_write(ANDROID_LOG_DEBUG, sys.argv[0], text);
        }
 #else
-       if(outfd < 0)
+       if(sys.outfd < 0)
                return;
-#ifdef FNDELAY
+#ifdef O_NDELAY
        // BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
        // this is because both go to /dev/tty by default!
        {
-               int origflags = fcntl (outfd, F_GETFL, 0);
-               fcntl (outfd, F_SETFL, origflags & ~FNDELAY);
+               int origflags = fcntl (sys.outfd, F_GETFL, 0);
+               fcntl (sys.outfd, F_SETFL, origflags & ~O_NDELAY);
 #endif
 #ifdef WIN32
 #define write _write
 #endif
                while(*text)
                {
-                       fs_offset_t written = (fs_offset_t)write(outfd, text, (int)strlen(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;
                }
-#ifdef FNDELAY
-               fcntl (outfd, F_SETFL, origflags);
+#ifdef O_NDELAY
+               fcntl (sys.outfd, F_SETFL, origflags);
        }
 #endif
        //fprintf(stdout, "%s", text);
@@ -173,7 +170,7 @@ char *Sys_GetClipboardData (void)
        cliptext = SDL_GetClipboardText();
        if (cliptext != NULL) {
                size_t allocsize;
-               allocsize = strlen(cliptext) + 1;
+               allocsize = min(MAX_INPUTLINE, strlen(cliptext) + 1);
                data = (char *)Z_Malloc (allocsize);
                strlcpy (data, cliptext, allocsize);
                SDL_free(cliptext);
@@ -194,8 +191,9 @@ int main (int argc, char *argv[])
        Sys_AllowProfiling(true);
 #endif
 
-       com_argc = argc;
-       com_argv = (const char **)argv;
+       sys.selffd = -1;
+       sys.argc = argc;
+       sys.argv = (const char **)argv;
 
        // Sys_Error this early in startup might screw with automated
        // workflows or something if we show the dialog by default.
@@ -208,15 +206,15 @@ int main (int argc, char *argv[])
                nocrashdialog = false;
        // COMMANDLINEOPTION: sdl: -noterminal disables console output on stdout
        if(COM_CheckParm("-noterminal"))
-               outfd = -1;
+               sys.outfd = -1;
        // COMMANDLINEOPTION: sdl: -stderr moves console output to stderr
        else if(COM_CheckParm("-stderr"))
-               outfd = 2;
+               sys.outfd = 2;
        else
-               outfd = 1;
+               sys.outfd = 1;
 
 #ifndef WIN32
-       fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
+       fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NDELAY);
 #endif
 
        // we don't know which systems we'll want to init, yet...