X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin2_src%2FWM%2Fmain.c;h=781194a8d8aaf629f2b10689abef9cecb29f2dbf;hb=fe24894229067f695d5db33c213fc09086740dec;hp=1234b66277c64ce9f61f9b8ada5eabd0756c517f;hpb=85eb17b306404571aa39596946c87ad9bb1d9d13;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin2_src/WM/main.c b/Usermode/Applications/axwin2_src/WM/main.c
index 1234b662..781194a8 100644
--- a/Usermode/Applications/axwin2_src/WM/main.c
+++ b/Usermode/Applications/axwin2_src/WM/main.c
@@ -6,14 +6,11 @@
 #include <acess/sys.h>
 
 // === IMPORTS ===
-extern void	ParseCommandline(int argc, char *argv[]);
-extern void	Video_Setup(void);
 extern void	WM_Update(void);
-extern void	Messages_PollIPC(void);
 
 // === GLOBALS ===
-char	*gsTerminalDevice = NULL;
-char	*gsMouseDevice = NULL;
+const char	*gsTerminalDevice = NULL;
+const char	*gsMouseDevice = NULL;
 
  int	giScreenWidth = 640;
  int	giScreenHeight = 480;
@@ -34,17 +31,32 @@ 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);
+		
+		nfds ++;
+		select(nfds, &fds, NULL, NULL, NULL);
+
+		Input_HandleSelect(&fds);
+		IPC_HandleSelect(&fds);
 	}
 	return 0;
 }
+