--- np2/x11/np2.h	2004/06/16 12:50:49	1.10
+++ np2/x11/np2.h	2007/01/23 15:48:20	1.16
@@ -1,6 +1,10 @@
 #ifndef	NP2_X11_NP2_H__
 #define	NP2_X11_NP2_H__
 
+#include <signal.h>
+
+#include "joymng.h"
+
 typedef struct {
 	BYTE	port;
 	BYTE	def_en;
@@ -29,7 +33,10 @@ typedef struct {
 	BYTE	MOUSE_SW;
 	BYTE	JOYPAD1;
 	BYTE	JOYPAD2;
-	BYTE	JOY1BTN[4];
+	BYTE	JOY1BTN[JOY_NBUTTON];
+	BYTE	JOYAXISMAP[2][JOY_NAXIS];
+	BYTE	JOYBTNMAP[2][JOY_NBUTTON];
+	char	JOYDEV[2][MAX_PATH];
 
 	COMCFG	mpu;
 	COMCFG	com[3];
@@ -47,16 +54,14 @@ typedef struct {
 	BYTE	I286SAVE;
 
 	BYTE	snddrv;
-	char	audiodev[MAX_PATH];
 	char	MIDIDEV[2][MAX_PATH];
 	UINT32	MIDIWAIT;
 
 	BYTE	mouse_move_ratio;
 
-	char	toolkit[32];
-
 	BYTE	disablemmx;
-	BYTE	shared_pixmap;
+	BYTE	drawinterp;
+	BYTE	F11KEY;
 } NP2OSCFG;
 
 
@@ -73,12 +78,19 @@ enum {
 	MMXFLAG_NOTSUPPORT	= 2
 };
 
+enum {
+	INTERP_NEAREST		= 0,
+	INTERP_TILES		= 1,
+	INTERP_BILINEAR		= 2,
+	INTERP_HYPER		= 3
+};
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* np2.c */
-extern BOOL np2running;
+extern volatile sig_atomic_t np2running;
 extern NP2OSCFG np2oscfg;
 extern BYTE scrnmode;
 
@@ -89,7 +101,7 @@ extern UINT framemax;
 extern BOOL s98logging;
 extern int s98log_count;
 
-extern BOOL use_shared_pixmap;
+extern int verbose;
 
 extern char hddfolder[MAX_PATH];
 extern char fddfolder[MAX_PATH];