X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=6175b4f5e31f8bdc7d893fc343339c74664a0fdc;hb=1a606ca4c462e8a9a76cd5e7e085efbecbe90009;hp=d7ed9179f717e3f73231ba240cd7474897ad81c8;hpb=d1a66b1504773e5da10463fd15d524697b0c2ba2;p=xonotic%2Fdarkplaces.git diff --git a/sys_sdl.c b/sys_sdl.c index d7ed9179..6175b4f5 100644 --- a/sys_sdl.c +++ b/sys_sdl.c @@ -1,6 +1,9 @@ -#include "quakedef.h" #ifdef WIN32 +#ifdef _MSC_VER +#pragma comment(lib, "sdl.lib") +#pragma comment(lib, "sdlmain.lib") +#endif #include #include "conio.h" #else @@ -13,6 +16,8 @@ #include +#include "quakedef.h" + // ======================================================================= // General routines // ======================================================================= @@ -47,53 +52,35 @@ void Sys_Error (const char *error, ...) exit (1); } +static int outfd = 1; void Sys_PrintToTerminal(const char *text) { -#ifndef WIN32 + if(outfd < 0) + return; +#ifdef FNDELAY // 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) + // this is because both go to /dev/tty by default! { - 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; + int origflags = fcntl (outfd, F_GETFL, 0); + fcntl (outfd, F_SETFL, origflags & ~FNDELAY); +#endif +#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); } -#ifndef WIN32 - fcntl (1, F_SETFL, origflags); #endif //fprintf(stdout, "%s", text); } -double Sys_DoubleTime (void) -{ - static int first = true; - static double oldtime = 0.0, curtime = 0.0; - double newtime; - 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); - } - else - curtime += newtime - oldtime; - oldtime = newtime; - - return curtime; -} - char *Sys_ConsoleInput(void) { if (cls.state == ca_dedicated) @@ -107,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; } @@ -119,8 +106,8 @@ char *Sys_ConsoleInput(void) { if (len) { - putch (' '); - putch (c); + _putch (' '); + _putch (c); len--; text[len] = 0; } @@ -154,13 +141,6 @@ char *Sys_ConsoleInput(void) return NULL; } -void Sys_Sleep(int microseconds) -{ - if (microseconds < 1000) - microseconds = 1000; - SDL_Delay(microseconds / 1000); -} - char *Sys_GetClipboardData (void) { #ifdef WIN32 @@ -173,11 +153,11 @@ char *Sys_GetClipboardData (void) if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0) { - if ((cliptext = GlobalLock (hClipboardData)) != 0) + if ((cliptext = (char *)GlobalLock (hClipboardData)) != 0) { size_t allocsize; allocsize = GlobalSize (hClipboardData) + 1; - data = Z_Malloc (allocsize); + data = (char *)Z_Malloc (allocsize); strlcpy (data, cliptext, allocsize); GlobalUnlock (hClipboardData); } @@ -194,16 +174,22 @@ void Sys_InitConsole (void) { } -void Sys_Init_Commands (void) -{ -} - int main (int argc, char *argv[]) { signal(SIGFPE, SIG_IGN); com_argc = argc; 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); @@ -216,3 +202,13 @@ int main (int argc, char *argv[]) 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); +}