Made RENDERPATH_GL20 require fbo support and always use it.

[xonotic/darkplaces.git] / sys_sdl.c

diff --git a/sys_sdl.c b/sys_sdl.c
index 702cfaf881a85c7c801c72b22e476723f89af3af..d3564bac89fb0a76a699f9da6ddd092ef9b213ed 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -8,18 +8,41 @@
 #include <sys/time.h>
 #endif
 
-#include <signal.h>
+#ifdef __ANDROID__
+#include <android/log.h>
 
-#include "quakedef.h"
+#ifndef FNDELAY
+#define FNDELAY                O_NDELAY
+#endif
+#endif
+
+#include <signal.h>
 
 #include <SDL.h>
 
+#ifdef WIN32
+#ifdef _MSC_VER
+#if SDL_MAJOR_VERSION == 1
+#pragma comment(lib, "sdl.lib")
+#pragma comment(lib, "sdlmain.lib")
+#else
+#pragma comment(lib, "sdl2.lib")
+#pragma comment(lib, "sdl2main.lib")
+#endif
+#endif
+#endif
+
+#include "quakedef.h"
+
 // =======================================================================
 // General routines
 // =======================================================================
 
 void Sys_Shutdown (void)
 {
+#ifdef __ANDROID__
+       Sys_AllowProfiling(false);
+#endif
 #ifndef WIN32
        fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
 #endif
@@ -44,60 +67,53 @@ void Sys_Error (const char *error, ...)
 
        Con_Printf ("Quake Error: %s\n", string);
 
+#ifdef WIN32
+       MessageBox(NULL, string, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
+#endif
+
        Host_Shutdown ();
        exit (1);
 }
 
+static int outfd = 1;
 void Sys_PrintToTerminal(const char *text)
 {
-#ifndef WIN32
+#ifdef __ANDROID__
+       if (developer.integer > 0)
+       {
+               __android_log_write(ANDROID_LOG_DEBUG, com_argv[0], text);
+       }
+#else
+       if(outfd < 0)
+               return;
+#ifdef FNDELAY
        // 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)
+       // this is because both go to /dev/tty by default!
        {
-               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;
+               int origflags = fcntl (outfd, F_GETFL, 0);
+               fcntl (outfd, F_SETFL, origflags & ~FNDELAY);
+#endif
+#ifdef WIN32
+#define write _write
+#endif
+               while(*text)
+               {
+                       fs_offset_t written = (fs_offset_t)write(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);
        }
-#ifndef WIN32
-       fcntl (1, F_SETFL, origflags);
 #endif
        //fprintf(stdout, "%s", text);
-}
-
-double Sys_DoubleTime (void)
-{
-       static int first = true;
-       static double oldtime = 0.0, curtime = 0.0;
-       double newtime;
-       newtime = (double) SDL_GetTicks() / 1000.0;
-
-
-       if (first)
-       {
-               first = false;
-               oldtime = newtime;
-       }
-
-       if (newtime < oldtime)
-       {
-               // warn if it's significant
-               if (newtime - oldtime < -0.01)
-                       Con_Printf("Sys_DoubleTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime);
-       }
-       else
-               curtime += newtime - oldtime;
-       oldtime = newtime;
-
-       return curtime;
+#endif
 }
 
 char *Sys_ConsoleInput(void)
 {
-       if (cls.state == ca_dedicated)
+//     if (cls.state == ca_dedicated)
        {
                static char text[MAX_INPUTLINE];
                int len = 0;
@@ -108,11 +124,11 @@ char *Sys_ConsoleInput(void)
                while (_kbhit ())
                {
                        c = _getch ();
-                       putch (c);
+                       _putch (c);
                        if (c == '\r')
                        {
                                text[len] = 0;
-                               putch ('\n');
+                               _putch ('\n');
                                len = 0;
                                return text;
                        }
@@ -120,8 +136,8 @@ char *Sys_ConsoleInput(void)
                        {
                                if (len)
                                {
-                                       putch (' ');
-                                       putch (c);
+                                       _putch (' ');
+                                       _putch (c);
                                        len--;
                                        text[len] = 0;
                                }
@@ -155,16 +171,23 @@ char *Sys_ConsoleInput(void)
        return NULL;
 }
 
-void Sys_Sleep(int milliseconds)
-{
-       if (milliseconds < 1)
-               milliseconds = 1;
-       SDL_Delay(milliseconds);
-}
-
 char *Sys_GetClipboardData (void)
 {
-#ifdef WIN32
+#if SDL_MAJOR_VERSION != 1
+       char *data = NULL;
+       char *cliptext;
+
+       cliptext = SDL_GetClipboardText();
+       if (cliptext != NULL) {
+               size_t allocsize;
+               allocsize = strlen(cliptext) + 1;
+               data = (char *)Z_Malloc (allocsize);
+               strlcpy (data, cliptext, allocsize);
+               SDL_free(cliptext);
+       }
+
+       return data;
+#elif defined(WIN32)
        char *data = NULL;
        char *cliptext;
 
@@ -174,11 +197,11 @@ char *Sys_GetClipboardData (void)
 
                if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
                {
-                       if ((cliptext = GlobalLock (hClipboardData)) != 0)
+                       if ((cliptext = (char *)GlobalLock (hClipboardData)) != 0)
                        {
                                size_t allocsize;
                                allocsize = GlobalSize (hClipboardData) + 1;
-                               data = Z_Malloc (allocsize);
+                               data = (char *)Z_Malloc (allocsize);
                                strlcpy (data, cliptext, allocsize);
                                GlobalUnlock (hClipboardData);
                        }
@@ -195,16 +218,26 @@ void Sys_InitConsole (void)
 {
 }
 
-void Sys_Init_Commands (void)
-{
-}
-
 int main (int argc, char *argv[])
 {
        signal(SIGFPE, SIG_IGN);
 
+#ifdef __ANDROID__
+       Sys_AllowProfiling(true);
+#endif
+
        com_argc = argc;
        com_argv = (const char **)argv;
+       Sys_ProvideSelfFD();
+
+       // COMMANDLINEOPTION: sdl: -noterminal disables console output on stdout
+       if(COM_CheckParm("-noterminal"))
+               outfd = -1;
+       // COMMANDLINEOPTION: sdl: -stderr moves console output to stderr
+       else if(COM_CheckParm("-stderr"))
+               outfd = 2;
+       else
+               outfd = 1;
 
 #ifndef WIN32
        fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
@@ -217,3 +250,13 @@ int main (int argc, char *argv[])
 
        return 0;
 }
+
+qboolean sys_supportsdlgetticks = true;
+unsigned int Sys_SDL_GetTicks (void)
+{
+       return SDL_GetTicks();
+}
+void Sys_SDL_Delay (unsigned int milliseconds)
+{
+       SDL_Delay(milliseconds);
+}