X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sys_win.c;h=4fa62ee06cc5e4c6186ffc1fdab6fb02019e6452;hb=0061ac3a7fb346971da88d3e1684ea106311ab8c;hp=43d324d2ee328ec7e5e68338d18a269374c6b2da;hpb=6631251252a526c873d18d381d26a47bafe5ab51;p=xonotic%2Fdarkplaces.git

diff --git a/sys_win.c b/sys_win.c
index 43d324d2..4fa62ee0 100644
--- a/sys_win.c
+++ b/sys_win.c
@@ -31,14 +31,6 @@ 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
-#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,8 +47,6 @@ SYSTEM IO
 ===============================================================================
 */
 
-void SleepUntilInput (int time);
-
 void Sys_Error (const char *error, ...)
 {
 	va_list		argptr;
@@ -64,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)
 	{
@@ -87,7 +85,7 @@ void Sys_Error (const char *error, ...)
 	if (!in_sys_error2)
 	{
 		in_sys_error2 = 1;
-		DeinitConProc ();
+		Sys_Shutdown ();
 	}
 
 	exit (1);
@@ -234,13 +232,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,25 +268,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;
 }
 
-
 /*
 ==============================================================================
 
@@ -305,12 +300,6 @@ WINDOWS CRAP
 */
 
 
-void SleepUntilInput (int time)
-{
-	MsgWaitForMultipleObjects(1, &tevent, false, time, QS_ALLINPUT);
-}
-
-
 /*
 ==================
 WinMain
@@ -335,55 +324,46 @@ 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)
+		while (*lpCmdLine && *lpCmdLine <= ' ')
 			lpCmdLine++;
 
-		if (*lpCmdLine)
-		{
-			if (*lpCmdLine == '\"')
-			{
-				// quoted string
-				argv[com_argc] = lpCmdLine;
-				com_argc++;
-
-				while (*lpCmdLine && (*lpCmdLine != '\"'))
-					lpCmdLine++;
-
-				if (*lpCmdLine)
-				{
-					*lpCmdLine = 0;
-					lpCmdLine++;
-				}
-
-				if (*lpCmdLine == '\"')
-					lpCmdLine++;
-			}
-			else
-			{
-				// unquoted word
-				argv[com_argc] = lpCmdLine;
-				com_argc++;
+		if (!*lpCmdLine)
+			break;
 
-				while (*lpCmdLine && *lpCmdLine > 32)
-					lpCmdLine++;
+		if (*lpCmdLine == '\"')
+		{
+			// 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++;
-				}
-			}
+		if (*lpCmdLine)
+		{
+			*lpCmdLine = 0;
+			lpCmdLine++;
 		}
 	}
-	com_argv = argv;
 
 	Sys_Shared_EarlyInit();
 
@@ -438,18 +418,6 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 	/* 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;
@@ -458,4 +426,3 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 	/* return success of application */
 	return true;
 }
-