X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2Finclude%2Faxwin3%2Faxwin.h;h=fe116e9d8ca2ed3d56d22e8a9987b28b28b8061a;hb=3e29ef3929531865fe4b669b09609baa8158af66;hp=af5c242be6c14e660b7579039a1b84371c46287c;hpb=1f2e2ea9289e3fa3768172de9fad129880ed198f;p=tpg%2Facess2.git

diff --git a/Usermode/include/axwin3/axwin.h b/Usermode/include/axwin3/axwin.h
index af5c242b..fe116e9d 100644
--- a/Usermode/include/axwin3/axwin.h
+++ b/Usermode/include/axwin3/axwin.h
@@ -8,22 +8,57 @@
 #ifndef _AXWIN3_AXWIN_H_
 #define _AXWIN3_AXWIN_H_
 
+// === CONSTANTS ===
+
+// === TYPES ===
 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);
+// --- Non-Window based functions
+extern int	AxWin3_GetDisplayCount(void);
+extern int	AxWin3_GetDisplayDims(int Display, int *X, int *Y, int *Width, int *Height);
+
+// --- 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);
-extern void	AxWin3_SetWindowPos(tHWND Window, int X, int Y, int W, int H);
-extern void	AxWin3_SetWindowShown(tHWND Window, int bShow);
+// --- Core window management functions
+extern void	AxWin3_SendMessage(tHWND Window, tHWND Dest, int Message, int Length, void *Data);
+extern void	AxWin3_SetWindowTitle(tHWND Window, const char *Title);
+extern void	AxWin3_FocusWindow(tHWND Window);
+extern void	AxWin3_ShowWindow(tHWND Window, int bShow);
+extern void	AxWin3_DecorateWindow(tHWND Window, int bDecorate);
+extern void	AxWin3_SetWindowPos(tHWND Window, short X, short Y, short W, short H);
+extern void	AxWin3_MoveWindow(tHWND Window, short X, short Y);
+extern void	AxWin3_ResizeWindow(tHWND Window, short W, short H);
 
 #endif