X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sys_linux.c;h=ac2ea61636c7087eb6d6c59be09c039bc9eeebba;hb=fe52804d325b7688cab684f2b83ba1106702a2aa;hp=90c959b995a34b6fa7747a44fdfd333924abed11;hpb=b5ef0c5b7dde43f96f07950e9565670e46e26d71;p=xonotic%2Fdarkplaces.git

diff --git a/sys_linux.c b/sys_linux.c
index 90c959b9..ac2ea616 100644
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -1,273 +1,184 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
+#ifdef WIN32
+#include <windows.h>
+#include <mmsystem.h>
+#include <io.h>
+#include "conio.h"
+#else
 #include <unistd.h>
 #include <fcntl.h>
+#include <time.h>
+#endif
 
 #include <signal.h>
-#include <limits.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/mman.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <time.h>
 
 #include "quakedef.h"
 
-char *basedir = ".";
-#if CACHEENABLE
-char *cachedir = "/tmp";
-#endif
-
 // =======================================================================
 // General routines
 // =======================================================================
-
-void Sys_DebugNumber(int y, int val)
+void Sys_Shutdown (void)
 {
-}
-
-void Sys_Quit (void)
-{
-	Host_Shutdown();
+#ifdef FNDELAY
 	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
+#endif
 	fflush(stdout);
-	exit(0);
 }
 
-void Sys_Error (char *error, ...)
+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 (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)
-{
-	struct stat buf;
-
-	if (stat (path,&buf) == -1)
-		return -1;
-
-	return buf.st_mtime;
-}
-
-
-void Sys_mkdir (char *path)
-{
-	mkdir (path, 0777);
-}
-
-int Sys_FileOpenRead (char *path, int *handle)
-{
-	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;
-}
-
-int Sys_FileOpenWrite (char *path)
-{
-	int handle;
-
-	umask (0);
-
-	handle = open(path,O_RDWR | O_CREAT | O_TRUNC, 0666);
-
-	if (handle == -1)
-	{
-		Con_Printf("Sys_FileOpenWrite: Error opening %s: %s", path, strerror(errno));
-		return 0;
-	}
-
-	return handle;
-}
-
-int Sys_FileWrite (int handle, void *src, int count)
-{
-	return write (handle, src, count);
-}
-
-void Sys_FileClose (int handle)
-{
-	close (handle);
-}
-
-void Sys_FileSeek (int handle, int position)
-{
-	lseek (handle, position, SEEK_SET);
 }
 
-int Sys_FileRead (int handle, void *dest, int count)
+static int outfd = 1;
+void Sys_PrintToTerminal(const char *text)
 {
-	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_CREAT | O_APPEND, 0666);
-	write(fd, data, strlen(data));
-	close(fd);
-}
-
-double Sys_DoubleTime (void)
-{
-	static int first = true;
-	static double oldtime = 0.0, curtime = 0.0;
-	double newtime;
-	struct timeval tp;
-	struct timezone tzp;
-
-	gettimeofday(&tp, &tzp);
-
-	newtime = (double) ((unsigned long) tp.tv_sec) + tp.tv_usec/1000000.0;
-
-	if (first)
+	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!
 	{
-		first = false;
-		oldtime = newtime;
-	}
-
-	if (newtime < oldtime)
-		Con_Printf("Sys_DoubleTime: time running backwards??\n");
-	else
-	{
-		curtime += newtime - oldtime;
-		oldtime = newtime;
+		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);
 	}
-
-	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 c, char **v)
+void Sys_InitConsole (void)
 {
-	double oldtime, newtime;
+}
 
+int main (int argc, char **argv)
+{
 	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;
+	com_argc = argc;
+	com_argv = (const char **)argv;
+	Sys_ProvideSelfFD();
 
-	host_parms.basedir = basedir;
+	// 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();
-
-	Sys_Shared_LateInit();
-
-	oldtime = Sys_DoubleTime () - 0.1;
-	while (1)
-	{
-		// find time spent rendering last frame
-		newtime = Sys_DoubleTime ();
+	Host_Main();
 
-		Host_Frame (newtime - oldtime);
+	return 0;
+}
 
-		oldtime = newtime;
-	}
+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");
+}