X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=724eb79d663a0a4bf456521d652ca85bebe710ee;hb=44eca4096e55c7625b8f8e377806aa7f8365b96b;hp=5f3e6c6c5049920644bde787367efecd19dd55b1;hpb=742f7346f34fdbfc533a724064eec022ed1d2fed;p=xonotic%2Fdarkplaces.git

diff --git a/sys_sdl.c b/sys_sdl.c
index 5f3e6c6c..724eb79d 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,3 +1,4 @@
+#include "quakedef.h"
 
 #ifdef WIN32
 #include <io.h>
@@ -10,8 +11,6 @@
 
 #include <signal.h>
 
-#include "quakedef.h"
-
 #include <SDL.h>
 
 // =======================================================================
@@ -54,6 +53,8 @@ void Sys_PrintToTerminal(const char *text)
 	// 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
 	while(*text)
 	{
@@ -68,33 +69,6 @@ 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;
-	newtime = (double) SDL_GetTicks() / 1000.0;
-
-
-	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;
-}
-
 char *Sys_ConsoleInput(void)
 {
 	if (cls.state == ca_dedicated)
@@ -108,11 +82,11 @@ char *Sys_ConsoleInput(void)
 		while (_kbhit ())
 		{
 			c = _getch ();
-			putch (c);
+			_putch (c);
 			if (c == '\r')
 			{
 				text[len] = 0;
-				putch ('\n');
+				_putch ('\n');
 				len = 0;
 				return text;
 			}
@@ -120,8 +94,8 @@ char *Sys_ConsoleInput(void)
 			{
 				if (len)
 				{
-					putch (' ');
-					putch (c);
+					_putch (' ');
+					_putch (c);
 					len--;
 					text[len] = 0;
 				}
@@ -155,13 +129,6 @@ char *Sys_ConsoleInput(void)
 	return NULL;
 }
 
-void Sys_Sleep(int milliseconds)
-{
-	if (milliseconds < 1)
-		milliseconds = 1;
-	SDL_Delay(milliseconds);
-}
-
 char *Sys_GetClipboardData (void)
 {
 #ifdef WIN32
@@ -174,10 +141,12 @@ char *Sys_GetClipboardData (void)
 
 		if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
 		{
-			if ((cliptext = GlobalLock (hClipboardData)) != 0)
+			if ((cliptext = (char *)GlobalLock (hClipboardData)) != 0)
 			{
-				data = Z_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);
 			}
 		}
@@ -193,16 +162,13 @@ void Sys_InitConsole (void)
 {
 }
 
-void Sys_Init_Commands (void)
-{
-}
-
 int main (int argc, char *argv[])
 {
 	signal(SIGFPE, SIG_IGN);
 
 	com_argc = argc;
 	com_argv = (const char **)argv;
+	Sys_ProvideSelfFD();
 
 #ifndef WIN32
 	fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
@@ -215,3 +181,13 @@ int main (int argc, char *argv[])
 
 	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);
+}