--- np2/x11/np2.c	2003/11/28 16:29:57	1.5
+++ np2/x11/np2.c	2004/01/05 07:22:02	1.9
@@ -37,6 +37,7 @@
 
 #include "kdispwin.h"
 #include "toolwin.h"
+#include "viewer.h"
 
 #include "commng.h"
 #include "joymng.h"
@@ -45,10 +46,11 @@
 #include "scrnmng.h"
 #include "soundmng.h"
 #include "sysmng.h"
+#include "taskmng.h"
 
 
 NP2OSCFG np2oscfg = {
-#if !defined(CPU386)		/* titles */
+#if !defined(CPUCORE_IA32)		/* titles */
 	"Neko Project II",
 #else
 	"Neko Project II + IA32",
@@ -58,12 +60,12 @@ NP2OSCFG np2oscfg = {
 	0,			/* paddingy */
 
 	0,			/* NOWAIT */
-	2,			/* DRAW_SKIP */
+	0,			/* DRAW_SKIP */
 
 	0,			/* DISPCLK */
 
 	KEY_KEY106,		/* KEYBOARD */
-	0,			/* F12COPY */
+	0,			/* F12KEY */
 
 	0,			/* MOUSE_SW */
 	0,			/* JOYPAD1 */
@@ -91,8 +93,12 @@ NP2OSCFG np2oscfg = {
 
 #if defined(USE_GTK)		/* toolkit */
 	"gtk",
-#else
+#elif defined(USE_QT)
 	"qt",
+#elif defined(USE_SDL)
+	"sdl",
+#else
+	"unknown",
 #endif
 
 	MMXFLAG_DISABLE,	/* disablemmx */
@@ -115,6 +121,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;
@@ -258,6 +269,7 @@ framereset(UINT cnt)
 	scrnmng_dispclock();
 	kdispwin_draw((BYTE)cnt);
 	toolwin_draw((BYTE)cnt);
+	viewer_allreload(FALSE);
 	if (np2oscfg.DISPCLK & 3) {
 		if (sysmng_workclockrenewal()) {
 			sysmng_updatecaption(3);
@@ -273,7 +285,7 @@ processwait(UINT cnt)
 		timing_setcount(0);
 		framereset(cnt);
 	} else {
-		usleep(1);
+		taskmng_sleep(1);
 	}
 }