X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FApplications%2Faxwin4_src%2FServer%2Finclude%2Finput.hpp;h=952e2e922d673f75db509f29749848dea8712e1a;hb=8ae0b1147e613573a45fcd8e6f2f6af2aeff54ac;hp=6a4303405631477a4a3e8ee1371d32f169a2283b;hpb=340e7923b1e95c39ac85a4b22af7f1b53b315cd9;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin4_src/Server/include/input.hpp b/Usermode/Applications/axwin4_src/Server/include/input.hpp
index 6a430340..952e2e92 100644
--- a/Usermode/Applications/axwin4_src/Server/include/input.hpp
+++ b/Usermode/Applications/axwin4_src/Server/include/input.hpp
@@ -11,14 +11,21 @@
 #include <acess/sys.h>
 
 namespace AxWin {
-namespace Input {
 
-extern void	Initialise(const CConfigInput& config);
-extern int	FillSelect(::fd_set& rfds);
-extern void	HandleSelect(::fd_set& rfds);
+class CCompositor;
 
+class CInput
+{
+	CCompositor&	m_compositor;
+	 int	m_keyboardFD;
+	 int	m_mouseFD;
+public:
+	CInput(const CConfigInput& config, CCompositor& compositor);
+	 int FillSelect(::fd_set& rfds);
+	void HandleSelect(::fd_set& rfds);
 };
-};
+
+};	// namespace AxWin
 
 #endif