X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sys_win.c;h=e261d04ddf5d046c9db2af7cb07eb8b02401e274;hb=5e20bfd1146312b43ea9cad50e4cc47c3900c3f7;hp=34f82380330afe6abc830bd18d617b3bb0fc4a13;hpb=83fe4d8441466918165cfc7ce822831ed1ba72f6;p=xonotic%2Fdarkplaces.git

diff --git a/sys_win.c b/sys_win.c
index 34f82380..e261d04d 100644
--- a/sys_win.c
+++ b/sys_win.c
@@ -20,12 +20,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // sys_win.c -- Win32 system interface code
 
 #include "quakedef.h"
-#include "winquake.h"
+#include <windows.h>
+#include <dsound.h>
 #include "errno.h"
 #include "resource.h"
 #include "conproc.h"
 #include "direct.h"
 
+extern void S_BlockSound (void);
+
 cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
 
 // # of seconds to wait on Sys_Error running dedicated before exiting
@@ -70,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;
@@ -90,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);
 
@@ -102,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;
@@ -271,30 +274,36 @@ char *Sys_ConsoleInput (void)
 	return NULL;
 }
 
-void Sys_Sleep (void)
+void Sys_Sleep(int milliseconds)
 {
-	Sleep (1);
+	if (milliseconds < 1)
+		milliseconds = 1;
+	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;
+		HANDLE hClipboardData;
 
-		if (!GetMessage (&msg, NULL, 0, 0))
-			Sys_Quit ();
-
-		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;
 }
 
-
 /*
 ==============================================================================
 
@@ -316,7 +325,6 @@ WinMain
 ==================
 */
 HINSTANCE	global_hInstance;
-int			global_nCmdShow;
 const char	*argv[MAX_NUM_ARGVS];
 char		program_name[MAX_OSPATH];
 
@@ -331,37 +339,50 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 		return 0;
 
 	global_hInstance = hInstance;
-	global_nCmdShow = nCmdShow;
 
 	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)))
+			while (*lpCmdLine && (*lpCmdLine != '\"'))
 				lpCmdLine++;
-
-			if (*lpCmdLine)
-			{
-				*lpCmdLine = 0;
+		}
+		else
+		{
+			// unquoted word
+			argv[com_argc] = lpCmdLine;
+			com_argc++;
+			while (*lpCmdLine && *lpCmdLine > ' ')
 				lpCmdLine++;
-			}
+		}
+
+		if (*lpCmdLine)
+		{
+			*lpCmdLine = 0;
+			lpCmdLine++;
 		}
 	}
-	com_argv = argv;
 
 	Sys_Shared_EarlyInit();
 
@@ -436,4 +457,3 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 	/* return success of application */
 	return true;
 }
-