From: John Hodge (sonata) <tpg@mutabah.net>
Date: Wed, 28 Nov 2012 03:30:06 +0000 (+0800)
Subject: Usermode/AxWin3 - Cleaning up stray debug
X-Git-Tag: rel0.15~647
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=6312f7425503f27821671cb0aef9403f27ce7aca;p=tpg%2Facess2.git

Usermode/AxWin3 - Cleaning up stray debug
---

diff --git a/Usermode/Applications/axwin3_src/WM/ipc.c b/Usermode/Applications/axwin3_src/WM/ipc.c
index 38cd1335..2917bc98 100644
--- a/Usermode/Applications/axwin3_src/WM/ipc.c
+++ b/Usermode/Applications/axwin3_src/WM/ipc.c
@@ -571,7 +571,8 @@ void IPC_Handle(const tIPC_Type *IPCType, const void *Ident, size_t MsgLen, tAxW
 		}
 		_SysDebug("IPC_Handle: Call %s-%i", renderer->Name, Msg->ID);
 		rv = renderer->IPCHandlers[Msg->ID](win, Msg->Size, Msg->Data);
-		_SysDebug("IPC_Handle: rv = %i", rv);
+		if( rv )
+			_SysDebug("IPC_Handle: rv != 0 (%i)", rv);
 	}
 	else
 	{
@@ -589,11 +590,12 @@ void IPC_Handle(const tIPC_Type *IPCType, const void *Ident, size_t MsgLen, tAxW
 	
 		_SysDebug("IPC_Handle: Call WM-%i", Msg->ID);
 		rv = gIPC_MessageHandlers[Msg->ID](client, Msg);
-		_SysDebug("IPC_Handle: rv = %i", rv);
+		if( rv )
+			_SysDebug("IPC_Handle: rv != 0 (%i)", rv);
 	}
 }
 
-// --- Server->Client replies
+// Dispatch a message to the client
 void IPC_SendWMMessage(tIPC_Client *Client, uint32_t Src, uint32_t Dst, int MsgID, int Len, void *Data)
 {
 	tAxWin_IPCMessage	*hdr;
@@ -616,6 +618,7 @@ void IPC_SendWMMessage(tIPC_Client *Client, uint32_t Src, uint32_t Dst, int MsgI
 	Client->IPCType->SendMessage(Client->Ident, sizeof(buf), buf);
 }
 
+// --- Server->Client replies
 void IPC_SendReply(tIPC_Client *Client, uint32_t WinID, int MsgID, size_t Len, const void *Data)
 {
 	tAxWin_IPCMessage	*hdr;
diff --git a/Usermode/Applications/axwin3_src/WM/renderers/widget.c b/Usermode/Applications/axwin3_src/WM/renderers/widget.c
index 12566d53..49f1f646 100644
--- a/Usermode/Applications/axwin3_src/WM/renderers/widget.c
+++ b/Usermode/Applications/axwin3_src/WM/renderers/widget.c
@@ -766,6 +766,7 @@ void Widget_Fire(tElement *Element)
 {
 	tWidgetMsg_Fire	msg;
 	msg.WidgetID = Element->ID;
+	_SysDebug("Widget_Fire: Fire on %p %i", Element->Window, Element->ID);
 	WM_SendMessage(Element->Window, Element->Window, MSG_WIDGET_FIRE, sizeof(msg), &msg);
 }
 
diff --git a/Usermode/Applications/axwin3_src/WM/wm.c b/Usermode/Applications/axwin3_src/WM/wm.c
index 4afe1dc8..464eeb11 100644
--- a/Usermode/Applications/axwin3_src/WM/wm.c
+++ b/Usermode/Applications/axwin3_src/WM/wm.c
@@ -151,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;
@@ -294,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;
 	}
 	
@@ -307,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;
@@ -326,6 +342,7 @@ 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);
 	}