collision.h doesn't need winding.h anymore

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index ad69c1cd206b4f1fbdf5abdf079a7c79a44b0227..f53745e560ef2485da9e1631e1ac75ae2ad36e97 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -28,7 +28,6 @@ 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"};
 
@@ -74,10 +73,14 @@ void Sys_Error (const char *error, ...)
        if (!in_sys_error0 && cls.state != ca_dedicated)
        {
                in_sys_error0 = 1;
-               VID_Shutdown();
+               VID_Shutdown();     
        }
        MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
 
+       Con_Print ("Quake Error: ");
+       Con_Print (text);
+       Con_Print ("\n");
+
        if (!in_sys_error1)
        {
                in_sys_error1 = 1;
@@ -94,10 +97,8 @@ void Sys_Error (const char *error, ...)
        exit (1);
 }
 
-void Sys_Quit (void)
+void Sys_Shutdown (void)
 {
-       Host_Shutdown();
-
        if (tevent)
                CloseHandle (tevent);
 
@@ -106,11 +107,9 @@ 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;
@@ -282,25 +281,29 @@ void Sys_Sleep(int milliseconds)
        Sleep(milliseconds);
 }
 
-
-void Sys_SendKeyEvents (void)
+char *Sys_GetClipboardData (void)
 {
-       MSG msg;
+       char *data = NULL;
+       char *cliptext;
 
-       while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE))
+       if (OpenClipboard (NULL) != 0)
        {
-       // we always update if there are any event, even if we're paused
-               scr_skipupdate = 0;
-
-               if (!GetMessage (&msg, NULL, 0, 0))
-                       Sys_Quit ();
+               HANDLE hClipboardData;
 
-               TranslateMessage (&msg);
-               DispatchMessage (&msg);
+               if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
+               {
+                       if ((cliptext = GlobalLock (hClipboardData)) != 0) 
+                       {
+                               data = malloc (GlobalSize(hClipboardData)+1);
+                               strcpy (data, cliptext);
+                               GlobalUnlock (hClipboardData);
+                       }
+               }
+               CloseClipboard ();
        }
+       return data;
 }
 
-
 /*
 ==============================================================================
 
@@ -345,23 +348,46 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
        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))
        {
-               while (*lpCmdLine && ((*lpCmdLine <= 32) || (*lpCmdLine > 126)))
+               while (*lpCmdLine && *lpCmdLine <= 32)
                        lpCmdLine++;
 
                if (*lpCmdLine)
                {
-                       argv[com_argc] = lpCmdLine;
-                       com_argc++;
+                       if (*lpCmdLine == '\"')
+                       {
+                               // quoted string
+                               argv[com_argc] = lpCmdLine;
+                               com_argc++;
 
-                       while (*lpCmdLine && ((*lpCmdLine > 32) && (*lpCmdLine <= 126)))
-                               lpCmdLine++;
+                               while (*lpCmdLine && (*lpCmdLine != '\"'))
+                                       lpCmdLine++;
 
-                       if (*lpCmdLine)
+                               if (*lpCmdLine)
+                               {
+                                       *lpCmdLine = 0;
+                                       lpCmdLine++;
+                               }
+
+                               if (*lpCmdLine == '\"')
+                                       lpCmdLine++;
+                       }
+                       else
                        {
-                               *lpCmdLine = 0;
-                               lpCmdLine++;
+                               // unquoted word
+                               argv[com_argc] = lpCmdLine;
+                               com_argc++;
+
+                               while (*lpCmdLine && *lpCmdLine > 32)
+                                       lpCmdLine++;
+
+                               if (*lpCmdLine)
+                               {
+                                       *lpCmdLine = 0;
+                                       lpCmdLine++;
+                               }
                        }
                }
        }
@@ -440,4 +466,3 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
        /* return success of application */
        return true;
 }
-