--- np2/x11/ini.c	2004/07/05 14:30:39	1.13
+++ np2/x11/ini.c	2008/03/18 15:33:14	1.21
@@ -1,3 +1,5 @@
+/*	$Id: ini.c,v 1.21 2008/03/18 15:33:14 monaka Exp $	*/
+
 #include "compiler.h"
 
 #include "np2.h"
@@ -8,6 +10,7 @@
 #include "strres.h"
 
 #include "commng.h"
+#include "joymng.h"
 #include "kbdmng.h"
 #include "soundmng.h"
 
@@ -180,6 +183,21 @@ inirdsnddrv(const char *src, const INITB
 	*(UINT8 *)ini->value = snddrv_drv2num(src);
 }
 
+static void
+inirdinterp(const char *src, const 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
@@ -264,6 +282,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;
@@ -338,6 +361,20 @@ 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
@@ -436,6 +473,10 @@ ini_write(const char *path, const char *
 				SPRINTF(work, "%s", snddrv_num2drv(*(UINT8 *)p->value));
 				break;
 
+			case INITYPE_INTERP:
+				SPRINTF(work, "%s", iniwrinterp(*(UINT8 *)p->value));
+				break;
+
 			default:
 				set = FAILURE;
 				break;
@@ -483,7 +524,7 @@ static const INITBL iniitem[] = {
 	{"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 +597,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 +630,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 +645,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]))