--- np2/x11/ini.c	2004/07/05 14:30:39	1.13
+++ np2/x11/ini.c	2012/01/23 04:20:24	1.26
@@ -8,14 +8,15 @@
 #include "strres.h"
 
 #include "commng.h"
+#include "joymng.h"
 #include "kbdmng.h"
 #include "soundmng.h"
 
 
 typedef struct {
 	const char	*title;
-	const INITBL	*tbl;
-	const INITBL	*tblterm;
+	INITBL		*tbl;
+	INITBL		*tblterm;
 	UINT		count;
 } _INIARG, *INIARG;
 
@@ -42,7 +43,7 @@ inisetbmp(BYTE *ptr, UINT pos, BOOL set)
 }
 
 static void
-inirdargs16(const char *src, const INITBL *ini)
+inirdargs16(const char *src, INITBL *ini)
 {
 	SINT16 *dst;
 	int dsize;
@@ -70,7 +71,7 @@ inirdargs16(const char *src, const INITB
 }
 
 static void
-inirdargh8(const char *src, const INITBL *ini)
+inirdargh8(const char *src, INITBL *ini)
 {
 	BYTE *dst;
 	int dsize;
@@ -116,7 +117,7 @@ inirdargh8(const char *src, const INITBL
 }
 
 static void
-iniwrsetargh8(char *work, int size, const INITBL *ini)
+iniwrsetargh8(char *work, int size, INITBL *ini)
 {
 	char tmp[8];
 	const BYTE *ptr;
@@ -126,11 +127,11 @@ iniwrsetargh8(char *work, int size, cons
 	ptr = (BYTE *)(ini->value);
 	arg = ini->arg;
 	if (arg > 0) {
-		SPRINTF(tmp, "%.2x ", ptr[0]);
+		g_snprintf(tmp, sizeof(tmp), "%.2x ", ptr[0]);
 		milstr_ncpy(work, tmp, size);
 	}
 	for (i = 1; i < arg; i++) {
-		SPRINTF(tmp, "%.2x ", ptr[i]);
+		g_snprintf(tmp, sizeof(tmp), "%.2x ", ptr[i]);
 		milstr_ncat(work, tmp, size);
 	}
 }
@@ -138,7 +139,7 @@ iniwrsetargh8(char *work, int size, cons
 /* ----- user */
 
 static void
-inirdbyte3(const char *src, const INITBL *ini)
+inirdbyte3(const char *src, INITBL *ini)
 {
 	UINT i;
 
@@ -154,7 +155,7 @@ inirdbyte3(const char *src, const INITBL
 }
 
 static void
-inirdkb(const char *src, const INITBL *ini)
+inirdkb(const char *src, INITBL *ini)
 {
 
 	if ((!milstr_extendcmp(src, "DOS"))
@@ -174,19 +175,34 @@ inirdkb(const char *src, const INITBL *i
 }
 
 static void
-inirdsnddrv(const char *src, const INITBL *ini)
+inirdsnddrv(const char *src, INITBL *ini)
 {
 
 	*(UINT8 *)ini->value = snddrv_drv2num(src);
 }
 
+static void
+inirdinterp(const char *src, INITBL *ini)
+{
+
+	if (!milstr_cmp(src, "NEAREST")) {
+		*(UINT8 *)ini->value = INTERP_NEAREST;
+	} else if (!milstr_cmp(src, "TILES")) {
+		*(UINT8 *)ini->value = INTERP_TILES;
+	} else if (!milstr_cmp(src, "HYPER")) {
+		*(UINT8 *)ini->value = INTERP_HYPER;
+	} else {
+		*(UINT8 *)ini->value = INTERP_BILINEAR;
+	}
+}
+
 static void update_iniread_flag(const INITBL *p);
 
 static BOOL
 inireadcb(void *arg, const char *para, const char *key, const char *data)
 {
 	char work[512];
-	const INITBL *p;
+	INITBL *p;
 	BOOL rv;
 
 	if (arg == NULL) {
@@ -264,6 +280,11 @@ inireadcb(void *arg, const char *para, c
 				inirdsnddrv(work, p);
 				break;
 
+			case INITYPE_INTERP:
+				milstr_ncpy(work, data, 512);
+				inirdinterp(work, p);
+				break;
+
 			default:
 				rv = FALSE;
 				break;
@@ -278,7 +299,7 @@ inireadcb(void *arg, const char *para, c
 }
 
 void
-ini_read(const char *path, const char *title, const INITBL *tbl, UINT count)
+ini_read(const char *path, const char *title, INITBL *tbl, UINT count)
 {
 	_INIARG	iniarg;
 
@@ -338,16 +359,30 @@ iwss_extend:
 	}
 }
 
+static const char *
+iniwrinterp(UINT8 interp)
+{
+
+	if (interp == INTERP_NEAREST)
+		return "NEAREST";
+	else if (interp == INTERP_TILES)
+		return "TILES";
+	else if (interp == INTERP_HYPER)
+		return "HYPER";
+	else
+		return "BILINEAR";
+}
+
 static BOOL read_iniread_flag(const INITBL *p);
 
 void
-ini_write(const char *path, const char *title, const INITBL *tbl, UINT count, BOOL create)
+ini_write(const char *path, const char *title, INITBL *tbl, UINT count, BOOL create)
 {
-	char		work[512];
-	const INITBL	*p;
-	const INITBL	*pterm;
-	FILEH		fh;
-	BOOL		set;
+	char	work[512];
+	INITBL	*p;
+	INITBL	*pterm;
+	FILEH	fh;
+	BOOL	set;
 
 	fh = FILEH_INVALID;
 	if (!create) {
@@ -390,39 +425,39 @@ ini_write(const char *path, const char *
 				break;
 
 			case INITYPE_SINT8:
-				SPRINTF(work, "%d", *((char *)p->value));
+				g_snprintf(work, sizeof(work), "%d", *((char *)p->value));
 				break;
 
 			case INITYPE_SINT16:
-				SPRINTF(work, "%d", *((SINT16 *)p->value));
+				g_snprintf(work, sizeof(work), "%d", *((SINT16 *)p->value));
 				break;
 
 			case INITYPE_SINT32:
-				SPRINTF(work, "%d", *((SINT32 *)p->value));
+				g_snprintf(work, sizeof(work), "%d", *((SINT32 *)p->value));
 				break;
 
 			case INITYPE_UINT8:
-				SPRINTF(work, "%u", *((BYTE *)p->value));
+				g_snprintf(work, sizeof(work), "%u", *((BYTE *)p->value));
 				break;
 
 			case INITYPE_UINT16:
-				SPRINTF(work, "%u", *((UINT16 *)p->value));
+				g_snprintf(work, sizeof(work), "%u", *((UINT16 *)p->value));
 				break;
 
 			case INITYPE_UINT32:
-				SPRINTF(work, "%u", *((UINT32 *)p->value));
+				g_snprintf(work, sizeof(work), "%u", *((UINT32 *)p->value));
 				break;
 
 			case INITYPE_HEX8:
-				SPRINTF(work, "%x", *((BYTE *)p->value));
+				g_snprintf(work, sizeof(work), "%x", *((BYTE *)p->value));
 				break;
 
 			case INITYPE_HEX16:
-				SPRINTF(work, "%x", *((UINT16 *)p->value));
+				g_snprintf(work, sizeof(work), "%x", *((UINT16 *)p->value));
 				break;
 
 			case INITYPE_HEX32:
-				SPRINTF(work, "%x", *((UINT32 *)p->value));
+				g_snprintf(work, sizeof(work), "%x", *((UINT32 *)p->value));
 				break;
 
 			case INITYPE_KB:
@@ -433,7 +468,11 @@ ini_write(const char *path, const char *
 				break;
 
 			case INITYPE_SNDDRV:
-				SPRINTF(work, "%s", snddrv_num2drv(*(UINT8 *)p->value));
+				g_snprintf(work, sizeof(work), "%s", snddrv_num2drv(*(UINT8 *)p->value));
+				break;
+
+			case INITYPE_INTERP:
+				g_snprintf(work, sizeof(work), "%s", iniwrinterp(*(UINT8 *)p->value));
 				break;
 
 			default:
@@ -452,9 +491,12 @@ ini_write(const char *path, const char *
 	file_close(fh);
 }
 
-extern char modulefile[];
-
-static const char ini_title[] = "NekoProjectII";
+static const char ini_title[] =
+#if !defined(CPUCORE_IA32)
+	"NekoProjectII";
+#else
+	"NekoProjectII_IA32";
+#endif
 
 enum {
 	INIRO_STR	= INIFLAG_RO | INITYPE_STR,
@@ -470,7 +512,7 @@ enum {
 	INIRO_KB	= INIFLAG_RO | INITYPE_KB
 };
 
-static const INITBL iniitem[] = {
+static INITBL iniitem[] = {
 	{"np2title", INIRO_STR,		np2oscfg.titles,	sizeof(np2oscfg.titles)},
 	{"paddingx", INIROMAX_SINT32,	&np2oscfg.paddingx,	32},
 	{"paddingy", INIROMAX_SINT32,	&np2oscfg.paddingy,	32},
@@ -479,11 +521,11 @@ static const INITBL iniitem[] = {
 	{"HDfolder", INITYPE_STR,	hddfolder,		MAX_PATH},
 	{"bmap_Dir", INITYPE_STR,	bmpfilefolder,		MAX_PATH},
 	{"fontfile", INITYPE_STR,	np2cfg.fontfile,	MAX_PATH},
-	{"biospath", INITYPE_STR,	np2cfg.biospath,	MAX_PATH},
+	{"biospath", INIRO_STR,		np2cfg.biospath,	MAX_PATH},
 	{"hdrvroot", INIRO_STR,		np2cfg.hdrvroot,	MAX_PATH},
 	{"hdrv_acc", INIRO_UINT8,	&np2cfg.hdrvacc,	0},
 
-	{"pc_model", INITYPE_STR,	&np2cfg.model,		sizeof(np2cfg.model)},
+	{"pc_model", INITYPE_STR,	np2cfg.model,		sizeof(np2cfg.model)},
 
 	{"clk_base", INITYPE_UINT32,	&np2cfg.baseclock,	0},
 	{"clk_mult", INITYPE_UINT32,	&np2cfg.multiple,	0},
@@ -556,7 +598,10 @@ static const INITBL iniitem[] = {
 	{"keyboard", INIRO_KB,		&np2oscfg.KEYBOARD,	0},
 	{"F12_COPY", INITYPE_UINT8,	&np2oscfg.F12KEY,	0},
 	{"Joystick", INITYPE_BOOL,	&np2oscfg.JOYPAD1,	0},
-	{"Joy1_btn", INITYPE_ARGH8,	np2oscfg.JOY1BTN,	4},
+	{"Joy1_btn", INITYPE_ARGH8,	np2oscfg.JOY1BTN,	JOY_NBUTTON},
+	{"Joy1_dev", INITYPE_STR,	&np2oscfg.JOYDEV[0],	MAX_PATH},
+	{"Joy1amap", INITYPE_ARGH8,	np2oscfg.JOYAXISMAP[0],	JOY_NAXIS},
+	{"Joy1bmap", INITYPE_ARGH8,	np2oscfg.JOYBTNMAP[0],	JOY_NBUTTON},
 
 	{"confirm_", INITYPE_BOOL,	&np2oscfg.confirm,	0},
 
@@ -586,8 +631,12 @@ static const INITBL iniitem[] = {
 	{"com3mmdl", INITYPE_STR,	np2oscfg.com[2].mdl,	64},
 	{"com3mdef", INITYPE_STR,	np2oscfg.com[2].def,	MAX_PATH},
 
+#if defined(SUPPORT_RESUME)
 	{"e_resume", INITYPE_BOOL,	&np2oscfg.resume,	0},
+#endif
+#if defined(SUPPORT_STATSAVE)
 	{"STATSAVE", INIRO_BOOL,	&np2oscfg.statsave,	0},
+#endif
 #if defined(GCC_CPU_ARCH_IA32)
 	{"nousemmx", INITYPE_BOOL,	&np2oscfg.disablemmx,	0},
 #endif
@@ -597,16 +646,16 @@ static const INITBL iniitem[] = {
 	{"jast_snd", INITYPE_BOOL,	&np2oscfg.jastsnd,	0},
 
 	{"sounddrv", INITYPE_SNDDRV,	&np2oscfg.snddrv,	0},
-	{"audiodev", INITYPE_STR,	&np2oscfg.audiodev,	MAX_PATH},
 	{"MIDIOUTd", INITYPE_STR,	&np2oscfg.MIDIDEV[0],	MAX_PATH},
 	{"MIDIIN_d", INITYPE_STR,	&np2oscfg.MIDIDEV[1],	MAX_PATH},
 	{"MIDIWAIT", INITYPE_UINT32,	&np2oscfg.MIDIWAIT,	0},
 
-	{"sharepix", INIRO_BOOL,	&np2oscfg.shared_pixmap,0},
-
-	{"toolkit_", INIRO_STR,		&np2oscfg.toolkit,	sizeof(np2oscfg.toolkit)},
+	{"dinterp_", INITYPE_INTERP,	&np2oscfg.drawinterp,	0},
+	{"fullscrn", INITYPE_UINT32,	&ignore_fullscreen_mode,0},
+	{"F11_KEY_", INITYPE_UINT8,	&np2oscfg.F11KEY,	0},
+	{"READONLY", INIRO_BOOL,	&np2oscfg.cfgreadonly,	0},
 
-	{"I286SAVE", INIRO_BOOL,	&np2oscfg.I286SAVE,	0}
+	{"I286SAVE", INIRO_BOOL,	&np2oscfg.I286SAVE,	0},
 };
 #define	INIITEMS	(sizeof(iniitem) / sizeof(iniitem[0]))
 
@@ -620,7 +669,7 @@ calc_index(const INITBL *p)
 	UINT idx;
 
 	if (p) {
-		offset = (char *)p - (char *)iniitem;
+		offset = (const char *)p - (const char *)iniitem;
 		if ((offset % sizeof(iniitem[0])) == 0) {
 			idx = offset / sizeof(iniitem[0]);
 			if (idx < INIITEMS) {