--- np2/x11/np2.c	2008/03/13 16:27:39	1.29
+++ np2/x11/np2.c	2011/01/15 18:43:13	1.34
@@ -109,6 +109,8 @@ NP2OSCFG np2oscfg = {
 	MMXFLAG_DISABLE,	/* disablemmx */
 	INTERP_NEAREST,		/* drawinterp */
 	0,			/* F11KEY */
+
+	FALSE,			/* cfgreadonly */
 };
 
 volatile sig_atomic_t np2running = 0;
@@ -128,6 +130,7 @@ 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";
 
@@ -136,11 +139,6 @@ const char np2resumeext[] = "sav";
 #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];
 
 int verbose = 0;
@@ -161,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);
 }
 
@@ -215,7 +215,7 @@ flagload(const char* ext, const char* ti
 		rv = 1;
 	} else if ((!force) && (ret & STATFLAG_DISKCHG)) {
 		ret = toolkit_msgbox(title, "Conflict!\nContinue?",
-		    TK_MB_YESNOCANCEL|TK_MB_ICON_QUESTION);
+		    TK_MB_YESNO|TK_MB_ICON_QUESTION);
 		if (ret != TK_MB_YES) {
 			rv = 1;
 		}
@@ -312,8 +312,6 @@ int
 mainloop(void *p)
 {
 
-	UNUSED(p);
-
 	if (np2oscfg.NOWAIT) {
 		joymng_sync();
 		mousemng_callback();