--- np2/x11/np2.c	2003/11/26 14:55:01	1.3
+++ np2/x11/np2.c	2003/12/11 15:11:56	1.7
@@ -35,8 +35,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"
@@ -48,7 +49,7 @@
 
 
 NP2OSCFG np2oscfg = {
-#if !defined(CPU386)		/* titles */
+#if !defined(CPUCORE_IA32)		/* titles */
 	"Neko Project II",
 #else
 	"Neko Project II + IA32",
@@ -96,12 +97,7 @@ NP2OSCFG np2oscfg = {
 #endif
 
 	MMXFLAG_DISABLE,	/* disablemmx */
-
-#if defined(MITSHM)		/* shared_pixmap */
-	TRUE,
-#else
-	FALSE,
-#endif
+	FALSE,			/* shared_pixmap */
 };
 
 BOOL np2running = FALSE;
@@ -120,6 +116,11 @@ char bmpfilefolder[MAX_PATH];
 char modulefile[MAX_PATH];
 char statpath[MAX_PATH];
 
+#ifndef FONTFACE
+#define FONTFACE "-misc-fixed-%s-r-normal--%d-*-*-*-*-*-*-*"
+#endif
+char fontname[1024] = FONTFACE;
+
 char timidity_cfgfile_path[MAX_PATH];
 
 BOOL use_shared_pixmap;
@@ -224,7 +225,7 @@ changescreen(BYTE newmode)
 	if (renewal) {
 		if (renewal & SCRNMODE_FULLSCREEN) {
 			toolwin_destroy();
-			keydisp_destroy();
+			kdispwin_destroy();
 		}
 		soundmng_stop();
 		mouse_running(MOUSE_STOP);
@@ -244,7 +245,7 @@ changescreen(BYTE newmode)
 					toolwin_create();
 				}
 				if (np2oscfg.keydisp) {
-					keydisp_create();
+					kdispwin_create();
 				}
 			}
 		}
@@ -261,8 +262,9 @@ framereset(UINT cnt)
 
 	framecnt = 0;
 	scrnmng_dispclock();
-	keydisp_draw((BYTE)cnt);
+	kdispwin_draw((BYTE)cnt);
 	toolwin_draw((BYTE)cnt);
+	viewer_allreload(FALSE);
 	if (np2oscfg.DISPCLK & 3) {
 		if (sysmng_workclockrenewal()) {
 			sysmng_updatecaption(3);