-
-#ifdef WIN32
-#include <io.h>
-#include "conio.h"
-#else
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/time.h>
-#endif
-
-#ifdef __ANDROID__
-#include <android/log.h>
-#endif
-
-#include <signal.h>
-
+/*
+ * Include this BEFORE darkplaces.h because it breaks wrapping
+ * _Static_assert. Cloudwalk has no idea how or why so don't ask.
+ */
#include <SDL.h>
+#include "darkplaces.h"
+
#ifdef WIN32
#ifdef _MSC_VER
#pragma comment(lib, "sdl2.lib")
#endif
#endif
-#include "quakedef.h"
-
-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_NDELAY);
-#endif
- fflush(stdout);
SDL_Quit();
}
-static qboolean nocrashdialog;
-void Sys_Error (const char *error, ...)
+// 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_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_NDELAY);
-#endif
-
- va_start (argptr,error);
- dpvsnprintf (string, sizeof (string), error, argptr);
- va_end (argptr);
-
- Con_Printf(CON_ERROR "Engine Error: %s\n", string);
-
if(!nocrashdialog)
- SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Engine Error", string, NULL);
-
- Host_Shutdown ();
- exit (1);
-}
-
-void Sys_PrintToTerminal(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;
-#ifdef O_NDELAY
- // 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_NDELAY);
-#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;
- }
-#ifdef O_NDELAY
- fcntl (sys.outfd, F_SETFL, origflags);
- }
-#endif
- //fprintf(stdout, "%s", text);
-#endif
+ SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, title, string, NULL);
}
-char *Sys_ConsoleInput(void)
-{
-// if (cls.state == ca_dedicated)
- {
- static char text[MAX_INPUTLINE];
- int len = 0;
-#ifdef WIN32
- int c;
-
- // read a line out
- while (_kbhit ())
- {
- c = _getch ();
- _putch (c);
- if (c == '\r')
- {
- text[len] = 0;
- _putch ('\n');
- len = 0;
- return text;
- }
- if (c == 8)
- {
- if (len)
- {
- _putch (' ');
- _putch (c);
- len--;
- text[len] = 0;
- }
- continue;
- }
- text[len] = c;
- len++;
- text[len] = 0;
- if (len == sizeof (text))
- len = 0;
- }
-#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))
- {
- len = read (0, text, sizeof(text));
- if (len >= 1)
- {
- // rip off the \n and terminate
- text[len-1] = 0;
- return text;
- }
- }
-#endif
- }
- return NULL;
-}
-
-char *Sys_GetClipboardData (void)
+char *Sys_SDL_GetClipboardData (void)
{
char *data = NULL;
char *cliptext;
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);
}
return data;
}
-void Sys_InitConsole (void)
+void Sys_SDL_Init(void)
{
-}
-
-int main (int argc, char *argv[])
-{
- signal(SIGFPE, SIG_IGN);
-
-#ifdef __ANDROID__
- Sys_AllowProfiling(true);
-#endif
-
- sys.selffd = -1;
- sys.argc = argc;
- sys.argv = (const char **)argv;
-
- // Sys_Error this early in startup might screw with automated
- // workflows or something if we show the dialog by default.
- nocrashdialog = true;
-
- Sys_ProvideSelfFD();
-
- // COMMANDLINEOPTION: -nocrashdialog disables "Engine Error" crash dialog boxes
- if(!COM_CheckParm("-nocrashdialog"))
- nocrashdialog = false;
- // COMMANDLINEOPTION: sdl: -noterminal disables console output on stdout
- if(COM_CheckParm("-noterminal"))
- sys.outfd = -1;
- // COMMANDLINEOPTION: sdl: -stderr moves console output to stderr
- else if(COM_CheckParm("-stderr"))
- sys.outfd = 2;
- else
- sys.outfd = 1;
-
-#ifndef WIN32
- fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NDELAY);
-#endif
-
// we don't know which systems we'll want to init, yet...
- SDL_Init(0);
-
- Host_Main();
+ if (SDL_Init(0) < 0)
+ Sys_Error("SDL_Init failed: %s\n", SDL_GetError());
- Sys_Quit(0);
-
- return 0;
+ // COMMANDLINEOPTION: sdl: -nocrashdialog disables "Engine Error" crash dialog boxes
+ if(!Sys_CheckParm("-nocrashdialog"))
+ nocrashdialog = false;
}
-qboolean sys_supportsdlgetticks = true;
+qbool sys_supportsdlgetticks = true;
unsigned int Sys_SDL_GetTicks (void)
{
return SDL_GetTicks();
{
SDL_Delay(milliseconds);
}
+
+int main(int argc, char *argv[])
+{
+ return Sys_Main(argc, argv);
+}
projects / xonotic / darkplaces.git / blobdiff