--- np2/macos9/menu.cpp 2003/11/09 23:42:06 1.4 +++ np2/macos9/menu.cpp 2004/01/07 08:33:00 1.7 @@ -85,18 +85,32 @@ void menu_setxshift(BYTE value) { _CheckMenuItem(hmenu, IDM_XGRPH, MFCHECK(value & 4)); } -void menu_setf12copy(BYTE value) { +void menu_setf11key(BYTE value) { MenuHandle hmenu; - if (value >= 3) { + if (value >= 4) { value = 0; } - np2oscfg.F12COPY = value; + np2oscfg.F11KEY = value; + hmenu = _GetMenu(IDM_KEYBOARD); + _CheckMenuItem(hmenu, IDM_F11KANA, MFCHECK(value == 0)); + _CheckMenuItem(hmenu, IDM_F11STOP, MFCHECK(value == 1)); + _CheckMenuItem(hmenu, IDM_F11NFER, MFCHECK(value == 3)); +} + +void menu_setf12key(BYTE value) { + + MenuHandle hmenu; + + if (value >= 4) { + value = 0; + } + np2oscfg.F12KEY = value; hmenu = _GetMenu(IDM_KEYBOARD); _CheckMenuItem(hmenu, IDM_F12MOUSE, MFCHECK(value == 0)); _CheckMenuItem(hmenu, IDM_F12COPY, MFCHECK(value == 1)); - _CheckMenuItem(hmenu, IDM_F12STOP, MFCHECK(value == 2)); + _CheckMenuItem(hmenu, IDM_F12XFER, MFCHECK(value == 3)); } void menu_setbeepvol(BYTE value) { @@ -127,6 +141,14 @@ void menu_setsound(BYTE value) { _CheckMenuItem(hmenu, IDM_PC9801_118, MFCHECK(value == 0x08)); _CheckMenuItem(hmenu, IDM_SPEAKBOARD, MFCHECK(value == 0x20)); _CheckMenuItem(hmenu, IDM_SPARKBOARD, MFCHECK(value == 0x40)); + _CheckMenuItem(hmenu, IDM_AMD98, MFCHECK(value == 0x80)); +} + +void menu_setjastsnd(BYTE value) { + + value &= 1; + np2oscfg.jastsnd = value; + _CheckMenuItem(_GetMenu(IDM_SOUND), IDM_JASTSND, MFCHECK(value)); } void menu_setmotorflg(BYTE value) {