X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Fmain.c;h=66fe14e7c6defed166bef4ae35eb6b34a436ec72;hb=11dbd684e9a3d907d43d71a3145205f1a86992fb;hp=c6a454639cfc887b8ccabf9a304ff72790ecc1fe;hpb=c90f683ef8d3dde9db5b78feebe5508ca3f84ff3;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/main.c b/Usermode/Applications/axwin3_src/WM/main.c
index c6a45463..66fe14e7 100644
--- a/Usermode/Applications/axwin3_src/WM/main.c
+++ b/Usermode/Applications/axwin3_src/WM/main.c
@@ -11,8 +11,13 @@
 #include <stdio.h>
 
 // === IMPORTS ===
-extern void	WM_Update(void);
 extern void	Video_Setup(void);
+extern void	WM_Initialise(void);
+extern int	Renderer_Menu_Init(void);
+extern int	Renderer_Widget_Init(void);
+extern int	Renderer_Background_Init(void);
+extern int	Renderer_Framebuffer_Init(void);
+extern void	WM_Update(void);
 
 // === PROTOTYPES ===
 void	ParseCommandline(int argc, char **argv);
@@ -45,15 +50,18 @@ int main(int argc, char *argv[])
 		gsTerminalDevice = "/Devices/VTerm/6";
 	}
 	if( gsMouseDevice == NULL ) {
-		gsMouseDevice = "/Devices/PS2Mouse";
+		gsMouseDevice = "/Devices/Mouse/system";
 	}
 	
 	Video_Setup();
-//	Interface_Init();
 	IPC_Init();
 	Input_Init();
 	
-//	WM_Update();
+	Renderer_Menu_Init();
+	Renderer_Widget_Init();
+	Renderer_Background_Init();
+	Renderer_Framebuffer_Init();
+	WM_Initialise();
 	
 	// Spawn interface root
 	if( clone(CLONE_VM, 0) == 0 )
@@ -62,8 +70,10 @@ int main(int argc, char *argv[])
 		char	server_info[] = "AXWIN3_SERVER=00000";
 		char	*envp[] = {server_info, NULL};
 		char	*argv[] = {csInterfaceApp, NULL};
+		_SysDebug("server_tid = %i, &server_tid = %p", server_tid, &server_tid);
 		sprintf(server_info, "AXWIN3_SERVER=%i", server_tid);
 		execve(csInterfaceApp, argv, envp);
+		exit(1);
 	}
 
 	// Main Loop
@@ -73,11 +83,13 @@ int main(int argc, char *argv[])
 		 int	nfds = 0;
 		FD_ZERO(&fds);
 	
+		WM_Update();
+
 		Input_FillSelect(&nfds, &fds);
 		IPC_FillSelect(&nfds, &fds);
 		
 		nfds ++;
-		if( select(nfds, &fds, NULL, NULL, NULL) == -1 ) {
+		if( _SysSelect(nfds, &fds, NULL, NULL, NULL, THREAD_EVENT_IPCMSG) == -1 ) {
 			_SysDebug("ERROR: select() returned -1");
 			return -1;
 		}