Added detection of which window the mouse is over

 - Do not run scripts or redraw if the window is out of focus and the mouse is not over the window.

Also the following reverts:
Revert "Fix stuff for mingw-w64 only"

This reverts commit 805e29c.

Revert "Switch to blocking RunMessages when possible"

This reverts commit 6d36731.

Author: dclamage

engine/common.h

@@ -87,9 +87,7 @@ class textBuffer_c {
 // Constants
 // =========
 
-#ifndef M_PI
-#	define M_PI 3.14159265358979323846f
-#endif
+#define M_PI 3.14159265358979323846f
 
 static const char axchr[] = {'X', 'Y', 'Z', 'W'};
 

engine/core/core_image.cpp

@@ -370,12 +370,12 @@ struct jpegError_s: public jpeg_error_mgr {
 		char buffer[JMSG_LENGTH_MAX];
 		(*cinfo->err->format_message)(cinfo, buffer);
 		clientData_s* cd = (clientData_s*)cinfo->client_data;
-		//cd->con->Warning("JPEG '%s': %s", cd->fileName, buffer);
+		cd->con->Warning("JPEG '%s': %s", cd->fileName, buffer);
 	}
 	static void FatalError(j_common_ptr cinfo)
 	{
 		MSGOut(cinfo);
-		//throw 1;
+		throw 1;
 	}
 };
 

engine/core/core_main.cpp

@@ -27,8 +27,6 @@ class core_main_c: public core_IMain {
 	void	KeyEvent(int key, int type);
 	bool	CanExit();
 
-	int	SubScriptCount();
-
 	// Encapsulated
 	core_main_c(sys_IMain* sysHnd);
 
@@ -83,8 +81,7 @@ void core_main_c::Init(int argc, char** argv)
 
 void core_main_c::Frame()
 {
-	// causes a livelock?
-	// sys->con->Printf("Messages...\n");
+	sys->con->Printf("Messages...\n");
 
 	// Execute commands
 	sys->con->ExecCommands();
@@ -125,8 +122,3 @@ bool core_main_c::CanExit()
 
 	return ui->CanExit();
 }
-
-int core_main_c::SubScriptCount()
-{
-	return ui->SubScriptCount();
-}

engine/core/core_main.h

@@ -19,7 +19,5 @@ class core_IMain {
 	virtual void	Shutdown() = 0;
 	virtual void	KeyEvent(int key, int type) = 0;
 	virtual bool	CanExit() = 0;
-
-	virtual int	SubScriptCount() = 0;
 };
 

engine/system/sys_console.h

@@ -14,6 +14,7 @@ class sys_IConsole {
 	static sys_IConsole* GetHandle(class sys_IMain* sysHnd);
 	static void FreeHandle(sys_IConsole* hnd);
 
-	virtual	void	SetVisible(bool show) = 0;	// Set window state
+	virtual	void	SetVisible( bool show ) = 0;	// Set window state
+	virtual	bool	IsVisible() = 0;				// Get window state
 	virtual void	SetTitle(const char* title) = 0; // Set window title
 };

engine/system/sys_video.h

@@ -55,8 +55,10 @@ class sys_IVideo {
 	virtual void	PosChanged(int x, int y) = 0; // Respond to window position change
 	virtual void	GetMinSize(int &width, int &height) = 0; // Get minimum window size
 	virtual void	SetVisible(bool vis) = 0;		// Show/hide window
+	virtual bool	IsVisible() = 0; // Get whether the window is shown
 	virtual void	SetTitle(const char* title) = 0;// Change window title
 	virtual void*	GetWindowHandle() = 0;			// Get window handle
 	virtual void	GetRelativeCursor(int &x, int &y) = 0; // Get cursor position relative to window
 	virtual void	SetRelativeCursor(int x, int y) = 0; // Set cursor position relative to window
+	virtual bool	IsCursorOverWindow() = 0; // Get whether the cursor is over the window, including obstructions
 };

engine/system/win/sys_console.cpp

@@ -24,6 +24,7 @@ class sys_console_c: public sys_IConsole, public conPrintHook_c, public thread_c
 public:
 	// Interface
 	void	SetVisible(bool show);
+	bool	IsVisible();
 	void	SetTitle(const char* title);
 
 	// Encapsulated
@@ -69,8 +70,7 @@ sys_console_c::sys_console_c(sys_IMain* sysHnd)
 	doRun = true;
 
 	ThreadStart(true);
-	while ( !isRunning )
-		Sleep(15);
+	while ( !isRunning );
 }
 
 void sys_console_c::ThreadProc()
@@ -132,17 +132,16 @@ void sys_console_c::ThreadProc()
 	bBackground = CreateSolidBrush(CFG_SCON_TEXTBG);
 
 	// Flush any messages created
-	sys->RunMessages(NULL, true);
+	sys->RunMessages();
 
 	shown = true;
 
 	InstallPrintHook();
 
 	isRunning = true;
-
 	while (doRun) {
-		sys->RunMessages(NULL, false, 100);
-		//sys->Sleep(1);
+		sys->RunMessages(hwMain);
+		sys->Sleep(1);
 	}
 
 	RemovePrintHook();
@@ -161,8 +160,7 @@ void sys_console_c::ThreadProc()
 sys_console_c::~sys_console_c()
 {
 	doRun = false;
-	while (isRunning)
-		Sleep(15);
+	while (isRunning);
 }
 
 // ========================
@@ -214,7 +212,7 @@ void sys_console_c::SetVisible(bool show)
 			Print(buffer);
 			delete buffer;
 
-			sys->RunMessages(NULL, true);
+			sys->RunMessages(hwMain);
 		}
 	} else {
 		shown = false;
@@ -224,6 +222,11 @@ void sys_console_c::SetVisible(bool show)
 	}
 }
 
+bool sys_console_c::IsVisible()
+{
+	return IsWindowVisible(hwMain);
+}
+
 void sys_console_c::SetTitle(const char* title)
 {
 	SetWindowText(hwMain, (title && *title)? title : CFG_SCON_TITLE);
@@ -272,7 +275,7 @@ void sys_console_c::Print(const char* text)
 	Edit_SetSel(hwOut, Edit_GetTextLength(hwOut), -1);
 	Edit_ReplaceSel(hwOut, winText);
 	Edit_Scroll(hwOut, 0xFFFF, 0);
-	sys->RunMessages(NULL, true);
+	sys->RunMessages(hwMain);
 	delete winText;
 }
 

engine/system/win/sys_local.h

@@ -9,7 +9,6 @@
 
 #include "system.h"
 
-#undef _WIN32_WINNT
 #define _WIN32_WINNT _WIN32_WINNT_WINXP
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -45,7 +44,7 @@ class sys_main_c: public sys_IMain {
 	bool	Run(int argc, char** argv);
 
 	static LRESULT __stdcall WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
-	int	RunMessages(HWND hwnd, bool slurp, unsigned timeout = 0);
+	void	RunMessages(HWND hwnd = NULL);
 	void	PrintLastError(const char* msg);
 
 	int		KeyToVirtual(byte key);

engine/system/win/sys_main.cpp

@@ -11,10 +11,6 @@
 
 #include <eh.h>
 
-#if defined __MINGW32__
-#   define _set_se_translator(x) ((void)0)
-#endif
-
 // ======
 // Locals
 // ======
@@ -639,63 +635,17 @@ LRESULT __stdcall sys_main_c::WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 	return DefWindowProc(hwnd, msg, wParam, lParam);
 }
 
-int sys_main_c::RunMessages(HWND hwnd, bool slurp, unsigned timeout)
+void sys_main_c::RunMessages(HWND hwnd)
 {
+	// Flush message queue
 	MSG msg;
-	unsigned ret;
-	unsigned nmsg = 0;
-
-	if (timeout == 0)
-		timeout = 250;
-
-	for (;;)
-	{
-		// take care of non-blocking, blocking, and block+timeout message reads
-		if (slurp)
-		{
-			if (PeekMessage(&msg, hwnd, 0, 0, PM_NOREMOVE))
-			{
-				ret = GetMessage(&msg, hwnd, 0, 0);
-			}
-			else
-				break;
-		}
-		else
-		{
-			static const UINT_PTR TIMER_ID = 1042;
-			UINT_PTR id = hwnd ? TIMER_ID : 0;
-			id = SetTimer(hwnd, id, timeout, NULL);
-			ret = GetMessage(&msg, hwnd, 0, 0);
-			(void) KillTimer(hwnd, id);
-			if (ret != unsigned(-1) && ret != 0)
-			{
-				if (msg.message == WM_TIMER && msg.wParam == id)
-					break;
-			}
-		}
-
-		// deal error, window destruction, and valid messages respectively
-		if (ret == unsigned(-1))
-			break;
-		else if (ret == 0)
-		{
-			nmsg++;
+	while (PeekMessage(&msg, hwnd, 0, 0, PM_NOREMOVE)) {
+		if (GetMessage(&msg, hwnd, 0, 0) == 0) {
 			Exit();
-			break;
 		}
-		else
-		{
-			nmsg++;
-			TranslateMessage(&msg);
-			DispatchMessage(&msg);
-		}
-
-		// one message is enough in case of blocking reads
-		if (!slurp && !PeekMessage(&msg, hwnd, 0, 0, PM_NOREMOVE))
-			break;
+		TranslateMessage(&msg);
+		DispatchMessage(&msg);
 	}
-
-	return nmsg;
 }
 
 // ==============================
@@ -729,8 +679,8 @@ void sys_main_c::Error(char *fmt, ...)
 
 	exitFlag = false;
 	while (exitFlag == false) {
-		RunMessages(NULL, false, 1000);
-		//Sleep(50);
+		RunMessages();
+		Sleep(50);
 	}
 
 #ifdef _MEMTRAK_H
@@ -813,20 +763,21 @@ bool sys_main_c::Run(int argc, char** argv)
 	con->Printf("\n");
 
 	initialised = true;
+
 	try {
 		// Enable translation to catch C exceptions if debugger is not present
 		if ( !debuggerRunning ) {
 			_set_se_translator(SE_ErrorTrans);
 		}
+
 		// Initialise engine
 		core->Init(argc, argv);
+
 		// Run frame loop
 		while (exitFlag == false) {
-			int nsubscript = core->SubScriptCount();
-			int nmsg = RunMessages(NULL, false);
+			RunMessages();
 
-			if (nsubscript || nmsg)
-				core->Frame();
+			core->Frame();
 
 			if (threadError) {
 				Error(threadError);
@@ -862,8 +813,8 @@ bool sys_main_c::Run(int argc, char** argv)
 			exitMsg = NULL;
 		}
 		while (exitFlag == false) {
-			RunMessages(NULL, false);
-			//Sleep(50);
+			RunMessages();
+			Sleep(50);
 		}
 	}	
 

engine/system/win/sys_opengl.cpp

@@ -166,7 +166,7 @@ void sys_openGL_c::Swap()
 
 void* sys_openGL_c::GetProc(char* name)
 {
-	return (void*) wglGetProcAddress(name);
+	return wglGetProcAddress(name);
 }
 
 bool sys_openGL_c::CaptureSecondary()