X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=4a908537cce4c72f4c56ac3efae71c0481a0c43e;hb=f68ef7b22979928fb6b8d2ba6b28e14c4caeb7c2;hp=fd3642f1d698fc6baf428ef2f1f3a18b3eecdf23;hpb=ff46d6ff516fda192c5adc55a5c9b82007545bd2;p=xonotic%2Fdarkplaces.git diff --git a/sys_sdl.c b/sys_sdl.c index fd3642f1..4a908537 100644 --- a/sys_sdl.c +++ b/sys_sdl.c @@ -1,5 +1,7 @@ +#include "quakedef.h" #ifdef WIN32 +#include #include "conio.h" #else #include @@ -9,34 +11,26 @@ #include -#include "quakedef.h" - #include -#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); + 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,9 +38,10 @@ 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); Host_Shutdown (); exit (1); @@ -54,7 +49,24 @@ void Sys_Error (const char *error, ...) 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); +#else +#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; + } +#ifndef WIN32 + fcntl (1, F_SETFL, origflags); +#endif + //fprintf(stdout, "%s", text); } double Sys_DoubleTime (void) @@ -62,59 +74,8 @@ 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) SDL_GetTicks() / 1000.0; - 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)) - 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 - } -#else - struct timeval tp; - gettimeofday(&tp, NULL); - newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0; -#endif if (first) { @@ -128,6 +89,10 @@ double Sys_DoubleTime (void) 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; @@ -139,7 +104,7 @@ char *Sys_ConsoleInput(void) { if (cls.state == ca_dedicated) { - static char text[256]; + static char text[MAX_INPUTLINE]; int len = 0; #ifdef WIN32 int c; @@ -148,11 +113,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 +125,8 @@ char *Sys_ConsoleInput(void) { if (len) { - putch (' '); - putch (c); + _putch (' '); + _putch (c); len--; text[len] = 0; } @@ -195,41 +160,63 @@ char *Sys_ConsoleInput(void) return NULL; } -void Sys_Sleep(int milliseconds) +void Sys_Sleep(int microseconds) { - if (milliseconds < 1) - milliseconds = 1; - SDL_Delay(milliseconds); + SDL_Delay(microseconds / 1000); } -int SDL_main (int argc, char *argv[]) +char *Sys_GetClipboardData (void) { - double frameoldtime, framenewtime; +#ifdef WIN32 + char *data = NULL; + char *cliptext; + if (OpenClipboard (NULL) != 0) + { + HANDLE hClipboardData; + + if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0) + { + if ((cliptext = (char *)GlobalLock (hClipboardData)) != 0) + { + size_t allocsize; + allocsize = GlobalSize (hClipboardData) + 1; + data = (char *)Z_Malloc (allocsize); + strlcpy (data, cliptext, allocsize); + GlobalUnlock (hClipboardData); + } + } + CloseClipboard (); + } + return data; +#else + return NULL; +#endif +} + +void Sys_InitConsole (void) +{ +} + +void Sys_Init_Commands (void) +{ +} + +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(); - - Sys_Shared_LateInit(); + // we don't know which systems we'll want to init, yet... + SDL_Init(0); - frameoldtime = Sys_DoubleTime () - 0.1; - while (1) - { - // find time spent rendering last frame - framenewtime = Sys_DoubleTime (); - - Host_Frame (framenewtime - frameoldtime); + Host_Main(); - frameoldtime = framenewtime; - } return 0; }