+#include "quakedef.h"
#ifdef WIN32
+#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 "quakedef.h"
-
#ifdef WIN32
-cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
+cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1", "use windows timeGetTime function (which has issues on some motherboards) for timing rather than QueryPerformanceCounter timer (which has issues on multicore/multiprocessor machines and processors which are designed to conserve power)"};
+#else
+# 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
#endif
// =======================================================================
// General routines
// =======================================================================
-
-void Sys_Quit (void)
+void Sys_Shutdown (void)
{
- Host_Shutdown();
#ifndef WIN32
fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
#endif
fflush(stdout);
- exit(0);
}
void Sys_Error (const char *error, ...)
{
va_list argptr;
- char string[1024];
+ char string[MAX_INPUTLINE];
// change stdin to non blocking
#ifndef WIN32
#endif
va_start (argptr,error);
- vsprintf (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);
Host_Shutdown ();
exit (1);
}
-void Sys_Print(const char *text)
+void Sys_PrintToTerminal(const char *text)
{
- printf("%s", text);
+#ifndef WIN32
+ // 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)
+ {
+ 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;
+ }
+#ifndef WIN32
+ fcntl (1, F_SETFL, origflags);
+#endif
+ //fprintf(stdout, "%s", text);
}
double Sys_DoubleTime (void)
static double oldtime = 0.0, curtime = 0.0;
double newtime;
#ifdef WIN32
+#include <mmsystem.h>
// 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)
{
LARGE_INTEGER PerformanceCount;
if (!QueryPerformanceFrequency (&PerformanceFreq))
- Sys_Error ("No hardware timer available");
+ {
+ Con_Printf ("No hardware timer available\n");
+ // fall back to timeGetTime
+ Cvar_SetValueQuick(&sys_usetimegettime, true);
+ return Sys_DoubleTime();
+ }
QueryPerformanceCounter (&PerformanceCount);
#ifdef __BORLANDC__
#endif
}
#else
- struct timeval tp;
- gettimeofday(&tp, NULL);
- newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0;
+# 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
+# endif
+ {
+ struct timeval tp;
+ gettimeofday(&tp, NULL);
+ newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0;
+ }
#endif
if (first)
{
if (cls.state == ca_dedicated)
{
- static char text[256];
- int len;
+ static char text[MAX_INPUTLINE];
+ static unsigned int len = 0;
#ifdef WIN32
int c;
while (_kbhit ())
{
c = _getch ();
- putch (c);
if (c == '\r')
{
- text[len] = 0;
+ text[len] = '\0';
putch ('\n');
len = 0;
return text;
}
- if (c == 8)
+ if (c == '\b')
{
if (len)
{
+ putch (c);
putch (' ');
putch (c);
len--;
- text[len] = 0;
}
continue;
}
- text[len] = c;
- len++;
- text[len] = 0;
- if (len == sizeof (text))
- len = 0;
+ if (len < sizeof (text) - 1)
+ {
+ putch (c);
+ text[len] = c;
+ len++;
+ }
}
#else
fd_set fdset;
return NULL;
}
-void Sys_Sleep(void)
+void Sys_Sleep(int microseconds)
{
#ifdef WIN32
- Sleep (1);
+ Sleep(microseconds / 1000);
#else
- usleep(1);
+ usleep(microseconds);
#endif
}
-int main (int argc, const char **argv)
+char *Sys_GetClipboardData (void)
+{
+ return NULL;
+}
+
+void Sys_InitConsole (void)
{
- double frameoldtime, framenewtime;
+}
+
+void Sys_Init_Commands (void)
+{
+#ifdef WIN32
+ Cvar_RegisterVariable(&sys_usetimegettime);
+#else
+# ifndef MACOSX
+ Cvar_RegisterVariable(&sys_useclockgettime);
+# endif
+#endif
+}
+int main (int argc, char **argv)
+{
signal(SIGFPE, SIG_IGN);
com_argc = argc;
- com_argv = argv;
+ com_argv = (const char **)argv;
#ifndef WIN32
fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
#endif
- Sys_Shared_EarlyInit();
-
- Host_Init();
+ Host_Main();
- Sys_Shared_LateInit();
-
- frameoldtime = Sys_DoubleTime () - 0.1;
- while (1)
- {
- // find time spent rendering last frame
- framenewtime = Sys_DoubleTime ();
-
- Host_Frame (framenewtime - frameoldtime);
-
- frameoldtime = framenewtime;
- }
return 0;
}
projects / xonotic / darkplaces.git / blobdiff