--- np2/x11/np2.h	2004/07/26 15:53:26	1.12
+++ np2/x11/np2.h	2008/03/18 15:33:14	1.19
@@ -1,6 +1,10 @@
+/*	$Id: np2.h,v 1.19 2008/03/18 15:33:14 monaka Exp $	*/
+
 #ifndef	NP2_X11_NP2_H__
 #define	NP2_X11_NP2_H__
 
+#include <signal.h>
+
 #include "joymng.h"
 
 typedef struct {
@@ -52,16 +56,16 @@ 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;
+
+	BYTE	cfgreadonly;
 } NP2OSCFG;
 
 
@@ -78,14 +82,22 @@ 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 volatile BOOL np2running;
+extern volatile sig_atomic_t np2running;
 extern NP2OSCFG np2oscfg;
 extern BYTE scrnmode;
+extern int ignore_fullscreen_mode;
 
 extern UINT framecnt;
 extern UINT waitcnt;
@@ -94,7 +106,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];
@@ -104,6 +116,10 @@ extern char statpath[MAX_PATH];
 extern char fontname[1024];
 extern char fontfilename[MAX_PATH];
 
+extern char np2appname[MAX_PATH];
+extern const char np2flagext[];
+extern const char np2resumeext[];
+
 int flagload(const char* ext, const char* title, BOOL force);
 int flagsave(const char* ext);
 void flagdelete(const char* ext);
@@ -113,10 +129,8 @@ void framereset(UINT cnt);
 void processwait(UINT cnt);
 int mainloop(void *);
 
-#if defined(GCC_CPU_ARCH_IA32)
 extern int mmxflag;
 int havemmx(void);
-#endif
 
 #ifdef __cplusplus
 }