X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin2_src%2FWM%2Fmain.c;h=67ceb6376fb897a711f402f222798db2e121e2fd;hb=889b379627388811c630aad3214efcaee1ac9885;hp=7b42562d381c8649c3706f7cce755144237fc90d;hpb=6e1cf1d50bca85f01b5f802b1a76f090e362bf05;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin2_src/WM/main.c b/Usermode/Applications/axwin2_src/WM/main.c
index 7b42562d..67ceb637 100644
--- a/Usermode/Applications/axwin2_src/WM/main.c
+++ b/Usermode/Applications/axwin2_src/WM/main.c
@@ -9,8 +9,12 @@
 extern void	ParseCommandline(int argc, char *argv[]);
 extern void	Video_Setup(void);
 extern void	WM_Update(void);
-extern void	Messages_PollIPC(void);
 extern void	Interface_Init(void);
+extern void	IPC_Init(void);
+extern void	IPC_FillSelect(int *nfds, fd_set *set);
+extern void	IPC_HandleSelect(fd_set *set);
+extern void	Input_FillSelect(int *nfds, fd_set *set);
+extern void	Input_HandleSelect(fd_set *set);
 
 // === GLOBALS ===
 char	*gsTerminalDevice = NULL;
@@ -35,17 +39,31 @@ int main(int argc, char *argv[])
 	if( gsTerminalDevice == NULL ) {
 		gsTerminalDevice = "/Devices/VTerm/6";
 	}
+	if( gsMouseDevice == NULL ) {
+		gsMouseDevice = "/Devices/PS2Mouse";
+	}
 	
 	Video_Setup();
 	Interface_Init();
+	IPC_Init();
 	
 	WM_Update();
 	
 	// Main Loop
 	for(;;)
 	{
-		Messages_PollIPC();
-		//yield();
+		fd_set	fds;
+		 int	nfds = 0;
+		FD_ZERO(&fds);
+	
+		Input_FillSelect(&nfds, &fds);
+		IPC_FillSelect(&nfds, &fds);
+
+		select(nfds, &fds, NULL, NULL, NULL);
+
+		Input_HandleSelect(&fds);
+		IPC_HandleSelect(&fds);
 	}
 	return 0;
 }
+