--- np2/x11/main.c	2004/01/07 14:51:53	1.12
+++ np2/x11/main.c	2004/07/26 15:53:26	1.20
@@ -47,6 +47,8 @@
 #include "sysmenu.h"
 #include "toolwin.h"
 #include "viewer.h"
+#include "debugwin.h"
+#include "skbdwin.h"
 
 #include "commng.h"
 #include "fontmng.h"
@@ -100,7 +102,6 @@ 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
@@ -116,10 +117,9 @@ usage(void)
 
 	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--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");
-	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
@@ -138,7 +138,6 @@ main(int argc, char *argv[])
 	int rv = 1;
 	int ch;
 	int i, drvmax;
-	BOOL shared_pixmap_flag = FALSE;
 
 	progname = argv[0];
 
@@ -176,10 +175,6 @@ main(int argc, char *argv[])
 			milstr_ncpy(fontfilename, optarg, sizeof(fontfilename));
 			break;
 
-		case 'p':
-			shared_pixmap_flag = TRUE;
-			break;
-
 		case 'h':
 		case '?':
 		default:
@@ -247,15 +242,16 @@ main(int argc, char *argv[])
 	initload();
 	toolwin_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();
 
@@ -264,12 +260,13 @@ main(int argc, char *argv[])
 
 	kdispwin_initialize();
 	viewer_init();
+	skbdwin_initialize();
 
 	toolkit_widget_create();
 	scrnmng_initialize();
 	kbdmng_init();
 	inputmng_init();
-	keystat_reset();
+	keystat_initialize();
 
 	scrnmode = 0;
 	if (np2cfg.RASTER) {
@@ -298,6 +295,7 @@ main(int argc, char *argv[])
 		}
 	}
 
+	joymng_initialize();
 	mousemng_initialize();
 	if (np2oscfg.MOUSE_SW) {
 		mouse_running(MOUSE_ON);
@@ -307,7 +305,6 @@ main(int argc, char *argv[])
 	sysmng_initialize();
 	taskmng_initialize();
 
-	joy_init();
 	pccore_init();
 	S98_init();
 
@@ -323,6 +320,9 @@ main(int argc, char *argv[])
 		if (np2oscfg.keydisp) {
 			kdispwin_create();
 		}
+		if (np2oscfg.softkbd) {
+			skbdwin_create();
+		}
 	}
 
 	if (np2oscfg.resume) {
@@ -344,10 +344,12 @@ main(int argc, char *argv[])
 
 	kdispwin_destroy();
 	toolwin_destroy();
+	skbdwin_destroy();
 
 	pccore_cfgupdate();
 
 	mouse_running(MOUSE_OFF);
+	joymng_deinitialize();
 	S98_trash();
 
 	if (np2oscfg.resume) {
@@ -357,6 +359,7 @@ main(int argc, char *argv[])
 	}
 
 	pccore_term();
+	debugwin_destroy();
 
 	soundmng_deinitialize();
 	scrnmng_destroy();
@@ -372,8 +375,11 @@ fontmng_failure:
 		initsave();
 		toolwin_writeini();
 		kdispwin_writeini();
+		skbdwin_writeini();
 	}
 
+	skbdwin_deinitialize();
+
 	TRACETERM();
 	dosio_term();