X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_linux.c;h=9b6aa09e0c5b58fe594992581dda07ff944a0032;hp=e63d6a7a8df3db2305e2b241cdfefcf5bd3e7d7c;hb=f646375ed19af70b5ac241a13c1890251babd135;hpb=51d67386b0e66fcab982ee52fb0efd67b4699f98

diff --git a/sys_linux.c b/sys_linux.c
index e63d6a7a..9b6aa09e 100644
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -5,7 +5,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/time.h>
-#include <dlfcn.h>
 #endif
 
 #include <signal.h>
@@ -17,60 +16,23 @@
 cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
 #endif
 
-/*
-===============================================================================
-
-DLL MANAGEMENT
-
-===============================================================================
-*/
-
-dllhandle_t Sys_LoadLibrary (const char* name)
-{
-#ifdef WIN32
-	return LoadLibrary (name);
-#else
-	return dlopen (name, RTLD_LAZY);
-#endif
-}
-
-void Sys_UnloadLibrary (dllhandle_t handle)
-{
-#ifdef WIN32
-	FreeLibrary (handle);
-#else
-	dlclose (handle);
-#endif
-}
-
-void* Sys_GetProcAddress (dllhandle_t handle, const char* name)
-{
-#ifdef WIN32
-	return (void *)GetProcAddress (handle, name);
-#else
-	return (void *)dlsym (handle, name);
-#endif
-}
 
 
 // =======================================================================
 // General routines
 // =======================================================================
-
-void Sys_Quit (void)
+void Sys_Shutdown (void)
 {
-	Host_Shutdown();
 #ifndef WIN32
 	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
 #endif
 	fflush(stdout);
-	exit(0);
 }
 
 void Sys_Error (const char *error, ...)
 {
 	va_list argptr;
-	char string[1024];
+	char string[MAX_INPUTLINE];
 
 // change stdin to non blocking
 #ifndef WIN32
@@ -78,17 +40,18 @@ void Sys_Error (const char *error, ...)
 #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_Print(const char *text)
+void Sys_PrintToTerminal(const char *text)
 {
-	printf("%s", text);
+	fprintf(stdout, "%s", text);
 }
 
 double Sys_DoubleTime (void)
@@ -133,7 +96,12 @@ double Sys_DoubleTime (void)
 		LARGE_INTEGER PerformanceCount;
 
 		if (!QueryPerformanceFrequency (&PerformanceFreq))
-			Sys_Error ("No hardware timer available");
+		{
+			Con_Printf ("No hardware timer available\n");
+			// fall back to timeGetTime
+			Cvar_SetValueQuick(&sys_usetimegettime, true);
+			return Sys_DoubleTime();
+		}
 		QueryPerformanceCounter (&PerformanceCount);
 
 		#ifdef __BORLANDC__
@@ -173,8 +141,8 @@ char *Sys_ConsoleInput(void)
 {
 	if (cls.state == ca_dedicated)
 	{
-		static char text[256];
-		int len;
+		static char text[MAX_INPUTLINE];
+		static unsigned int len = 0;
 #ifdef WIN32
 		int c;
 
@@ -182,30 +150,30 @@ char *Sys_ConsoleInput(void)
 		while (_kbhit ())
 		{
 			c = _getch ();
-			putch (c);
 			if (c == '\r')
 			{
-				text[len] = 0;
+				text[len] = '\0';
 				putch ('\n');
 				len = 0;
 				return text;
 			}
-			if (c == 8)
+			if (c == '\b')
 			{
 				if (len)
 				{
+					putch (c);
 					putch (' ');
 					putch (c);
 					len--;
-					text[len] = 0;
 				}
 				continue;
 			}
-			text[len] = c;
-			len++;
-			text[len] = 0;
-			if (len == sizeof (text))
-				len = 0;
+			if (len < sizeof (text) - 1)
+			{
+				putch (c);
+				text[len] = c;
+				len++;
+			}
 		}
 #else
 		fd_set fdset;
@@ -229,34 +197,45 @@ char *Sys_ConsoleInput(void)
 	return NULL;
 }
 
-void Sys_Sleep(void)
+void Sys_Sleep(int milliseconds)
 {
+	if (milliseconds < 1)
+		milliseconds = 1;
 #ifdef WIN32
-	Sleep (1);
+	Sleep(milliseconds);
 #else
-	usleep(1);
+	usleep(milliseconds * 1000);
 #endif
 }
 
-int main (int argc, const char **argv)
+char *Sys_GetClipboardData (void)
+{
+	return NULL;
+}
+
+void Sys_InitConsole (void)
+{
+}
+
+void Sys_Init_Commands (void)
+{
+}
+
+int main (int argc, char **argv)
 {
 	double frameoldtime, framenewtime;
 
 	signal(SIGFPE, SIG_IGN);
 
 	com_argc = argc;
-	com_argv = argv;
+	com_argv = (const char **)argv;
 
 #ifndef WIN32
 	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
 #endif
 
-	Sys_Shared_EarlyInit();
-
 	Host_Init();
 
-	Sys_Shared_LateInit();
-
 	frameoldtime = Sys_DoubleTime () - 0.1;
 	while (1)
 	{