X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=982956b1bd942a22ef1016f61fe845390b57ccf6;hb=e775691c81f0bcb3b4f85bdfb771e1a4ebbc6b30;hp=bdefa12255a10eb0e7698774f034dffd80f527cb;hpb=182f5dd46097dc11b3643dc2376b4dd6a4fa42c7;p=xonotic%2Fdarkplaces.git diff --git a/sys_sdl.c b/sys_sdl.c index bdefa122..982956b1 100644 --- a/sys_sdl.c +++ b/sys_sdl.c @@ -1,5 +1,7 @@ +#include "darkplaces.h" #ifdef WIN32 +#include #include "conio.h" #else #include @@ -7,44 +9,58 @@ #include #endif -#include +#ifdef __ANDROID__ +#include +#endif -#include "quakedef.h" +#include #include +#ifdef WIN32 +#ifdef _MSC_VER +#pragma comment(lib, "sdl2.lib") +#pragma comment(lib, "sdl2main.lib") +#endif +#endif + +sys_t sys; + // ======================================================================= // General routines // ======================================================================= void Sys_Shutdown (void) { +#ifdef __ANDROID__ + Sys_AllowProfiling(false); +#endif #ifndef WIN32 - fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); + fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK); #endif fflush(stdout); SDL_Quit(); } - +static qbool nocrashdialog; void Sys_Error (const char *error, ...) { va_list argptr; - char string[1024]; + char string[MAX_INPUTLINE]; // change stdin to non blocking #ifndef WIN32 - fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); + 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); - fprintf(stderr, "Error: %s\n", string); - Con_Print ("Quake Error: "); - Con_Print (string); - Con_Print ("\n"); + Con_Printf(CON_ERROR "Engine Error: %s\n", string); + + if(!nocrashdialog) + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Engine Error", string, NULL); Host_Shutdown (); exit (1); @@ -52,41 +68,44 @@ void Sys_Error (const char *error, ...) void Sys_PrintToTerminal(const char *text) { - printf("%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) +#ifdef __ANDROID__ + if (developer.integer > 0) { - first = false; - oldtime = newtime; + __android_log_write(ANDROID_LOG_DEBUG, sys.argv[0], text); } - - if (newtime < oldtime) +#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! { - // 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); + 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); } - else - curtime += newtime - oldtime; - oldtime = newtime; - - return curtime; +#endif + //fprintf(stdout, "%s", text); +#endif } char *Sys_ConsoleInput(void) { - if (cls.state == ca_dedicated) +// if (cls.state == ca_dedicated) { - static char text[256]; + static char text[MAX_INPUTLINE]; int len = 0; #ifdef WIN32 int c; @@ -95,11 +114,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; } @@ -107,8 +126,8 @@ char *Sys_ConsoleInput(void) { if (len) { - putch (' '); - putch (c); + _putch (' '); + _putch (c); len--; text[len] = 0; } @@ -142,72 +161,80 @@ 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 char *data = NULL; char *cliptext; - if (OpenClipboard (NULL) != 0) - { - HANDLE hClipboardData; - - if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0) - { - if ((cliptext = GlobalLock (hClipboardData)) != 0) - { - data = malloc (GlobalSize(hClipboardData)+1); - strcpy (data, cliptext); - GlobalUnlock (hClipboardData); - } - } - CloseClipboard (); + cliptext = SDL_GetClipboardText(); + if (cliptext != NULL) { + size_t allocsize; + allocsize = min(MAX_INPUTLINE, strlen(cliptext) + 1); + data = (char *)Z_Malloc (allocsize); + strlcpy (data, cliptext, allocsize); + SDL_free(cliptext); } + return data; -#else - return NULL; -#endif } 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 = (const char **)argv; +#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(!Sys_CheckParm("-nocrashdialog")) + nocrashdialog = false; + // COMMANDLINEOPTION: sdl: -noterminal disables console output on stdout + if(Sys_CheckParm("-noterminal")) + sys.outfd = -1; + // COMMANDLINEOPTION: sdl: -stderr moves console output to stderr + else if(Sys_CheckParm("-stderr")) + sys.outfd = 2; + else + sys.outfd = 1; #ifndef WIN32 - fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY); + fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NONBLOCK); #endif - Host_Init(); + // we don't know which systems we'll want to init, yet... + SDL_Init(0); - frameoldtime = Sys_DoubleTime () - 0.1; - while (1) - { - // find time spent rendering last frame - framenewtime = Sys_DoubleTime (); + // used by everything + Memory_Init(); - Host_Frame (framenewtime - frameoldtime); + Host_Main(); - frameoldtime = framenewtime; - } + Sys_Quit(0); + return 0; } + +qbool sys_supportsdlgetticks = true; +unsigned int Sys_SDL_GetTicks (void) +{ + return SDL_GetTicks(); +} +void Sys_SDL_Delay (unsigned int milliseconds) +{ + SDL_Delay(milliseconds); +}