X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Fmain.c;h=5b0e5ff3e39cb764aa44ab9683d986c51e02c34e;hb=e7dd0e094f0c23bb20ddb0025f41d1c0c28f5ab2;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..5b0e5ff3 100644
--- a/Usermode/Applications/axwin3_src/WM/main.c
+++ b/Usermode/Applications/axwin3_src/WM/main.c
@@ -11,8 +11,11 @@
 #include <stdio.h>
 
 // === IMPORTS ===
-extern void	WM_Update(void);
 extern void	Video_Setup(void);
+extern void	WM_Initialise(void);
+extern int	Renderer_Widget_Init(void);
+extern int	Renderer_Background_Init(void);
+extern void	WM_Update(void);
 
 // === PROTOTYPES ===
 void	ParseCommandline(int argc, char **argv);
@@ -53,7 +56,9 @@ int main(int argc, char *argv[])
 	IPC_Init();
 	Input_Init();
 	
-//	WM_Update();
+	Renderer_Widget_Init();
+	Renderer_Background_Init();
+	WM_Initialise();
 	
 	// Spawn interface root
 	if( clone(CLONE_VM, 0) == 0 )
@@ -64,6 +69,7 @@ int main(int argc, char *argv[])
 		char	*argv[] = {csInterfaceApp, NULL};
 		sprintf(server_info, "AXWIN3_SERVER=%i", server_tid);
 		execve(csInterfaceApp, argv, envp);
+		exit(1);
 	}
 
 	// Main Loop
@@ -73,6 +79,8 @@ int main(int argc, char *argv[])
 		 int	nfds = 0;
 		FD_ZERO(&fds);
 	
+		WM_Update();
+
 		Input_FillSelect(&nfds, &fds);
 		IPC_FillSelect(&nfds, &fds);