--- np2/x11/np2.c	2003/11/27 17:24:20	1.4
+++ np2/x11/np2.c	2004/07/26 15:53:26	1.22
@@ -31,12 +31,14 @@
 #include "pccore.h"
 #include "dosio.h"
 #include "scrndraw.h"
-#include "statsave.h"
 #include "timing.h"
 #include "toolkit.h"
 
-#include "keydisp.h"
+#include "kdispwin.h"
 #include "toolwin.h"
+#include "viewer.h"
+#include "debugwin.h"
+#include "skbdwin.h"
 
 #include "commng.h"
 #include "joymng.h"
@@ -45,10 +47,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,19 +61,34 @@ 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 */
 	0,			/* JOYPAD2 */
-	{ 0, 0, 0, 0 },		/* JOY1BTN */
+	{ 1, 2, 5, 6 },		/* JOY1BTN */
+	{
+		{ 0, 1 },		/* JOYAXISMAP[0] */
+		{ 0, 1 },		/* JOYAXISMAP[1] */
+	},
+	{
+		{ 0, 1, 0xff, 0xff },	/* JOYBTNMAP[0] */
+		{ 0, 1, 0xff, 0xff },	/* JOYBTNMAP[1] */
+	},
+	{ "", "" },		/* JOYDEV */
 
 	{ COMPORT_MIDI, 0, 0x3e, 19200, "", "", "", "" },	/* mpu */
+	{
+		{ COMPORT_NONE, 0, 0x3e, 19200, "", "", "", "" },/* com1 */
+		{ COMPORT_NONE, 0, 0x3e, 19200, "", "", "", "" },/* com2 */
+		{ COMPORT_NONE, 0, 0x3e, 19200, "", "", "", "" },/* com3 */
+	},
 
 	0,			/* confirm */
 
@@ -79,7 +97,9 @@ NP2OSCFG np2oscfg = {
 	0,			/* statsave */
 	0,			/* toolwin */
 	0,			/* keydisp */
+	0,			/* softkbd */
 	0,			/* hostdrv_write */
+	0,			/* jastsnd */
 	0,			/* I286SAVE */
 
 	SNDDRV_NODRV,		/* snddrv */
@@ -91,15 +111,19 @@ 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 */
 	FALSE,			/* shared_pixmap */
 };
 
-BOOL np2running = FALSE;
+volatile BOOL np2running = FALSE;
 BYTE scrnmode = 0;
 
 UINT framecnt = 0;
@@ -115,9 +139,19 @@ 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;
+
+#ifndef	FONTNAME_DEFAULT
+#define	FONTNAME_DEFAULT	"./default.ttf"
+#endif
+char fontfilename[MAX_PATH] = FONTNAME_DEFAULT;
+
 char timidity_cfgfile_path[MAX_PATH];
 
-BOOL use_shared_pixmap;
+BOOL use_shared_pixmap = FALSE;
 
 
 UINT32
@@ -185,10 +219,10 @@ flagload(const char* ext, const char* ti
 
 	getstatfilename(path, ext, sizeof(path));
 	ret = statsave_check(path, buf, sizeof(buf));
-	if (ret & (~NP2FLAG_DISKCHG)) {
+	if (ret & (~STATFLAG_DISKCHG)) {
 		fprintf(stderr, "Couldn't restart\n");
 		rv = 1;
-	} else if ((!force) && (ret & NP2FLAG_DISKCHG)) {
+	} else if ((!force) && (ret & STATFLAG_DISKCHG)) {
 		fprintf(stderr, "Conflict\n");
 		rv = 1;
 	}
@@ -219,7 +253,7 @@ changescreen(BYTE newmode)
 	if (renewal) {
 		if (renewal & SCRNMODE_FULLSCREEN) {
 			toolwin_destroy();
-			keydisp_destroy();
+			kdispwin_destroy();
 		}
 		soundmng_stop();
 		mouse_running(MOUSE_STOP);
@@ -239,7 +273,7 @@ changescreen(BYTE newmode)
 					toolwin_create();
 				}
 				if (np2oscfg.keydisp) {
-					keydisp_create();
+					kdispwin_create();
 				}
 			}
 		}
@@ -256,8 +290,11 @@ framereset(UINT cnt)
 
 	framecnt = 0;
 	scrnmng_dispclock();
-	keydisp_draw((BYTE)cnt);
+	kdispwin_draw((BYTE)cnt);
+	skbdwin_process();
+	debugwin_process();
 	toolwin_draw((BYTE)cnt);
+	viewer_allreload(FALSE);
 	if (np2oscfg.DISPCLK & 3) {
 		if (sysmng_workclockrenewal()) {
 			sysmng_updatecaption(3);
@@ -273,7 +310,7 @@ processwait(UINT cnt)
 		timing_setcount(0);
 		framereset(cnt);
 	} else {
-		usleep(1);
+		taskmng_sleep(1);
 	}
 }
 
@@ -284,7 +321,7 @@ mainloop(void *p)
 	UNUSED(p);
 
 	if (np2oscfg.NOWAIT) {
-		joy_flash();
+		joymng_sync();
 		mousemng_callback();
 		pccore_exec(framecnt == 0);
 		if (np2oscfg.DRAW_SKIP) {
@@ -303,7 +340,7 @@ mainloop(void *p)
 	} else if (np2oscfg.DRAW_SKIP) {
 		/* frame skip */
 		if (framecnt < np2oscfg.DRAW_SKIP) {
-			joy_flash();
+			joymng_sync();
 			mousemng_callback();
 			pccore_exec(framecnt == 0);
 			framecnt++;
@@ -314,7 +351,7 @@ mainloop(void *p)
 		/* auto skip */
 		if (waitcnt == 0) {
 			UINT cnt;
-			joy_flash();
+			joymng_sync();
 			mousemng_callback();
 			pccore_exec(framecnt == 0);
 			framecnt++;
@@ -344,7 +381,7 @@ mainloop(void *p)
 	return TRUE;
 }
 
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 int mmxflag;
 
 int
@@ -352,6 +389,9 @@ havemmx(void)
 {
 	int rv;
 
+#if defined(GCC_CPU_ARCH_AMD64)
+	rv = 1;
+#else	/* !GCC_CPU_ARCH_AMD64 */
 	asm volatile (
 		"pushf;"
 		"popl	%%eax;"
@@ -372,7 +412,8 @@ havemmx(void)
 		"andl	$0x00800000, %0;"
 	".nocpuid:"
 		: "=a" (rv));
-
+#endif /* GCC_CPU_ARCH_AMD64 */
 	return rv;
 }
-#endif
+
+#endif /* GCC_CPU_ARCH_IA32 */