X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Fwm.c;h=cb59154529f45fe2756c9e036b2c4a29d054492a;hb=507f19941f45bca7c1de783a394f56b15f10be4d;hp=a056a52b704e0bef5fce8ef26e457cfa7221cd5b;hpb=cee7338738f1a68c7eb7b956cab8d9fb83f95714;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/wm.c b/Usermode/Applications/axwin3_src/WM/wm.c
index a056a52b..cb591545 100644
--- a/Usermode/Applications/axwin3_src/WM/wm.c
+++ b/Usermode/Applications/axwin3_src/WM/wm.c
@@ -14,13 +14,16 @@
 #include <decorator.h>
 
 // === IMPORTS ===
-extern void	IPC_SendWMMessage(tIPC_Client *Client, uint32_t Src, uint32_t Dst, int Msg, int Len, void *Data);
+extern void	IPC_SendWMMessage(tIPC_Client *Client, uint32_t Src, uint32_t Dst, int Msg, int Len, const void *Data);
+extern tWindow	*IPC_int_GetWindow(tIPC_Client *Client, uint32_t ID);
 
 // === GLOBALS ===
 tWMRenderer	*gpWM_Renderers;
 tWindow	*gpWM_RootWindow;
 //! Window which will recieve the next keyboard event
 tWindow	*gpWM_FocusedWindow;
+//! Hilighted window (owner of the currently focused window)
+tWindow	*gpWM_HilightedWindow;
 
 // === CODE ===
 void WM_Initialise(void)
@@ -53,26 +56,26 @@ tWindow *WM_CreateWindow(tWindow *Parent, tIPC_Client *Client, uint32_t ID, int
 	if(renderer == NULL)
 		return NULL;
 
-	if(!Parent)
-		Parent = gpWM_RootWindow;
-
 	// - Call create window function
 	ret = renderer->CreateWindow(RendererArg);
 	ret->Client = Client;
 	ret->ID = ID;
 	ret->Parent = Parent;
+	if(!ret->Parent)
+		ret->Parent = gpWM_RootWindow;
+	ret->Owner = Parent;
 	ret->Renderer = renderer;
 	ret->Flags |= WINFLAG_CLEAN;	// Needed to stop invaildate early exiting
 
 	// Append to parent
-	if(Parent)
+	if(ret->Parent)
 	{
-		if(Parent->LastChild)
-			Parent->LastChild->NextSibling = ret;
+		if(ret->Parent->LastChild)
+			ret->Parent->LastChild->NextSibling = ret;
 		else
-			Parent->FirstChild = ret;
-		ret->PrevSibling = Parent->LastChild;
-		Parent->LastChild = ret;
+			ret->Parent->FirstChild = ret;
+		ret->PrevSibling = ret->Parent->LastChild;
+		ret->Parent->LastChild = ret;
 		ret->NextSibling = NULL;
 	}
 	else
@@ -81,7 +84,7 @@ tWindow *WM_CreateWindow(tWindow *Parent, tIPC_Client *Client, uint32_t ID, int
 	}
 
 	// Don't decorate child windows by default
-	if(Parent != gpWM_RootWindow)
+	if(Parent)
 	{
 		ret->Flags |= WINFLAG_NODECORATE;
 	}
@@ -90,6 +93,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;
@@ -147,31 +155,44 @@ void WM_FocusWindow(tWindow *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;
 }
 
 
 void WM_ShowWindow(tWindow *Window, int bShow)
 {
-	// Message window
 	struct sWndMsg_Bool	_msg;
 	
 	if( !!(Window->Flags & WINFLAG_SHOW) == bShow )
 		return ;
 
+	// Message window
 	_msg.Val = !!bShow;
 	WM_SendMessage(NULL, Window, WNDMSG_SHOW, sizeof(_msg), &_msg);
-	
+
+	// Update the flag
 	if(bShow)
 		Window->Flags |= WINFLAG_SHOW;
-	else {
+	else
+	{
 		Window->Flags &= ~WINFLAG_SHOW;
+
 		if( Window == gpWM_FocusedWindow )
 			WM_FocusWindow(Window->Parent);
+		
+		// Just a little memory saving for large hidden windows
+		if(Window->RenderBuffer) {
+			free(Window->RenderBuffer);
+			Window->RenderBuffer = NULL;
+		}
 	}
-	// Just a little memory saving for large hidden windows
-	if(Window->RenderBuffer)
-		free(Window->RenderBuffer);
 	
 	WM_Invalidate(Window);
 }
@@ -187,8 +208,10 @@ void WM_DecorateWindow(tWindow *Window, int bDecorate)
 		Window->Flags |= WINFLAG_NODECORATE;
 	
 	// Needed because the window size changes
-	if(Window->RenderBuffer)
+	if(Window->RenderBuffer) {
 		free(Window->RenderBuffer);
+		Window->RenderBuffer = NULL;
+	}
 	
 	WM_Invalidate(Window);
 }
@@ -216,8 +239,10 @@ int WM_ResizeWindow(tWindow *Window, int W, int H)
 
 	Window->W = W;	Window->H = H;
 
-	if(Window->RenderBuffer)
+	if(Window->RenderBuffer) {
 		free(Window->RenderBuffer);
+		Window->RenderBuffer = NULL;
+	}
 	WM_Invalidate(Window);
 
 	{
@@ -230,10 +255,16 @@ int WM_ResizeWindow(tWindow *Window, int W, int H)
 	return 0;
 }
 
-int WM_SendMessage(tWindow *Source, tWindow *Dest, int Message, int Length, void *Data)
+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;
+
+	if( Decorator_HandleMessage(Dest, Message, Length, Data) != 1 )
+	{
+		// TODO: Catch errors from ->HandleMessage
+		return 0;
+	}
 	
 	// ->HandleMessage returns 1 when the message was not handled
 	if( Dest->Renderer->HandleMessage(Dest, Message, Length, Data) != 1 )
@@ -266,6 +297,7 @@ int WM_SendMessage(tWindow *Source, tWindow *Dest, int Message, int Length, void
 
 void WM_Invalidate(tWindow *Window)
 {
+	if(!Window)	return ;
 	_SysDebug("Invalidating %p", Window);
 	// Don't invalidate twice (speedup)
 //	if( !(Window->Flags & WINFLAG_CLEAN) )	return;
@@ -281,7 +313,7 @@ void WM_Invalidate(tWindow *Window)
 // --- Rendering / Update
 void WM_int_UpdateWindow(tWindow *Window)
 {
-	tWindow	*child;
+	 int	bDecoratorRedraw = 0;
 
 	// Ignore hidden windows
 	if( !(Window->Flags & WINFLAG_SHOW) )
@@ -297,7 +329,7 @@ void WM_int_UpdateWindow(tWindow *Window)
 			Decorator_UpdateBorderSize(Window);
 			Window->RealW = Window->BorderL + Window->W + Window->BorderR;
 			Window->RealH = Window->BorderT + Window->H + Window->BorderB;
-			Decorator_Redraw(Window);
+			bDecoratorRedraw = 1;
 		}
 		else
 		{
@@ -316,6 +348,7 @@ void WM_int_UpdateWindow(tWindow *Window)
 	// Process children
 	if( !(Window->Flags & WINFLAG_CHILDCLEAN) )
 	{
+		tWindow	*child;
 		for( child = Window->FirstChild; child; child = child->NextSibling )
 		{
 			WM_int_UpdateWindow(child);
@@ -323,6 +356,8 @@ void WM_int_UpdateWindow(tWindow *Window)
 		Window->Flags |= WINFLAG_CHILDCLEAN;
 	}
 	
+	if( bDecoratorRedraw )
+		Decorator_Redraw(Window);
 }
 
 void WM_int_BlitWindow(tWindow *Window)
@@ -333,9 +368,20 @@ void WM_int_BlitWindow(tWindow *Window)
 	if( !(Window->Flags & WINFLAG_SHOW) )
 		return ;
 
-	_SysDebug("Blit %p to (%i,%i) %ix%i", Window, Window->X, Window->Y, Window->RealW, Window->RealH);
+//	_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);
 	
+	if( Window == gpWM_FocusedWindow && Window->CursorW )
+	{
+		Video_FillRect(
+			Window->X + Window->BorderL + Window->CursorX,
+			Window->Y + Window->BorderT + Window->CursorY,
+			Window->CursorW, Window->CursorH,
+			0x000000
+			);
+			
+	}
+
 	for( child = Window->FirstChild; child; child = child->NextSibling )
 	{
 		WM_int_BlitWindow(child);