X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_sdl.c;h=c781cfed3cff43f632c862a2e312362ca5887a31;hp=9c7571671333698f9a4ea910f1e529bb9b809e41;hb=50099d9c0934fe93646fa2792fa7a9657422333b;hpb=93ed14242647c8f0ca1ed8d5e3f3238e70671f07 diff --git a/sys_sdl.c b/sys_sdl.c index 9c757167..c781cfed 100644 --- a/sys_sdl.c +++ b/sys_sdl.c @@ -1,5 +1,6 @@ #ifdef WIN32 +#include #include "conio.h" #else #include @@ -13,30 +14,24 @@ #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,17 +39,33 @@ 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); } -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) @@ -62,59 +73,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) { @@ -139,7 +99,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; @@ -195,41 +155,65 @@ char *Sys_ConsoleInput(void) return NULL; } -void Sys_Sleep(int milliseconds) +void Sys_Sleep(int microseconds) +{ + if (microseconds < 1000) + microseconds = 1000; + SDL_Delay(microseconds / 1000); +} + +char *Sys_GetClipboardData (void) +{ +#ifdef WIN32 + char *data = NULL; + char *cliptext; + + if (OpenClipboard (NULL) != 0) + { + HANDLE hClipboardData; + + if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0) + { + if ((cliptext = GlobalLock (hClipboardData)) != 0) + { + size_t allocsize; + allocsize = GlobalSize (hClipboardData) + 1; + data = Z_Malloc (allocsize); + strlcpy (data, cliptext, allocsize); + GlobalUnlock (hClipboardData); + } + } + CloseClipboard (); + } + return data; +#else + return NULL; +#endif +} + +void Sys_InitConsole (void) { - if (milliseconds < 1) - milliseconds = 1; - SDL_Delay(milliseconds); } -int SDL_main (int argc, char *argv[]) +void Sys_Init_Commands (void) { - double frameoldtime, framenewtime; +} +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; }