#ifdef WIN32
+#include <windows.h>
+#include <mmsystem.h>
+#include <io.h>
#include "conio.h"
#else
#include <unistd.h>
#include <fcntl.h>
-#include <sys/time.h>
+#include <time.h>
#endif
#include <signal.h>
#include "quakedef.h"
-
-#ifdef WIN32
-cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
-#endif
-
-
-
// =======================================================================
// General routines
// =======================================================================
void Sys_Shutdown (void)
{
-#ifndef WIN32
+#ifdef FNDELAY
fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
#endif
fflush(stdout);
void Sys_Error (const char *error, ...)
{
va_list argptr;
- char string[1024];
+ char string[MAX_INPUTLINE];
// change stdin to non blocking
-#ifndef WIN32
+#ifdef FNDELAY
fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
#endif
exit (1);
}
+static int outfd = 1;
void Sys_PrintToTerminal(const char *text)
{
- fprintf(stdout, "%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!
{
- 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)
+ int origflags = fcntl (outfd, F_GETFL, 0);
+ fcntl (outfd, F_SETFL, origflags & ~FNDELAY);
+#endif
+#ifdef WIN32
+#define write _write
+#endif
+ while(*text)
{
- timeBeginPeriod (1);
- firsttimegettime = false;
+ 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;
}
-
- 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
+#ifdef FNDELAY
+ fcntl (outfd, F_SETFL, origflags);
}
-#else
- struct timeval tp;
- gettimeofday(&tp, NULL);
- newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0;
#endif
-
- 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;
+ //fprintf(stdout, "%s", text);
}
char *Sys_ConsoleInput(void)
{
- if (cls.state == ca_dedicated)
+ //if (cls.state == ca_dedicated)
{
- static char text[256];
- static int len = 0;
+ static char text[MAX_INPUTLINE];
+ static unsigned int len = 0;
#ifdef WIN32
int c;
if (c == '\r')
{
text[len] = '\0';
- putch ('\n');
+ _putch ('\n');
len = 0;
return text;
}
{
if (len)
{
- putch (c);
- putch (' ');
- putch (c);
+ _putch (c);
+ _putch (' ');
+ _putch (c);
len--;
}
continue;
}
if (len < sizeof (text) - 1)
{
- putch (c);
+ _putch (c);
text[len] = c;
len++;
}
timeout.tv_usec = 0;
if (select (1, &fdset, NULL, NULL, &timeout) != -1 && FD_ISSET(0, &fdset))
{
- len = read (0, text, sizeof(text));
+ len = read (0, text, sizeof(text) - 1);
if (len >= 1)
{
// rip off the \n and terminate
- text[len-1] = 0;
+ // 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;
}
}
return NULL;
}
-void Sys_Sleep(int milliseconds)
-{
- if (milliseconds < 1)
- milliseconds = 1;
-#ifdef WIN32
- Sleep(milliseconds);
-#else
- usleep(milliseconds * 1000);
-#endif
-}
-
char *Sys_GetClipboardData (void)
{
return NULL;
{
}
-void Sys_Init_Commands (void)
-{
-}
-
int main (int argc, char **argv)
{
- double frameoldtime, framenewtime;
-
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
+#ifdef FNDELAY
fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
#endif
- Host_Init();
+ Host_Main();
- 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");
+}
projects / xonotic / darkplaces.git / blobdiff