--- np2/x11/main.c	2003/11/27 17:24:20	1.7
+++ np2/x11/main.c	2003/12/11 15:13:17	1.9
@@ -42,8 +42,9 @@
 #include "timing.h"
 #include "toolkit.h"
 
-#include "keydisp.h"
+#include "kdispwin.h"
 #include "toolwin.h"
+#include "viewer.h"
 
 #include "commng.h"
 #include "joymng.h"
@@ -221,7 +222,7 @@ main(int argc, char *argv[])
 	file_setcd(modulefile);
 	initload();
 	toolwin_readini();
-	keydisp_readini();
+	kdispwin_readini();
 
 	rand_setseed((SINT32)time(NULL));
 
@@ -236,6 +237,9 @@ main(int argc, char *argv[])
 
 	keystat_reset();
 
+	kdispwin_initialize();
+	viewer_init();
+
 	toolkit_widget_create();
 	scrnmng_initialize();
 	kbdmng_init();
@@ -287,7 +291,7 @@ main(int argc, char *argv[])
 			toolwin_create();
 		}
 		if (np2oscfg.keydisp) {
-			keydisp_create();
+			kdispwin_create();
 		}
 	}
 
@@ -310,7 +314,7 @@ main(int argc, char *argv[])
 	np2running = FALSE;
 	rv = 0;
 
-	keydisp_destroy();
+	kdispwin_destroy();
 	toolwin_destroy();
 
 	pccore_cfgupdate();
@@ -333,12 +337,13 @@ resource_cleanup:
 	if (sys_updates & (SYS_UPDATECFG|SYS_UPDATEOSCFG)) {
 		initsave();
 		toolwin_writeini();
-		keydisp_writeini();
+		kdispwin_writeini();
 	}
 
 	TRACETERM();
 	dosio_term();
 
+	viewer_term();
 	toolkit_terminate();
 
 	return rv;