X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sys_sdl.c;h=e63c85ba817117224c0d5a232d6347a50f7beb58;hb=925dc3b341a087249ca6fa0be7c227e49d01b213;hp=3bdbc7e53a7ba931ce29fe6774101ebe12d1c2a9;hpb=642d100a7741843488a5166d089b9be03e6a8e40;p=xonotic%2Fdarkplaces.git diff --git a/sys_sdl.c b/sys_sdl.c index 3bdbc7e5..e63c85ba 100644 --- a/sys_sdl.c +++ b/sys_sdl.c @@ -1,5 +1,6 @@ #ifdef WIN32 +#include #include "conio.h" #else #include @@ -7,15 +8,26 @@ #include #endif -#include +#ifdef __ANDROID__ +#include -#include "quakedef.h" +#ifndef FNDELAY +#define FNDELAY O_NDELAY +#endif +#endif + +#include #include #ifdef WIN32 -cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"}; +#ifdef _MSC_VER +#pragma comment(lib, "sdl2.lib") +#pragma comment(lib, "sdl2main.lib") #endif +#endif + +#include "quakedef.h" // ======================================================================= // General routines @@ -23,18 +35,21 @@ cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"}; void Sys_Shutdown (void) { +#ifdef __ANDROID__ + Sys_AllowProfiling(false); +#endif #ifndef WIN32 fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); #endif fflush(stdout); SDL_Quit(); } - + void Sys_Error (const char *error, ...) { va_list argptr; - char string[1024]; + char string[MAX_INPUTLINE]; // change stdin to non blocking #ifndef WIN32 @@ -42,84 +57,60 @@ void Sys_Error (const char *error, ...) #endif va_start (argptr,error); - vsnprintf (string, sizeof (string), error, argptr); + 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 ("Quake Error: %s\n", string); + +#ifdef WIN32 + MessageBox(NULL, string, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP); +#endif Host_Shutdown (); exit (1); } +static int outfd = 1; 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; -#ifdef WIN32 - // LordHavoc: note to people modifying this code, DWORD is specifically defined as an unsigned 32bit number, therefore the 65536.0 * 65536.0 is fine. - if (!sys_usetimegettime.integer) +#ifdef __ANDROID__ + if (developer.integer > 0) { - // QueryPerformanceCounter - // platform: - // Windows 95/98/ME/NT/2000/XP - // features: - // very accurate (CPU cycles) - // known issues: - // does not necessarily match realtime too well (tends to get faster and faster in win98) - // wraps around occasionally on some platforms (depends on CPU speed and probably other unknown factors) - double timescale; - LARGE_INTEGER PerformanceFreq; - LARGE_INTEGER PerformanceCount; - - if (!QueryPerformanceFrequency (&PerformanceFreq)) - Sys_Error ("No hardware timer available"); - QueryPerformanceCounter (&PerformanceCount); - - #ifdef __BORLANDC__ - timescale = 1.0 / ((double) PerformanceFreq.u.LowPart + (double) PerformanceFreq.u.HighPart * 65536.0 * 65536.0); - newtime = ((double) PerformanceCount.u.LowPart + (double) PerformanceCount.u.HighPart * 65536.0 * 65536.0) * timescale; - #else - timescale = 1.0 / ((double) PerformanceFreq.LowPart + (double) PerformanceFreq.HighPart * 65536.0 * 65536.0); - newtime = ((double) PerformanceCount.LowPart + (double) PerformanceCount.HighPart * 65536.0 * 65536.0) * timescale; - #endif - } else -#endif - newtime = (double) SDL_GetTicks() / 1000.0; - - - if (first) - { - first = false; - oldtime = newtime; + __android_log_write(ANDROID_LOG_DEBUG, com_argv[0], text); } - - if (newtime < oldtime) +#else + if(outfd < 0) + return; +#ifdef FNDELAY + // 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 (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); } - 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; @@ -128,11 +119,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; } @@ -140,8 +131,8 @@ char *Sys_ConsoleInput(void) { if (len) { - putch (' '); - putch (c); + _putch (' '); + _putch (c); len--; text[len] = 0; } @@ -175,72 +166,66 @@ 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 = strlen(cliptext) + 1; + data = (char *)Z_Malloc (allocsize); + strlcpy (data, cliptext, allocsize); + SDL_free(cliptext); } + return data; -#else - return NULL; -#endif } -int SDL_main (int argc, char *argv[]) +void Sys_InitConsole (void) { - double frameoldtime, framenewtime; +} +int main (int argc, char *argv[]) +{ signal(SIGFPE, SIG_IGN); +#ifdef __ANDROID__ + Sys_AllowProfiling(true); +#endif + com_argc = argc; - com_argv = argv; + com_argv = (const char **)argv; + Sys_ProvideSelfFD(); + + // 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 - Sys_Shared_EarlyInit(); - -#ifdef WIN32 - Cvar_RegisterVariable(&sys_usetimegettime); -#endif - - Host_Init(); - - Sys_Shared_LateInit(); - - frameoldtime = Sys_DoubleTime () - 0.1; - while (1) - { - // find time spent rendering last frame - framenewtime = Sys_DoubleTime (); + // we don't know which systems we'll want to init, yet... + SDL_Init(0); - Host_Frame (framenewtime - frameoldtime); + Host_Main(); - 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); +}