X-Git-Url: https://git.ucc.asn.au/?p=tpg%2Facess2.git;a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin4_src%2FServer%2Finclude%2FCCompositor.hpp;h=fe24303929c9502981e59b704053d9d25dbec15f;hp=51f04c9171aae3b573bfad35e22164a963ae7261;hb=6fbf6b93bec9b8b5bd6d7c683eefb0ebed8dff77;hpb=47296e890b2b09cbc46db30d7fe2aeeae11a6d4a

diff --git a/Usermode/Applications/axwin4_src/Server/include/CCompositor.hpp b/Usermode/Applications/axwin4_src/Server/include/CCompositor.hpp
index 51f04c91..fe243039 100644
--- a/Usermode/Applications/axwin4_src/Server/include/CCompositor.hpp
+++ b/Usermode/Applications/axwin4_src/Server/include/CCompositor.hpp
@@ -19,11 +19,6 @@ namespace AxWin {
 class CClient;
 class CVideo;
 
-struct TWindowID
-{
-	uint16_t	Client;
-	uint16_t	Window;
-};
 
 enum eMouseButton
 {
@@ -34,30 +29,51 @@ enum eMouseButton
 	MOUSEBTN_BTN5,
 };
 
+class CWindowIDBuffer
+{
+	struct TWindowID
+	{
+		uint16_t	Client;
+		uint16_t	Window;
+	};
+	unsigned int	m_w;
+	::std::vector<TWindowID>	m_buf;
+public:
+	CWindowIDBuffer(unsigned int W, unsigned int H);
+	
+	void set(unsigned int X, unsigned int Y, unsigned int W, unsigned int H, CWindow* win);
+	CWindow* get(unsigned int X, unsigned int Y);
+};
+
 class CCompositor
 {
 	CVideo&	m_video;
 	::std::list<CRect>	m_damageRects;
 	::std::list<CWindow*>	m_windows;
+	CWindow*	m_focussed_window;
 
-	::std::vector<TWindowID>	m_windowIDBuffer;	// One 32-bit value per pixel
-	//::std::vector<CPixel> 	m_frameBuffer;	// Local copy of the framebuffer (needed?)
+	CWindowIDBuffer	m_windowIDBuffer;	// One 32-bit value per pixel
 	
 public:
 	CCompositor(CVideo& video);
 
 	CWindow* CreateWindow(CClient& client, const ::std::string& name);
 
+	void	ShowWindow(CWindow* window);
+	void	HideWindow(CWindow* window);
+
 	bool	GetScreenDims(unsigned int ScrenID, unsigned int *Width, unsigned int *Height);
 
 	void	Redraw();
 	void	DamageArea(const CRect& rect);
 	void	BlitFromSurface(const CSurface& dest, const CRect& src_rect);
 	
-	void	MouseMove(unsigned int CursorID,  unsigned int X, unsigned int Y,  int dX, int dY);
-	void	MouseButton(unsigned int CursorID,  unsigned int X, unsigned int Y,  eMouseButton Button, bool Press);
+	void	MouseMove(unsigned int Cursor, unsigned int X, unsigned int Y, int dX, int dY);
+	void	MouseButton(unsigned int Cursor, unsigned int X, unsigned int Y, eMouseButton Button, bool Press);
 	
 	void	KeyState(unsigned int KeyboardID, uint32_t KeySym, bool Press, uint32_t Codepoint);
+public:
+	CWindow*	getWindowForCoord(unsigned int X, unsigned int Y);
 };