X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_linux.c;h=1e675e4799a5865f88cba7deb9421d6d4f0d5d4e;hp=7c3033a612d15b352e567f4592349a1ba2f14bde;hb=3a3aa7084a0065a5106a661cfbf73030d46108ae;hpb=d57be67cb00229acb8564b92c8b7c58eeed8a0cb diff --git a/sys_linux.c b/sys_linux.c index 7c3033a6..1e675e47 100644 --- a/sys_linux.c +++ b/sys_linux.c @@ -19,190 +19,103 @@ #include #include +#include + #include "quakedef.h" -char *basedir = "."; -#if CACHEENABLE -char *cachedir = "/tmp"; -#endif +/* +=============================================================================== -// ======================================================================= -// General routines -// ======================================================================= +DLL MANAGEMENT + +=============================================================================== +*/ -void Sys_DebugNumber(int y, int val) +dllhandle_t Sys_LoadLibrary (const char* name) { + return dlopen (name, RTLD_LAZY); } -#if 0 -static char end1[] = -"\x1b[?7h\x1b[40m\x1b[2J\x1b[0;1;41m\x1b[1;1H QUAKE: The Doomed Dimension \x1b[33mby \x1b[44mid\x1b[41m Software \x1b[2;1H ---------------------------------------------------------------------------- \x1b[3;1H CALL 1-800-IDGAMES TO ORDER OR FOR TECHNICAL SUPPORT \x1b[4;1H PRICE: $45.00 (PRICES MAY VARY OUTSIDE THE US.) \x1b[5;1H \x1b[6;1H \x1b[37mYes! You only have one fourth of this incredible epic. That is because most \x1b[7;1H of you have paid us nothing or at most, very little. You could steal the \x1b[8;1H game from a friend. But we both know you'll be punished by God if you do. \x1b[9;1H \x1b[33mWHY RISK ETERNAL DAMNATION? CALL 1-800-IDGAMES AND BUY NOW! \x1b[10;1H \x1b[37mRemember, we love you almost as much as He does. \x1b[11;1H \x1b[12;1H \x1b[33mProgramming: \x1b[37mJohn Carmack, Michael Abrash, John Cash \x1b[13;1H \x1b[33mDesign: \x1b[37mJohn Romero, Sandy Petersen, American McGee, Tim Willits \x1b[14;1H \x1b[33mArt: \x1b[37mAdrian Carmack, Kevin Cloud \x1b[15;1H \x1b[33mBiz: \x1b[37mJay Wilbur, Mike Wilson, Donna Jackson \x1b[16;1H \x1b[33mProjects: \x1b[37mShawn Green \x1b[33mSupport: \x1b[37mBarrett Alexander \x1b[17;1H \x1b[33mSound Effects: \x1b[37mTrent Reznor and Nine Inch Nails \x1b[18;1H For other information or details on ordering outside the US, check out the \x1b[19;1H files accompanying QUAKE or our website at http://www.idsoftware.com. \x1b[20;1H \x1b[0;41mQuake is a trademark of Id Software, inc., (c)1996 Id Software, inc. \x1b[21;1H All rights reserved. NIN logo is a" -" registered trademark licensed to \x1b[22;1H Nothing Interactive, Inc. All rights reserved. \x1b[40m\x1b[23;1H\x1b[0m"; -static char end2[] = -"\x1b[?7h\x1b[40m\x1b[2J\x1b[0;1;41m\x1b[1;1H QUAKE \x1b[33mby \x1b[44mid\x1b[41m Software \x1b[2;1H ----------------------------------------------------------------------------- \x1b[3;1H \x1b[37mWhy did you quit from the registered version of QUAKE? Did the \x1b[4;1H scary monsters frighten you? Or did Mr. Sandman tug at your \x1b[5;1H little lids? No matter! What is important is you love our \x1b[6;1H game, and gave us your money. Congratulations, you are probably \x1b[7;1H not a thief. \x1b[8;1H Thank You. \x1b[9;1H \x1b[33;44mid\x1b[41m Software is: \x1b[10;1H PROGRAMMING: \x1b[37mJohn Carmack, Michael Abrash, John Cash \x1b[11;1H \x1b[33mDESIGN: \x1b[37mJohn Romero, Sandy Petersen, American McGee, Tim Willits \x1b[12;1H \x1b[33mART: \x1b[37mAdrian Carmack, Kevin Cloud \x1b[13;1H \x1b[33mBIZ: \x1b[37mJay Wilbur, Mike Wilson \x1b[33mPROJECTS MAN: \x1b[37mShawn Green \x1b[14;1H \x1b[33mBIZ ASSIST: \x1b[37mDonna Jackson \x1b[33mSUPPORT: \x1b[37mBarrett Alexander \x1b[15;1H \x1b[33mSOUND EFFECTS AND MUSIC: \x1b[37mTrent Reznor and Nine Inch Nails \x1b[16;1H \x1b[17;1H If you need help running QUAKE refer to the text files in the \x1b[18;1H QUAKE directory, or our website at http://www.idsoftware.com. \x1b[19;1H If all else fails, call our technical support at 1-800-IDGAMES. \x1b[20;1H \x1b[0;41mQuake is a trademark of Id Software, inc., (c)1996 Id Software, inc. \x1b[21;1H All rights reserved." -" NIN logo is a registered trademark licensed \x1b[22;1H to Nothing Interactive, Inc. All rights reserved. \x1b[23;1H\x1b[40m\x1b[0m"; -#endif - -void Sys_Quit (void) +void Sys_UnloadLibrary (dllhandle_t handle) { - Host_Shutdown(); - fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); -#if 0 - if (registered.integer) - printf("%s", end2); - else - printf("%s", end1); -#endif - fflush(stdout); - exit(0); + dlclose (handle); } -void Sys_Error (char *error, ...) -{ - va_list argptr; - char string[1024]; - -// change stdin to non blocking - fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); - - va_start (argptr,error); - vsprintf (string,error,argptr); - va_end (argptr); - fprintf(stderr, "Error: %s\n", string); - - Host_Shutdown (); - exit (1); - -} - -void Sys_Warn (char *warning, ...) -{ - va_list argptr; - char string[1024]; - - va_start (argptr,warning); - vsprintf (string,warning,argptr); - va_end (argptr); - fprintf(stderr, "Warning: %s", string); -} - -/* -============ -Sys_FileTime - -returns -1 if not present -============ -*/ -int Sys_FileTime (char *path) +void* Sys_GetProcAddress (dllhandle_t handle, const char* name) { - struct stat buf; - - if (stat (path,&buf) == -1) - return -1; - - return buf.st_mtime; + return (void *)dlsym (handle, name); } -void Sys_mkdir (char *path) -{ - mkdir (path, 0777); -} +// ======================================================================= +// General routines +// ======================================================================= -int Sys_FileOpenRead (char *path, int *handle) +void Sys_Quit (void) { - int h; - struct stat fileinfo; - - - h = open (path, O_RDONLY, 0666); - *handle = h; - if (h == -1) - return -1; - - if (fstat (h,&fileinfo) == -1) - Sys_Error ("Error fstating %s", path); - - return fileinfo.st_size; + Host_Shutdown(); + fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); + fflush(stdout); + exit(0); } -int Sys_FileOpenWrite (char *path) +void Sys_Error (const char *error, ...) { - int handle; - - umask (0); - - handle = open(path,O_RDWR | O_CREAT | O_TRUNC, 0666); + va_list argptr; + char string[1024]; - if (handle == -1) - { - Con_Printf("Sys_FileOpenWrite: Error opening %s: %s", path, strerror(errno)); - return 0; - } +// change stdin to non blocking + fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); - return handle; -} + va_start (argptr,error); + vsprintf (string,error,argptr); + va_end (argptr); + fprintf(stderr, "Error: %s\n", string); -int Sys_FileWrite (int handle, void *src, int count) -{ - return write (handle, src, count); -} + Host_Shutdown (); + exit (1); -void Sys_FileClose (int handle) -{ - close (handle); } -void Sys_FileSeek (int handle, int position) +void Sys_Warn (const char *warning, ...) { - lseek (handle, position, SEEK_SET); -} + va_list argptr; + char string[1024]; -int Sys_FileRead (int handle, void *dest, int count) -{ - return read (handle, dest, count); -} - -void Sys_DebugLog(char *file, char *fmt, ...) -{ - va_list argptr; - static char data[1024]; - int fd; - - va_start(argptr, fmt); - vsprintf(data, fmt, argptr); - va_end(argptr); -// fd = open(file, O_WRONLY | O_BINARY | O_CREAT | O_APPEND, 0666); - fd = open(file, O_WRONLY | O_CREAT | O_APPEND, 0666); - write(fd, data, strlen(data)); - close(fd); + 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, basetime = 0.0; + static double oldtime = 0.0, curtime = 0.0; double newtime; struct timeval tp; - struct timezone tzp; - gettimeofday(&tp, &tzp); + gettimeofday(&tp, NULL); - newtime = (double) ((unsigned long) tp.tv_sec) + tp.tv_usec/1000000.0 - basetime; + newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0; if (first) { first = false; - basetime = newtime; - newtime = 0.0; + oldtime = newtime; } if (newtime < oldtime) - Sys_Error("Sys_DoubleTime: time running backwards??\n"); - + { + // 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 newtime; + return curtime; } // ======================================================================= @@ -218,18 +131,18 @@ void alarm_handler(int x) void floating_point_exception_handler(int whatever) { -// Sys_Warn("floating point exception\n"); signal(SIGFPE, floating_point_exception_handler); } char *Sys_ConsoleInput(void) { - static char text[256]; - int len; - fd_set fdset; - struct timeval timeout; + static char text[256]; + int len; + fd_set fdset; + struct timeval timeout; - if (cls.state == ca_dedicated) { + if (cls.state == ca_dedicated) + { FD_ZERO(&fdset); FD_SET(0, &fdset); // stdin timeout.tv_sec = 0; @@ -252,23 +165,14 @@ void Sys_Sleep(void) usleep(1); } -int main (int c, char **v) +int main (int argc, const char **argv) { + double frameoldtime, framenewtime; - double oldtime, newtime; - -// static char cwd[1024]; - -// signal(SIGFPE, floating_point_exception_handler); signal(SIGFPE, SIG_IGN); - memset(&host_parms, 0, sizeof(host_parms)); - - COM_InitArgv(c, v); - host_parms.argc = com_argc; - host_parms.argv = com_argv; - - host_parms.basedir = basedir; + com_argc = argc; + com_argv = argv; fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY); @@ -278,15 +182,15 @@ int main (int c, char **v) Sys_Shared_LateInit(); - oldtime = Sys_DoubleTime () - 0.1; + frameoldtime = Sys_DoubleTime () - 0.1; while (1) { // find time spent rendering last frame - newtime = Sys_DoubleTime (); + framenewtime = Sys_DoubleTime (); - Host_Frame (newtime - oldtime); + Host_Frame (framenewtime - frameoldtime); - oldtime = newtime; + frameoldtime = framenewtime; } return 0; }