X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2Finclude%2Faxwin2%2Fmessages.h;h=61536f351c18ca58baa342ad12487527a8878d80;hb=89e41793b9d495d98633f90e6595722b8e5979d3;hp=4d53ab5d19be4f40e46484723ce45cd1c7fe27bd;hpb=93c9e2f871609348b3cfd2cd164057d9d0009f80;p=tpg%2Facess2.git

diff --git a/Usermode/include/axwin2/messages.h b/Usermode/include/axwin2/messages.h
index 4d53ab5d..61536f35 100644
--- a/Usermode/include/axwin2/messages.h
+++ b/Usermode/include/axwin2/messages.h
@@ -22,14 +22,15 @@ typedef struct sAxWin_RetMsg	tAxWin_RetMsg;
  */
 enum eAxWin_Messages
 {
-	// Server Requests
+	// Client->Server Requests
 	MSG_SREQ_PING,
 	// - Windows
 	MSG_SREQ_REGISTER,	// bool (char[] Name) - Registers this PID with the Window Manager
 	
-	MSG_SREQ_ADDTAB,	// TAB (char[] Name) - Adds a tab to the window
-	MSG_SREQ_DELTAB,	// void (TAB Tab)	- Closes a tab
+	MSG_SREQ_ADDWIN,	// ELEMENT (char[] Name) - Adds a tab to the window
 	
+	MSG_SREQ_SETICON,	// void (TAB Tab, char[] IconURI)	- Set the icon of a tab (or application)
+
 	MSG_SREQ_NEWDIALOG,	// DIALOG (TAB Parent, char[] Name)	- Creates a dialog
 	MSG_SREQ_DELDIALOG,	// void (DIALOG Dialog)	- Closes a dialog
 	
@@ -37,19 +38,25 @@ enum eAxWin_Messages
 	MSG_SREQ_GETNAME,	// char[] (ELEMENT Element)
 	
 	// - Builtin Elements
-	MSG_SREQ_INSERT,	// void (ELEMENT Parent, eAxWin_Controls Type, u32 Flags)
+	MSG_SREQ_INSERT,	// ELEMENT (ELEMENT Parent, eAxWin_Controls Type, u32 Flags)
+	MSG_SREQ_DELETE,	// void (ELEMENT Element)
 	
 	// - Drawing
 	//  All drawing functions take an ELEMENT as their first parameter.
-	//  This must be either a Tab, Dialog or Canvas control
+	//  This must be either a Window or Canvas control
 	MSG_SREQ_SETCOL,
 	MSG_SREQ_PSET,
 	MSG_SREQ_LINE,	MSG_SREQ_CURVE,
 	MSG_SREQ_RECT,	MSG_SREQ_FILLRECT,
 	MSG_SREQ_RIMG,	MSG_SREQ_SIMG,	// Register/Set Image
 	MSG_SREQ_SETFONT,	MSG_SREQ_PUTTEXT,
+
+	// - Callback Registration
+
+	// - WM Control
+	MSG_SREQ_SET_MAXIMIZE_AREA,	// void (uint16_t X, Y, W, H)
 	
-	// Server Responses
+	// Server->Client Responses
 	MSG_SRSP_VERSION,
 	MSG_SRSP_RETURN,	// {int RequestID, void[] Return Value} - Returns a value from a server request
 	
@@ -74,6 +81,13 @@ struct sAxWin_SReq_NewWindow
 	uint32_t	Flags;
 };
 
+struct sAxWin_SReq_NewElement
+{
+	uint16_t	Parent;
+	uint16_t	Type;
+	uint32_t	Flags;
+};
+
 
 // --- Server Responses
 /**
@@ -87,15 +101,6 @@ struct sAxWin_SRsp_Version
 	uint16_t	Build;
 };
 
-/**
- * \brief Server Response - New Window
- * \see eAxWin_Messages.MSG_SRSP_NEWWINDOW
- */
-struct sAxWin_SRsp_NewWindow
-{
-	uint32_t	Handle;
-};
-
 
 // === Core Message Structure
 /**
@@ -104,8 +109,9 @@ struct sAxWin_SRsp_NewWindow
  */
 struct sAxWin_Message
 {
+	uint32_t	Source;
 	uint16_t	ID;
-	uint16_t	Size;	//!< Size in DWORDS
+	uint16_t	Size;	// Size of data
 	char	Data[];
 };
 
@@ -113,12 +119,7 @@ struct sAxWin_RetMsg
 {
 	uint16_t	ReqID;
 	uint16_t	Rsvd;
-	union
-	{
-		 uint8_t	Bool;
-		uint32_t	Handle;
-		 int	Integer;
-	};
+	uint32_t	Value;
 };
 
 #endif