--- np2/x11/main.c	2003/11/17 16:12:27	1.2
+++ np2/x11/main.c	2004/01/07 14:51:53	1.12
@@ -27,6 +27,7 @@
 
 #include "compiler.h"
 
+#include <sys/stat.h>
 #include <getopt.h>
 #include <signal.h>
 
@@ -42,16 +43,21 @@
 #include "timing.h"
 #include "toolkit.h"
 
-#include "keydisp.h"
+#include "kdispwin.h"
+#include "sysmenu.h"
 #include "toolwin.h"
+#include "viewer.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,6 +100,10 @@ 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   },
 };
@@ -104,7 +114,15 @@ static void
 usage(void)
 {
 
-	printf("Usage: %s [options] [[FD0 image] [[FD1 image] [[FD2 image] [FD3 image]]]]\n", progname);
+	printf("Usage: %s [options] [[FD1 image] [[FD2 image] [[FD3 image] [FD4 image]]]]\n\n", progname);
+	printf("options:\n");
+	printf("\t--help\n          [-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");
+	printf("\t--shared-pixmap   [-p]        : use MIT-SHM pixmap extention\n");
+#if defined(USE_SDL) || defined(USE_SYSMENU)
+	printf("\t--ttfont          [-t] <file> : specify TrueType font\n");
+#endif
 	exit(1);
 }
 
@@ -120,13 +138,14 @@ 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:h", 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)) {
@@ -149,6 +168,18 @@ main(int argc, char *argv[])
 			    sizeof(timidity_cfgfile_path));
 			break;
 
+		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 'p':
+			shared_pixmap_flag = TRUE;
+			break;
+
 		case 'h':
 		case '?':
 		default:
@@ -215,7 +246,7 @@ main(int argc, char *argv[])
 	file_setcd(modulefile);
 	initload();
 	toolwin_readini();
-	keydisp_readini();
+	kdispwin_readini();
 
 	rand_setseed((SINT32)time(NULL));
 
@@ -224,25 +255,35 @@ main(int argc, char *argv[])
 	mmxflag += np2oscfg.disablemmx ? MMXFLAG_DISABLE : 0;
 #endif
 
+	use_shared_pixmap = np2oscfg.shared_pixmap && shared_pixmap_flag;
+
 	TRACEINIT();
 
-	keystat_reset();
+	if (fontmng_init() != SUCCESS)
+		goto fontmng_failure;
+
+	kdispwin_initialize();
+	viewer_init();
 
 	toolkit_widget_create();
 	scrnmng_initialize();
 	kbdmng_init();
+	inputmng_init();
+	keystat_reset();
 
 	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"));
 		if (!result) {
-			result = soundmng_pcmload(SOUND_PCMSEEK, SYSRESPATH "/fddseek.wav");
+			result = soundmng_pcmload(SOUND_PCMSEEK, SYSRESPATH "/wav/fddseek.wav");
 		}
 		if (result) {
 			soundmng_pcmvolume(SOUND_PCMSEEK, np2cfg.MOTORVOL);
@@ -250,7 +291,7 @@ main(int argc, char *argv[])
 
 		result = soundmng_pcmload(SOUND_PCMSEEK1, file_getcd("fddseek1.wav"));
 		if (!result) {
-			soundmng_pcmload(SOUND_PCMSEEK1, SYSRESPATH "/fddseek1.wav");
+			result = soundmng_pcmload(SOUND_PCMSEEK1, SYSRESPATH "/wav/fddseek1.wav");
 		}
 		if (result) {
 			soundmng_pcmvolume(SOUND_PCMSEEK1, np2cfg.MOTORVOL);
@@ -264,6 +305,7 @@ main(int argc, char *argv[])
 
 	commng_initialize();
 	sysmng_initialize();
+	taskmng_initialize();
 
 	joy_init();
 	pccore_init();
@@ -279,7 +321,7 @@ main(int argc, char *argv[])
 			toolwin_create();
 		}
 		if (np2oscfg.keydisp) {
-			keydisp_create();
+			kdispwin_create();
 		}
 	}
 
@@ -297,12 +339,10 @@ 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();
 
 	pccore_cfgupdate();
@@ -321,15 +361,24 @@ main(int argc, char *argv[])
 	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();
 	}
 
 	TRACETERM();
 	dosio_term();
 
+	viewer_term();
+	toolkit_terminate();
+
 	return rv;
 }