Menu work, move VOS queue interface

GpD3D/GpAppEnvironment.cpp

@@ -14,6 +14,7 @@ GpAppEnvironment::GpAppEnvironment()
 	, m_displayDriver(nullptr)
 	, m_audioDriver(nullptr)
 	, m_fontHandler(nullptr)
+	, m_vosEventQueue(nullptr)
 	, m_applicationFiber(nullptr)
 	, m_vosFiber(nullptr)
 	, m_suspendCallID(PortabilityLayer::HostSuspendCallID_Unknown)
@@ -100,6 +101,11 @@ void GpAppEnvironment::SetFontHandler(PortabilityLayer::HostFontHandler *fontHan
 	m_fontHandler = fontHandler;
 }
 
+void GpAppEnvironment::SetVOSEventQueue(GpVOSEventQueue *eventQueue)
+{
+	m_vosEventQueue = eventQueue;
+}
+
 void GpAppEnvironment::StaticAppThreadFunc(void *context)
 {
 	static_cast<GpAppEnvironment*>(context)->AppThreadFunc();
@@ -117,7 +123,7 @@ void GpAppEnvironment::InitializeApplicationState()
 	GpAppInterface_Get()->PL_InstallHostSuspendHook(GpAppEnvironment::StaticSuspendHookFunc, this);
 
 	GpAppInterface_Get()->PL_HostFontHandler_SetInstance(m_fontHandler);
-	GpAppInterface_Get()->PL_HostVOSEventQueue_SetInstance(&m_vosEventQueue);
+	GpAppInterface_Get()->PL_HostVOSEventQueue_SetInstance(m_vosEventQueue);
 
 	SynchronizeState();
 }

GpD3D/GpAppEnvironment.h

@@ -30,6 +30,7 @@ public:
 	void SetDisplayDriver(IGpDisplayDriver *displayDriver);
 	void SetAudioDriver(IGpAudioDriver *audioDriver);
 	void SetFontHandler(PortabilityLayer::HostFontHandler *fontHandler);
+	void SetVOSEventQueue(GpVOSEventQueue *eventQueue);
 
 private:
 	enum ApplicationState
@@ -54,7 +55,7 @@ private:
 	IGpDisplayDriver *m_displayDriver;
 	IGpAudioDriver *m_audioDriver;
 	PortabilityLayer::HostFontHandler *m_fontHandler;
-	GpVOSEventQueue m_vosEventQueue;
+	GpVOSEventQueue *m_vosEventQueue;
 	IGpFiber *m_applicationFiber;
 	IGpFiber *m_vosFiber;
 

GpD3D/GpMain.cpp

@@ -26,6 +26,7 @@ namespace
 
 int GpMain::Run()
 {
+	GpVOSEventQueue *eventQueue = new GpVOSEventQueue();
 	GpAppEnvironment *appEnvironment = new GpAppEnvironment();
 
 	GpDisplayDriverProperties ddProps;
@@ -50,6 +51,7 @@ int GpMain::Run()
 
 	ddProps.m_type = g_gpGlobalConfig.m_displayDriverType;
 	ddProps.m_osGlobals = g_gpGlobalConfig.m_osGlobals;
+	ddProps.m_eventQueue = eventQueue;
 
 	GpAudioDriverProperties adProps;
 	memset(&adProps, 0, sizeof(adProps));
@@ -69,6 +71,7 @@ int GpMain::Run()
 	appEnvironment->SetDisplayDriver(displayDriver);
 	appEnvironment->SetAudioDriver(audioDriver);
 	appEnvironment->SetFontHandler(fontHandler);
+	appEnvironment->SetVOSEventQueue(eventQueue);
 
 	// Start the display loop
 	displayDriver->Run();

GpD3D/GpMain_Win32.cpp

@@ -7,18 +7,83 @@
 #include "GpFileSystem_Win32.h"
 #include "GpAppInterface.h"
 #include "GpSystemServices_Win32.h"
+#include "GpVOSEvent.h"
+#include "IGpVOSEventQueue.h"
 
 #include "HostFileSystem.h"
 
 #include "GpWindows.h"
 
 #include <stdio.h>
+#include <windowsx.h>
 
 GpWindowsGlobals g_gpWindowsGlobals;
 
 extern "C" __declspec(dllimport) IGpAudioDriver *GpDriver_CreateAudioDriver_XAudio2(const GpAudioDriverProperties &properties);
 extern "C" __declspec(dllimport) IGpDisplayDriver *GpDriver_CreateDisplayDriver_D3D11(const GpDisplayDriverProperties &properties);
 
+static void PostMouseEvent(IGpVOSEventQueue *eventQueue, GpMouseEventType_t eventType, GpMouseButton_t button, int32_t x, int32_t y)
+{
+	if (GpVOSEvent *evt = eventQueue->QueueEvent())
+	{
+		evt->m_eventType = GpVOSEventTypes::kMouseInput;
+
+		GpMouseInputEvent &mEvent = evt->m_event.m_mouseInputEvent;
+		mEvent.m_button = button;
+		mEvent.m_x = x;
+		mEvent.m_y = y;
+		mEvent.m_eventType = eventType;
+	}
+}
+
+static void TranslateWindowsMessage(const MSG *msg, IGpVOSEventQueue *eventQueue)
+{
+	WPARAM wParam = msg->wParam;
+	LPARAM lParam = msg->lParam;
+
+	switch (msg->message)
+	{
+		case WM_LBUTTONDOWN:
+			PostMouseEvent(eventQueue, GpMouseEventTypes::kDown, GpMouseButtons::kLeft, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			break;
+		case WM_LBUTTONUP:
+			PostMouseEvent(eventQueue, GpMouseEventTypes::kUp, GpMouseButtons::kLeft, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			break;
+		case WM_MBUTTONDOWN:
+			PostMouseEvent(eventQueue, GpMouseEventTypes::kDown, GpMouseButtons::kMiddle, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			break;
+		case WM_MBUTTONUP:
+			PostMouseEvent(eventQueue, GpMouseEventTypes::kUp, GpMouseButtons::kMiddle, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			break;
+		case WM_RBUTTONDOWN:
+			PostMouseEvent(eventQueue, GpMouseEventTypes::kDown, GpMouseButtons::kRight, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			break;
+		case WM_RBUTTONUP:
+			PostMouseEvent(eventQueue, GpMouseEventTypes::kUp, GpMouseButtons::kRight, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			break;
+		case WM_XBUTTONDOWN:
+			if (GET_XBUTTON_WPARAM(wParam) == XBUTTON1)
+				PostMouseEvent(eventQueue, GpMouseEventTypes::kDown, GpMouseButtons::kX1, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			else if (GET_XBUTTON_WPARAM(wParam) == XBUTTON2)
+				PostMouseEvent(eventQueue, GpMouseEventTypes::kDown, GpMouseButtons::kX2, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			break;
+		case WM_XBUTTONUP:
+			if (GET_XBUTTON_WPARAM(wParam) == XBUTTON1)
+				PostMouseEvent(eventQueue, GpMouseEventTypes::kUp, GpMouseButtons::kX1, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			else if (GET_XBUTTON_WPARAM(wParam) == XBUTTON2)
+				PostMouseEvent(eventQueue, GpMouseEventTypes::kUp, GpMouseButtons::kX2, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			break;
+		case WM_MOUSEMOVE:
+			PostMouseEvent(eventQueue, GpMouseEventTypes::kMove, GpMouseButtons::kNone, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+			break;
+		case WM_MOUSELEAVE:
+			PostMouseEvent(eventQueue, GpMouseEventTypes::kLeave, GpMouseButtons::kNone, 0, 0);
+			break;
+		default:
+			break;
+	}
+}
+
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
 	GpAppInterface_Get()->PL_HostFileSystem_SetInstance(GpFileSystem_Win32::GetInstance());
@@ -32,6 +97,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 
 	g_gpWindowsGlobals.m_createFiberFunc = GpFiber_Win32::Create;
 	g_gpWindowsGlobals.m_loadColorCursorFunc = GpColorCursor_Win32::Load;
+	g_gpWindowsGlobals.m_translateWindowsMessageFunc = TranslateWindowsMessage;
 
 	g_gpGlobalConfig.m_displayDriverType = EGpDisplayDriverType_D3D11;
 	g_gpGlobalConfig.m_osGlobals = &g_gpWindowsGlobals;

GpD3D/GpPLGlueDisplayDriver.cpp

@@ -1,40 +1,40 @@
 #include "GpPLGlueDisplayDriver.h"
-#include "VirtualDirectory.h"
-#include "IGpDisplayDriver.h"
-
-GpPLGlueDisplayDriver::GpPLGlueDisplayDriver()
-	: m_displayDriver(nullptr)
-{
-}
-
-void GpPLGlueDisplayDriver::GetDisplayResolution(unsigned int *width, unsigned int *height, GpPixelFormat_t *bpp)
-{
-	m_displayDriver->GetDisplayResolution(width, height, bpp);
+#include "VirtualDirectory.h"
+#include "IGpDisplayDriver.h"
+
+GpPLGlueDisplayDriver::GpPLGlueDisplayDriver()
+	: m_displayDriver(nullptr)
+{
+}
+
+void GpPLGlueDisplayDriver::GetDisplayResolution(unsigned int *width, unsigned int *height, GpPixelFormat_t *bpp)
+{
+	m_displayDriver->GetDisplayResolution(width, height, bpp);
 }
 
 IGpColorCursor *GpPLGlueDisplayDriver::LoadColorCursor(int cursorID)
 {
-	return m_displayDriver->LoadColorCursor(cursorID);
-}
-
-void GpPLGlueDisplayDriver::SetColorCursor(IGpColorCursor *colorCursor)
-{
-	m_displayDriver->SetColorCursor(colorCursor);
+	return m_displayDriver->LoadColorCursor(cursorID);
 }
-
+
+void GpPLGlueDisplayDriver::SetColorCursor(IGpColorCursor *colorCursor)
+{
+	m_displayDriver->SetColorCursor(colorCursor);
+}
+
 void GpPLGlueDisplayDriver::SetStandardCursor(EGpStandardCursor_t standardCursor)
 {
-	m_displayDriver->SetStandardCursor(standardCursor);
-}
-
-GpPLGlueDisplayDriver *GpPLGlueDisplayDriver::GetInstance()
-{
-	return &ms_instance;
-}
-
-void GpPLGlueDisplayDriver::SetGpDisplayDriver(IGpDisplayDriver *displayDriver)
-{
-	m_displayDriver = displayDriver;
-}
-
-GpPLGlueDisplayDriver GpPLGlueDisplayDriver::ms_instance;
+	m_displayDriver->SetStandardCursor(standardCursor);
+}
+
+GpPLGlueDisplayDriver *GpPLGlueDisplayDriver::GetInstance()
+{
+	return &ms_instance;
+}
+
+void GpPLGlueDisplayDriver::SetGpDisplayDriver(IGpDisplayDriver *displayDriver)
+{
+	m_displayDriver = displayDriver;
+}
+
+GpPLGlueDisplayDriver GpPLGlueDisplayDriver::ms_instance;

GpD3D/GpVOSEventQueue.h

@@ -3,10 +3,10 @@
 #include <stdint.h>
 
 #include "HostVOSEventQueue.h"
-#include "GpVOSEvent.h"
+#include "GpVOSEvent.h"
 
 class GpVOSEventQueue final : public PortabilityLayer::HostVOSEventQueue
-{
+{
 public:
 	GpVOSEventQueue();
 	~GpVOSEventQueue();
@@ -14,7 +14,7 @@ public:
 	const GpVOSEvent *GetNext() override;
 	void DischargeOne() override;
 
-	GpVOSEvent *QueueEvent();
+	GpVOSEvent *QueueEvent() override;
 
 private:
 	static const size_t kMaxEvents = 10000;