Merge PR 'Add a third masterextra and default it to dpm.dpmaster.org'

[xonotic/darkplaces.git] / sys_sdl.c

diff --git a/sys_sdl.c b/sys_sdl.c
index e57bd669cfce35a14dd0b82396061521e1b5586b..1bf22cd08463c11279ddb3a70c93252a38994e9e 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,6 +1,5 @@
-
 #ifdef WIN32
-#include <io.h>
+#include <io.h> // Include this BEFORE darkplaces.h because it uses strncpy which trips DP_STATIC_ASSERT
 #include "conio.h"
 #else
 #include <unistd.h>
@@ -14,8 +13,14 @@
 
 #include <signal.h>
 
+/*
+ * Include this BEFORE darkplaces.h because it breaks wrapping
+ * _Static_assert. Cloudwalk has no idea how or why so don't ask.
+ */
 #include <SDL.h>
 
+#include "darkplaces.h"
+
 #ifdef WIN32
 #ifdef _MSC_VER
 #pragma comment(lib, "sdl2.lib")
@@ -23,8 +28,6 @@
 #endif
 #endif
 
-#include "quakedef.h"
-
 sys_t sys;
 
 // =======================================================================
@@ -37,13 +40,13 @@ void Sys_Shutdown (void)
        Sys_AllowProfiling(false);
 #endif
 #ifndef WIN32
-       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NDELAY);
+       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
 #endif
        fflush(stdout);
        SDL_Quit();
 }
 
-static qboolean nocrashdialog;
+static qbool nocrashdialog;
 void Sys_Error (const char *error, ...)
 {
        va_list argptr;
@@ -51,7 +54,7 @@ void Sys_Error (const char *error, ...)
 
 // change stdin to non blocking
 #ifndef WIN32
-       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NDELAY);
+       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
 #endif
 
        va_start (argptr,error);
@@ -63,11 +66,11 @@ void Sys_Error (const char *error, ...)
        if(!nocrashdialog)
                SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Engine Error", string, NULL);
 
-       Host_Shutdown ();
+       //Host_Shutdown ();
        exit (1);
 }
 
-void Sys_PrintToTerminal(const char *text)
+void Sys_Print(const char *text)
 {
 #ifdef __ANDROID__
        if (developer.integer > 0)
@@ -77,12 +80,12 @@ void Sys_PrintToTerminal(const char *text)
 #else
        if(sys.outfd < 0)
                return;
-#ifdef O_NDELAY
+#ifndef WIN32
        // 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 (sys.outfd, F_GETFL, 0);
-               fcntl (sys.outfd, F_SETFL, origflags & ~O_NDELAY);
+               fcntl (sys.outfd, F_SETFL, origflags & ~O_NONBLOCK);
 #endif
 #ifdef WIN32
 #define write _write
@@ -94,7 +97,7 @@ void Sys_PrintToTerminal(const char *text)
                                break; // sorry, I cannot do anything about this error - without an output
                        text += written;
                }
-#ifdef O_NDELAY
+#ifndef WIN32
                fcntl (sys.outfd, F_SETFL, origflags);
        }
 #endif
@@ -104,61 +107,58 @@ void Sys_PrintToTerminal(const char *text)
 
 char *Sys_ConsoleInput(void)
 {
-//     if (cls.state == ca_dedicated)
-       {
-               static char text[MAX_INPUTLINE];
-               int len = 0;
+       static char text[MAX_INPUTLINE];
+       int len = 0;
 #ifdef WIN32
-               int c;
+       int c;
 
-               // read a line out
-               while (_kbhit ())
+       // read a line out
+       while (_kbhit ())
+       {
+               c = _getch ();
+               _putch (c);
+               if (c == '\r')
+               {
+                       text[len] = 0;
+                       _putch ('\n');
+                       len = 0;
+                       return text;
+               }
+               if (c == 8)
                {
-                       c = _getch ();
-                       _putch (c);
-                       if (c == '\r')
+                       if (len)
                        {
+                               _putch (' ');
+                               _putch (c);
+                               len--;
                                text[len] = 0;
-                               _putch ('\n');
-                               len = 0;
-                               return text;
-                       }
-                       if (c == 8)
-                       {
-                               if (len)
-                               {
-                                       _putch (' ');
-                                       _putch (c);
-                                       len--;
-                                       text[len] = 0;
-                               }
-                               continue;
                        }
-                       text[len] = c;
-                       len++;
-                       text[len] = 0;
-                       if (len == sizeof (text))
-                               len = 0;
+                       continue;
                }
+               text[len] = c;
+               len++;
+               text[len] = 0;
+               if (len == sizeof (text))
+                       len = 0;
+       }
 #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));
+               if (len >= 1)
                {
-                       len = read (0, text, sizeof(text));
-                       if (len >= 1)
-                       {
-                               // rip off the \n and terminate
-                               text[len-1] = 0;
-                               return text;
-                       }
+                       // rip off the \n and terminate
+                       text[len-1] = 0;
+                       return text;
                }
-#endif
        }
+#endif
        return NULL;
 }
 
@@ -179,10 +179,6 @@ char *Sys_GetClipboardData (void)
        return data;
 }
 
-void Sys_InitConsole (void)
-{
-}
-
 int main (int argc, char *argv[])
 {
        signal(SIGFPE, SIG_IGN);
@@ -202,24 +198,27 @@ int main (int argc, char *argv[])
        Sys_ProvideSelfFD();
 
        // COMMANDLINEOPTION: -nocrashdialog disables "Engine Error" crash dialog boxes
-       if(!COM_CheckParm("-nocrashdialog"))
+       if(!Sys_CheckParm("-nocrashdialog"))
                nocrashdialog = false;
        // 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_NDELAY);
+       fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NONBLOCK);
 #endif
 
        // we don't know which systems we'll want to init, yet...
        SDL_Init(0);
 
+       // used by everything
+       Memory_Init();
+
        Host_Main();
 
        Sys_Quit(0);
@@ -227,7 +226,7 @@ int main (int argc, char *argv[])
        return 0;
 }
 
-qboolean sys_supportsdlgetticks = true;
+qbool sys_supportsdlgetticks = true;
 unsigned int Sys_SDL_GetTicks (void)
 {
        return SDL_GetTicks();