]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - sys_sdl.c
Remove a duplicate definition of qglGetPointerv.
[xonotic/darkplaces.git] / sys_sdl.c
index 9c7571671333698f9a4ea910f1e529bb9b809e41..e63c85ba817117224c0d5a232d6347a50f7beb58 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,5 +1,6 @@
 
 #ifdef WIN32
+#include <io.h>
 #include "conio.h"
 #else
 #include <unistd.h>
@@ -7,36 +8,48 @@
 #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
-cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
+#ifdef _MSC_VER
+#pragma comment(lib, "sdl2.lib")
+#pragma comment(lib, "sdl2main.lib")
+#endif
 #endif
 
-
+#include "quakedef.h"
 
 // =======================================================================
 // General routines
 // =======================================================================
 
-void Sys_Quit (void)
+void Sys_Shutdown (void)
 {
-       Host_Shutdown();
+#ifdef __ANDROID__
+       Sys_AllowProfiling(false);
+#endif
 #ifndef WIN32
        fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
 #endif
        fflush(stdout);
-       exit(0);
+       SDL_Quit();
 }
 
+
 void Sys_Error (const char *error, ...)
 {
        va_list argptr;
-       char string[1024];
+       char string[MAX_INPUTLINE];
 
 // change stdin to non blocking
 #ifndef WIN32
@@ -44,102 +57,60 @@ void Sys_Error (const char *error, ...)
 #endif
 
        va_start (argptr,error);
-       vsnprintf (string, sizeof (string), error, argptr);
+       dpvsnprintf (string, sizeof (string), error, argptr);
        va_end (argptr);
-       fprintf(stderr, "Error: %s\n", string);
+
+       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);
 }
 
-void Sys_Print(const char *text)
+static int outfd = 1;
+void Sys_PrintToTerminal(const char *text)
 {
-       printf("%s", text);
-}
-
-double Sys_DoubleTime (void)
-{
-       static int first = true;
-       static double oldtime = 0.0, curtime = 0.0;
-       double newtime;
-#ifdef WIN32
-       // LordHavoc: note to people modifying this code, DWORD is specifically defined as an unsigned 32bit number, therefore the 65536.0 * 65536.0 is fine.
-       if (sys_usetimegettime.integer)
-       {
-               static int firsttimegettime = true;
-               // timeGetTime
-               // platform:
-               // Windows 95/98/ME/NT/2000/XP
-               // features:
-               // reasonable accuracy (millisecond)
-               // issues:
-               // wraps around every 47 days or so (but this is non-fatal to us, odd times are rejected, only causes a one frame stutter)
-
-               // make sure the timer is high precision, otherwise different versions of windows have varying accuracy
-               if (firsttimegettime)
-               {
-                       timeBeginPeriod (1);
-                       firsttimegettime = false;
-               }
-
-               newtime = (double) timeGetTime () / 1000.0;
-       }
-       else
+#ifdef __ANDROID__
+       if (developer.integer > 0)
        {
-               // QueryPerformanceCounter
-               // platform:
-               // Windows 95/98/ME/NT/2000/XP
-               // features:
-               // very accurate (CPU cycles)
-               // known issues:
-               // does not necessarily match realtime too well (tends to get faster and faster in win98)
-               // wraps around occasionally on some platforms (depends on CPU speed and probably other unknown factors)
-               double timescale;
-               LARGE_INTEGER PerformanceFreq;
-               LARGE_INTEGER PerformanceCount;
-
-               if (!QueryPerformanceFrequency (&PerformanceFreq))
-                       Sys_Error ("No hardware timer available");
-               QueryPerformanceCounter (&PerformanceCount);
-
-               #ifdef __BORLANDC__
-               timescale = 1.0 / ((double) PerformanceFreq.u.LowPart + (double) PerformanceFreq.u.HighPart * 65536.0 * 65536.0);
-               newtime = ((double) PerformanceCount.u.LowPart + (double) PerformanceCount.u.HighPart * 65536.0 * 65536.0) * timescale;
-               #else
-               timescale = 1.0 / ((double) PerformanceFreq.LowPart + (double) PerformanceFreq.HighPart * 65536.0 * 65536.0);
-               newtime = ((double) PerformanceCount.LowPart + (double) PerformanceCount.HighPart * 65536.0 * 65536.0) * timescale;
-               #endif
+               __android_log_write(ANDROID_LOG_DEBUG, com_argv[0], text);
        }
 #else
-       struct timeval tp;
-       gettimeofday(&tp, NULL);
-       newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0;
-#endif
-
-       if (first)
-       {
-               first = false;
-               oldtime = newtime;
-       }
-
-       if (newtime < oldtime)
+       if(outfd < 0)
+               return;
+#ifdef FNDELAY
+       // BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
+       // this is because both go to /dev/tty by default!
        {
-               // 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);
+               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);
        }
-       else
-               curtime += newtime - oldtime;
-       oldtime = newtime;
-
-       return curtime;
+#endif
+       //fprintf(stdout, "%s", text);
+#endif
 }
 
 char *Sys_ConsoleInput(void)
 {
-       if (cls.state == ca_dedicated)
+//     if (cls.state == ca_dedicated)
        {
-               static char text[256];
+               static char text[MAX_INPUTLINE];
                int len = 0;
 #ifdef WIN32
                int c;
@@ -148,11 +119,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;
                        }
@@ -160,8 +131,8 @@ char *Sys_ConsoleInput(void)
                        {
                                if (len)
                                {
-                                       putch (' ');
-                                       putch (c);
+                                       _putch (' ');
+                                       _putch (c);
                                        len--;
                                        text[len] = 0;
                                }
@@ -195,41 +166,66 @@ char *Sys_ConsoleInput(void)
        return NULL;
 }
 
-void Sys_Sleep(int milliseconds)
+char *Sys_GetClipboardData (void)
 {
-       if (milliseconds < 1)
-               milliseconds = 1;
-       SDL_Delay(milliseconds);
+       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;
 }
 
-int SDL_main (int argc, char *argv[])
+void Sys_InitConsole (void)
 {
-       double frameoldtime, framenewtime;
+}
 
+int main (int argc, char *argv[])
+{
        signal(SIGFPE, SIG_IGN);
 
+#ifdef __ANDROID__
+       Sys_AllowProfiling(true);
+#endif
+
        com_argc = argc;
-       com_argv = argv;
+       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);
 #endif
 
-       Sys_Shared_EarlyInit();
-
-       Host_Init();
-
-       Sys_Shared_LateInit();
-
-       frameoldtime = Sys_DoubleTime () - 0.1;
-       while (1)
-       {
-               // find time spent rendering last frame
-               framenewtime = Sys_DoubleTime ();
+       // we don't know which systems we'll want to init, yet...
+       SDL_Init(0);
 
-               Host_Frame (framenewtime - frameoldtime);
+       Host_Main();
 
-               frameoldtime = framenewtime;
-       }
        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);
+}