X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sys_win.c;h=34f82380330afe6abc830bd18d617b3bb0fc4a13;hb=c07e1f2b31de62fd14ffd9d4bd93714797503c87;hp=f239daf6b0aeb957b4f54f77f1e793c9da276b77;hpb=ee1558ddc0664f2fa549a36e86e9748da225f584;p=xonotic%2Fdarkplaces.git

diff --git a/sys_win.c b/sys_win.c
index f239daf6..34f82380 100644
--- a/sys_win.c
+++ b/sys_win.c
@@ -19,8 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sys_win.c -- Win32 system interface code
 
-#define WIN32_USETIMEGETTIME 0
-
 #include "quakedef.h"
 #include "winquake.h"
 #include "errno.h"
@@ -28,6 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "conproc.h"
 #include "direct.h"
 
+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
@@ -35,9 +35,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // sleep time when not focus
 #define NOT_FOCUS_SLEEP	20
 
-int			starttime;
-qboolean	ActiveApp, Minimized;
-
 static qboolean		sc_return_on_enter = false;
 HANDLE				hinput, houtput;
 
@@ -46,129 +43,6 @@ static HANDLE	hFile;
 static HANDLE	heventParent;
 static HANDLE	heventChild;
 
-/*
-===============================================================================
-
-QFile IO
-
-===============================================================================
-*/
-
-// LordHavoc: 256 pak files (was 10)
-#define	MAX_HANDLES		256
-QFile	*sys_handles[MAX_HANDLES];
-
-int		findhandle (void)
-{
-	int		i;
-
-	for (i=1 ; i<MAX_HANDLES ; i++)
-		if (!sys_handles[i])
-			return i;
-	Sys_Error ("out of handles");
-	return -1;
-}
-
-/*
-================
-Sys_FileLength
-================
-*/
-int Sys_FileLength (QFile *f)
-{
-	int		pos;
-	int		end;
-
-	pos = Qtell (f);
-	Qseek (f, 0, SEEK_END);
-	end = Qtell (f);
-	Qseek (f, pos, SEEK_SET);
-
-	return end;
-}
-
-int Sys_FileOpenRead (char *path, int *hndl)
-{
-	QFile	*f;
-	int		i, retval;
-
-	i = findhandle ();
-
-	f = Qopen(path, "rbz");
-
-	if (!f)
-	{
-		*hndl = -1;
-		retval = -1;
-	}
-	else
-	{
-		sys_handles[i] = f;
-		*hndl = i;
-		retval = Sys_FileLength(f);
-	}
-
-	return retval;
-}
-
-int Sys_FileOpenWrite (char *path)
-{
-	QFile	*f;
-	int		i;
-
-	i = findhandle ();
-
-	f = Qopen(path, "wb");
-	if (!f)
-	{
-		Con_Printf("Sys_FileOpenWrite: Error opening %s: %s", path, strerror(errno));
-		return 0;
-	}
-	sys_handles[i] = f;
-
-	return i;
-}
-
-void Sys_FileClose (int handle)
-{
-	Qclose (sys_handles[handle]);
-	sys_handles[handle] = NULL;
-}
-
-void Sys_FileSeek (int handle, int position)
-{
-	Qseek (sys_handles[handle], position, SEEK_SET);
-}
-
-int Sys_FileRead (int handle, void *dest, int count)
-{
-	return Qread (sys_handles[handle], dest, count);
-}
-
-int Sys_FileWrite (int handle, void *data, int count)
-{
-	return Qwrite (sys_handles[handle], data, count);
-}
-
-int	Sys_FileTime (char *path)
-{
-	QFile	*f;
-
-	f = Qopen(path, "rb");
-	if (f)
-	{
-		Qclose(f);
-		return 1;
-	}
-
-	return -1;
-}
-
-void Sys_mkdir (char *path)
-{
-	_mkdir (path);
-}
-
 
 /*
 ===============================================================================
@@ -178,60 +52,27 @@ SYSTEM IO
 ===============================================================================
 */
 
-void Sys_Error (char *error, ...)
+void SleepUntilInput (int time);
+
+void Sys_Error (const char *error, ...)
 {
 	va_list		argptr;
-	char		text[1024], text2[1024];
-	char		*text3 = "Press Enter to exit\n";
-	char		*text4 = "***********************************\n";
-	char		*text5 = "\n";
-	DWORD		dummy;
-	double		starttime;
+	char		text[1024];
 	static int	in_sys_error0 = 0;
 	static int	in_sys_error1 = 0;
 	static int	in_sys_error2 = 0;
-	static int	in_sys_error3 = 0;
-
-	if (!in_sys_error3)
-		in_sys_error3 = 1;
 
 	va_start (argptr, error);
-	vsprintf (text, error, argptr);
+	vsnprintf (text, sizeof (text), error, argptr);
 	va_end (argptr);
 
-	if (cls.state == ca_dedicated)
+	// close video so the message box is visible, unless we already tried that
+	if (!in_sys_error0 && cls.state != ca_dedicated)
 	{
-		va_start (argptr, error);
-		vsprintf (text, error, argptr);
-		va_end (argptr);
-
-		sprintf (text2, "ERROR: %s\n", text);
-		WriteFile (houtput, text5, strlen (text5), &dummy, NULL);
-		WriteFile (houtput, text4, strlen (text4), &dummy, NULL);
-		WriteFile (houtput, text2, strlen (text2), &dummy, NULL);
-		WriteFile (houtput, text3, strlen (text3), &dummy, NULL);
-		WriteFile (houtput, text4, strlen (text4), &dummy, NULL);
-
-
-		starttime = Sys_DoubleTime ();
-		sc_return_on_enter = true;	// so Enter will get us out of here
-
-		while (!Sys_ConsoleInput () && ((Sys_DoubleTime () - starttime) < CONSOLE_ERROR_TIMEOUT))
-			SleepUntilInput(1);
-	}
-	else
-	{
-	// switch to windowed so the message box is visible, unless we already
-	// tried that and failed
-		if (!in_sys_error0)
-		{
-			in_sys_error0 = 1;
-			VID_SetDefaultMode ();
-			MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
-		}
-		else
-			MessageBox(NULL, text, "Double Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
+		in_sys_error0 = 1;
+		VID_Shutdown();
 	}
+	MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
 
 	if (!in_sys_error1)
 	{
@@ -265,6 +106,13 @@ void Sys_Quit (void)
 	exit (0);
 }
 
+void Sys_Print(const char *text)
+{
+	DWORD dummy;
+	extern HANDLE houtput;
+	if (cls.state == ca_dedicated)
+		WriteFile(houtput, text, strlen (text), &dummy, NULL);
+}
 
 /*
 ================
@@ -277,45 +125,52 @@ double Sys_DoubleTime (void)
 	static double oldtime = 0.0, curtime = 0.0;
 	double newtime;
 	// LordHavoc: note to people modifying this code, DWORD is specifically defined as an unsigned 32bit number, therefore the 65536.0 * 65536.0 is fine.
-#if WIN32_USETIMEGETTIME
-	// timeGetTime
-	// platform:
-	// Windows 95/98/ME/NT/2000
-	// features:
-	// reasonable accuracy (millisecond)
-	// issues:
-	// wraps around every 47 days or so (but this is non-fatal to us, odd times are rejected, only causes a one frame stutter)
-
-	// make sure the timer is high precision, otherwise different versions of windows have varying accuracy
-	if (first)
-		timeBeginPeriod (1);
-
-	newtime = (double) timeGetTime () / 1000.0;
-#else
-	// QueryPerformanceCounter
-	// platform:
-	// Windows 95/98/ME/NT/2000
-	// features:
-	// very accurate (CPU cycles)
-	// known issues:
-	// does not necessarily match realtime too well (tends to get faster and faster in win98)
-	// wraps around occasionally on some platforms (depends on CPU speed and probably other unknown factors)
-	static double timescale = 0.0;
-	LARGE_INTEGER PerformanceFreq;
-	LARGE_INTEGER PerformanceCount;
-
-	if (!QueryPerformanceFrequency (&PerformanceFreq))
-		Sys_Error ("No hardware timer available");
-	QueryPerformanceCounter (&PerformanceCount);
-
-#ifdef __BORLANDC__
-	timescale = 1.0 / ((double) PerformanceFreq.u.LowPart + (double) PerformanceFreq.u.HighPart * 65536.0 * 65536.0);
-	newtime = ((double) PerformanceCount.u.LowPart + (double) PerformanceCount.u.HighPart * 65536.0 * 65536.0) * timescale;
-#else
-	timescale = 1.0 / ((double) PerformanceFreq.LowPart + (double) PerformanceFreq.HighPart * 65536.0 * 65536.0);
-	newtime = ((double) PerformanceCount.LowPart + (double) PerformanceCount.HighPart * 65536.0 * 65536.0) * timescale;
-#endif
-#endif
+	if (sys_usetimegettime.integer)
+	{
+		static int firsttimegettime = true;
+		// timeGetTime
+		// platform:
+		// Windows 95/98/ME/NT/2000/XP
+		// features:
+		// reasonable accuracy (millisecond)
+		// issues:
+		// wraps around every 47 days or so (but this is non-fatal to us, odd times are rejected, only causes a one frame stutter)
+
+		// make sure the timer is high precision, otherwise different versions of windows have varying accuracy
+		if (firsttimegettime)
+		{
+			timeBeginPeriod (1);
+			firsttimegettime = false;
+		}
+
+		newtime = (double) timeGetTime () / 1000.0;
+	}
+	else
+	{
+		// QueryPerformanceCounter
+		// platform:
+		// Windows 95/98/ME/NT/2000/XP
+		// features:
+		// very accurate (CPU cycles)
+		// known issues:
+		// does not necessarily match realtime too well (tends to get faster and faster in win98)
+		// wraps around occasionally on some platforms (depends on CPU speed and probably other unknown factors)
+		double timescale;
+		LARGE_INTEGER PerformanceFreq;
+		LARGE_INTEGER PerformanceCount;
+
+		if (!QueryPerformanceFrequency (&PerformanceFreq))
+			Sys_Error ("No hardware timer available");
+		QueryPerformanceCounter (&PerformanceCount);
+
+		#ifdef __BORLANDC__
+		timescale = 1.0 / ((double) PerformanceFreq.u.LowPart + (double) PerformanceFreq.u.HighPart * 65536.0 * 65536.0);
+		newtime = ((double) PerformanceCount.u.LowPart + (double) PerformanceCount.u.HighPart * 65536.0 * 65536.0) * timescale;
+		#else
+		timescale = 1.0 / ((double) PerformanceFreq.LowPart + (double) PerformanceFreq.HighPart * 65536.0 * 65536.0);
+		newtime = ((double) PerformanceCount.LowPart + (double) PerformanceCount.HighPart * 65536.0 * 65536.0) * timescale;
+		#endif
+	}
 
 	if (first)
 	{
@@ -324,12 +179,14 @@ double Sys_DoubleTime (void)
 	}
 
 	if (newtime < oldtime)
-		Con_Printf("Sys_DoubleTime: time running backwards??\n");
-	else
 	{
-		curtime += newtime - oldtime;
-		oldtime = newtime;
+		// warn if it's significant
+		if (newtime - oldtime < -0.01)
+			Con_Printf("Sys_DoubleTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime);
 	}
+	else
+		curtime += newtime - oldtime;
+	oldtime = newtime;
 
 	return curtime;
 }
@@ -460,15 +317,14 @@ WinMain
 */
 HINSTANCE	global_hInstance;
 int			global_nCmdShow;
-char		*argv[MAX_NUM_ARGVS];
-static char	*empty_string = "";
+const char	*argv[MAX_NUM_ARGVS];
+char		program_name[MAX_OSPATH];
 
 int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
-	double			oldtime, newtime;
-	MEMORYSTATUS	lpBuffer;
-	static	char	cwd[1024];
-	int				t;
+	double frameoldtime, framenewtime;
+	MEMORYSTATUS lpBuffer;
+	int t;
 
 	/* previous instances do not exist in Win32 */
 	if (hPrevInstance)
@@ -480,28 +336,20 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 	lpBuffer.dwLength = sizeof(MEMORYSTATUS);
 	GlobalMemoryStatus (&lpBuffer);
 
-	if (!GetCurrentDirectory (sizeof(cwd), cwd))
-		Sys_Error ("Couldn't determine current directory");
-
-	if (cwd[strlen(cwd)-1] == '/')
-		cwd[strlen(cwd)-1] = 0;
-
-	memset(&host_parms, 0, sizeof(host_parms));
+	com_argc = 1;
+	program_name[sizeof(program_name)-1] = 0;
+	GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1);
+	argv[0] = program_name;
 
-	host_parms.basedir = cwd;
-
-	host_parms.argc = 1;
-	argv[0] = empty_string;
-
-	while (*lpCmdLine && (host_parms.argc < MAX_NUM_ARGVS))
+	while (*lpCmdLine && (com_argc < MAX_NUM_ARGVS))
 	{
 		while (*lpCmdLine && ((*lpCmdLine <= 32) || (*lpCmdLine > 126)))
 			lpCmdLine++;
 
 		if (*lpCmdLine)
 		{
-			argv[host_parms.argc] = lpCmdLine;
-			host_parms.argc++;
+			argv[com_argc] = lpCmdLine;
+			com_argc++;
 
 			while (*lpCmdLine && ((*lpCmdLine > 32) && (*lpCmdLine <= 126)))
 				lpCmdLine++;
@@ -511,19 +359,14 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 				*lpCmdLine = 0;
 				lpCmdLine++;
 			}
-
 		}
 	}
-
-	host_parms.argv = argv;
-
-	COM_InitArgv (host_parms.argc, host_parms.argv);
-
-	host_parms.argc = com_argc;
-	host_parms.argv = com_argv;
+	com_argv = argv;
 
 	Sys_Shared_EarlyInit();
 
+	Cvar_RegisterVariable(&sys_usetimegettime);
+
 	tevent = CreateEvent(NULL, false, false, NULL);
 
 	if (!tevent)
@@ -568,26 +411,26 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 
 	Sys_Shared_LateInit();
 
-	oldtime = Sys_DoubleTime ();
-
+	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 && !ActiveApp) || Minimized)
+			if ((cl.paused && !vid_activewindow) || vid_hidden)
 			{
 				SleepUntilInput (PAUSE_SLEEP);
 				scr_skipupdate = 1;		// no point in bothering to draw
 			}
-			else if (!ActiveApp)
+			else if (!vid_activewindow)
 				SleepUntilInput (NOT_FOCUS_SLEEP);
 		}
 
-		newtime = Sys_DoubleTime ();
-		Host_Frame (newtime - oldtime);
-		oldtime = newtime;
+		framenewtime = Sys_DoubleTime ();
+		Host_Frame (framenewtime - frameoldtime);
+		frameoldtime = framenewtime;
 	}
 
 	/* return success of application */