]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - sys_win.c
another WIN32_LEAN_AND_MEAN patch from Willis, this one for non-SDL client and dedica...
[xonotic/darkplaces.git] / sys_win.c
index e7ec1630cbec129be1ed7f83fbad0a80aaeab714..c5fdb0c35581bb9dfcb381ad0e66180b27e7b7a8 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 #include <windows.h>
+#include <mmsystem.h>
 #include <dsound.h>
 #include "errno.h"
 #include "resource.h"
@@ -29,16 +30,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern void S_BlockSound (void);
 
-cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
+cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1", "use windows timeGetTime function (which has issues on some motherboards) for timing rather than QueryPerformanceCounter timer (which has issues on multicore/multiprocessor machines and processors which are designed to conserve power)"};
 
-// # of seconds to wait on Sys_Error running dedicated before exiting
-#define CONSOLE_ERROR_TIMEOUT  60.0
-// sleep time on pause or minimization
-#define PAUSE_SLEEP            50
-// sleep time when not focus
-#define NOT_FOCUS_SLEEP        20
-
-static qboolean                sc_return_on_enter = false;
 HANDLE                         hinput, houtput;
 
 static HANDLE  tevent;
@@ -55,27 +48,33 @@ SYSTEM IO
 ===============================================================================
 */
 
-void SleepUntilInput (int time);
-
 void Sys_Error (const char *error, ...)
 {
        va_list         argptr;
-       char            text[1024];
+       char            text[MAX_INPUTLINE];
        static int      in_sys_error0 = 0;
        static int      in_sys_error1 = 0;
        static int      in_sys_error2 = 0;
+       static int      in_sys_error3 = 0;
 
        va_start (argptr, error);
-       vsnprintf (text, sizeof (text), error, argptr);
+       dpvsnprintf (text, sizeof (text), error, argptr);
        va_end (argptr);
 
+       Con_Printf ("Quake Error: %s\n", text);
+
        // close video so the message box is visible, unless we already tried that
        if (!in_sys_error0 && cls.state != ca_dedicated)
        {
                in_sys_error0 = 1;
                VID_Shutdown();
        }
-       MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
+
+       if (!in_sys_error3 && cls.state != ca_dedicated)
+       {
+               in_sys_error3 = true;
+               MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
+       }
 
        if (!in_sys_error1)
        {
@@ -87,7 +86,7 @@ void Sys_Error (const char *error, ...)
        if (!in_sys_error2)
        {
                in_sys_error2 = 1;
-               DeinitConProc ();
+               Sys_Shutdown ();
        }
 
        exit (1);
@@ -110,7 +109,7 @@ void Sys_PrintToTerminal(const char *text)
        DWORD dummy;
        extern HANDLE houtput;
        if (cls.state == ca_dedicated)
-               WriteFile(houtput, text, strlen (text), &dummy, NULL);
+               WriteFile(houtput, text, (DWORD) strlen(text), &dummy, NULL);
 }
 
 /*
@@ -159,7 +158,12 @@ double Sys_DoubleTime (void)
                LARGE_INTEGER PerformanceCount;
 
                if (!QueryPerformanceFrequency (&PerformanceFreq))
-                       Sys_Error ("No hardware timer available");
+               {
+                       Con_Printf ("No hardware timer available\n");
+                       // fall back to timeGetTime
+                       Cvar_SetValueQuick(&sys_usetimegettime, true);
+                       return Sys_DoubleTime();
+               }
                QueryPerformanceCounter (&PerformanceCount);
 
                #ifdef __BORLANDC__
@@ -193,7 +197,7 @@ double Sys_DoubleTime (void)
 
 char *Sys_ConsoleInput (void)
 {
-       static char text[256];
+       static char text[MAX_INPUTLINE];
        static int len;
        INPUT_RECORD recs[1024];
        int ch;
@@ -234,13 +238,6 @@ char *Sys_ConsoleInput (void)
                                                        len = 0;
                                                        return text;
                                                }
-                                               else if (sc_return_on_enter)
-                                               {
-                                               // special case to allow exiting from the error handler on Enter
-                                                       text[0] = '\r';
-                                                       len = 0;
-                                                       return text;
-                                               }
 
                                                break;
 
@@ -277,99 +274,34 @@ void Sys_Sleep(int milliseconds)
        Sleep(milliseconds);
 }
 
-/*
-==============================================================================
-
-WINDOWS CRAP
-
-==============================================================================
-*/
-
-
-void SleepUntilInput (int time)
-{
-       MsgWaitForMultipleObjects(1, &tevent, false, time, QS_ALLINPUT);
-}
-
-
-/*
-==================
-WinMain
-==================
-*/
-HINSTANCE      global_hInstance;
-const char     *argv[MAX_NUM_ARGVS];
-char           program_name[MAX_OSPATH];
-
-int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+char *Sys_GetClipboardData (void)
 {
-       double frameoldtime, framenewtime;
-       MEMORYSTATUS lpBuffer;
-       int t;
-
-       /* previous instances do not exist in Win32 */
-       if (hPrevInstance)
-               return 0;
-
-       global_hInstance = hInstance;
-
-       lpBuffer.dwLength = sizeof(MEMORYSTATUS);
-       GlobalMemoryStatus (&lpBuffer);
+       char *data = NULL;
+       char *cliptext;
 
-       com_argc = 1;
-       program_name[sizeof(program_name)-1] = 0;
-       GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1);
-       argv[0] = program_name;
-
-       // FIXME: this tokenizer is rather redundent, call a more general one
-       while (*lpCmdLine && (com_argc < MAX_NUM_ARGVS))
+       if (OpenClipboard (NULL) != 0)
        {
-               while (*lpCmdLine && *lpCmdLine <= 32)
-                       lpCmdLine++;
+               HANDLE hClipboardData;
 
-               if (*lpCmdLine)
+               if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
                {
-                       if (*lpCmdLine == '\"')
-                       {
-                               // quoted string
-                               argv[com_argc] = lpCmdLine;
-                               com_argc++;
-
-                               while (*lpCmdLine && (*lpCmdLine != '\"'))
-                                       lpCmdLine++;
-
-                               if (*lpCmdLine)
-                               {
-                                       *lpCmdLine = 0;
-                                       lpCmdLine++;
-                               }
-
-                               if (*lpCmdLine == '\"')
-                                       lpCmdLine++;
-                       }
-                       else
+                       if ((cliptext = GlobalLock (hClipboardData)) != 0)
                        {
-                               // unquoted word
-                               argv[com_argc] = lpCmdLine;
-                               com_argc++;
-
-                               while (*lpCmdLine && *lpCmdLine > 32)
-                                       lpCmdLine++;
-
-                               if (*lpCmdLine)
-                               {
-                                       *lpCmdLine = 0;
-                                       lpCmdLine++;
-                               }
+                               data = malloc (GlobalSize(hClipboardData)+1);
+                               strcpy (data, cliptext);
+                               GlobalUnlock (hClipboardData);
                        }
                }
+               CloseClipboard ();
        }
-       com_argv = argv;
-
-       Sys_Shared_EarlyInit();
+       return data;
+}
 
-       Cvar_RegisterVariable(&sys_usetimegettime);
+void Sys_InitConsole (void)
+{
+       int t;
 
+       // initialize the windows dedicated server console if needed
        tevent = CreateEvent(NULL, false, false, NULL);
 
        if (!tevent)
@@ -385,6 +317,9 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
                hinput = GetStdHandle (STD_INPUT_HANDLE);
                houtput = GetStdHandle (STD_OUTPUT_HANDLE);
 
+#ifdef _WIN64
+#define atoi _atoi64
+#endif
        // give QHOST a chance to hook into the console
                if ((t = COM_CheckParm ("-HFILE")) > 0)
                {
@@ -409,28 +344,93 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 
 // because sound is off until we become active
        S_BlockSound ();
+}
 
-       Host_Init ();
+void Sys_Init_Commands (void)
+{
+       Cvar_RegisterVariable(&sys_usetimegettime);
+}
 
-       Sys_Shared_LateInit();
+/*
+==============================================================================
 
-       frameoldtime = Sys_DoubleTime ();
-       
-       /* main window message loop */
-       while (1)
+WINDOWS CRAP
+
+==============================================================================
+*/
+
+
+/*
+==================
+WinMain
+==================
+*/
+HINSTANCE      global_hInstance;
+const char     *argv[MAX_NUM_ARGVS];
+char           program_name[MAX_OSPATH];
+
+int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+{
+       double frameoldtime, framenewtime;
+       MEMORYSTATUS lpBuffer;
+
+       /* previous instances do not exist in Win32 */
+       if (hPrevInstance)
+               return 0;
+
+       global_hInstance = hInstance;
+
+       lpBuffer.dwLength = sizeof(MEMORYSTATUS);
+       GlobalMemoryStatus (&lpBuffer);
+
+       program_name[sizeof(program_name)-1] = 0;
+       GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1);
+
+       com_argc = 1;
+       com_argv = argv;
+       argv[0] = program_name;
+
+       // FIXME: this tokenizer is rather redundent, call a more general one
+       while (*lpCmdLine && (com_argc < MAX_NUM_ARGVS))
        {
-               if (cls.state != ca_dedicated)
+               while (*lpCmdLine && *lpCmdLine <= ' ')
+                       lpCmdLine++;
+
+               if (!*lpCmdLine)
+                       break;
+
+               if (*lpCmdLine == '\"')
                {
-               // yield the CPU for a little while when paused, minimized, or not the focus
-                       if ((cl.paused && !vid_activewindow) || vid_hidden)
-                       {
-                               SleepUntilInput (PAUSE_SLEEP);
-                               scr_skipupdate = 1;             // no point in bothering to draw
-                       }
-                       else if (!vid_activewindow)
-                               SleepUntilInput (NOT_FOCUS_SLEEP);
+                       // quoted string
+                       lpCmdLine++;
+                       argv[com_argc] = lpCmdLine;
+                       com_argc++;
+                       while (*lpCmdLine && (*lpCmdLine != '\"'))
+                               lpCmdLine++;
+               }
+               else
+               {
+                       // unquoted word
+                       argv[com_argc] = lpCmdLine;
+                       com_argc++;
+                       while (*lpCmdLine && *lpCmdLine > ' ')
+                               lpCmdLine++;
+               }
+
+               if (*lpCmdLine)
+               {
+                       *lpCmdLine = 0;
+                       lpCmdLine++;
                }
+       }
+
+       Host_Init ();
+
+       frameoldtime = Sys_DoubleTime ();
 
+       /* main window message loop */
+       while (1)
+       {
                framenewtime = Sys_DoubleTime ();
                Host_Frame (framenewtime - frameoldtime);
                frameoldtime = framenewtime;
@@ -439,4 +439,3 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
        /* return success of application */
        return true;
 }
-