X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2Finclude%2Faxwin3%2Faxwin.h;h=7d1d3f47590787c052c20bfa6bccc00e241d0aa9;hb=1314c5a4586315b526d84500d5b2ef5f7800b703;hp=6564e23c3669498baedff1227d1f2cb12ceee91d;hpb=58a0f278ca687c7ed28f4fd212123db2f056ffec;p=tpg%2Facess2.git

diff --git a/Usermode/include/axwin3/axwin.h b/Usermode/include/axwin3/axwin.h
index 6564e23c..7d1d3f47 100644
--- a/Usermode/include/axwin3/axwin.h
+++ b/Usermode/include/axwin3/axwin.h
@@ -9,20 +9,42 @@
 #define _AXWIN3_AXWIN_H_
 
 typedef struct sAxWin3_Window	*tHWND;
+typedef unsigned int	tAxWin3_Colour;	// TODO: Actual 32-bit
 
 typedef void	(*tAxWin3_MessageCallback)(int SourceTID, int Length);
 
-typedef int	(*tAxWin3_WindowMessageHandler)(tHWND Window, int Length, void *Data);
+typedef int	(*tAxWin3_WindowMessageHandler)(tHWND Window, int Message, int Length, void *Data);
 
+// --- Connection management
 extern void	AxWin3_Connect(const char *ServerDesc);
 extern tAxWin3_MessageCallback	AxWin3_SetMessageCallback(tAxWin3_MessageCallback Callback);
 extern void	AxWin3_MainLoop(void);
 
-extern tHWND	AxWin3_CreateWindow(tHWND Parent, const char *Renderer, int Flags, int DataBytes, void **DataPtr,
-	tAxWin3_WindowMessageHandler MessageHandler);
+// --- Window creation/deletion
+/**
+ * \brief Create a new window (with the required client structures)
+ * \param Parent	Parent window handle
+ * \param Renderer	Symbolic name of the renderer to use
+ * \param RendererArg	Argument to pass to the renderer's initialisation
+ * \param DataBytes	Number of bytes to allocate for the caller's use
+ * \param MessageHandler	Function to call when a message arrives for the window
+ * \return New window handle
+ * \note Usually wrapped by renderer-specific functions
+ */
+extern tHWND	AxWin3_CreateWindow(
+	tHWND Parent,
+	const char *Renderer, int RendererArg,
+	int DataBytes,
+	tAxWin3_WindowMessageHandler MessageHandler
+	);
+/**
+ * \brief Destroy a window
+ * \param Window	Handle to a window to destroy
+ */
 extern void	AxWin3_DestroyWindow(tHWND Window);
 
-extern void	AxWin3_SendMessage(tHWND Window, int Length, void *Data);
+// --- Core window management functions
+extern void	AxWin3_SendMessage(tHWND Window, tHWND Dest, int Message, int Length, void *Data);
 extern void	AxWin3_ShowWindow(tHWND Window, int bShow);
 extern void	AxWin3_SetWindowPos(tHWND Window, short X, short Y, short W, short H);
 extern void	AxWin3_MoveWindow(tHWND Window, short X, short Y);