X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_linux.c;h=ac2ea61636c7087eb6d6c59be09c039bc9eeebba;hp=1e675e4799a5865f88cba7deb9421d6d4f0d5d4e;hb=85a33377d64ae8438e6582a7b8472f5a4bd41942;hpb=bdffd88cf8584630d1e24363e75a969435af2809 diff --git a/sys_linux.c b/sys_linux.c index 1e675e47..ac2ea616 100644 --- a/sys_linux.c +++ b/sys_linux.c @@ -1,196 +1,184 @@ -#include -#include -#include -#include -#include +#ifdef WIN32 +#include +#include +#include +#include "conio.h" +#else #include #include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#endif -#include +#include #include "quakedef.h" -/* -=============================================================================== - -DLL MANAGEMENT - -=============================================================================== -*/ - -dllhandle_t Sys_LoadLibrary (const char* name) -{ - return dlopen (name, RTLD_LAZY); -} - -void Sys_UnloadLibrary (dllhandle_t handle) -{ - dlclose (handle); -} - -void* Sys_GetProcAddress (dllhandle_t handle, const char* name) -{ - return (void *)dlsym (handle, name); -} - - // ======================================================================= // General routines // ======================================================================= - -void Sys_Quit (void) +void Sys_Shutdown (void) { - Host_Shutdown(); +#ifdef FNDELAY fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); +#endif fflush(stdout); - exit(0); } void Sys_Error (const char *error, ...) { va_list argptr; - char string[1024]; + char string[MAX_INPUTLINE]; // change stdin to non blocking +#ifdef FNDELAY 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, ...) +static int outfd = 1; +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); -} - -double Sys_DoubleTime (void) -{ - static int first = true; - static double oldtime = 0.0, curtime = 0.0; - double newtime; - struct timeval tp; - - gettimeofday(&tp, NULL); - - newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0; - - if (first) - { - first = false; - oldtime = newtime; - } - - if (newtime < oldtime) + 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! { - // 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); + 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, (int)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; -} - -// ======================================================================= -// 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); +#endif + //fprintf(stdout, "%s", text); } char *Sys_ConsoleInput(void) { - static char text[256]; - int len; - fd_set fdset; - struct timeval timeout; - - if (cls.state == ca_dedicated) + //if (cls.state == ca_dedicated) { + static char text[MAX_INPUTLINE]; + static unsigned 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; - - len = read (0, text, sizeof(text)); - if (len < 1) - return NULL; - text[len-1] = 0; // rip off the /n and terminate - - return text; + if (select (1, &fdset, NULL, NULL, &timeout) != -1 && FD_ISSET(0, &fdset)) + { + len = read (0, text, sizeof(text) - 1); + if (len >= 1) + { + // rip off the \n and terminate + // div0: WHY? console code can deal with \n just fine + // this caused problems with pasting stuff into a terminal window + // so, not ripping off the \n, but STILL keeping a NUL terminator + text[len] = 0; + return text; + } + } +#endif } return NULL; } -void Sys_Sleep(void) +char *Sys_GetClipboardData (void) { - usleep(1); + return NULL; } -int main (int argc, const 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; +#ifdef FNDELAY fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY); +#endif - Sys_Shared_EarlyInit(); - - 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); + return 0; +} - frameoldtime = framenewtime; - } +qboolean sys_supportsdlgetticks = false; +unsigned int Sys_SDL_GetTicks (void) +{ + Sys_Error("Called Sys_SDL_GetTicks on non-SDL target"); return 0; } +void Sys_SDL_Delay (unsigned int milliseconds) +{ + Sys_Error("Called Sys_SDL_Delay on non-SDL target"); +}