X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Fwm.c;h=cc7e86ea96d20e22f924ff268ced3033e1c1dc82;hb=32980a36e515d1be2da1c7bf551070d4e972963e;hp=019ce5a8a19240c9f75b976e57dcbde02ac11b9e;hpb=fa0ff18a7f85c7dc637aef2dfe5c1ed3dea7aee5;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/wm.c b/Usermode/Applications/axwin3_src/WM/wm.c
index 019ce5a8..cc7e86ea 100644
--- a/Usermode/Applications/axwin3_src/WM/wm.c
+++ b/Usermode/Applications/axwin3_src/WM/wm.c
@@ -12,10 +12,20 @@
 #include <video.h>
 #include <wm_messages.h>
 #include <decorator.h>
+#include <axwin3/keysyms.h>
+#include <wm_hotkeys.h>
 
 // === IMPORTS ===
+extern int	Renderer_Menu_Init(void);
+extern int	Renderer_Widget_Init(void);
+extern int	Renderer_Background_Init(void);
+extern int	Renderer_Framebuffer_Init(void);
+extern int	Renderer_RichText_Init(void);
+
 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);
+extern void	IPC_int_SetWindow(tIPC_Client *Client, uint32_t ID, tWindow *Window);
 
 // === GLOBALS ===
 tWMRenderer	*gpWM_Renderers;
@@ -28,15 +38,40 @@ tWindow	*gpWM_HilightedWindow;
 // === CODE ===
 void WM_Initialise(void)
 {
+	// TODO: Autodetect these
+	Renderer_Menu_Init();
+	Renderer_Widget_Init();
+	Renderer_Background_Init();
+	Renderer_Framebuffer_Init();
+	Renderer_RichText_Init();
+	
 	WM_CreateWindow(NULL, NULL, 0, 0x0088FF, "Background");
 	gpWM_RootWindow->W = giScreenWidth;
 	gpWM_RootWindow->H = giScreenHeight;
 	gpWM_RootWindow->Flags = WINFLAG_SHOW|WINFLAG_NODECORATE;
+
+	// TODO: Move these to config
+	uint32_t	keys[4];
+	keys[0] = KEYSYM_LEFTGUI;	keys[1] = KEYSYM_r;
+	WM_Hotkey_Register(2, keys, "Interface>Run");
+	keys[0] = KEYSYM_LEFTGUI;	keys[1] = KEYSYM_t;
+	WM_Hotkey_Register(2, keys, "Interface>Terminal");
+	keys[0] = KEYSYM_LEFTGUI;	keys[1] = KEYSYM_e;
+	WM_Hotkey_Register(2, keys, "Interface>TextEdit");
 }
 
 void WM_RegisterRenderer(tWMRenderer *Renderer)
 {
-	// TODO: Catch out duplicates
+	// Catch out duplicates
+	for(tWMRenderer *r = gpWM_Renderers; r; r = r->Next ) {
+		if( r == Renderer ) {
+			return ;
+		}
+		if( strcmp(r->Name, Renderer->Name) == 0 ) {
+			return ;
+		}
+	}
+	
 	Renderer->Next = gpWM_Renderers;
 	gpWM_Renderers = Renderer;
 }
@@ -93,6 +128,60 @@ tWindow *WM_CreateWindow(tWindow *Parent, tIPC_Client *Client, uint32_t ID, int
 	return ret;
 }
 
+void WM_DestroyWindow(tWindow *Window)
+{
+	// TODO: Lock window and flag as invalid
+	
+	// - Remove from render tree
+	{
+		// TODO: Lock render tree?
+		tWindow *prev = Window->PrevSibling;
+		tWindow *next = Window->NextSibling;
+		if(prev)
+			prev->NextSibling = next;
+		else
+			Window->Parent->FirstChild = next;
+		if(next)
+			next->PrevSibling = prev;
+		else
+			Window->Parent->LastChild = prev;
+	}
+	// - Full invalidate
+	WM_Invalidate(Window, 0);
+	Window->Parent->Flags &= ~WINFLAG_CLEAN;	// Mark parent as unclean, forcing redraw
+	
+	// - Remove from inheritance tree?
+	
+	// - Clean up render children
+	{
+		// Lock should not be needed
+		tWindow *win, *next;
+		for( win = Window->FirstChild; win; win = next )
+		{
+			next = win->NextSibling;
+			ASSERT(Window->FirstChild->Parent == Window);
+			WM_DestroyWindow(win);
+		}
+	}
+	
+	// - Clean up inheriting children?
+
+	// - Tell renderer to clean up
+	if( Window->Renderer->DestroyWindow )
+		Window->Renderer->DestroyWindow(Window);
+	else
+		_SysDebug("WARN: Renderer '%s' does not have a destroy function", Window->Renderer->Name);
+
+	// - Tell client to clean up
+	WM_SendMessage(NULL, Window, WNDMSG_DESTROY, 0, NULL);
+
+	// - Clean up render cache and window structure
+	free(Window->Title);
+	free(Window->RenderBuffer);
+	free(Window);
+	IPC_int_SetWindow(Window->Client, Window->ID, NULL);
+}
+
 tWindow *WM_GetWindowByID(tWindow *Requester, uint32_t ID)
 {
 	return IPC_int_GetWindow(Requester->Client, ID);
@@ -139,30 +228,62 @@ 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)
 {
 	struct sWndMsg_Bool	_msg;
 	
+	_SysDebug("WM_FocusWindow(%p)", Destination);
+
 	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);
+	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;
-
+	// TODO: Leave it up to the renderer to decide to invalidate
+	WM_Invalidate(gpWM_FocusedWindow, 1);
+	WM_Invalidate(Destination, 1);
 
-	// Get the owner of the focused window	
-//	while(Destination && Destination->Owner)	Destination = Destination->Owner;
-//	gpWM_HilightedWindow = Destination;
+	gpWM_FocusedWindow = Destination;
 }
 
 
@@ -172,14 +293,20 @@ void WM_ShowWindow(tWindow *Window, int bShow)
 	
 	if( !!(Window->Flags & WINFLAG_SHOW) == bShow )
 		return ;
+	
+	// Window is being hidden, invalidate parents
+	if( !bShow )
+		WM_Invalidate(Window, 0);
 
 	// Message window
 	_msg.Val = !!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;
@@ -192,9 +319,12 @@ void WM_ShowWindow(tWindow *Window, int bShow)
 			free(Window->RenderBuffer);
 			Window->RenderBuffer = NULL;
 		}
+		_SysDebug("Window %p hidden", Window);
 	}
 	
-	WM_Invalidate(Window);
+	// Window has been shown, invalidate everything
+	if( bShow )
+		WM_Invalidate(Window, 1);
 }
 
 void WM_DecorateWindow(tWindow *Window, int bDecorate)
@@ -213,20 +343,62 @@ void WM_DecorateWindow(tWindow *Window, int bDecorate)
 		Window->RenderBuffer = NULL;
 	}
 	
-	WM_Invalidate(Window);
+	WM_Invalidate(Window, 1);
+}
+
+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
+
+	if( Window->X == X && Window->Y == Y ) {
+		_SysDebug("WM_MoveWindow: Equal (%i,%i)", X, Y);
+		return 0;
+	}
+
+	if( Window->Parent )
+		Window->Parent->Flags |= WINFLAG_NEEDREBLIT;
+
+	_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	
+	WM_Invalidate(Window, 0);
 
 	return 0;
 }
@@ -239,14 +411,19 @@ int WM_ResizeWindow(tWindow *Window, int W, int H)
 
 	if( Window->W == W && Window->H == H )
 		return 0;
+	
+	// If the window size has decreased, force the parent to reblit
+	if( Window->Parent && (Window->W > W || Window->H > H) )
+		Window->Parent->Flags |= WINFLAG_NEEDREBLIT;
 
+	_SysDebug("WM_ResizeWindow: %p:%i %ix%i", Window->Client, Window->ID, W, H);
 	Window->W = W;	Window->H = H;
 
 	if(Window->RenderBuffer) {
 		free(Window->RenderBuffer);
 		Window->RenderBuffer = NULL;
 	}
-	WM_Invalidate(Window);
+	WM_Invalidate(Window, 1);
 
 	{
 		struct sWndMsg_Resize	msg;
@@ -260,12 +437,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;
 	}
 	
@@ -273,11 +458,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;
@@ -292,24 +479,33 @@ 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;
 }
 
-void WM_Invalidate(tWindow *Window)
+int WM_SendIPCReply(tWindow *Window, int Message, size_t Length, const void *Data)
 {
-	if(!Window)	return ;
-	_SysDebug("Invalidating %p", Window);
-	// Don't invalidate twice (speedup)
-//	if( !(Window->Flags & WINFLAG_CLEAN) )	return;
+	IPC_SendReply(Window->Client, Window->ID, Message, Length, Data);
+	return 0;
+}
 
+void WM_Invalidate(tWindow *Window, int bClearClean)
+{
+	if(!Window)	return ;
+	
+	// Don't bother invalidating if the window isn't shown
+	if( !(Window->Flags & WINFLAG_SHOW) )
+		return ;
+	
 	// Mark for re-render
-	Window->Flags &= ~WINFLAG_CLEAN;
+	if( bClearClean )
+		Window->Flags &= ~WINFLAG_CLEAN;
 
 	// Mark up the tree that a child window has changed	
-	while( (Window = Window->Parent) )
+	while( (Window = Window->Parent) && (Window->Flags & WINFLAG_SHOW) )
 		Window->Flags &= ~WINFLAG_CHILDCLEAN;
 }
 
@@ -322,13 +518,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;
@@ -343,9 +550,9 @@ void WM_int_UpdateWindow(tWindow *Window)
 			Window->RealW = Window->W;
 			Window->RealH = Window->H;
 		}
-		
+
 		Window->Renderer->Redraw(Window);
-		Window->Flags |= WINFLAG_CLEAN;
+		Window->Flags |= WINFLAG_CLEAN|WINFLAG_NEEDREBLIT;
 	}
 	
 	// Process children
@@ -363,23 +570,44 @@ void WM_int_UpdateWindow(tWindow *Window)
 		Decorator_Redraw(Window);
 }
 
-void WM_int_BlitWindow(tWindow *Window)
+void WM_int_BlitWindow(tWindow *Window, int bForceReblit)
 {
 	tWindow	*child;
 
 	// 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 (%p) to (%i,%i) %ix%i", Window, Window->RenderBuffer,
-		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);
+	// TODO Don't blit unless:
+	// a) A parent has been reblitted (thus clobbering the existing content)
+	// b) A child has moved (exposing a previously hidden area)
+	if( bForceReblit || (Window->Flags & WINFLAG_NEEDREBLIT) )
+	{
+		Video_Blit(Window->RenderBuffer, Window->RealX, Window->RealY, Window->RealW, Window->RealH);
+		Window->Flags &= ~WINFLAG_NEEDREBLIT;
+		bForceReblit = 1;
+	}
 	
+	// Draw cursor
 	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
 			);
@@ -387,7 +615,7 @@ void WM_int_BlitWindow(tWindow *Window)
 
 	for( child = Window->FirstChild; child; child = child->NextSibling )
 	{
-		WM_int_BlitWindow(child);
+		WM_int_BlitWindow(child, bForceReblit);
 	}
 }
 
@@ -401,7 +629,7 @@ void WM_Update(void)
 	WM_int_UpdateWindow(gpWM_RootWindow);
 	
 	// - Draw windows from back to front to the render buffer
-	WM_int_BlitWindow(gpWM_RootWindow);
+	WM_int_BlitWindow(gpWM_RootWindow, 0);
 
 	Video_Update();
 }