Usermode/AxWin3 - Decorator resize and close, misc fixes

[tpg/acess2.git] / Usermode / Applications / axwin3_src / WM / wm.c

diff --git a/Usermode/Applications/axwin3_src/WM/wm.c b/Usermode/Applications/axwin3_src/WM/wm.c
index f039460..cc9d81d 100644 (file)
--- a/Usermode/Applications/axwin3_src/WM/wm.c
+++ b/Usermode/Applications/axwin3_src/WM/wm.c
@@ -94,6 +94,57 @@ 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;
+       }
+       WM_Invalidate(Window->Parent);
+       
+       // - 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);
+}
+
 tWindow *WM_GetWindowByID(tWindow *Requester, uint32_t ID)
 {
        return IPC_int_GetWindow(Requester->Client, ID);
@@ -173,6 +224,8 @@ 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) )
@@ -292,8 +345,9 @@ int WM_MoveWindow(tWindow *Window, int X, int Y)
        _SysDebug("WM_MoveWindow: (%i,%i)", X, Y);
        Window->X = X;  Window->Y = Y;
 
-       // TODO: Why invalidate buffer?
-       WM_Invalidate(Window);
+       // Mark up the tree that a child window has changed     
+       while( (Window = Window->Parent) )
+               Window->Flags &= ~WINFLAG_CHILDCLEAN;
 
        return 0;
 }
@@ -307,7 +361,7 @@ int WM_ResizeWindow(tWindow *Window, int W, int H)
        if( Window->W == W && Window->H == H )
                return 0;
 
-       _SysDebug("WM_Resizeindow: %ix%i", W, H);
+       _SysDebug("WM_ResizeWindow: %ix%i", W, H);
        Window->W = W;  Window->H = H;
 
        if(Window->RenderBuffer) {
@@ -407,6 +461,17 @@ 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) )
        {
@@ -428,17 +493,6 @@ void WM_int_UpdateWindow(tWindow *Window)
                        Window->RealW = Window->W;
                        Window->RealH = Window->H;
                }
-               
-               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;
-               }
 
                Window->Renderer->Redraw(Window);
                Window->Flags |= WINFLAG_CLEAN;
@@ -466,6 +520,18 @@ 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 (%p) to (%i,%i) %ix%i", Window, Window->RenderBuffer,
 //             Window->RealX, Window->RealY, Window->RealW, Window->RealH);