--- np2/x11/np2.c	2005/03/12 12:36:13	1.23
+++ np2/x11/np2.c	2011/01/15 18:43:13	1.34
@@ -100,29 +100,22 @@ NP2OSCFG np2oscfg = {
 	0,			/* jastsnd */
 	0,			/* I286SAVE */
 
-	SNDDRV_NODRV,		/* snddrv */
-	"",			/* audiodev */
+	SNDDRV_SDL,		/* snddrv */
 	{ "", "" }, 		/* MIDIDEV */
 	0,			/* MIDIWAIT */
 
 	MOUSE_RATIO_100,	/* mouse_move_ratio */
 
-#if defined(USE_GTK)		/* toolkit */
-	"gtk",
-#elif defined(USE_QT)
-	"qt",
-#elif defined(USE_SDL)
-	"sdl",
-#else
-	"unknown",
-#endif
-
 	MMXFLAG_DISABLE,	/* disablemmx */
-	FALSE,			/* shared_pixmap */
+	INTERP_NEAREST,		/* drawinterp */
+	0,			/* F11KEY */
+
+	FALSE,			/* cfgreadonly */
 };
 
-volatile BOOL np2running = FALSE;
+volatile sig_atomic_t np2running = 0;
 BYTE scrnmode = 0;
+int ignore_fullscreen_mode = 0;
 
 UINT framecnt = 0;
 UINT waitcnt = 0;
@@ -137,19 +130,18 @@ char bmpfilefolder[MAX_PATH];
 char modulefile[MAX_PATH];
 char statpath[MAX_PATH];
 
+char np2appname[MAX_PATH] = "np2";
+const char np2flagext[] = "s%02d";
+const char np2resumeext[] = "sav";
+
 #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 = FALSE;
+int verbose = 0;
 
 
 UINT32
@@ -167,15 +159,17 @@ getstatfilename(char* path, const char* 
 
 	/*
 	 * default:
-	 * e.g. resume:   "/home/user_name/.np2/sav/sav"
-	 *      statpath: "/home/user_name/.np2/sav/s00"
+	 * e.g. resume:   "/home/user_name/.np2/sav/np2.sav"
+	 *      statpath: "/home/user_name/.np2/sav/np2.s00"
+	 *      config:   "/home/user_name/.np2/np2rc"
 	 *
 	 * --config option:
-	 * e.g. resume:   "/config_file_path/sav"
-	 *      statpath: "/config_file_path/s00"
+	 * e.g. resume:   "/config_file_path/sav/np2.sav"
+	 *      statpath: "/config_file_path/sav/np2.s00"
 	 *      config:   "/config_file_path/config_file_name"
 	 */
 	file_cpyname(path, statpath, size);
+	file_catname(path, ".", size);
 	file_catname(path, ext, size);
 }
 
@@ -213,16 +207,18 @@ flagload(const char* ext, const char* ti
 	int ret;
 	int rv = 0;
 
-	UNUSED(title);
-
 	getstatfilename(path, ext, sizeof(path));
 	ret = statsave_check(path, buf, sizeof(buf));
 	if (ret & (~STATFLAG_DISKCHG)) {
-		fprintf(stderr, "Couldn't restart\n");
+		toolkit_msgbox(title, "Couldn't restart",
+		    TK_MB_OK|TK_MB_ICON_ERROR);
 		rv = 1;
 	} else if ((!force) && (ret & STATFLAG_DISKCHG)) {
-		fprintf(stderr, "Conflict\n");
-		rv = 1;
+		ret = toolkit_msgbox(title, "Conflict!\nContinue?",
+		    TK_MB_YESNO|TK_MB_ICON_QUESTION);
+		if (ret != TK_MB_YES) {
+			rv = 1;
+		}
 	}
 	if (rv == 0) {
 		statsave_load(path);
@@ -316,8 +312,6 @@ int
 mainloop(void *p)
 {
 
-	UNUSED(p);
-
 	if (np2oscfg.NOWAIT) {
 		joymng_sync();
 		mousemng_callback();
@@ -379,12 +373,14 @@ mainloop(void *p)
 	return TRUE;
 }
 
-#if defined(GCC_CPU_ARCH_IA32)
 int mmxflag;
 
 int
 havemmx(void)
 {
+#if !defined(GCC_CPU_ARCH_IA32)
+	return 0;
+#else	/* GCC_CPU_ARCH_IA32 */
 	int rv;
 
 #if defined(GCC_CPU_ARCH_AMD64)
@@ -412,6 +408,5 @@ havemmx(void)
 		: "=a" (rv));
 #endif /* GCC_CPU_ARCH_AMD64 */
 	return rv;
-}
-
 #endif /* GCC_CPU_ARCH_IA32 */
+}