X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Fwm.c;h=f9592db5d182c97988385a849f4dac61d58d7ba3;hb=a41c4af4ae30e963f6bc370efad60dacc39b0275;hp=2478151280e052087d953390115ed317f6564f11;hpb=b1488ae9beae34068d38d00e191b90ef0bf812f3;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/wm.c b/Usermode/Applications/axwin3_src/WM/wm.c
index 24781512..f9592db5 100644
--- a/Usermode/Applications/axwin3_src/WM/wm.c
+++ b/Usermode/Applications/axwin3_src/WM/wm.c
@@ -15,6 +15,8 @@
 
 // === 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 ===
 tWMRenderer	*gpWM_Renderers;
@@ -92,6 +94,11 @@ tWindow *WM_CreateWindow(tWindow *Parent, tIPC_Client *Client, uint32_t ID, int
 	return ret;
 }
 
+tWindow *WM_GetWindowByID(tWindow *Requester, uint32_t ID)
+{
+	return IPC_int_GetWindow(Requester->Client, ID);
+}
+
 tWindow *WM_CreateWindowStruct(size_t ExtraSize)
 {
 	tWindow	*ret;
@@ -133,7 +140,34 @@ void WM_RaiseWindow(tWindow *Window)
 	Window->PrevSibling = parent->LastChild;
 	Window->NextSibling = NULL;
 	parent->LastChild = Window;
+	
+	_SysDebug("Raised %p", Window);
+}
+
+/*
+void WM_RaiseWindow(tWindow *Window)
+{
+	// Move to the last render position (move to top)
+	while(Window && Window->Parent)
+	{
+		if( Window->NextSibling )
+		{
+			// remove
+			if( Window->PrevSibling )
+				Window->PrevSibling->NextSibling = Window->NextSibling;
+			Window->NextSibling->PrevSibling = Window->PrevSibling;
+			// Mutate self
+			Window->PrevSibling = Window->Parent->LastChild;
+			Window->NextSibling = NULL;
+			// re-add
+			Window->PrevSibling->NextSibling = Window;
+			Window->Parent->LastChild = Window;
+		}
+		_SysDebug("WM_RaiseWindow: Raised %p", Window);
+		Window = Window->Parent;
+	}
 }
+*/
 
 void WM_FocusWindow(tWindow *Destination)
 {
@@ -144,19 +178,21 @@ 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;
 
-
-	// Get the owner of the focused window	
-//	while(Destination && Destination->Owner)	Destination = Destination->Owner;
-//	gpWM_HilightedWindow = Destination;
+	gpWM_FocusedWindow = Destination;
 }
 
 
@@ -172,8 +208,10 @@ void WM_ShowWindow(tWindow *Window, int bShow)
 	WM_SendMessage(NULL, Window, WNDMSG_SHOW, sizeof(_msg), &_msg);
 
 	// Update the flag
-	if(bShow)
+	if(bShow) {
 		Window->Flags |= WINFLAG_SHOW;
+		_SysDebug("Window %p shown", Window);
+	}
 	else
 	{
 		Window->Flags &= ~WINFLAG_SHOW;
@@ -186,6 +224,7 @@ void WM_ShowWindow(tWindow *Window, int bShow)
 			free(Window->RenderBuffer);
 			Window->RenderBuffer = NULL;
 		}
+		_SysDebug("Window %p hidden", Window);
 	}
 	
 	WM_Invalidate(Window);
@@ -210,17 +249,52 @@ void WM_DecorateWindow(tWindow *Window, int bDecorate)
 	WM_Invalidate(Window);
 }
 
+void WM_SetRelative(tWindow *Window, int bRelativeToParent)
+{
+//	_SysDebug("WM_SetRelative: (%p{Parent=%p},%i)", Window, Window->Parent, bRelativeToParent);
+	// No meaning if no parent
+	if( !Window->Parent )
+		return ;
+
+	// Check that the flag is changing
+	if( !!bRelativeToParent == !!(Window->Flags & WINFLAG_RELATIVE) )
+		return ;
+
+	if( bRelativeToParent ) {
+		// Set
+		Window->Flags |= WINFLAG_RELATIVE;
+		WM_MoveWindow(Window, Window->X, Window->Y);
+	}
+	else {
+		// Clear
+		Window->Flags &= ~WINFLAG_RELATIVE;
+		WM_MoveWindow(Window, Window->X - Window->Parent->X, Window->Y - Window->Parent->Y);
+	}
+}
+
 int WM_MoveWindow(tWindow *Window, int X, int Y)
 {
+//	_SysDebug("Move %p to (%i,%i)", Window, X, Y);
 	// Clip coordinates
 	if(X + Window->W < 0)	X = -Window->W + 1;
 	if(Y + Window->H < 0)	Y = -Window->H + 1;
 	if(X >= giScreenWidth)	X = giScreenWidth - 1;
 	if(Y >= giScreenHeight)	Y = giScreenHeight - 1;
 	
+	// If relative to the parent, extra checks
+	if( (Window->Flags & WINFLAG_RELATIVE) && Window->Parent )
+	{
+		if( X > Window->Parent->W )	return 1;
+		if( Y > Window->Parent->H )	return 1;
+	}
+	// TODO: Re-sanitise
+
+	_SysDebug("WM_MoveWindow: (%i,%i)", X, Y);
 	Window->X = X;	Window->Y = Y;
 
-	WM_Invalidate(Window);
+	// Mark up the tree that a child window has changed	
+	while( (Window = Window->Parent) )
+		Window->Flags &= ~WINFLAG_CHILDCLEAN;
 
 	return 0;
 }
@@ -231,6 +305,10 @@ int WM_ResizeWindow(tWindow *Window, int W, int H)
 	if(Window->X + W < 0)	Window->X = -W + 1;
 	if(Window->Y + H < 0)	Window->Y = -H + 1;
 
+	if( Window->W == W && Window->H == H )
+		return 0;
+
+	_SysDebug("WM_Resizeindow: %ix%i", W, H);
 	Window->W = W;	Window->H = H;
 
 	if(Window->RenderBuffer) {
@@ -251,12 +329,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;
 	}
 	
@@ -264,11 +350,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;
@@ -283,16 +371,23 @@ 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 ;
-	_SysDebug("Invalidating %p", Window);
+//	_SysDebug("Invalidating %p", Window);
 	// Don't invalidate twice (speedup)
 //	if( !(Window->Flags & WINFLAG_CLEAN) )	return;
 
@@ -313,13 +408,24 @@ void WM_int_UpdateWindow(tWindow *Window)
 	if( !(Window->Flags & WINFLAG_SHOW) )
 		return ;
 	
+	if( (Window->Flags & WINFLAG_RELATIVE) && Window->Parent )
+	{
+		Window->RealX = Window->Parent->RealX + Window->Parent->BorderL + Window->X;
+		Window->RealY = Window->Parent->RealY + Window->Parent->BorderT + Window->Y;
+	}
+	else
+	{
+		Window->RealX = Window->X;
+		Window->RealY = Window->Y;
+	}
+	
 	// Render
 	if( !(Window->Flags & WINFLAG_CLEAN) )
 	{
 		// Calculate RealW/RealH
 		if( !(Window->Flags & WINFLAG_NODECORATE) )
 		{
-			_SysDebug("Applying decorations to %p", Window);
+			//_SysDebug("Applying decorations to %p", Window);
 			Decorator_UpdateBorderSize(Window);
 			Window->RealW = Window->BorderL + Window->W + Window->BorderR;
 			Window->RealH = Window->BorderT + Window->H + Window->BorderB;
@@ -334,7 +440,7 @@ void WM_int_UpdateWindow(tWindow *Window)
 			Window->RealW = Window->W;
 			Window->RealH = Window->H;
 		}
-		
+
 		Window->Renderer->Redraw(Window);
 		Window->Flags |= WINFLAG_CLEAN;
 	}
@@ -361,19 +467,31 @@ void WM_int_BlitWindow(tWindow *Window)
 	// Ignore hidden windows
 	if( !(Window->Flags & WINFLAG_SHOW) )
 		return ;
+	
+	// Duplicated position update to handle window moving
+	if( (Window->Flags & WINFLAG_RELATIVE) && Window->Parent )
+	{
+		Window->RealX = Window->Parent->RealX + Window->Parent->BorderL + Window->X;
+		Window->RealY = Window->Parent->RealY + Window->Parent->BorderT + Window->Y;
+	}
+	else
+	{
+		Window->RealX = Window->X;
+		Window->RealY = Window->Y;
+	}
 
-//	_SysDebug("Blit %p to (%i,%i) %ix%i", Window, Window->X, Window->Y, Window->RealW, Window->RealH);
-	Video_Blit(Window->RenderBuffer, Window->X, Window->Y, Window->RealW, Window->RealH);
+//	_SysDebug("Blit %p (%p) to (%i,%i) %ix%i", Window, Window->RenderBuffer,
+//		Window->RealX, Window->RealY, Window->RealW, Window->RealH);
+	Video_Blit(Window->RenderBuffer, Window->RealX, Window->RealY, Window->RealW, Window->RealH);
 	
 	if( Window == gpWM_FocusedWindow && Window->CursorW )
 	{
 		Video_FillRect(
-			Window->X + Window->BorderL + Window->CursorX,
-			Window->Y + Window->BorderT + Window->CursorY,
+			Window->RealX + Window->BorderL + Window->CursorX,
+			Window->RealY + Window->BorderT + Window->CursorY,
 			Window->CursorW, Window->CursorH,
 			0x000000
 			);
-			
 	}
 
 	for( child = Window->FirstChild; child; child = child->NextSibling )