X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Fmain.c;h=105039539b4470d5e5d76762ce5ca712f338c96b;hb=69597a188bf638485ea83b7608430f92080c1855;hp=a2e1fdae0c8b97b893dc73c670adda4dee284658;hpb=5057414aefd4d2c869fc9937b48dfdd1910fb573;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/main.c b/Usermode/Applications/axwin3_src/WM/main.c
index a2e1fdae..10503953 100644
--- a/Usermode/Applications/axwin3_src/WM/main.c
+++ b/Usermode/Applications/axwin3_src/WM/main.c
@@ -9,13 +9,12 @@
 #include <acess/sys.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
+#include "include/lowlevel.h"
 
 // === IMPORTS ===
 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 void	WM_Update(void);
 
 // === PROTOTYPES ===
@@ -29,11 +28,14 @@ const char	*gsMouseDevice = NULL;
  int	giScreenHeight = 480;
 
  int	giTerminalFD = -1;
+ int	giTerminalFD_Input = 0;
  int	giMouseFD = -1;
 
 #define __INSTALL_ROOT	"/Acess/Apps/AxWin/3.0"
 
 const char	*gsInstallRoot = __INSTALL_ROOT;
+const char	*gsInterfaceApp = __INSTALL_ROOT"/AxWinUI";
+ int	gbNoSpawnUI = 0;
 
 // === CODE ===
 /**
@@ -41,65 +43,95 @@ const char	*gsInstallRoot = __INSTALL_ROOT;
  */
 int main(int argc, char *argv[])
 {
-	 int	server_tid = gettid();
-	
 	ParseCommandline(argc, argv);
 	
 	if( gsTerminalDevice == NULL ) {
 		gsTerminalDevice = "/Devices/VTerm/6";
 	}
 	if( gsMouseDevice == NULL ) {
-		gsMouseDevice = "/Devices/PS2Mouse";
+		gsMouseDevice = "/Devices/Mouse/system";
 	}
 	
 	Video_Setup();
-//	Interface_Init();
 	IPC_Init();
 	Input_Init();
 	
-	Renderer_Menu_Init();
-	Renderer_Widget_Init();
-	Renderer_Background_Init();
 	WM_Initialise();
 	
 	// Spawn interface root
-	if( clone(CLONE_VM, 0) == 0 )
+	if( !gbNoSpawnUI )
 	{
-		static char csInterfaceApp[] = __INSTALL_ROOT"/AxWinUI";
+	 	int	server_tid = gettid();
+		_SysDebug("server_tid = %i", server_tid);
 		char	server_info[] = "AXWIN3_SERVER=00000";
-		char	*envp[] = {server_info, NULL};
-		char	*argv[] = {csInterfaceApp, NULL};
+		const char	*envp[] = {server_info, NULL};
+		const char	*argv[] = {gsInterfaceApp, 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);
+		// TODO: Does the client need FDs?
+		 int	rv = _SysSpawn(gsInterfaceApp, argv, envp, 0, NULL, NULL);
+		if( rv < 0 ) {
+			_SysDebug("_SysSpawn chucked a sad, rv=%i, errno=%i", rv, _errno);
+		}
 	}
 
 	// Main Loop
 	for(;;)
 	{
 		fd_set	fds;
+		fd_set	efds;
 		 int	nfds = 0;
 		FD_ZERO(&fds);
+		FD_ZERO(&efds);
 	
 		WM_Update();
 
 		Input_FillSelect(&nfds, &fds);
-		IPC_FillSelect(&nfds, &fds);
+		IPC_FillSelect(&nfds, &fds, &efds);
 		
 		nfds ++;
-		if( select(nfds, &fds, NULL, NULL, NULL) == -1 ) {
+		if( _SysSelect(nfds, &fds, NULL, &efds, NULL, THREAD_EVENT_IPCMSG) == -1 ) {
 			_SysDebug("ERROR: select() returned -1");
 			return -1;
 		}
 
 		Input_HandleSelect(&fds);
-		IPC_HandleSelect(&fds);
+		IPC_HandleSelect(&fds, &efds);
 	}
 	return 0;
 }
 
+void PrintUsage(void)
+{
+	fprintf(stderr, "Arguments:\n");
+	fprintf(stderr, "  --no-ui  : Don't spawn the UI process\n");
+}
+
 void ParseCommandline(int argc, char **argv)
 {
-	
+	for( int i = 1; i < argc; i ++ )
+	{
+		if( argv[i][0] != '-' ) {
+			// Error?
+			PrintUsage();
+			exit(-1);
+		}
+		else if( argv[i][1] != '-' ) {
+			// Short
+			PrintUsage();
+			exit(-1);
+		}
+		else {
+			// Long
+			if( strcmp(argv[i], "--no-ui") == 0 ) {
+				gbNoSpawnUI = 1;
+			}
+			else {
+				// Error.
+				PrintUsage();
+				exit(-1);
+			}
+		}
+	}
 }