X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FApplications%2Faxwin2_src%2FWM%2Fwm.h;h=5977fd689a3459b6834c58350955d7a1b5c3d31e;hb=e02f66c7125bf18f77c6c53587238cbd49da2c89;hp=e7b6bee9d8a0ad517baeb9c68cbafdbcd031e48a;hpb=775bf8013abe9fe4ef3d4883ea2e43bba2a84da1;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin2_src/WM/wm.h b/Usermode/Applications/axwin2_src/WM/wm.h
index e7b6bee9..5977fd68 100644
--- a/Usermode/Applications/axwin2_src/WM/wm.h
+++ b/Usermode/Applications/axwin2_src/WM/wm.h
@@ -1,34 +1,109 @@
-
+/*
+ * Acess2 Window Manager (AxWin2)
+ */
 #ifndef _WM_H_
 #define _WM_H_
 
-typedef struct sElement
+#include <axwin2/axwin.h>
+#include "common.h"
+
+/**
+ * \brief Number of elements that can be owned by each application
+ */
+// TODO: Fine tune these values
+#define MAX_ELEMENTS_PER_APP	1024
+#define DEFAULT_ELEMENTS_PER_APP	128
+
+typedef struct sAxWin_Element	tElement;
+typedef struct sMenuItem	tMenuItem;
+typedef struct sWindow	tWindow;
+typedef struct sApplication	tApplication;
+
+struct sAxWin_Element
 {
-	struct sElement	*NextSibling;
+	enum eElementTypes	Type;
+	
+	// Element Tree
+	tElement	*Parent;
+	tElement	*FirstChild;
+	tElement	*LastChild;
+	tElement	*NextSibling;
+	
+	// Application
+	tApplication	*Owner;	//!< Owning application
+	uint16_t	ApplicationID;	//!< Index into sApplication::EleIndex
+
+	// User modifiable attributes	
+	short	PaddingL, PaddingR;
+	short	PaddingT, PaddingB;
+	short	GapSize;
+	
+	uint32_t	Flags;
+	
+	short	FixedWith;	//!< Fixed lengthways Size attribute (height)
+	short	FixedCross;	//!< Fixed Cross Size attribute (width)
+	
+	char	*Text;
 	
-	short	CachedX;
-	short	CachedY;
-	short	CachedW;
-	short	CachedH;
+	// -- Attributes maitained by the element code
+	// Not touched by the user
+	short	MinWith;	//!< Minimum long size
+	short	MinCross;	//!< Minimum cross size
+	void	*Data;	//!< Per-type data
 	
-	struct sElement	*FirstChild;
-}	tElement;
+	// -- Render Cache
+	short	CachedX, CachedY;
+	short	CachedW, CachedH;
+	
+	char	DebugName[];
+};
+
+struct sMenuItem
+{
+	tMenuItem	*Next;
+	 int	Flags;
+	 int	ID;	//!< ID number sent to application
+	const char	*Label;
+	const char	*Right;
+	tMenuItem	*FirstChild;
+};
 
-typedef struct sTab
+struct sWindow
 {
-	char	*Name;
+	 int	X, Y, W, H;
+	void	*Icon;
+	
+	tApplication	*App;
+	
+	tWindow	*OrderNext;	// Render order
 	
-	tElement	*RootElement;
-}	tTab;
+	tMenuItem	*Menus;
+	
+	tElement	RootElement;
+};
 
-typedef struct sApplication
+struct sApplication
 {
-	pid_t	PID;
+	tApplication	*Next;
+
+	tIPC_Type	*IPCType;
+	void	*Ident;	//!< Client Identifier
+	
+	char	*Name;	//!< Application name
 	
-	 int	nTabs;
-	tTab	*Tabs;
+	 int	MaxElementIndex;	//!< Number of entries in \a EleIndex
+	tElement	**EleIndex;	//!< Array of pointers to elements owned by this application
 	
-	char	Name[];
-}	tApplication;
+	tElement	MetaElement;	//!< Tabs child off this
+};
+
+// === FUNCTIONS ===
+
+// --- Render
+extern void	WM_UpdateMinDims(tElement *Element);
+extern void	WM_UpdateDimensions(tElement *Element, int Pass);
+extern void	WM_UpdatePosition(tElement *Element);
+extern void	WM_RenderWidget(tElement *Element);
+extern void	WM_Update(void);
 
 #endif