X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin4_src%2FServer%2Fipc.cpp;h=5f59ae193c841fe1640ffb014c5910dbe787c57d;hb=6fbf6b93bec9b8b5bd6d7c683eefb0ebed8dff77;hp=4c5da25865a1ad42986e412927718a075437d69c;hpb=cb37616a62753de8a1b8d28e3c4ec3ad9891de1b;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin4_src/Server/ipc.cpp b/Usermode/Applications/axwin4_src/Server/ipc.cpp
index 4c5da258..5f59ae19 100644
--- a/Usermode/Applications/axwin4_src/Server/ipc.cpp
+++ b/Usermode/Applications/axwin4_src/Server/ipc.cpp
@@ -25,7 +25,8 @@ namespace IPC {
 
 CCompositor*	gpCompositor;
 ::std::list<IIPCChannel*>	glChannels;
-//::std::map<uint16_t,CClient*>	glClients;
+::std::map<uint16_t,CClient*>	glClients;
+uint16_t	giNextClient = 1;
 
 void Initialise(const CConfigIPC& config, CCompositor& compositor)
 {
@@ -64,20 +65,72 @@ void HandleSelect(const fd_set& rfds)
 
 void RegisterClient(CClient& client)
 {
+	_SysDebug("RegisterClient(&client=%p)", &client);
 	// allocate a client ID, and save
-	//client.m_id = 123;
-	//glClients[client.m_id] = &client;
+	for( int i = 0; i < 100; i ++ )
+	{
+		uint16_t id = giNextClient++;
+		if(giNextClient == 0)	giNextClient = 1;
+		auto r = glClients.insert( ::std::pair<uint16_t,CClient*>(id, &client) );
+		if( r.second == true )
+		{
+			client.set_id(id);
+			return;
+		}
+	}
+	// Wut? 100 attempts and fail!
+	assert(!"Todo - Better way of handling client ID reuse");
+}
+
+CClient* GetClientByID(uint16_t id)
+{
+	auto it = glClients.find(id);
+	if(it == glClients.end()) {
+		//_SysDebug("Client %i not registered", id);
+		return nullptr;
+	}
+	else {
+		//_SysDebug("Client %i %i = %p", id, it->first, it->second);
+		return it->second;
+	}
 }
 
 void DeregisterClient(CClient& client)
 {
-	//glClients.erase( client.m_id );
+	glClients.erase( client.id() );
 }
 
 
-void SendMessage_NotifyDims(CClient& client, unsigned int NewW, unsigned int NewH)
+void SendMessage_NotifyDims(CClient& client, unsigned int WinID, unsigned int NewW, unsigned int NewH)
+{
+	_SysDebug("TODO: IPC::SendMessage_NotifyDims");
+}
+void SendMessage_MouseButton(CClient& client, unsigned int WinID, unsigned int X, unsigned int Y, uint8_t Button, bool Pressed)
 {
-	_SysDebug("TODO: CClient::SendNotify_Dims");
+	CSerialiser	msg;
+	msg.WriteU8(IPCMSG_INPUTEVENT);
+	msg.WriteU8(IPC_INEV_MOUSEBTN);
+	msg.WriteU16(WinID);
+	msg.WriteU16(X);
+	msg.WriteU16(Y);
+	msg.WriteU8(Button);
+	msg.WriteU8(Pressed ? 0 : 1);
+	client.SendMessage(msg);
+}
+void SendMessage_MouseMove(CClient& client, unsigned int WinID, unsigned int X, unsigned int Y)
+{
+	_SysDebug("TODO: IPC::SendMessage_MouseButton");
+}
+void SendMessage_KeyEvent(CClient& client, unsigned int WinID, uint32_t KeySym, bool Pressed, const char *Translated)
+{
+	CSerialiser	msg;
+	msg.WriteU8(IPCMSG_INPUTEVENT);
+	msg.WriteU8(IPC_INEV_KEYBOARD);
+	msg.WriteU16(WinID);
+	msg.WriteU16(KeySym);
+	msg.WriteU8(Pressed ? 0 : 1);
+	msg.WriteString(Translated);
+	client.SendMessage(msg);
 }
 
 
@@ -163,7 +216,7 @@ void HandleMessage_CreateWindow(CClient& client, CDeserialiser& message)
 	::std::string	name = message.ReadString();
 	
 	::_SysDebug("_CreateWindow: (%i, '%s')", new_id, name.c_str());
-	client.SetWindow( new_id, gpCompositor->CreateWindow(client, name) );
+	client.SetWindow( new_id, new CWindow(*gpCompositor, client, name, new_id) );
 }
 
 void HandleMessage_DestroyWindow(CClient& client, CDeserialiser& message)
@@ -185,7 +238,7 @@ void HandleMessage_SetWindowAttr(CClient& client, CDeserialiser& message)
 {
 	uint16_t	win_id = message.ReadU16();
 	uint16_t	attr_id = message.ReadU16();
-	_SysDebug("_SetWindowAttr: (%i, %i)", win_id, attr_id);
+	_SysDebug("_SetWindowAttr: (Win=%i, ID=%i)", win_id, attr_id);
 	
 	CWindow*	win = client.GetWindow(win_id);
 	if(!win) {
@@ -208,7 +261,7 @@ void HandleMessage_SetWindowAttr(CClient& client, CDeserialiser& message)
 		win->Show( message.ReadU8() != 0 );
 		break;
 	case IPC_WINATTR_FLAGS:
-		_SysDebug("TODO: IPC_WINATTR_FLAGS");
+		win->SetFlags( message.ReadU8() );	// TODO: U8? why so small?
 		break;
 	case IPC_WINATTR_TITLE:
 		assert(!"TODO: IPC_WINATTR_TITLE");
@@ -276,7 +329,7 @@ void HandleMessage_PushData(CClient& client, CDeserialiser& message)
 	uint16_t	y = message.ReadU16();
 	uint16_t	w = message.ReadU16();
 	uint16_t	h = message.ReadU16();
-	//_SysDebug("_PushData: (%i, (%i,%i) %ix%i)", win_id, x, y, w, h);
+	_SysDebug("_PushData: (%i, (%i,%i) %ix%i)", win_id, x, y, w, h);
 	
 	CWindow*	win = client.GetWindow(win_id);
 	if(!win) {
@@ -306,6 +359,8 @@ void HandleMessage_DrawCtl(CClient& client, CDeserialiser& message)
 	uint16_t	w = message.ReadU16();
 	uint16_t	h = message.ReadU16();
 	uint16_t	ctrl_id = message.ReadU16();
+	uint16_t 	frame = message.ReadU16();
+	_SysDebug("_DrawCtl: (%i, (%i,%i) %ix%i Ctl%i frame?=0x%04x)", win_id, x, y, w, h, ctrl_id, frame);
 	
 	CWindow*	win = client.GetWindow(win_id);
 	if(!win) {
@@ -327,9 +382,23 @@ void HandleMessage_DrawText(CClient& client, CDeserialiser& message)
 	uint16_t	y = message.ReadU16();
 	uint16_t	w = message.ReadU16();
 	uint16_t	h = message.ReadU16();
+	uint16_t	font = message.ReadU16();
 	::std::string	str = message.ReadString();
+	_SysDebug("_DrawText: (%i (%i,%i) %ix%i Font%i \"%s\")", win_id, x, y, w, h, font, str.c_str());
+	
+	CWindow*	win = client.GetWindow(win_id);
+	if(!win) {
+		throw IPC::CClientFailure("_DrawText: Bad window");
+	}
+	
+	// 1. Get font from client structure
+	//CFont& font = client.GetFont(font_id);
+	
+	// 2. Render
+	//CRect	area(x, y, w, h);
+	//font->Render(win->m_surface, area, str, h);
 	
-	assert(!"TODO HandleMessage_DrawText");
+	_SysDebug("TODO: HandleMessage_DrawText");
 }
 
 typedef void	MessageHandler_op_t(CClient& client, CDeserialiser& message);