X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_linux.c;h=4bdaf077dfd565b44cf18bcbb34198d2ed6f7ddc;hp=451844ce69e8ad45dec978e853893a5940e5b561;hb=6f079ecb90e1e6b7597d4da1a98f95c5822aad8d;hpb=80cbaf49351c00ec6dcc52ba01dcad7487ec77ba diff --git a/sys_linux.c b/sys_linux.c index 451844ce..4bdaf077 100644 --- a/sys_linux.c +++ b/sys_linux.c @@ -1,36 +1,32 @@ -#include -#include -#include -#include -#include +#ifdef WIN32 +#include "conio.h" +#else #include #include +#include +#endif #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "quakedef.h" + +#ifdef WIN32 +cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"}; +#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, ...) @@ -39,27 +35,23 @@ void Sys_Error (const char *error, ...) char string[1024]; // change stdin to non blocking +#ifndef WIN32 fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); +#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_Warn (const char *warning, ...) +void Sys_PrintToTerminal(const char *text) { - va_list argptr; - char string[1024]; - - va_start (argptr,warning); - vsprintf (string,warning,argptr); - va_end (argptr); - fprintf(stderr, "Warning: %s", string); + fprintf(stdout, "%s", text); } double Sys_DoubleTime (void) @@ -67,11 +59,64 @@ 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 + { + // 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)) + { + Con_Printf ("No hardware timer available"); + // fall back to timeGetTime + Cvar_SetValueQuick(&sys_usetimegettime, true); + return Sys_DoubleTime(); + } + 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 + } +#else struct timeval tp; - gettimeofday(&tp, NULL); - newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0; +#endif if (first) { @@ -92,51 +137,88 @@ double Sys_DoubleTime (void) return curtime; } -// ======================================================================= -// Sleeps for microseconds -// ======================================================================= - -static volatile int oktogo; - -void alarm_handler(int x) -{ - oktogo=1; -} - -void floating_point_exception_handler(int whatever) -{ - signal(SIGFPE, floating_point_exception_handler); -} - char *Sys_ConsoleInput(void) { - static char text[256]; - int len; - fd_set fdset; - struct timeval timeout; - if (cls.state == ca_dedicated) { + static char text[256]; + static int len = 0; +#ifdef WIN32 + int c; + + // read a line out + while (_kbhit ()) + { + c = _getch (); + if (c == '\r') + { + text[len] = '\0'; + putch ('\n'); + len = 0; + return text; + } + if (c == '\b') + { + if (len) + { + putch (c); + putch (' '); + putch (c); + len--; + } + continue; + } + if (len < sizeof (text) - 1) + { + putch (c); + text[len] = c; + len++; + } + } +#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)) - return NULL; + if (select (1, &fdset, NULL, NULL, &timeout) != -1 && FD_ISSET(0, &fdset)) + { + len = read (0, text, sizeof(text)); + if (len >= 1) + { + // rip off the \n and terminate + text[len-1] = 0; + return text; + } + } +#endif + } + return NULL; +} - len = read (0, text, sizeof(text)); - if (len < 1) - return NULL; - text[len-1] = 0; // rip off the /n and terminate +void Sys_Sleep(int milliseconds) +{ + if (milliseconds < 1) + milliseconds = 1; +#ifdef WIN32 + Sleep(milliseconds); +#else + usleep(milliseconds * 1000); +#endif +} - return text; - } +char *Sys_GetClipboardData (void) +{ return NULL; } -void Sys_Sleep(void) +void Sys_InitConsole (void) +{ +} + +void Sys_Init_Commands (void) { - usleep(1); } int main (int argc, char **argv) @@ -145,23 +227,15 @@ int main (int argc, char **argv) signal(SIGFPE, SIG_IGN); - memset(&host_parms, 0, sizeof(host_parms)); - com_argc = argc; - com_argv = argv; - host_parms.basedir = "."; -#if CACHEENABLE - host_parms.cachedir = "/tmp"; -#endif + com_argv = (const char **)argv; +#ifndef WIN32 fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY); - - Sys_Shared_EarlyInit(); +#endif Host_Init(); - Sys_Shared_LateInit(); - frameoldtime = Sys_DoubleTime () - 0.1; while (1) {