X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Fwm.c;h=464eeb1181a8f5702c98444599d7422401095599;hb=6312f7425503f27821671cb0aef9403f27ce7aca;hp=fe944e3aff188901e22ba9d5365279981926b4eb;hpb=1b9e758fbf856934974e847c3d5b348d237a0001;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/wm.c b/Usermode/Applications/axwin3_src/WM/wm.c
index fe944e3a..464eeb11 100644
--- a/Usermode/Applications/axwin3_src/WM/wm.c
+++ b/Usermode/Applications/axwin3_src/WM/wm.c
@@ -15,6 +15,7 @@
 
 // === IMPORTS ===
 extern void	IPC_SendWMMessage(tIPC_Client *Client, uint32_t Src, uint32_t Dst, int Msg, int Len, const void *Data);
+extern void	IPC_SendReply(tIPC_Client *Client, uint32_t WinID, int MsgID, size_t Len, const void *Data);
 extern tWindow	*IPC_int_GetWindow(tIPC_Client *Client, uint32_t ID);
 
 // === GLOBALS ===
@@ -150,11 +151,17 @@ void WM_FocusWindow(tWindow *Destination)
 	if( Destination && !(Destination->Flags & WINFLAG_SHOW) )
 		return ;
 	
-	_msg.Val = 0;
-	WM_SendMessage(NULL, gpWM_FocusedWindow, WNDMSG_FOCUS, sizeof(_msg), &_msg);
-	_msg.Val = 1;
-	WM_SendMessage(NULL, Destination, WNDMSG_FOCUS, sizeof(_msg), &_msg);
-	
+	if( gpWM_FocusedWindow )
+	{
+		_msg.Val = 0;
+		WM_SendMessage(NULL, gpWM_FocusedWindow, WNDMSG_FOCUS, sizeof(_msg), &_msg);
+	}
+	if( Destination )
+	{
+		_msg.Val = 1;
+		WM_SendMessage(NULL, Destination, WNDMSG_FOCUS, sizeof(_msg), &_msg);
+	}
+		
 	WM_Invalidate(gpWM_FocusedWindow);
 	WM_Invalidate(Destination);
 	gpWM_FocusedWindow = Destination;
@@ -293,12 +300,20 @@ int WM_ResizeWindow(tWindow *Window, int W, int H)
 
 int WM_SendMessage(tWindow *Source, tWindow *Dest, int Message, int Length, const void *Data)
 {
-	if(Dest == NULL)	return -2;
-	if(Length > 0 && Data == NULL)	return -1;
+//	_SysDebug("WM_SendMessage: (%p, %p, %i, %i, %p)", Source, Dest, Message, Length, Data);
+	if(Dest == NULL) {
+		_SysDebug("WM_SendMessage: NULL destination from %p", __builtin_return_address(0));
+		return -2;
+	}
+	if(Length > 0 && Data == NULL) {
+		_SysDebug("WM_SendMessage: non-zero length and NULL data");
+		return -1;
+	}
 
 	if( Decorator_HandleMessage(Dest, Message, Length, Data) != 1 )
 	{
 		// TODO: Catch errors from ->HandleMessage
+//		_SysDebug("WM_SendMessage: Decorator grabbed message?");
 		return 0;
 	}
 	
@@ -306,11 +321,13 @@ int WM_SendMessage(tWindow *Source, tWindow *Dest, int Message, int Length, cons
 	if( Dest->Renderer->HandleMessage(Dest, Message, Length, Data) != 1 )
 	{
 		// TODO: Catch errors from ->HandleMessage
+//		_SysDebug("WM_SendMessage: Renderer grabbed message?");
 		return 0;
 	}
 
 	// TODO: Implement message masking
 
+	// Dispatch to client
 	if(Dest->Client)
 	{
 		uint32_t	src_id;
@@ -325,12 +342,19 @@ int WM_SendMessage(tWindow *Source, tWindow *Dest, int Message, int Length, cons
 			src_id = Source->ID;
 		}
 		
+//		_SysDebug("WM_SendMessage: IPC Dispatch");
 		IPC_SendWMMessage(Dest->Client, src_id, Dest->ID, Message, Length, Data);
 	}	
 
 	return 1;
 }
 
+int WM_SendIPCReply(tWindow *Window, int Message, size_t Length, const void *Data)
+{
+	IPC_SendReply(Window->Client, Window->ID, Message, Length, Data);
+	return 0;
+}
+
 void WM_Invalidate(tWindow *Window)
 {
 	if(!Window)	return ;