X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2Finclude%2Faxwin%2Fmessages.h;h=e4ed1fe2f478fcedff7fa6c7e8c7a95fe24c1e78;hb=b3fa9a08edcbc459bd8e9df73186e292470ebfc3;hp=c11b8644e79e8e4600e5d7992200d7c6443b31fd;hpb=3c85c92afe3f506a921447ef07963525d796137b;p=tpg%2Facess2.git

diff --git a/Usermode/include/axwin/messages.h b/Usermode/include/axwin/messages.h
index c11b8644..e4ed1fe2 100644
--- a/Usermode/include/axwin/messages.h
+++ b/Usermode/include/axwin/messages.h
@@ -6,6 +6,8 @@
 #ifndef _AXWIN_MESSAGES_H
 #define _AXWIN_MESSAGES_H
 
+#include <stdint.h>
+
 typedef struct sAxWin_Message	tAxWin_Message;
 
 /**
@@ -16,7 +18,7 @@ enum eAxWin_Messages
 	// Server Requests
 	MSG_SREQ_PING,
 	// - Windows
-	MSG_SREQ_NEWWINDOW,
+	MSG_SREQ_NEWWINDOW,	// (short x, y, w, h, uint32_t flags)
 	MSG_SREQ_GETFLAGS,	MSG_SREQ_SETFLAGS,
 	MSG_SREQ_GETRECT,	MSG_SREQ_SETRECT,
 	// - Drawing
@@ -29,19 +31,54 @@ enum eAxWin_Messages
 	
 	// Server Responses
 	MSG_SRSP_PONG,
+	MSG_SRSP_WINDOW,	// Returns the new window ID
 	MSG_SRSP_IMG,	// Returns the image ID
 	
 	NUM_MSG
 };
 
+// --- Server Requests (Requests from the client of the server)
 /**
- * \brief New Window Request structure
+ * \brief Server Request - Ping (Get Server Version)
  */
-struct sAxWin_Req_NewWindow
+struct sAxWin_SReq_Ping
 {
-	
 };
 
+/**
+ * \brief Server Request - New Window
+ * \see eAxWin_Messages.MSG_SREQ_NEWWINDOW
+ */
+struct sAxWin_SReq_NewWindow
+{
+	uint16_t	X, Y, W, H;
+	uint32_t	Flags;
+};
+
+
+// --- Server Responses
+/**
+ * \brief Server Response - Pong
+ * \see eAxWin_Messages.MSG_SRSP_PONG
+ */
+struct sAxWin_SRsp_Pong
+{
+	uint8_t	Major;
+	uint8_t	Minor;
+	uint16_t	Build;
+};
+
+/**
+ * \brief Server Response - New Window
+ * \see eAxWin_Messages.MSG_SRSP_NEWWINDOW
+ */
+struct sAxWin_SRsp_NewWindow
+{
+	uint32_t	Handle;
+};
+
+
+// === Core Message Structure
 /**
  * \brief Overarching Message Structure
  * \note sizeof(tAxWin_Message) is never valid
@@ -50,6 +87,15 @@ struct sAxWin_Message
 {
 	uint16_t	ID;
 	uint16_t	Size;	//!< Size in DWORDS
+	union
+	{
+		struct sAxWin_SReq_Ping	SReq_Pong;
+		struct sAxWin_SReq_NewWindow	SReq_NewWindow;
+		
+		// Server Responses
+		struct sAxWin_SRsp_Pong	SRsp_Pong;
+		struct sAxWin_SRsp_NewWindow	SRsp_Window;
+	};
 };
 
 #endif