X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=6175b4f5e31f8bdc7d893fc343339c74664a0fdc;hb=94a5be97432b0a538c0200cd0c837253b65633bf;hp=bc48f44049ef53cf6a54215ddded806de7ed7c37;hpb=6631251252a526c873d18d381d26a47bafe5ab51;p=xonotic%2Fdarkplaces.git diff --git a/sys_sdl.c b/sys_sdl.c index bc48f440..6175b4f5 100644 --- a/sys_sdl.c +++ b/sys_sdl.c @@ -1,5 +1,10 @@ #ifdef WIN32 +#ifdef _MSC_VER +#pragma comment(lib, "sdl.lib") +#pragma comment(lib, "sdlmain.lib") +#endif +#include #include "conio.h" #else #include @@ -9,13 +14,9 @@ #include -#include "quakedef.h" - #include -#ifdef WIN32 -cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"}; -#endif +#include "quakedef.h" // ======================================================================= // General routines @@ -29,12 +30,12 @@ void Sys_Shutdown (void) fflush(stdout); 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 @@ -42,80 +43,49 @@ 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); } +static int outfd = 1; void Sys_PrintToTerminal(const char *text) { - printf("%s", text); -} - -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) + if(outfd < 0) + return; +#ifdef FNDELAY + // BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0). + // this is because both go to /dev/tty by default! { - // 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 + int origflags = fcntl (outfd, F_GETFL, 0); + fcntl (outfd, F_SETFL, origflags & ~FNDELAY); #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); +#ifdef WIN32 +#define write _write +#endif + 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); } - else - curtime += newtime - oldtime; - oldtime = newtime; - - return curtime; +#endif + //fprintf(stdout, "%s", text); } 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; @@ -124,11 +94,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; } @@ -136,8 +106,8 @@ char *Sys_ConsoleInput(void) { if (len) { - putch (' '); - putch (c); + _putch (' '); + _putch (c); len--; text[len] = 0; } @@ -171,45 +141,74 @@ char *Sys_ConsoleInput(void) return NULL; } -void Sys_Sleep(int milliseconds) +char *Sys_GetClipboardData (void) { - if (milliseconds < 1) - milliseconds = 1; - SDL_Delay(milliseconds); +#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 } -int SDL_main (int argc, char *argv[]) +void Sys_InitConsole (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; + 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); #endif - Sys_Shared_EarlyInit(); + // we don't know which systems we'll want to init, yet... + SDL_Init(0); -#ifdef WIN32 - Cvar_RegisterVariable(&sys_usetimegettime); -#endif - - 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; } + +qboolean sys_supportsdlgetticks = true; +unsigned int Sys_SDL_GetTicks (void) +{ + return SDL_GetTicks(); +} +void Sys_SDL_Delay (unsigned int milliseconds) +{ + SDL_Delay(milliseconds); +}