#ifdef WIN32
+#ifdef _MSC_VER
+#pragma comment(lib, "sdl.lib")
+#pragma comment(lib, "sdlmain.lib")
+#endif
+#include <io.h>
#include "conio.h"
#else
#include <unistd.h>
#include <signal.h>
-#include "quakedef.h"
-
#include <SDL.h>
-#ifdef WIN32
-cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
-#endif
+#include "quakedef.h"
// =======================================================================
// General routines
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
#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_Print ("Quake Error: ");
- Con_Print (string);
- Con_Print ("\n");
+ Con_Printf ("Quake Error: %s\n", string);
Host_Shutdown ();
exit (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)
- {
- // 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
+#ifndef WIN32
+ // 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);
+#else
+#define write _write
#endif
- newtime = (double) SDL_GetTicks() / 1000.0;
-
-
- if (first)
+ while(*text)
{
- first = false;
- oldtime = newtime;
+ 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;
}
-
- 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;
+#ifndef WIN32
+ fcntl (1, F_SETFL, origflags);
+#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;
while (_kbhit ())
{
c = _getch ();
- putch (c);
+ _putch (c);
if (c == '\r')
{
text[len] = 0;
- putch ('\n');
+ _putch ('\n');
len = 0;
return text;
}
{
if (len)
{
- putch (' ');
- putch (c);
+ _putch (' ');
+ _putch (c);
len--;
text[len] = 0;
}
return NULL;
}
-void Sys_Sleep(int milliseconds)
-{
- if (milliseconds < 1)
- milliseconds = 1;
- SDL_Delay(milliseconds);
-}
-
char *Sys_GetClipboardData (void)
{
#ifdef WIN32
if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
{
- if ((cliptext = GlobalLock (hClipboardData)) != 0)
+ if ((cliptext = (char *)GlobalLock (hClipboardData)) != 0)
{
- data = malloc (GlobalSize(hClipboardData)+1);
- strcpy (data, cliptext);
+ size_t allocsize;
+ allocsize = GlobalSize (hClipboardData) + 1;
+ data = (char *)Z_Malloc (allocsize);
+ strlcpy (data, cliptext, allocsize);
GlobalUnlock (hClipboardData);
}
}
#endif
}
-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();
#ifndef WIN32
fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
#endif
- Sys_Shared_EarlyInit();
-
-#ifdef WIN32
- Cvar_RegisterVariable(&sys_usetimegettime);
-#endif
-
- Host_Init();
+ // we don't know which systems we'll want to init, yet...
+ SDL_Init(0);
- Sys_Shared_LateInit();
+ Host_Main();
- 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);
+}