AxWin2 - Huge changes, getting to the working point

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

diff --git a/Usermode/Applications/axwin2_src/WM/wm.c b/Usermode/Applications/axwin2_src/WM/wm.c
index e2b0d23..ea80305 100644 (file)
--- a/Usermode/Applications/axwin2_src/WM/wm.c
+++ b/Usermode/Applications/axwin2_src/WM/wm.c
@@ -8,26 +8,33 @@
 #include <stdlib.h>
 #include <string.h>
 #include "wm.h"
+#include <acess/sys.h> // _SysDebug
 
 // === IMPORTS ===
 extern void    Decorator_RenderWidget(tElement *Element);
 extern void    Video_GetTextDims(tFont *Font, const char *Text, int *W, int *H);
 
 // === PROTOTYPES ===
-tElement       *WM_CreateElement(tElement *Parent, int Type, int Flags, const char *DebugName);
+tElement       *AxWin_CreateElement(tElement *Parent, int Type, int Flags, const char *DebugName);
+void   AxWin_DeleteElement(tElement *Element);
+void   AxWin_SetFlags(tElement *Element, int Flags);
+void   AxWin_SetSize(tElement *Element, int Size);
+void   AxWin_SetText(tElement *Element, const char *Text);
 void   WM_UpdateMinDims(tElement *Element);
-void   WM_SetFlags(tElement *Element, int Flags);
-void   WM_SetSize(tElement *Element, int Size);
-void   WM_SetText(tElement *Element, const char *Text);
 void   WM_UpdateDimensions(tElement *Element, int Pass);
 void   WM_UpdatePosition(tElement *Element);
 void   WM_RenderWidget(tElement *Element);
 void   WM_Update(void);
 
 // === GLOBALS ===
+// - TODO: Handle windows by having multiple root elements
 tElement       gWM_RootElement = {
        .DebugName = "ROOT"
 };
+
+tApplication   *gWM_Applications;
+
+// --- Element type flags
 struct {
        void    (*Init)(tElement *This);
        void    (*UpdateFlags)(tElement *This);
@@ -40,7 +47,7 @@ struct {
 
 // === CODE ===
 // --- Widget Creation and Control ---
-tElement *WM_CreateElement(tElement *Parent, int Type, int Flags, const char *DebugName)
+tAxWin_Element *AxWin_CreateElement(tElement *Parent, int Type, int Flags, const char *DebugName)
 {
        tElement        *ret;
        const char      *dbgName = DebugName ? DebugName : "";
@@ -74,10 +81,19 @@ tElement *WM_CreateElement(tElement *Parent, int Type, int Flags, const char *De
        return ret;
 }
 
+/**
+ * \brief
+ */
+void AxWin_DeleteElement(tElement *Element)
+{
+       // TODO: Implement AxWin_DeleteElement
+       free(Element);
+}
+
 /**
  * \brief Alter an element's flags 
  */
-void WM_SetFlags(tElement *Element, int Flags)
+void AxWin_SetFlags(tElement *Element, int Flags)
 {
        // Permissions are handled in the message handler
        if(!Element) {
@@ -89,7 +105,7 @@ void WM_SetFlags(tElement *Element, int Flags)
        return ;
 }
 
-void WM_SetSize(tElement *Element, int Size)
+void AxWin_SetSize(tElement *Element, int Size)
 {
        if(!Element)    return ;
        Element->FixedWith = Size;
@@ -100,7 +116,7 @@ void WM_SetSize(tElement *Element, int Size)
  * \brief Set the text field of an element
  * \note Used for the image path on ELETYPE_IMAGE
  */
-void WM_SetText(tElement *Element, const char *Text)
+void AxWin_SetText(tElement *Element, const char *Text)
 {
        if(!Element)    return ;
        if(Element->Text)       free(Element->Text);
@@ -144,6 +160,8 @@ void WM_SetText(tElement *Element, const char *Text)
                }
                }
                break;
+       default:        // Any other, no special case
+               break ; 
        }
        
        return ;
@@ -157,6 +175,7 @@ void WM_SetText(tElement *Element, const char *Text)
  */
 /**
  * \brief Updates the dimensions of an element
+ * \todo What is the \a Pass parameter for
  * 
  * The dimensions of an element are calculated from the parent's
  * cross dimension (the side at right angles to the alignment) sans some
@@ -257,7 +276,7 @@ void WM_UpdateDimensions(tElement *Element, int Pass)
                else
                        child->CachedW = with;
                
-               WM_UpdateDimensions(child, 0);
+               WM_UpdateDimensions(child, Pass);
        }
        
        _SysDebug("%p'%s' Done", Element, Element->DebugName);