X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=sys_sdl.c;h=e3b2956edafe19a3c9ba40e72a1a3104e14c6964;hb=b2471dccc74b4d105abd20d304f90f6169285168;hp=3833fdad9308fec02e1e6d0419fd78f077205a35;hpb=267196599b7ec2c80c47f1514b4f2f594fabe4af;p=xonotic%2Fdarkplaces.git diff --git a/sys_sdl.c b/sys_sdl.c index 3833fdad..e3b2956e 100644 --- a/sys_sdl.c +++ b/sys_sdl.c @@ -1,5 +1,6 @@ #ifdef WIN32 +#include #include "conio.h" #else #include @@ -7,18 +8,36 @@ #include #endif -#include +#ifdef __ANDROID__ +#include -#include "quakedef.h" +#ifndef FNDELAY +#define FNDELAY O_NDELAY +#endif +#endif + +#include #include +#ifdef WIN32 +#ifdef _MSC_VER +#pragma comment(lib, "sdl2.lib") +#pragma comment(lib, "sdl2main.lib") +#endif +#endif + +#include "quakedef.h" + // ======================================================================= // General routines // ======================================================================= void Sys_Shutdown (void) { +#ifdef __ANDROID__ + Sys_AllowProfiling(false); +#endif #ifndef WIN32 fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); #endif @@ -26,7 +45,7 @@ void Sys_Shutdown (void) SDL_Quit(); } - +static qboolean nocrashdialog; void Sys_Error (const char *error, ...) { va_list argptr; @@ -41,62 +60,54 @@ void Sys_Error (const char *error, ...) dpvsnprintf (string, sizeof (string), error, argptr); va_end (argptr); - Con_Printf ("Quake Error: %s\n", string); + Con_Errorf ("Engine Error: %s\n", string); + + if(!nocrashdialog) + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Engine Error", string, NULL); Host_Shutdown (); exit (1); } +static int outfd = 1; void Sys_PrintToTerminal(const char *text) { -#ifndef WIN32 +#ifdef __ANDROID__ + if (developer.integer > 0) + { + __android_log_write(ANDROID_LOG_DEBUG, com_argv[0], text); + } +#else + if(outfd < 0) + return; +#ifdef FNDELAY // 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); -#endif - while(*text) + // this is because both go to /dev/tty by default! { - ssize_t written = write(1, text, strlen(text)); - if(written <= 0) - break; // sorry, I cannot do anything about this error - without an output - text += written; + int origflags = fcntl (outfd, F_GETFL, 0); + fcntl (outfd, F_SETFL, origflags & ~FNDELAY); +#endif +#ifdef WIN32 +#define write _write +#endif + while(*text) + { + fs_offset_t written = (fs_offset_t)write(outfd, text, (int)strlen(text)); + if(written <= 0) + break; // sorry, I cannot do anything about this error - without an output + text += written; + } +#ifdef FNDELAY + fcntl (outfd, F_SETFL, origflags); } -#ifndef WIN32 - fcntl (1, F_SETFL, origflags); #endif //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; +#endif } char *Sys_ConsoleInput(void) { - if (cls.state == ca_dedicated) +// if (cls.state == ca_dedicated) { static char text[MAX_INPUTLINE]; int len = 0; @@ -107,11 +118,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; } @@ -119,8 +130,8 @@ char *Sys_ConsoleInput(void) { if (len) { - putch (' '); - putch (c); + _putch (' '); + _putch (c); len--; text[len] = 0; } @@ -154,72 +165,74 @@ 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); +#ifdef __ANDROID__ + Sys_AllowProfiling(true); +#endif + com_argc = argc; com_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")) + outfd = -1; + // COMMANDLINEOPTION: sdl: -stderr moves console output to stderr + else if(COM_CheckParm("-stderr")) + outfd = 2; + else + outfd = 1; + #ifndef WIN32 fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY); #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 (); + Host_Main(); - Host_Frame (framenewtime - frameoldtime); - - frameoldtime = framenewtime; - } 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); +}