--- np2/x11/main.c	2003/11/27 17:24:20	1.7
+++ np2/x11/main.c	2004/07/05 14:31:52	1.19
@@ -27,6 +27,7 @@
 
 #include "compiler.h"
 
+#include <sys/stat.h>
 #include <getopt.h>
 #include <signal.h>
 
@@ -42,16 +43,23 @@
 #include "timing.h"
 #include "toolkit.h"
 
-#include "keydisp.h"
+#include "kdispwin.h"
+#include "sysmenu.h"
 #include "toolwin.h"
+#include "viewer.h"
+#include "debugwin.h"
+#include "skbdwin.h"
 
 #include "commng.h"
+#include "fontmng.h"
+#include "inputmng.h"
 #include "joymng.h"
 #include "kbdmng.h"
 #include "mousemng.h"
 #include "scrnmng.h"
 #include "soundmng.h"
 #include "sysmng.h"
+#include "taskmng.h"
 
 
 /*
@@ -94,7 +102,9 @@ sighandler(int signo)
 static struct option longopts[] = {
 	{ "config",		required_argument,	0,	'c' },
 	{ "timidity-config",	required_argument,	0,	'C' },
-	{ "shared-pixmap",	no_argument,		0,	'p' },
+#if defined(USE_SDL) || defined(USE_SYSMENU)
+	{ "ttfont",		required_argument,	0,	't' },
+#endif
 	{ "help",		no_argument,		0,	'h' },
 	{ 0,			0,			0,	0   },
 };
@@ -105,7 +115,14 @@ static void
 usage(void)
 {
 
-	printf("Usage: %s [options] [[FD1 image] [[FD2 image] [[FD3 image] [FD4 image]]]]\n", progname);
+	printf("Usage: %s [options] [[FD1 image] [[FD2 image] [[FD3 image] [FD4 image]]]]\n\n", progname);
+	printf("options:\n");
+	printf("\t--help            [-h]        : print this message\n");
+	printf("\t--config          [-c] <file> : specify config file\n");
+	printf("\t--timidity-config [-C] <file> : specify timidity config file\n");
+#if defined(USE_SDL) || defined(USE_SYSMENU)
+	printf("\t--ttfont          [-t] <file> : specify TrueType font\n");
+#endif
 	exit(1);
 }
 
@@ -121,14 +138,13 @@ main(int argc, char *argv[])
 	int rv = 1;
 	int ch;
 	int i, drvmax;
-	BOOL shared_pixmap_flag = FALSE;
 
 	progname = argv[0];
 
 	toolkit_initialize();
 	toolkit_arginit(&argc, &argv);
 
-	while ((ch = getopt_long(argc, argv, "c:C:nh", longopts, NULL)) != -1) {
+	while ((ch = getopt_long(argc, argv, "c:C:t:ph", longopts, NULL)) != -1) {
 		switch (ch) {
 		case 'c':
 			if (stat(optarg, &sb) < 0 || !S_ISREG(sb.st_mode)) {
@@ -151,8 +167,12 @@ main(int argc, char *argv[])
 			    sizeof(timidity_cfgfile_path));
 			break;
 
-		case 'p':
-			shared_pixmap_flag = TRUE;
+		case 't':
+			if (stat(optarg, &sb) < 0 || !S_ISREG(sb.st_mode)) {
+				fprintf(stderr, "Can't access %s.\n", optarg);
+				exit(1);
+			}
+			milstr_ncpy(fontfilename, optarg, sizeof(fontfilename));
 			break;
 
 		case 'h':
@@ -221,31 +241,41 @@ main(int argc, char *argv[])
 	file_setcd(modulefile);
 	initload();
 	toolwin_readini();
-	keydisp_readini();
+	kdispwin_readini();
+	skbdwin_readini();
 
 	rand_setseed((SINT32)time(NULL));
 
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 	mmxflag = havemmx() ? 0 : MMXFLAG_NOTSUPPORT;
 	mmxflag += np2oscfg.disablemmx ? MMXFLAG_DISABLE : 0;
 #endif
 
-	use_shared_pixmap = np2oscfg.shared_pixmap && shared_pixmap_flag;
+	use_shared_pixmap = np2oscfg.shared_pixmap;
 
 	TRACEINIT();
 
-	keystat_reset();
+	if (fontmng_init() != SUCCESS)
+		goto fontmng_failure;
+
+	kdispwin_initialize();
+	viewer_init();
+	skbdwin_initialize();
 
 	toolkit_widget_create();
 	scrnmng_initialize();
 	kbdmng_init();
+	inputmng_init();
+	keystat_initialize();
 
 	scrnmode = 0;
 	if (np2cfg.RASTER) {
 		scrnmode |= SCRNMODE_HIGHCOLOR;
 	}
+	if (sysmenu_create() != SUCCESS)
+		goto sysmenu_failure;
 	if (scrnmng_create(scrnmode) != SUCCESS)
-		goto resource_cleanup;
+		goto scrnmng_failure;
 
 	if (soundmng_initialize() == SUCCESS) {
 		result = soundmng_pcmload(SOUND_PCMSEEK, file_getcd("fddseek.wav"));
@@ -272,6 +302,7 @@ main(int argc, char *argv[])
 
 	commng_initialize();
 	sysmng_initialize();
+	taskmng_initialize();
 
 	joy_init();
 	pccore_init();
@@ -287,7 +318,10 @@ main(int argc, char *argv[])
 			toolwin_create();
 		}
 		if (np2oscfg.keydisp) {
-			keydisp_create();
+			kdispwin_create();
+		}
+		if (np2oscfg.softkbd) {
+			skbdwin_create();
 		}
 	}
 
@@ -305,13 +339,12 @@ main(int argc, char *argv[])
 	setup_signal(SIGINT, sighandler);
 	setup_signal(SIGTERM, sighandler);
 
-	np2running = TRUE;
 	toolkit_widget_mainloop();
-	np2running = FALSE;
 	rv = 0;
 
-	keydisp_destroy();
+	kdispwin_destroy();
 	toolwin_destroy();
+	skbdwin_destroy();
 
 	pccore_cfgupdate();
 
@@ -325,20 +358,31 @@ main(int argc, char *argv[])
 	}
 
 	pccore_term();
+	debugwin_destroy();
 
 	soundmng_deinitialize();
 	scrnmng_destroy();
 
-resource_cleanup:
+scrnmng_failure:
+	sysmenu_destroy();
+
+sysmenu_failure:
+	fontmng_terminate();
+
+fontmng_failure:
 	if (sys_updates & (SYS_UPDATECFG|SYS_UPDATEOSCFG)) {
 		initsave();
 		toolwin_writeini();
-		keydisp_writeini();
+		kdispwin_writeini();
+		skbdwin_writeini();
 	}
 
+	skbdwin_deinitialize();
+
 	TRACETERM();
 	dosio_term();
 
+	viewer_term();
 	toolkit_terminate();
 
 	return rv;