-#include "quakedef.h"
#ifdef WIN32
+#ifdef _MSC_VER
+#pragma comment(lib, "sdl.lib")
+#pragma comment(lib, "sdlmain.lib")
+#endif
#include <io.h>
#include "conio.h"
#else
#include <unistd.h>
#include <fcntl.h>
#include <sys/time.h>
-#include <time.h>
#endif
#include <signal.h>
#include <SDL.h>
-cvar_t sys_usenoclockbutbenchmark = {CVAR_SAVE, "sys_usenoclockbutbenchmark", "0", "don't use ANY real timing, and simulate a clock (for benchmarking); the game then runs as fast as possible. Run a QC mod with bots that does some stuff, then does a quit at the end, to benchmark a server. NEVER do this on a public server."};
-static unsigned long benchmark_time;
-
-#ifndef WIN32
-# ifndef MACOSX
-cvar_t sys_useclockgettime = {CVAR_SAVE, "sys_useclockgettime", "0", "use POSIX clock_gettime function (which has issues if the system clock speed is far off, as it can't get fixed by NTP) for timing rather than gettimeofday (which has issues if the system time is stepped by ntpdate, or apparently on some Xen installations)"};
-# endif
-cvar_t sys_usegettimeofday = {CVAR_SAVE, "sys_usegettimeofday", "0", "use gettimeofday (which has issues if the system time is stepped by ntpdate, or apparently on some Xen installations) which has microsecond precision rather than SDL_GetTicks (which has only millisecond precision)"};
-#endif
-
+#include "quakedef.h"
// =======================================================================
// General routines
exit (1);
}
+static int outfd = 1;
void Sys_PrintToTerminal(const char *text)
{
-#ifndef WIN32
+ 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);
-#else
+ // this is because both go to /dev/tty by default!
+ {
+ int origflags = fcntl (outfd, F_GETFL, 0);
+ fcntl (outfd, F_SETFL, origflags & ~FNDELAY);
+#endif
+#ifdef WIN32
#define write _write
#endif
- while(*text)
- {
- 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;
+ while(*text)
+ {
+ fs_offset_t written = (fs_offset_t)write(outfd, text, 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;
- if(sys_usenoclockbutbenchmark.integer)
- {
- benchmark_time += 1;
- return ((double) benchmark_time) / 1e6;
- }
- // use higher precision timers on some platforms
-#ifndef WIN32
-# ifndef MACOSX
- if (sys_useclockgettime.integer)
- {
- struct timespec ts;
-# ifdef SUNOS
- clock_gettime(CLOCK_HIGHRES, &ts);
-# else
- clock_gettime(CLOCK_MONOTONIC, &ts);
-# endif
- newtime = (double) ts.tv_sec + ts.tv_nsec / 1000000000.0;
- }
- else if (sys_usegettimeofday.integer)
-# endif
- {
- struct timeval tp;
- gettimeofday(&tp, NULL);
- newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0;
- }
- else
-#endif
- {
- 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 if (newtime > oldtime + 1800)
- {
- Con_Printf("Sys_DoubleTime: time stepped forward (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime);
- }
- else
- curtime += newtime - oldtime;
- oldtime = newtime;
-
- return curtime;
-}
-
char *Sys_ConsoleInput(void)
{
if (cls.state == ca_dedicated)
return NULL;
}
-void Sys_Sleep(int microseconds)
-{
- if(sys_usenoclockbutbenchmark.integer)
- {
- benchmark_time += microseconds;
- return;
- }
- SDL_Delay(microseconds / 1000);
-}
-
char *Sys_GetClipboardData (void)
{
#ifdef WIN32
{
}
-void Sys_Init_Commands (void)
-{
- Cvar_RegisterVariable(&sys_usenoclockbutbenchmark);
-#ifndef WIN32
-# ifndef MACOSX
- Cvar_RegisterVariable(&sys_useclockgettime);
-# endif
- Cvar_RegisterVariable(&sys_usegettimeofday);
-#endif
-}
-
int main (int argc, char *argv[])
{
signal(SIGFPE, SIG_IGN);
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);
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);
+}
projects / xonotic / darkplaces.git / blobdiff