]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - sys_sdl.c
physics: fix and refactor unsticking
[xonotic/darkplaces.git] / sys_sdl.c
index 3bdbc7e53a7ba931ce29fe6774101ebe12d1c2a9..574f1355aacedb76cb10b57d497f29c910effe8b 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
-
-#ifdef WIN32
-#include "conio.h"
-#else
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/time.h>
-#endif
-
-#include <signal.h>
-
-#include "quakedef.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
-cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
+#ifdef _MSC_VER
+#pragma comment(lib, "sdl2.lib")
+#pragma comment(lib, "sdl2main.lib")
 #endif
+#endif
+
 
 // =======================================================================
 // General routines
 // =======================================================================
 
-void Sys_Shutdown (void)
+void Sys_SDL_Shutdown(void)
 {
-#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];
-
-// change stdin to non blocking
-#ifndef WIN32
-       fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
-#endif
-
-       va_start (argptr,error);
-       vsnprintf (string, sizeof (string), error, argptr);
-       va_end (argptr);
-       fprintf(stderr, "Error: %s\n", string);
-
-       Con_Print ("Quake Error: ");
-       Con_Print (string);
-       Con_Print ("\n");
-
-       Host_Shutdown ();
-       exit (1);
-}
 
-void Sys_PrintToTerminal(const char *text)
+// 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)
 {
-       printf("%s", text);
+       if(!nocrashdialog)
+               SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, title, string, NULL);
 }
 
-double Sys_DoubleTime (void)
+char *Sys_SDL_GetClipboardData (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)
-       {
-               // 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;
-       }
+       char *data = NULL;
+       char *cliptext;
 
-       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);
+       cliptext = SDL_GetClipboardText();
+       if (cliptext != NULL) {
+               size_t allocsize;
+               allocsize = min(MAX_INPUTLINE, strlen(cliptext) + 1);
+               data = (char *)Z_Malloc (allocsize);
+               dp_strlcpy (data, cliptext, allocsize);
+               SDL_free(cliptext);
        }
-       else
-               curtime += newtime - oldtime;
-       oldtime = newtime;
 
-       return curtime;
+       return data;
 }
 
-char *Sys_ConsoleInput(void)
+void Sys_SDL_Init(void)
 {
-       if (cls.state == ca_dedicated)
-       {
-               static char text[256];
-               int len = 0;
-#ifdef WIN32
-               int c;
+       // we don't know which systems we'll want to init, yet...
+       if (SDL_Init(0) < 0)
+               Sys_Error("SDL_Init failed: %s\n", SDL_GetError());
 
-               // 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;
+       // COMMANDLINEOPTION: sdl: -nocrashdialog disables "Engine Error" crash dialog boxes
+       if(!Sys_CheckParm("-nocrashdialog"))
+               nocrashdialog = false;
 }
 
-void Sys_Sleep(int milliseconds)
+qbool sys_supportsdlgetticks = true;
+unsigned int Sys_SDL_GetTicks (void)
 {
-       if (milliseconds < 1)
-               milliseconds = 1;
-       SDL_Delay(milliseconds);
+       return SDL_GetTicks();
 }
-
-char *Sys_GetClipboardData (void)
+void Sys_SDL_Delay (unsigned int milliseconds)
 {
-#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 ();
-       }
-       return data;
-#else
-       return NULL;
-#endif
+       SDL_Delay(milliseconds);
 }
 
-int SDL_main (int argc, char *argv[])
+int main(int argc, char *argv[])
 {
-       double frameoldtime, framenewtime;
-
-       signal(SIGFPE, SIG_IGN);
-
-       com_argc = argc;
-       com_argv = argv;
-
-#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 ();
-
-               Host_Frame (framenewtime - frameoldtime);
-
-               frameoldtime = framenewtime;
-       }
-       return 0;
+       return Sys_Main(argc, argv);
 }