]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - sys_win.c
Fixed alias parsing and added support for $* which pastes all formal parameters.
[xonotic/darkplaces.git] / sys_win.c
index ad69c1cd206b4f1fbdf5abdf079a7c79a44b0227..c0ae22af3006c3230409385a0cc0dbb763e418b1 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -28,18 +28,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "direct.h"
 
 extern void S_BlockSound (void);
-extern void S_UnblockSound (void);
 
 cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
 
-// # 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;
@@ -56,8 +47,6 @@ SYSTEM IO
 ===============================================================================
 */
 
-void SleepUntilInput (int time);
-
 void Sys_Error (const char *error, ...)
 {
        va_list         argptr;
@@ -65,18 +54,26 @@ void Sys_Error (const char *error, ...)
        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)
        {
@@ -88,16 +85,14 @@ void Sys_Error (const char *error, ...)
        if (!in_sys_error2)
        {
                in_sys_error2 = 1;
-               DeinitConProc ();
+               Sys_Shutdown ();
        }
 
        exit (1);
 }
 
-void Sys_Quit (void)
+void Sys_Shutdown (void)
 {
-       Host_Shutdown();
-
        if (tevent)
                CloseHandle (tevent);
 
@@ -106,16 +101,14 @@ void Sys_Quit (void)
 
 // shut down QHOST hooks if necessary
        DeinitConProc ();
-
-       exit (0);
 }
 
-void Sys_Print(const char *text)
+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);
 }
 
 /*
@@ -164,7 +157,12 @@ double Sys_DoubleTime (void)
                LARGE_INTEGER PerformanceCount;
 
                if (!QueryPerformanceFrequency (&PerformanceFreq))
-                       Sys_Error ("No hardware timer available");
+               {
+                       Con_Printf ("No hardware timer available");
+                       // fall back to timeGetTime
+                       Cvar_SetValueQuick(&sys_usetimegettime, true);
+                       return Sys_DoubleTime();
+               }
                QueryPerformanceCounter (&PerformanceCount);
 
                #ifdef __BORLANDC__
@@ -239,13 +237,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;
 
@@ -282,24 +273,82 @@ void Sys_Sleep(int milliseconds)
        Sleep(milliseconds);
 }
 
+char *Sys_GetClipboardData (void)
+{
+       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;
+}
 
-void Sys_SendKeyEvents (void)
+void Sys_InitConsole (void)
 {
-       MSG msg;
+       int t;
 
-       while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE))
+       // initialize the windows dedicated server console if needed
+       tevent = CreateEvent(NULL, false, false, NULL);
+
+       if (!tevent)
+               Sys_Error ("Couldn't create event");
+
+       // LordHavoc: can't check cls.state because it hasn't been initialized yet
+       // if (cls.state == ca_dedicated)
+       if (COM_CheckParm("-dedicated"))
        {
-       // we always update if there are any event, even if we're paused
-               scr_skipupdate = 0;
+               if (!AllocConsole ())
+                       Sys_Error ("Couldn't create dedicated server console");
 
-               if (!GetMessage (&msg, NULL, 0, 0))
-                       Sys_Quit ();
+               hinput = GetStdHandle (STD_INPUT_HANDLE);
+               houtput = GetStdHandle (STD_OUTPUT_HANDLE);
 
-               TranslateMessage (&msg);
-               DispatchMessage (&msg);
+#ifdef WIN64
+#define atoi _atoi64
+#endif
+       // give QHOST a chance to hook into the console
+               if ((t = COM_CheckParm ("-HFILE")) > 0)
+               {
+                       if (t < com_argc)
+                               hFile = (HANDLE)atoi (com_argv[t+1]);
+               }
+
+               if ((t = COM_CheckParm ("-HPARENT")) > 0)
+               {
+                       if (t < com_argc)
+                               heventParent = (HANDLE)atoi (com_argv[t+1]);
+               }
+
+               if ((t = COM_CheckParm ("-HCHILD")) > 0)
+               {
+                       if (t < com_argc)
+                               heventChild = (HANDLE)atoi (com_argv[t+1]);
+               }
+
+               InitConProc (hFile, heventParent, heventChild);
        }
+
+// because sound is off until we become active
+       S_BlockSound ();
 }
 
+void Sys_Init_Commands (void)
+{
+       Cvar_RegisterVariable(&sys_usetimegettime);
+}
 
 /*
 ==============================================================================
@@ -310,12 +359,6 @@ WINDOWS CRAP
 */
 
 
-void SleepUntilInput (int time)
-{
-       MsgWaitForMultipleObjects(1, &tevent, false, time, QS_ALLINPUT);
-}
-
-
 /*
 ==================
 WinMain
@@ -329,7 +372,6 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 {
        double frameoldtime, framenewtime;
        MEMORYSTATUS lpBuffer;
-       int t;
 
        /* previous instances do not exist in Win32 */
        if (hPrevInstance)
@@ -340,98 +382,54 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
        lpBuffer.dwLength = sizeof(MEMORYSTATUS);
        GlobalMemoryStatus (&lpBuffer);
 
-       com_argc = 1;
        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))
        {
-               while (*lpCmdLine && ((*lpCmdLine <= 32) || (*lpCmdLine > 126)))
+               while (*lpCmdLine && *lpCmdLine <= ' ')
                        lpCmdLine++;
 
-               if (*lpCmdLine)
+               if (!*lpCmdLine)
+                       break;
+
+               if (*lpCmdLine == '\"')
                {
+                       // quoted string
+                       lpCmdLine++;
                        argv[com_argc] = lpCmdLine;
                        com_argc++;
-
-                       while (*lpCmdLine && ((*lpCmdLine > 32) && (*lpCmdLine <= 126)))
-                               lpCmdLine++;
-
-                       if (*lpCmdLine)
-                       {
-                               *lpCmdLine = 0;
+                       while (*lpCmdLine && (*lpCmdLine != '\"'))
                                lpCmdLine++;
-                       }
-               }
-       }
-       com_argv = argv;
-
-       Sys_Shared_EarlyInit();
-
-       Cvar_RegisterVariable(&sys_usetimegettime);
-
-       tevent = CreateEvent(NULL, false, false, NULL);
-
-       if (!tevent)
-               Sys_Error ("Couldn't create event");
-
-       // LordHavoc: can't check cls.state because it hasn't been initialized yet
-       // if (cls.state == ca_dedicated)
-       if (COM_CheckParm("-dedicated"))
-       {
-               if (!AllocConsole ())
-                       Sys_Error ("Couldn't create dedicated server console");
-
-               hinput = GetStdHandle (STD_INPUT_HANDLE);
-               houtput = GetStdHandle (STD_OUTPUT_HANDLE);
-
-       // give QHOST a chance to hook into the console
-               if ((t = COM_CheckParm ("-HFILE")) > 0)
-               {
-                       if (t < com_argc)
-                               hFile = (HANDLE)atoi (com_argv[t+1]);
                }
-
-               if ((t = COM_CheckParm ("-HPARENT")) > 0)
+               else
                {
-                       if (t < com_argc)
-                               heventParent = (HANDLE)atoi (com_argv[t+1]);
+                       // unquoted word
+                       argv[com_argc] = lpCmdLine;
+                       com_argc++;
+                       while (*lpCmdLine && *lpCmdLine > ' ')
+                               lpCmdLine++;
                }
 
-               if ((t = COM_CheckParm ("-HCHILD")) > 0)
+               if (*lpCmdLine)
                {
-                       if (t < com_argc)
-                               heventChild = (HANDLE)atoi (com_argv[t+1]);
+                       *lpCmdLine = 0;
+                       lpCmdLine++;
                }
-
-               InitConProc (hFile, heventParent, heventChild);
        }
 
-// because sound is off until we become active
-       S_BlockSound ();
-
        Host_Init ();
 
-       Sys_Shared_LateInit();
-
        frameoldtime = Sys_DoubleTime ();
-       
+
        /* main window message loop */
        while (1)
        {
-               if (cls.state != ca_dedicated)
-               {
-               // 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);
-               }
-
                framenewtime = Sys_DoubleTime ();
                Host_Frame (framenewtime - frameoldtime);
                frameoldtime = framenewtime;
@@ -440,4 +438,3 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
        /* return success of application */
        return true;
 }
-