--- np2/win9x/menu.cpp	2003/10/16 17:58:52	1.1.1.1
+++ np2/win9x/menu.cpp	2003/11/03 00:49:55	1.6
@@ -8,102 +8,151 @@
 
 #define	MFCHECK(a) ((a)?MF_CHECKED:MF_UNCHECKED)
 
+typedef struct {
+const char	*str;
+	int		id;
+} SMENUITEM;
+
+static const char smenu_toolwin[] = "&Tool Window";
+static const char smenu_keydisp[] = "&Key display";
+static const char smenu_center[] = "&Centering";
+static const char smenu_snap[] = "&Window Snap";
+static const char smenu_bg[] = "&Background";
+static const char smenu_bgsnd[] = "Background &Sound";
+static const char smenu_320x200[] = " 320x200";
+static const char smenu_480x300[] = " 480x300";
+static const char smenu_640x400[] = " 640x400";
+static const char smenu_800x500[] = " 800x500";
+static const char smenu_960x600[] = " 960x600";
+static const char smenu_1280x800[] = "1280x600";
+
+static const char smenu_memdump[] = "&Memory Dump";
+static const char smenu_dbguty[] = "&Debug Utility";
+static const char menu_i286save[] = "&i286 save";
+
+static const SMENUITEM smenuitem[] = {
+			{smenu_toolwin,		IDM_TOOLWIN},
+			{smenu_keydisp,		IDM_KEYDISP},
+			{NULL,				0},
+			{smenu_center,		IDM_SCREENCENTER},
+			{smenu_snap,		IDM_SNAPENABLE},
+			{smenu_bg,			IDM_BACKGROUND},
+			{smenu_bgsnd,		IDM_BGSOUND},
+			{NULL,				0},
+			{smenu_320x200,		IDM_SCRNMUL4},
+			{smenu_480x300,		IDM_SCRNMUL6},
+			{smenu_640x400,		IDM_SCRNMUL8},
+			{smenu_800x500,		IDM_SCRNMUL10},
+			{smenu_960x600,		IDM_SCRNMUL12},
+			{smenu_1280x800,	IDM_SCRNMUL16},
+			{NULL,				0}};
+
+void sysmenu_init(void) {
+
+	HMENU	hMenu;
+	UINT	i;
+
+	hMenu = GetSystemMenu(hWndMain, FALSE);
+	for (i=0; i<(sizeof(smenuitem)/sizeof(SMENUITEM)); i++) {
+		if (smenuitem[i].str) {
+			InsertMenu(hMenu, i, MF_BYPOSITION | MF_STRING,
+									smenuitem[i].id, smenuitem[i].str);
+		}
+		else {
+			InsertMenu(hMenu, i, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
+		}
+	}
+	if (np2oscfg.I286SAVE) {
+		InsertMenu(hMenu, 7, MF_BYPOSITION | MF_STRING, IDM_MEMORYDUMP,
+							smenu_memdump);
+		InsertMenu(hMenu, 8, MF_BYPOSITION | MF_STRING, IDM_DEBUGUTY,
+							smenu_dbguty);
+	}
+}
 
-void disable_windowmenu(void) {
-
-	HMENU	hmenu = GetMenu(hWndMain);
+void sysmenu_settoolwin(BYTE value) {
 
-	EnableMenuItem(hmenu, IDM_WINDOW, MF_GRAYED);
-	EnableMenuItem(hmenu, IDM_FULLSCREEN, MF_GRAYED);
+	value &= 1;
+	np2oscfg.toolwin = value;
+	CheckMenuItem(GetSystemMenu(hWndMain, FALSE),
+											IDM_TOOLWIN, MFCHECK(value));
 }
 
-void xmenu_setsound(BYTE value) {
-
-	HMENU	hmenu = GetMenu(hWndMain);
+void sysmenu_setkeydisp(BYTE value) {
 
-	sysmng_update(SYS_UPDATESBOARD);
-	np2cfg.SOUND_SW = value;
-	CheckMenuItem(hmenu, IDM_NOSOUND, MFCHECK(np2cfg.SOUND_SW == 0));
-	CheckMenuItem(hmenu, IDM_PC9801_14, MFCHECK(np2cfg.SOUND_SW & 1));
-	CheckMenuItem(hmenu, IDM_PC9801_26K, MFCHECK(np2cfg.SOUND_SW & 2));
-	CheckMenuItem(hmenu, IDM_PC9801_86, MFCHECK(np2cfg.SOUND_SW & 4));
-	CheckMenuItem(hmenu, IDM_PC9801_118, MFCHECK(np2cfg.SOUND_SW & 8));
-	CheckMenuItem(hmenu, IDM_CHIBIOTO, MFCHECK(np2cfg.SOUND_SW & 0x10));
-	CheckMenuItem(hmenu, IDM_SPEAKBOARD, MFCHECK(np2cfg.SOUND_SW & 0x20));
-	CheckMenuItem(hmenu, IDM_SPARKBOARD, MFCHECK(np2cfg.SOUND_SW & 0x40));
-	CheckMenuItem(hmenu, IDM_AMD98, MFCHECK(np2cfg.SOUND_SW & 0x80));
+	value &= 1;
+	np2oscfg.keydisp = value;
+	CheckMenuItem(GetSystemMenu(hWndMain, FALSE),
+											IDM_KEYDISP, MFCHECK(value));
 }
 
-void xmenu_setbeepvol(BYTE value) {
-
-	HMENU	hmenu = GetMenu(hWndMain);
+void sysmenu_setwinsnap(BYTE value) {
 
-	np2cfg.BEEP_VOL = value & 3;
-	CheckMenuItem(hmenu, IDM_BEEPOFF, MFCHECK(np2cfg.BEEP_VOL == 0));
-	CheckMenuItem(hmenu, IDM_BEEPLOW, MFCHECK(np2cfg.BEEP_VOL == 1));
-	CheckMenuItem(hmenu, IDM_BEEPMID, MFCHECK(np2cfg.BEEP_VOL == 2));
-	CheckMenuItem(hmenu, IDM_BEEPHIGH, MFCHECK(np2cfg.BEEP_VOL == 3));
+	value &= 1;
+	np2oscfg.WINSNAP = value;
+	CheckMenuItem(GetSystemMenu(hWndMain, FALSE),
+											IDM_SNAPENABLE, MFCHECK(value));
 }
 
-void xmenu_setkey(BYTE value) {
+void sysmenu_setbackground(BYTE value) {
 
-	HMENU	hmenu = GetMenu(hWndMain);
+	HMENU	hmenu;
 
-	if (value >= 3) {
-		value = 0;
+	np2oscfg.background &= 2;
+	np2oscfg.background |= (value & 1);
+	hmenu = GetSystemMenu(hWndMain, FALSE);
+	if (value & 1) {
+		CheckMenuItem(hmenu, IDM_BACKGROUND, MF_UNCHECKED);
+		EnableMenuItem(hmenu, IDM_BGSOUND, MF_GRAYED);
+	}
+	else {
+		CheckMenuItem(hmenu, IDM_BACKGROUND, MF_CHECKED);
+		EnableMenuItem(hmenu, IDM_BGSOUND, MF_ENABLED);
 	}
-	np2cfg.KEY_MODE = value;
-	CheckMenuItem(hmenu, IDM_KEY, MFCHECK(value == 0));
-	CheckMenuItem(hmenu, IDM_JOY1, MFCHECK(value == 1));
-	CheckMenuItem(hmenu, IDM_JOY2, MFCHECK(value == 2));
 }
 
-void xmenu_setbtnrapid(BYTE value) {
+void sysmenu_setbgsound(BYTE value) {
 
-	np2cfg.BTN_RAPID = value;
-	CheckMenuItem(GetMenu(hWndMain), IDM_RAPID, MFCHECK(np2cfg.BTN_RAPID));
+	np2oscfg.background &= 1;
+	np2oscfg.background |= (value & 2);
+	CheckMenuItem(GetSystemMenu(hWndMain, FALSE),
+									IDM_BGSOUND, MFCHECK((value & 2) ^ 2));
 }
 
-void xmenu_setbtnmode(BYTE value) {
-
-	np2cfg.BTN_MODE = value & 1;
-	CheckMenuItem(GetMenu(hWndMain), IDM_JOYX, MFCHECK(np2cfg.BTN_MODE));
-}
+void sysmenu_setscrnmul(BYTE value) {
 
-void xmenu_setmsrapid(BYTE value) {
+	HMENU	hmenu;
 
-	np2cfg.MOUSERAPID = value;
-	CheckMenuItem(GetMenu(hWndMain), IDM_MSRAPID, MFCHECK(np2cfg.MOUSERAPID));
+//	np2cfg.scrnmul = value;
+	hmenu = GetSystemMenu(hWndMain, FALSE);
+	CheckMenuItem(hmenu, IDM_SCRNMUL4, MFCHECK(value == 4));
+	CheckMenuItem(hmenu, IDM_SCRNMUL6, MFCHECK(value == 6));
+	CheckMenuItem(hmenu, IDM_SCRNMUL8, MFCHECK(value == 8));
+	CheckMenuItem(hmenu, IDM_SCRNMUL10, MFCHECK(value == 10));
+	CheckMenuItem(hmenu, IDM_SCRNMUL12, MFCHECK(value == 12));
+	CheckMenuItem(hmenu, IDM_SCRNMUL16, MFCHECK(value == 16));
 }
 
-void xmenu_setwaitflg(BYTE value) {
 
-	np2oscfg.NOWAIT = value & 1;
-	CheckMenuItem(GetMenu(hWndMain), IDM_NOWAIT, MFCHECK(np2oscfg.NOWAIT));
-}
+// ----
 
-void xmenu_setframe(BYTE value) {
+void xmenu_disablewindow(void) {
 
-	HMENU	hmenu = GetMenu(hWndMain);
+	HMENU	hmenu;
 
-	np2oscfg.DRAW_SKIP = value;
-	CheckMenuItem(hmenu, IDM_AUTOFPS, MFCHECK(value == 0));
-	CheckMenuItem(hmenu, IDM_60FPS, MFCHECK(value == 1));
-	CheckMenuItem(hmenu, IDM_30FPS, MFCHECK(value == 2));
-	CheckMenuItem(hmenu, IDM_20FPS, MFCHECK(value == 3));
-	CheckMenuItem(hmenu, IDM_15FPS, MFCHECK(value == 4));
+	hmenu = GetMenu(hWndMain);
+	EnableMenuItem(hmenu, IDM_WINDOW, MF_GRAYED);
+	EnableMenuItem(hmenu, IDM_FULLSCREEN, MF_GRAYED);
 }
 
-void xmenu_setdispclk(BYTE value) {
+void xmenu_setroltate(BYTE value) {
 
-	HMENU	hmenu = GetMenu(hWndMain);
+	HMENU	hmenu;
 
-	value &= 3;
-	np2oscfg.DISPCLK = value;
-	CheckMenuItem(hmenu, IDM_DISPCLOCK, MFCHECK(value & 1));
-	CheckMenuItem(hmenu, IDM_DISPFRAME, MFCHECK(value & 2));
-	sysmng_workclockrenewal();
-	sysmng_updatecaption(3);
+	hmenu = GetMenu(hWndMain);
+	CheckMenuItem(hmenu, IDM_ROLNORMAL, MFCHECK(value == 0));
+	CheckMenuItem(hmenu, IDM_ROLLEFT, MFCHECK(value == 1));
+	CheckMenuItem(hmenu, IDM_ROLRIGHT, MFCHECK(value == 2));
 }
 
 void xmenu_setdispmode(BYTE value) {
@@ -113,53 +162,53 @@ void xmenu_setdispmode(BYTE value) {
 	CheckMenuItem(GetMenu(hWndMain), IDM_DISPSYNC, MFCHECK(value));
 }
 
-void xmenu_setmouse(BYTE value) {
+void xmenu_setraster(BYTE value) {
 
 	value &= 1;
-	np2oscfg.MOUSE_SW = value;
-	CheckMenuItem(GetMenu(hWndMain), IDM_MOUSE, MFCHECK(value));
+	np2cfg.RASTER = value;
+	CheckMenuItem(GetMenu(hWndMain), IDM_RASTER, MFCHECK(value));
 }
 
-void xmenu_setmotorflg(BYTE value) {
-
-	np2cfg.MOTOR = value & 1;
-	CheckMenuItem(GetMenu(hWndMain), IDM_SEEKSND, MFCHECK(np2cfg.MOTOR));
-}
-
-void xmenu_setwinsnap(BYTE value) {
+void xmenu_setwaitflg(BYTE value) {
 
 	value &= 1;
-	np2oscfg.WINSNAP = value;
-	CheckMenuItem(GetSystemMenu(hWndMain, FALSE),
-									IDM_SNAPENABLE, MFCHECK(value));
-}
-
-void xmenu_seti286save(BYTE value) {
-
-	if (!value) {
-		EnableMenuItem(GetMenu(hWndMain), IDM_I286SAVE, MF_GRAYED);
-	}
+	np2oscfg.NOWAIT = value;
+	CheckMenuItem(GetMenu(hWndMain), IDM_NOWAIT, MFCHECK(value));
 }
 
-void xmenu_setroltate(BYTE value) {
+void xmenu_setframe(BYTE value) {
 
-	HMENU	hmenu = GetMenu(hWndMain);
+	HMENU	hmenu;
 
-	CheckMenuItem(hmenu, IDM_ROLNORMAL, MFCHECK(value == 0));
-	CheckMenuItem(hmenu, IDM_ROLLEFT, MFCHECK(value == 1));
-	CheckMenuItem(hmenu, IDM_ROLRIGHT, MFCHECK(value == 2));
+	np2oscfg.DRAW_SKIP = value;
+	hmenu = GetMenu(hWndMain);
+	CheckMenuItem(hmenu, IDM_AUTOFPS, MFCHECK(value == 0));
+	CheckMenuItem(hmenu, IDM_60FPS, MFCHECK(value == 1));
+	CheckMenuItem(hmenu, IDM_30FPS, MFCHECK(value == 2));
+	CheckMenuItem(hmenu, IDM_20FPS, MFCHECK(value == 3));
+	CheckMenuItem(hmenu, IDM_15FPS, MFCHECK(value == 4));
 }
 
-void xmenu_sets98logging(BYTE value) {
+void xmenu_setkey(BYTE value) {
 
-	CheckMenuItem(GetMenu(hWndMain), IDM_S98LOGGING, MFCHECK(value));
+	HMENU	hmenu;
+
+	if (value >= 4) {
+		value = 0;
+	}
+	np2cfg.KEY_MODE = value;
+	hmenu = GetMenu(hWndMain);
+	CheckMenuItem(hmenu, IDM_KEY, MFCHECK(value == 0));
+	CheckMenuItem(hmenu, IDM_JOY1, MFCHECK(value == 1));
+	CheckMenuItem(hmenu, IDM_JOY2, MFCHECK(value == 2));
 }
 
 void xmenu_setxshift(BYTE value) {
 
-	HMENU	hmenu = GetMenu(hWndMain);
+	HMENU	hmenu;
 
 	np2cfg.XSHIFT = value;
+	hmenu = GetMenu(hWndMain);
 	CheckMenuItem(hmenu, IDM_XSHIFT, MFCHECK(value & 1));
 	CheckMenuItem(hmenu, IDM_XCTRL, MFCHECK(value & 2));
 	CheckMenuItem(hmenu, IDM_XGRPH, MFCHECK(value & 4));
@@ -167,84 +216,139 @@ void xmenu_setxshift(BYTE value) {
 
 void xmenu_setf12copy(BYTE value) {
 
-	HMENU	hmenu = GetMenu(hWndMain);
+	HMENU	hmenu;
 
-	if (value >= 3) {
+	if (value >= 5) {
 		value = 0;
 	}
 	np2oscfg.F12COPY = value;
+	hmenu = GetMenu(hWndMain);
 	CheckMenuItem(hmenu, IDM_F12MOUSE, MFCHECK(value == 0));
 	CheckMenuItem(hmenu, IDM_F12COPY, MFCHECK(value == 1));
 	CheckMenuItem(hmenu, IDM_F12STOP, MFCHECK(value == 2));
+	CheckMenuItem(hmenu, IDM_F12EQU, MFCHECK(value == 3));
+	CheckMenuItem(hmenu, IDM_F12COMMA, MFCHECK(value == 4));
+}
+
+void xmenu_setbeepvol(BYTE value) {
+
+	HMENU	hmenu;
+
+	value &= 3;
+	np2cfg.BEEP_VOL = value;
+	hmenu = GetMenu(hWndMain);
+	CheckMenuItem(hmenu, IDM_BEEPOFF, MFCHECK(value == 0));
+	CheckMenuItem(hmenu, IDM_BEEPLOW, MFCHECK(value == 1));
+	CheckMenuItem(hmenu, IDM_BEEPMID, MFCHECK(value == 2));
+	CheckMenuItem(hmenu, IDM_BEEPHIGH, MFCHECK(value == 3));
+}
+
+void xmenu_setsound(BYTE value) {
+
+	HMENU	hmenu;
+
+	sysmng_update(SYS_UPDATESBOARD);
+	np2cfg.SOUND_SW = value;
+	hmenu = GetMenu(hWndMain);
+	CheckMenuItem(hmenu, IDM_NOSOUND, MFCHECK(value == 0));
+	CheckMenuItem(hmenu, IDM_PC9801_14, MFCHECK(value & 1));
+	CheckMenuItem(hmenu, IDM_PC9801_26K, MFCHECK(value & 2));
+	CheckMenuItem(hmenu, IDM_PC9801_86, MFCHECK(value & 4));
+	CheckMenuItem(hmenu, IDM_PC9801_118, MFCHECK(value & 8));
+	CheckMenuItem(hmenu, IDM_CHIBIOTO, MFCHECK(value & 0x10));
+	CheckMenuItem(hmenu, IDM_SPEAKBOARD, MFCHECK(value & 0x20));
+	CheckMenuItem(hmenu, IDM_SPARKBOARD, MFCHECK(value & 0x40));
+	CheckMenuItem(hmenu, IDM_AMD98, MFCHECK(value & 0x80));
+}
+
+void xmenu_setmotorflg(BYTE value) {
+
+	value &= 1;
+	np2cfg.MOTOR = value;
+	CheckMenuItem(GetMenu(hWndMain), IDM_SEEKSND, MFCHECK(value));
 }
 
-void xmenu_setextmem(BYTE value) {								// ver0.28
+void xmenu_setextmem(BYTE value) {
 
-	HMENU	hmenu = GetMenu(hWndMain);
+	HMENU	hmenu;
 
 	sysmng_update(SYS_UPDATEMEMORY);
 	np2cfg.EXTMEM = value;
+	hmenu = GetMenu(hWndMain);
 	CheckMenuItem(hmenu, IDM_MEM640, MFCHECK(value == 0));
 	CheckMenuItem(hmenu, IDM_MEM16, MFCHECK(value == 1));
 	CheckMenuItem(hmenu, IDM_MEM36, MFCHECK(value == 3));
 	CheckMenuItem(hmenu, IDM_MEM76, MFCHECK(value == 7));
 }
 
-void xmenu_setraster(BYTE value) {
+void xmenu_setmouse(BYTE value) {
 
-	np2cfg.RASTER = (value & 1);
-	CheckMenuItem(GetMenu(hWndMain), IDM_RASTER, MFCHECK(np2cfg.RASTER));
+	value &= 1;
+	np2oscfg.MOUSE_SW = value;
+	CheckMenuItem(GetMenu(hWndMain), IDM_MOUSE, MFCHECK(value));
 }
 
-void xmenu_setbackground(BYTE value) {
-
-	HMENU	hmenu = GetSystemMenu(hWndMain, FALSE);
+void xmenu_sets98logging(BYTE value) {
 
-	np2oscfg.background &= 2;
-	np2oscfg.background |= (value & 1);
-	if (value & 1) {
-		CheckMenuItem(hmenu, IDM_BACKGROUND, MF_UNCHECKED);
-		EnableMenuItem(hmenu, IDM_BGSOUND, MF_GRAYED);
-	}
-	else {
-		CheckMenuItem(hmenu, IDM_BACKGROUND, MF_CHECKED);
-		EnableMenuItem(hmenu, IDM_BGSOUND, MF_ENABLED);
-	}
+	CheckMenuItem(GetMenu(hWndMain), IDM_S98LOGGING, MFCHECK(value));
 }
 
-void xmenu_setbgsound(BYTE value) {
+void xmenu_setshortcut(BYTE value) {
 
-	np2oscfg.background &= 1;
-	np2oscfg.background |= (value & 2);
-	CheckMenuItem(GetSystemMenu(hWndMain, FALSE),
-									IDM_BGSOUND, MFCHECK((value & 2) ^ 2));
+	HMENU	hmenu;
+
+	np2oscfg.shortcut = value;
+	hmenu = GetMenu(hWndMain);
+	CheckMenuItem(hmenu, IDM_ALTENTER, MFCHECK(value & 1));
+	CheckMenuItem(hmenu, IDM_ALTF4, MFCHECK(value & 2));
 }
 
-void xmenu_setscrnmul(BYTE value) {								// ver0.26
+void xmenu_setdispclk(BYTE value) {
 
-	HMENU	hmenu = GetSystemMenu(hWndMain, FALSE);
+	HMENU	hmenu;
 
-//	np2cfg.scrnmul = value;
-	CheckMenuItem(hmenu, IDM_SCRNMUL4, MFCHECK(value == 4));
-	CheckMenuItem(hmenu, IDM_SCRNMUL6, MFCHECK(value == 6));
-	CheckMenuItem(hmenu, IDM_SCRNMUL8, MFCHECK(value == 8));
-	CheckMenuItem(hmenu, IDM_SCRNMUL10, MFCHECK(value == 10));
-	CheckMenuItem(hmenu, IDM_SCRNMUL12, MFCHECK(value == 12));
-	CheckMenuItem(hmenu, IDM_SCRNMUL16, MFCHECK(value == 16));
+	value &= 3;
+	np2oscfg.DISPCLK = value;
+	hmenu = GetMenu(hWndMain);
+	CheckMenuItem(hmenu, IDM_DISPCLOCK, MFCHECK(value & 1));
+	CheckMenuItem(hmenu, IDM_DISPFRAME, MFCHECK(value & 2));
+	sysmng_workclockrenewal();
+	sysmng_updatecaption(3);
 }
 
-void xmenu_setshortcut(BYTE value) {							// ver0.30
+void xmenu_setbtnmode(BYTE value) {
 
-	HMENU	hmenu = GetMenu(hWndMain);
+	value &= 1;
+	np2cfg.BTN_MODE = value;
+	CheckMenuItem(GetMenu(hWndMain), IDM_JOYX, MFCHECK(value));
+}
 
-	np2oscfg.shortcut = value;
-	CheckMenuItem(hmenu, IDM_ALTENTER, MFCHECK(value & 1));
-	CheckMenuItem(hmenu, IDM_ALTF4, MFCHECK(value & 2));
+void xmenu_setbtnrapid(BYTE value) {
+
+	value &= 1;
+	np2cfg.BTN_RAPID = value;
+	CheckMenuItem(GetMenu(hWndMain), IDM_RAPID, MFCHECK(value));
+}
+
+void xmenu_setmsrapid(BYTE value) {
+
+	value &= 1;
+	np2cfg.MOUSERAPID = value;
+	CheckMenuItem(GetMenu(hWndMain), IDM_MSRAPID, MFCHECK(value));
 }
 
 void xmenu_setsstp(BYTE value) {
 
-	np2oscfg.sstp = value & 1;
-	CheckMenuItem(GetMenu(hWndMain), IDM_SSTP, MFCHECK(np2oscfg.sstp));
+	value &= 1;
+	np2oscfg.sstp = value;
+	CheckMenuItem(GetMenu(hWndMain), IDM_SSTP, MFCHECK(value));
+}
+
+void xmenu_seti286save(BYTE value) {
+
+	if (value) {
+		InsertMenu(GetSubMenu(GetMenu(hWndMain), 6), 10,
+					MF_BYPOSITION | MF_STRING, IDM_I286SAVE, menu_i286save);
+	}
 }