X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=f96bc87eabfc7aa5dc15177c0e9f3b6f77477a39;hb=4d00367a631bdcb5b5fd7166cdd277a8d53a9a72;hp=4ce2d75e0d3d2734ce2ffa5308eac483f1447b13;hpb=6ddb09ae21b379f7b921a9f1f9216d87df86ae8a;p=xonotic%2Fdarkplaces.git

diff --git a/sys_sdl.c b/sys_sdl.c
index 4ce2d75e..f96bc87e 100644
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -1,15 +1,3 @@
-#ifdef WIN32
-#include <io.h> // Include this BEFORE darkplaces.h because it uses strncpy which trips DP_STATIC_ASSERT
-#else
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/time.h>
-#endif
-
-#ifdef __ANDROID__
-#include <android/log.h>
-#endif
-
 /*
  * Include this BEFORE darkplaces.h because it breaks wrapping
  * _Static_assert. Cloudwalk has no idea how or why so don't ask.
@@ -25,88 +13,26 @@
 #endif
 #endif
 
-sys_t sys;
 
 // =======================================================================
 // General routines
 // =======================================================================
 
-void Sys_Shutdown (void)
+void Sys_SDL_Shutdown(void)
 {
-#ifdef __ANDROID__
-	Sys_AllowProfiling(false);
-#endif
-#ifndef WIN32
-	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
-#endif
-	fflush(stdout);
 	SDL_Quit();
 }
 
 // Sys_Error early in startup might screw with automated
 // workflows or something if we show the dialog by default.
 static qbool nocrashdialog = true;
-void Sys_Error (const char *error, ...)
+void Sys_SDL_Dialog(const char *title, const char *string)
 {
-	va_list argptr;
-	char string[MAX_INPUTLINE];
-
-// change stdin to non blocking
-#ifndef WIN32
-	fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK);
-#endif
-
-	va_start (argptr,error);
-	dpvsnprintf (string, sizeof (string), error, argptr);
-	va_end (argptr);
-
-	Con_Printf(CON_ERROR "Engine Error: %s\n", string);
-	
-	// don't want a dead window left blocking the OS UI or the crash dialog
-	Host_Shutdown();
-
 	if(!nocrashdialog)
-		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Engine Error", string, NULL);
-
-	exit (1);
-}
-
-void Sys_Print(const char *text)
-{
-#ifdef __ANDROID__
-	if (developer.integer > 0)
-	{
-		__android_log_write(ANDROID_LOG_DEBUG, sys.argv[0], text);
-	}
-#else
-	if(sys.outfd < 0)
-		return;
-#ifndef WIN32
-	// BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0).
-	// this is because both go to /dev/tty by default!
-	{
-		int origflags = fcntl (sys.outfd, F_GETFL, 0);
-		fcntl (sys.outfd, F_SETFL, origflags & ~O_NONBLOCK);
-#endif
-#ifdef WIN32
-#define write _write
-#endif
-		while(*text)
-		{
-			fs_offset_t written = (fs_offset_t)write(sys.outfd, text, (int)strlen(text));
-			if(written <= 0)
-				break; // sorry, I cannot do anything about this error - without an output
-			text += written;
-		}
-#ifndef WIN32
-		fcntl (sys.outfd, F_SETFL, origflags);
-	}
-#endif
-	//fprintf(stdout, "%s", text);
-#endif
+		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, title, string, NULL);
 }
 
-char *Sys_GetClipboardData (void)
+char *Sys_SDL_GetClipboardData (void)
 {
 	char *data = NULL;
 	char *cliptext;
@@ -116,7 +42,7 @@ char *Sys_GetClipboardData (void)
 		size_t allocsize;
 		allocsize = min(MAX_INPUTLINE, strlen(cliptext) + 1);
 		data = (char *)Z_Malloc (allocsize);
-		strlcpy (data, cliptext, allocsize);
+		dp_strlcpy (data, cliptext, allocsize);
 		SDL_free(cliptext);
 	}