--- np2/x11/ini.c	2004/03/25 15:10:33	1.10
+++ np2/x11/ini.c	2007/01/23 15:48:20	1.18
@@ -8,6 +8,7 @@
 #include "strres.h"
 
 #include "commng.h"
+#include "joymng.h"
 #include "kbdmng.h"
 #include "soundmng.h"
 
@@ -20,6 +21,27 @@ typedef struct {
 } _INIARG, *INIARG;
 
 
+static BOOL
+inigetbmp(const BYTE *ptr, UINT pos)
+{
+
+	return ((ptr[pos >> 3] >> (pos & 7)) & 1);
+}
+
+static void
+inisetbmp(BYTE *ptr, UINT pos, BOOL set)
+{
+	UINT8 bit;
+
+	ptr += (pos >> 3);
+	bit = 1 << (pos & 7);
+	if (set) {
+		*ptr |= bit;
+	} else {
+		*ptr &= ~bit;
+	}
+}
+
 static void
 inirdargs16(const char *src, const INITBL *ini)
 {
@@ -159,6 +181,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
@@ -187,6 +224,10 @@ inireadcb(void *arg, const char *para, c
 				*((BYTE *)p->value) = (!milstr_cmp(data, str_true))?1:0;
 				break;
 
+			case INITYPE_BITMAP:
+				inisetbmp((BYTE *)p->value, p->arg, milstr_cmp(data, str_true) == 0);
+				break;
+
 			case INITYPE_ARGS16:
 				milstr_ncpy(work, data, 512);
 				inirdargs16(work, p);
@@ -239,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;
@@ -313,6 +359,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
@@ -356,6 +416,10 @@ ini_write(const char *path, const char *
 				milstr_ncpy(work, (*((BYTE *)p->value)) ? str_true : str_false, sizeof(work));
 				break;
 
+			case INITYPE_BITMAP:
+				milstr_ncpy(work, inigetbmp((BYTE *)p->value, p->arg) ? str_true : str_false, sizeof(work));
+				break;
+
 			case INITYPE_ARGH8:
 				iniwrsetargh8(work, sizeof(work), p);
 				break;
@@ -407,6 +471,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;
@@ -430,6 +498,7 @@ static const char ini_title[] = "NekoPro
 enum {
 	INIRO_STR	= INIFLAG_RO | INITYPE_STR,
 	INIRO_BOOL	= INIFLAG_RO | INITYPE_BOOL,
+	INIRO_BITMAP	= INIFLAG_RO | INITYPE_BITMAP,
 	INIRO_UINT8	= INIFLAG_RO | INITYPE_UINT8,
 	INIMAX_UINT8	= INIFLAG_MAX | INITYPE_UINT8,
 	INIAND_UINT8	= INIFLAG_AND | INITYPE_UINT8,
@@ -453,7 +522,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},
@@ -518,11 +587,18 @@ static const INITBL iniitem[] = {
 
 	{"calendar", INITYPE_BOOL,	&np2cfg.calendar,	0},
 	{"USE144FD", INITYPE_BOOL,	&np2cfg.usefd144,	0},
+	{"FDDRIVE1", INIRO_BITMAP,	&np2cfg.fddequip,	0},
+	{"FDDRIVE2", INIRO_BITMAP,	&np2cfg.fddequip,	1},
+	{"FDDRIVE3", INIRO_BITMAP,	&np2cfg.fddequip,	2},
+	{"FDDRIVE4", INIRO_BITMAP,	&np2cfg.fddequip,	3},
 
 	{"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},
 
@@ -554,24 +630,23 @@ static const INITBL iniitem[] = {
 
 	{"e_resume", INITYPE_BOOL,	&np2oscfg.resume,	0},
 	{"STATSAVE", INIRO_BOOL,	&np2oscfg.statsave,	0},
-#if defined(__GNUC__) && (defined(i386) || defined(__i386__))
+#if defined(GCC_CPU_ARCH_IA32)
 	{"nousemmx", INITYPE_BOOL,	&np2oscfg.disablemmx,	0},
 #endif
 	{"toolwind", INITYPE_BOOL,	&np2oscfg.toolwin,	0},
 	{"keydispl", INITYPE_BOOL,	&np2oscfg.keydisp,	0},
+	{"soft_kbd", INITYPE_BOOL,	&np2oscfg.softkbd,	0},
 	{"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},
+	{"F11_KEY_", INITYPE_UINT8,	&np2oscfg.F11KEY,	0},
 
-	{"I286SAVE", INIRO_BOOL,	&np2oscfg.I286SAVE,	0}
+	{"I286SAVE", INIRO_BOOL,	&np2oscfg.I286SAVE,	0},
 };
 #define	INIITEMS	(sizeof(iniitem) / sizeof(iniitem[0]))
 
@@ -619,11 +694,17 @@ read_iniread_flag(const INITBL *p)
 	return FALSE;
 }
 
+NP2CFG np2cfg_default;
+NP2OSCFG np2oscfg_default;
+
 void
 initload(void)
 {
 	char path[MAX_PATH];
 
+	np2cfg_default = np2cfg;
+	np2oscfg_default = np2oscfg;
+
 	milstr_ncpy(path, modulefile, sizeof(path));
 	ini_read(path, ini_title, iniitem, INIITEMS);
 }