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

diff --git a/Usermode/Applications/axwin3_src/WM/wm.c b/Usermode/Applications/axwin3_src/WM/wm.c
index bfa86b10..24781512 100644
--- a/Usermode/Applications/axwin3_src/WM/wm.c
+++ b/Usermode/Applications/axwin3_src/WM/wm.c
@@ -11,13 +11,18 @@
 #include <string.h>
 #include <video.h>
 #include <wm_messages.h>
+#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);
 
 // === 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)
@@ -25,7 +30,7 @@ void WM_Initialise(void)
 	WM_CreateWindow(NULL, NULL, 0, 0x0088FF, "Background");
 	gpWM_RootWindow->W = giScreenWidth;
 	gpWM_RootWindow->H = giScreenHeight;
-	gpWM_RootWindow->Flags = WINFLAG_SHOW;
+	gpWM_RootWindow->Flags = WINFLAG_SHOW|WINFLAG_NODECORATE;
 }
 
 void WM_RegisterRenderer(tWMRenderer *Renderer)
@@ -50,32 +55,39 @@ 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
+	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
 	{
 		gpWM_RootWindow = ret;
 	}
 
+	// Don't decorate child windows by default
+	if(Parent)
+	{
+		ret->Flags |= WINFLAG_NODECORATE;
+	}
+	
 	// - Return!
 	return ret;
 }
@@ -90,13 +102,111 @@ tWindow *WM_CreateWindowStruct(size_t ExtraSize)
 	return ret;
 }
 
+void WM_SetWindowTitle(tWindow *Window, const char *Title)
+{
+	if(Window->Title)
+		free(Window->Title);
+	Window->Title = strdup(Title);
+	_SysDebug("Window %p title set to '%s'", Window, Title);
+}
+
+void WM_RaiseWindow(tWindow *Window)
+{
+	tWindow	*parent = Window->Parent;
+	if(!Window->Parent)	return ;
+	
+	// Remove from list
+	if(Window->PrevSibling)
+		Window->PrevSibling->NextSibling = Window->NextSibling;
+	if(Window->NextSibling)
+		Window->NextSibling->PrevSibling = Window->PrevSibling;
+	if(parent->FirstChild == Window)
+		parent->FirstChild = Window->NextSibling;
+	if(parent->LastChild == Window)
+		parent->LastChild = Window->PrevSibling;
+
+	// Append to end
+	if(parent->LastChild)
+		parent->LastChild->NextSibling = Window;
+	else
+		parent->FirstChild = Window;
+	Window->PrevSibling = parent->LastChild;
+	Window->NextSibling = NULL;
+	parent->LastChild = Window;
+}
+
+void WM_FocusWindow(tWindow *Destination)
+{
+	struct sWndMsg_Bool	_msg;
+	
+	if( gpWM_FocusedWindow == Destination )
+		return ;
+	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);
+	
+	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)
 {
-	// TODO: 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
+	{
 		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;
+		}
+	}
+	
+	WM_Invalidate(Window);
+}
+
+void WM_DecorateWindow(tWindow *Window, int bDecorate)
+{
+	if( !(Window->Flags & WINFLAG_NODECORATE) == !!bDecorate )
+		return ;
+	
+	if(bDecorate)
+		Window->Flags &= ~WINFLAG_NODECORATE;
+	else
+		Window->Flags |= WINFLAG_NODECORATE;
+	
+	// Needed because the window size changes
+	if(Window->RenderBuffer) {
+		free(Window->RenderBuffer);
+		Window->RenderBuffer = NULL;
+	}
+	
 	WM_Invalidate(Window);
 }
 
@@ -120,9 +230,13 @@ int WM_ResizeWindow(tWindow *Window, int W, int H)
 	if(W <= 0 || H <= 0 )	return 1;
 	if(Window->X + W < 0)	Window->X = -W + 1;
 	if(Window->Y + H < 0)	Window->Y = -H + 1;
-	
+
 	Window->W = W;	Window->H = H;
 
+	if(Window->RenderBuffer) {
+		free(Window->RenderBuffer);
+		Window->RenderBuffer = NULL;
+	}
 	WM_Invalidate(Window);
 
 	{
@@ -135,10 +249,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 )
@@ -171,8 +291,10 @@ 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;
+//	if( !(Window->Flags & WINFLAG_CLEAN) )	return;
 
 	// Mark for re-render
 	Window->Flags &= ~WINFLAG_CLEAN;
@@ -185,7 +307,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) )
@@ -194,6 +316,25 @@ void WM_int_UpdateWindow(tWindow *Window)
 	// Render
 	if( !(Window->Flags & WINFLAG_CLEAN) )
 	{
+		// Calculate RealW/RealH
+		if( !(Window->Flags & WINFLAG_NODECORATE) )
+		{
+			_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;
+			bDecoratorRedraw = 1;
+		}
+		else
+		{
+			Window->BorderL = 0;
+			Window->BorderR = 0;
+			Window->BorderT = 0;
+			Window->BorderB = 0;
+			Window->RealW = Window->W;
+			Window->RealH = Window->H;
+		}
+		
 		Window->Renderer->Redraw(Window);
 		Window->Flags |= WINFLAG_CLEAN;
 	}
@@ -201,6 +342,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);
@@ -208,6 +350,8 @@ void WM_int_UpdateWindow(tWindow *Window)
 		Window->Flags |= WINFLAG_CHILDCLEAN;
 	}
 	
+	if( bDecoratorRedraw )
+		Decorator_Redraw(Window);
 }
 
 void WM_int_BlitWindow(tWindow *Window)
@@ -217,9 +361,21 @@ void WM_int_BlitWindow(tWindow *Window)
 	// Ignore hidden windows
 	if( !(Window->Flags & WINFLAG_SHOW) )
 		return ;
+
+//	_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);
 	
-	Video_Blit(Window->RenderBuffer, Window->X, Window->Y, Window->W, Window->H);
-	
+	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);