--- np2/x11/main.c	2004/01/07 14:51:53	1.12
+++ np2/x11/main.c	2004/06/16 12:50:49	1.17
@@ -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"
@@ -116,7 +118,7 @@ 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");
@@ -247,10 +249,11 @@ 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
@@ -264,12 +267,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) {
@@ -323,6 +327,9 @@ main(int argc, char *argv[])
 		if (np2oscfg.keydisp) {
 			kdispwin_create();
 		}
+		if (np2oscfg.softkbd) {
+			skbdwin_create();
+		}
 	}
 
 	if (np2oscfg.resume) {
@@ -344,6 +351,7 @@ main(int argc, char *argv[])
 
 	kdispwin_destroy();
 	toolwin_destroy();
+	skbdwin_destroy();
 
 	pccore_cfgupdate();
 
@@ -357,6 +365,7 @@ main(int argc, char *argv[])
 	}
 
 	pccore_term();
+	debugwin_destroy();
 
 	soundmng_deinitialize();
 	scrnmng_destroy();
@@ -372,8 +381,11 @@ fontmng_failure:
 		initsave();
 		toolwin_writeini();
 		kdispwin_writeini();
+		skbdwin_writeini();
 	}
 
+	skbdwin_deinitialize();
+
 	TRACETERM();
 	dosio_term();