#ifdef WIN32
+#include <io.h>
#include "conio.h"
#else
#include <unistd.h>
void Sys_Error (const char *error, ...)
{
va_list argptr;
- char string[1024];
+ char string[MAX_INPUTLINE];
// change stdin to non blocking
#ifndef WIN32
va_start (argptr,error);
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);
+#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);
+#endif
+ while(*text)
+ {
+ 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;
+ }
+#ifndef WIN32
+ fcntl (1, F_SETFL, origflags);
+#endif
+ //fprintf(stdout, "%s", text);
}
double Sys_DoubleTime (void)
{
if (cls.state == ca_dedicated)
{
- static char text[256];
+ static char text[MAX_INPUTLINE];
int len = 0;
#ifdef WIN32
int c;
{
if ((cliptext = GlobalLock (hClipboardData)) != 0)
{
- data = malloc (GlobalSize(hClipboardData)+1);
- strcpy (data, cliptext);
+ size_t allocsize;
+ allocsize = GlobalSize (hClipboardData) + 1;
+ data = Z_Malloc (allocsize);
+ strlcpy (data, cliptext, allocsize);
GlobalUnlock (hClipboardData);
}
}
int main (int argc, char *argv[])
{
- double frameoldtime, framenewtime;
-
signal(SIGFPE, SIG_IGN);
com_argc = argc;
fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
#endif
- Host_Init();
+ // we don't know which systems we'll want to init, yet...
+ SDL_Init(0);
- frameoldtime = Sys_DoubleTime () - 0.1;
- while (1)
- {
- // find time spent rendering last frame
- framenewtime = Sys_DoubleTime ();
+ Host_Main();
- Host_Frame (framenewtime - frameoldtime);
-
- frameoldtime = framenewtime;
- }
return 0;
}