--- np2/x11/np2.h	2007/01/10 16:01:59	1.13
+++ np2/x11/np2.h	2011/01/15 18:43:13	1.21
@@ -54,16 +54,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;
 
 
@@ -80,6 +80,13 @@ enum {
 	MMXFLAG_NOTSUPPORT	= 2
 };
 
+enum {
+	INTERP_NEAREST		= 0,
+	INTERP_TILES		= 1,
+	INTERP_BILINEAR		= 2,
+	INTERP_HYPER		= 3
+};
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -88,6 +95,7 @@ extern "C" {
 extern volatile sig_atomic_t np2running;
 extern NP2OSCFG np2oscfg;
 extern BYTE scrnmode;
+extern int ignore_fullscreen_mode;
 
 extern UINT framecnt;
 extern UINT waitcnt;
@@ -96,7 +104,6 @@ extern UINT framemax;
 extern BOOL s98logging;
 extern int s98log_count;
 
-extern BOOL use_shared_pixmap;
 extern int verbose;
 
 extern char hddfolder[MAX_PATH];
@@ -105,7 +112,10 @@ extern char bmpfilefolder[MAX_PATH];
 extern char modulefile[MAX_PATH];
 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);
@@ -116,10 +126,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
 }