X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibaxwin4.so_src%2Fipc.cpp;fp=Usermode%2FLibraries%2Flibaxwin4.so_src%2Fipc.cpp;h=d6df7f86222216edb0173677dccd777da854c07f;hb=145dd00e5c5a36f844be327e16a00b2983245423;hp=10331fb386c83ce3f19d8823c6553237a257f27a;hpb=1aed2067a0f084e9c5fa1af48e177e28a81466bc;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libaxwin4.so_src/ipc.cpp b/Usermode/Libraries/libaxwin4.so_src/ipc.cpp
index 10331fb3..d6df7f86 100644
--- a/Usermode/Libraries/libaxwin4.so_src/ipc.cpp
+++ b/Usermode/Libraries/libaxwin4.so_src/ipc.cpp
@@ -9,7 +9,10 @@
 #include "include/common.hpp"
 #include "include/IIPCChannel.hpp"
 #include "include/CIPCChannel_AcessIPCPipe.hpp"
+#include <ipc_proto.hpp>
 #include <algorithm>
+#include <mutex>
+#include <stdexcept>
 
 #include <cstring>
 #include <cstdio>
@@ -17,6 +20,9 @@
 namespace AxWin {
 
 IIPCChannel*	gIPCChannel;
+::std::mutex	glSyncReply;
+bool	gSyncReplyValid;
+CDeserialiser	gSyncReplyBuf;
 
 extern "C" bool AxWin4_Connect(const char *URI)
 {
@@ -50,7 +56,7 @@ extern "C" bool AxWin4_PeekEventQueue(void)
 
 extern "C" bool AxWin4_WaitEventQueue(uint64_t Timeout)
 {
-	AxWin4_WaitEventQueueSelect(0, NULL, NULL, NULL, Timeout);
+	return AxWin4_WaitEventQueueSelect(0, NULL, NULL, NULL, Timeout);
 }
 
 extern "C" bool AxWin4_WaitEventQueueSelect(int nFDs, fd_set *rfds, fd_set *wfds, fd_set *efds, uint64_t Timeout)
@@ -73,6 +79,70 @@ void SendMessage(CSerialiser& message)
 {
 	gIPCChannel->Send(message);
 }
+void RecvMessage(CDeserialiser& message)
+{
+	uint8_t id = message.ReadU8();
+	switch(id)
+	{
+	case IPCMSG_REPLY:
+		// Flag reply and take a copy of this message
+		if( gSyncReplyValid )
+		{
+			// Oh... that was unexpected
+			_SysDebug("Unexpected second reply message %i", message.ReadU8());
+		}
+		else
+		{
+			gSyncReplyValid = true;
+			gSyncReplyBuf = message;
+		}
+		break;
+	default:
+		_SysDebug("TODO: RecvMessage(%i)", id);
+		break;
+	}
+}
+
+CDeserialiser GetSyncReply(CSerialiser& request, unsigned int Message)
+{
+	::std::lock_guard<std::mutex>	lock(glSyncReply);
+	gSyncReplyValid = false;
+	// Send once lock is acquired
+	SendMessage(request);
+	
+	while( !gSyncReplyValid )
+	{
+		// Tick along
+		if( !AxWin4_WaitEventQueue(0) )
+			throw ::std::runtime_error("Connection dropped while waiting for reply");
+	}
+	
+	uint8_t id = gSyncReplyBuf.ReadU8();
+	if( id != Message )
+	{
+		_SysDebug("Unexpected reply message '%i', message.ReadU8()");
+	}
+	
+	return gSyncReplyBuf;
+}
+
+extern "C" void AxWin4_GetScreenDimensions(unsigned int ScreenIndex, unsigned int *Width, unsigned int *Height)
+{
+	CSerialiser	req;
+	req.WriteU8(IPCMSG_GETGLOBAL);
+	req.WriteU16(IPC_GLOBATTR_SCREENDIMS);
+	req.WriteU8(ScreenIndex);
+	
+	CDeserialiser	response = GetSyncReply(req, IPCMSG_GETGLOBAL);
+	if( response.ReadU16() != IPC_GLOBATTR_SCREENDIMS ) {
+		
+	}
+	
+	*Width = response.ReadU16();
+	*Height = response.ReadU16();
+	
+	_SysDebug("AxWin4_GetScreenDimensions: %i = %ix%i", ScreenIndex, *Width, *Height);
+}
 
 IIPCChannel::~IIPCChannel()
 {