diff --git a/menu.cpp b/menu.cpp index a14bdb8..e2593f1 100644 --- a/menu.cpp +++ b/menu.cpp @@ -65,44 +65,28 @@ enum MENU { MENU_NONE1, MENU_NONE2, - MENU_MAIN1, - MENU_MAIN2, - MENU_FILE_SELECT1, - MENU_FILE_SELECT2, - MENU_FILE_SELECTED, - MENU_RESET1, - MENU_RESET2, - MENU_RECONF1, - MENU_RECONF2, - MENU_SETTINGS1, - MENU_SETTINGS2, - MENU_ROMFILE_SELECTED, - MENU_SETTINGS_VIDEO1, - MENU_SETTINGS_VIDEO2, - MENU_SETTINGS_MEMORY1, - MENU_SETTINGS_MEMORY2, - MENU_SETTINGS_CHIPSET1, - MENU_SETTINGS_CHIPSET2, - MENU_SETTINGS_DRIVES1, - MENU_SETTINGS_DRIVES2, - MENU_SETTINGS_HARDFILE1, - MENU_SETTINGS_HARDFILE2, - MENU_HARDFILE_SELECT1, - MENU_HARDFILE_SELECT2, - MENU_HARDFILE_SELECTED, - MENU_HARDFILE_SELECTED2, - MENU_HARDFILE_SELECTED3, - MENU_LOADCONFIG_1, - MENU_LOADCONFIG_2, - MENU_SAVECONFIG_1, - MENU_SAVECONFIG_2, MENU_SYSTEM1, MENU_SYSTEM2, + MENU_COMMON1, + MENU_COMMON2, + MENU_MISC1, + MENU_MISC2, + + MENU_ERROR, + MENU_INFO, + + MENU_FILE_SELECT1, + MENU_FILE_SELECT2, MENU_CORE_FILE_SELECTED1, MENU_CORE_FILE_SELECTED2, MENU_CORE_FILE_CANCELED, - MENU_ERROR, - MENU_INFO, + MENU_RECENT1, + MENU_RECENT2, + MENU_ABOUT1, + MENU_ABOUT2, + MENU_RESET1, + MENU_RESET2, + MENU_JOYSYSMAP, MENU_JOYDIGMAP, MENU_JOYDIGMAP1, @@ -115,24 +99,65 @@ enum MENU MENU_JOYKBDMAP1, MENU_KBDMAP, MENU_KBDMAP1, - MENU_SCRIPTS_PRE, - MENU_SCRIPTS_PRE1, - MENU_SCRIPTS, - MENU_SCRIPTS1, - MENU_SCRIPTS_FB, - MENU_SCRIPTS_FB2, MENU_BTPAIR, MENU_WMPAIR, MENU_WMPAIR1, MENU_LGCAL, MENU_LGCAL1, MENU_LGCAL2, + + MENU_SCRIPTS_PRE, + MENU_SCRIPTS_PRE1, + MENU_SCRIPTS, + MENU_SCRIPTS1, + MENU_SCRIPTS_FB, + MENU_SCRIPTS_FB2, + MENU_CHEATS1, MENU_CHEATS2, - MENU_RECENT1, - MENU_RECENT2, - // Atari ST specific pages + MENU_UART1, + MENU_UART2, + MENU_BAUD1, + MENU_BAUD2, + MENU_SFONT_FILE_SELECTED, + + MENU_COEFF_FILE_SELECTED, + MENU_GAMMA_FILE_SELECTED, + MENU_AFILTER_FILE_SELECTED, + + // Generic + MENU_GENERIC_MAIN1, + MENU_GENERIC_MAIN2, + MENU_GENERIC_FILE_SELECTED, + MENU_GENERIC_IMAGE_SELECTED, + + // Arcade + MENU_ARCADE_DIP1, + MENU_ARCADE_DIP2, + + // Minimig + MENU_MINIMIG_MAIN1, + MENU_MINIMIG_MAIN2, + MENU_MINIMIG_VIDEO1, + MENU_MINIMIG_VIDEO2, + MENU_MINIMIG_MEMORY1, + MENU_MINIMIG_MEMORY2, + MENU_MINIMIG_CHIPSET1, + MENU_MINIMIG_CHIPSET2, + MENU_MINIMIG_HARDFILE1, + MENU_MINIMIG_HARDFILE2, + MENU_MINIMIG_HARDFILE_SELECTED, + MENU_MINIMIG_HARDFILE_SELECTED2, + MENU_MINIMIG_HARDFILE_SELECTED3, + MENU_MINIMIG_ADFFILE_SELECTED, + MENU_MINIMIG_ROMFILE_SELECTED, + MENU_MINIMIG_LOADCONFIG1, + MENU_MINIMIG_LOADCONFIG2, + MENU_MINIMIG_SAVECONFIG1, + MENU_MINIMIG_SAVECONFIG2, + + // Atari ST MENU_ST_MAIN1, MENU_ST_MAIN2, MENU_ST_SYSTEM1, @@ -145,34 +170,10 @@ enum MENU MENU_ST_SAVE_CONFIG1, MENU_ST_SAVE_CONFIG2, - // archimedes menu entries + // Archie MENU_ARCHIE_MAIN1, MENU_ARCHIE_MAIN2, MENU_ARCHIE_MAIN_FILE_SELECTED, - - MENU_UART1, - MENU_UART2, - MENU_BAUD1, - MENU_BAUD2, - MENU_SFONT_FILE_SELECTED, - - // 8bit menu entries - MENU_8BIT_MAIN1, - MENU_8BIT_MAIN2, - MENU_8BIT_MAIN_FILE_SELECTED, - MENU_8BIT_MAIN_IMAGE_SELECTED, - MENU_8BIT_SYSTEM1, - MENU_8BIT_SYSTEM2, - MENU_COEFF_FILE_SELECTED, - MENU_GAMMA_FILE_SELECTED, - MENU_AFILTER_FILE_SELECTED, - MENU_8BIT_INFO, - MENU_8BIT_INFO2, - MENU_8BIT_ABOUT1, - MENU_8BIT_ABOUT2, - - MENU_ARCADE_DIP1, - MENU_ARCADE_DIP2 }; static uint32_t menustate = MENU_NONE1; @@ -519,7 +520,7 @@ static uint32_t menu_key_get(void) else if (CheckTimer(repeat)) { repeat = GetTimer(REPEATRATE); - if (GetASCIIKey(c1) || ((menustate == MENU_8BIT_SYSTEM2) && (menusub == 13)) || ((menustate == MENU_SYSTEM2) && (menusub == 4))) + if (GetASCIIKey(c1) || ((menustate == MENU_COMMON2) && (menusub == 13)) || ((menustate == MENU_SYSTEM2) && (menusub == 4))) { c = c1; hold_cnt++; @@ -1254,7 +1255,7 @@ void HandleUI(void) // only updating values in this function as necessary. // if (user_io_core_type() == CORE_TYPE_SHARPMZ) - sharpmz_ui(MENU_NONE1, MENU_NONE2, MENU_8BIT_SYSTEM1, MENU_FILE_SELECT1, + sharpmz_ui(MENU_NONE1, MENU_NONE2, MENU_COMMON1, MENU_FILE_SELECT1, &parentstate, &menustate, &menusub, &menusub_last, &menumask, Selected_F[0], &helptext_idx, helptext_custom, &fs_ExtLen, &fs_Options, &fs_MenuSelect, &fs_MenuCancel, @@ -1317,18 +1318,18 @@ void HandleUI(void) } else if (is_minimig()) { - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; } else { if ((get_key_mod() & (LGUI | RGUI)) && !is_x86() && has_menu()) //Win+Menu { - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; } else { parentstate = MENU_NONE1; - menustate = MENU_8BIT_MAIN1; + menustate = MENU_GENERIC_MAIN1; } } } @@ -1488,12 +1489,12 @@ void HandleUI(void) if (right) { - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; menusub = 0; } else if (left) { - menustate = MENU_8BIT_INFO; + menustate = MENU_MISC1; menusub = 3; } break; @@ -1524,7 +1525,7 @@ void HandleUI(void) /* 8 bit main menu */ /******************************************************************/ - case MENU_8BIT_MAIN1: { + case MENU_GENERIC_MAIN1: { spi_uio_cmd_cont(UIO_GET_OSDMASK); hdmask = spi_w(0); DisableIO(); @@ -1817,13 +1818,13 @@ void HandleUI(void) if (!entry) { if (page) page = 0; - else menustate = MENU_8BIT_SYSTEM1; + else menustate = MENU_COMMON1; menusub = 0; break; } parentstate = menustate; - menustate = MENU_8BIT_MAIN2; + menustate = MENU_GENERIC_MAIN2; // set helptext with core display on top of basic info sprintf(helptext_custom, HELPTEXT_SPACER); @@ -1831,10 +1832,10 @@ void HandleUI(void) strcat(helptext_custom, helptexts[HELPTEXT_MAIN]); helptext_idx = HELPTEXT_CUSTOM; - } break; // end MENU_8BIT_MAIN1 + } break; - case MENU_8BIT_MAIN2: - saved_menustate = MENU_8BIT_MAIN1; + case MENU_GENERIC_MAIN2: + saved_menustate = MENU_GENERIC_MAIN1; // menu key closes menu if (menu) @@ -1846,7 +1847,7 @@ void HandleUI(void) if(!page) menustate = MENU_NONE1; else { - menustate = MENU_8BIT_MAIN1; + menustate = MENU_GENERIC_MAIN1; menusub = menusub_parent; page = 0; } @@ -1858,7 +1859,7 @@ void HandleUI(void) if (!page) menustate = MENU_NONE1; else { - menustate = MENU_8BIT_MAIN1; + menustate = MENU_GENERIC_MAIN1; menusub = menusub_parent; page = 0; } @@ -1952,8 +1953,8 @@ void HandleUI(void) while (strlen(ext) % 3) strcat(ext, " "); fs_Options = SCANO_DIR | (is_neogeo() ? SCANO_NEOGEO | SCANO_NOENTER : 0); - fs_MenuSelect = MENU_8BIT_MAIN_FILE_SELECTED; - fs_MenuCancel = MENU_8BIT_MAIN1; + fs_MenuSelect = MENU_GENERIC_FILE_SELECTED; + fs_MenuCancel = MENU_GENERIC_MAIN1; strcpy(fs_pFileExt, ext); if (select) SelectFile(Selected_F[ioctl_index & 15], ext, fs_Options, fs_MenuSelect, fs_MenuCancel); @@ -1967,8 +1968,8 @@ void HandleUI(void) while (strlen(ext) % 3) strcat(ext, " "); fs_Options = SCANO_DIR | SCANO_UMOUNT; - fs_MenuSelect = MENU_8BIT_MAIN_IMAGE_SELECTED; - fs_MenuCancel = MENU_8BIT_MAIN1; + fs_MenuSelect = MENU_GENERIC_IMAGE_SELECTED; + fs_MenuCancel = MENU_GENERIC_MAIN1; strcpy(fs_pFileExt, ext); memcpy(Selected_tmp, Selected_S[(int)ioctl_index], sizeof(Selected_tmp)); @@ -2000,7 +2001,7 @@ void HandleUI(void) if (page < 1 || page > 9) page = 0; menusub_parent = menusub; substrcpy(title, p, 1); - menustate = MENU_8BIT_MAIN1; + menustate = MENU_GENERIC_MAIN1; menusub = 0; } else if (p[0] == 'C' && cheats_available() && select) @@ -2054,7 +2055,7 @@ void HandleUI(void) SetUARTMode(mode); } } - menustate = MENU_8BIT_MAIN1; + menustate = MENU_GENERIC_MAIN1; } else if (((p[0] == 'T') || (p[0] == 'R') || (p[0] == 't') || (p[0] == 'r')) && select) { @@ -2086,7 +2087,7 @@ void HandleUI(void) user_io_8bit_set_status(status ^ mask, mask, ex); user_io_8bit_set_status(status, mask, ex); - menustate = MENU_8BIT_MAIN1; + menustate = MENU_GENERIC_MAIN1; if (p[0] == 'R' || p[0] == 'r') menustate = MENU_NONE1; } } @@ -2095,7 +2096,7 @@ void HandleUI(void) { flat = !flat; page = 0; - menustate = MENU_8BIT_MAIN1; + menustate = MENU_GENERIC_MAIN1; menusub = 0; } } @@ -2103,26 +2104,26 @@ void HandleUI(void) } else if (right && !page) { - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; menusub = 0; } else if (left) { if (page) { - menustate = MENU_8BIT_MAIN1; + menustate = MENU_GENERIC_MAIN1; menusub = menusub_parent; page = 0; } else { - menustate = MENU_8BIT_INFO; + menustate = MENU_MISC1; menusub = 3; } } break; - case MENU_8BIT_MAIN_FILE_SELECTED: + case MENU_GENERIC_FILE_SELECTED: { MenuHide(); printf("File selected: %s\n", selPath); @@ -2153,9 +2154,9 @@ void HandleUI(void) } break; - case MENU_8BIT_MAIN_IMAGE_SELECTED: + case MENU_GENERIC_IMAGE_SELECTED: { - menustate = MENU_8BIT_MAIN1; + menustate = MENU_GENERIC_MAIN1; if (selPath[0] && !is_x86()) MenuHide(); printf("Image selected: %s\n", selPath); @@ -2189,15 +2190,15 @@ void HandleUI(void) } break; - case MENU_8BIT_SYSTEM1: + case MENU_COMMON1: { OsdSetSize(16); helptext_idx = 0; reboot_req = 0; OsdSetTitle("System", 0); - menustate = MENU_8BIT_SYSTEM2; - parentstate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON2; + parentstate = MENU_COMMON1; int n; while(1) @@ -2311,7 +2312,7 @@ void HandleUI(void) } break; - case MENU_8BIT_SYSTEM2: + case MENU_COMMON2: if (menu) { switch (user_io_core_type()) @@ -2330,7 +2331,7 @@ void HandleUI(void) { fs_Options = SCANO_CORES; fs_MenuSelect = MENU_CORE_FILE_SELECTED1; - fs_MenuCancel = MENU_8BIT_SYSTEM1; + fs_MenuCancel = MENU_COMMON1; if (recent_init(-1)) menustate = MENU_RECENT1; break; @@ -2341,7 +2342,7 @@ void HandleUI(void) switch (menusub) { case 0: - SelectFile("", 0, SCANO_CORES, MENU_CORE_FILE_SELECTED1, MENU_8BIT_SYSTEM1); + SelectFile("", 0, SCANO_CORES, MENU_CORE_FILE_SELECTED1, MENU_COMMON1); menusub = 0; break; @@ -2392,7 +2393,7 @@ void HandleUI(void) case 5: video_set_scaler_flt(video_get_scaler_flt() ? 0 : 1); - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; break; case 6: @@ -2400,12 +2401,12 @@ void HandleUI(void) { snprintf(Selected_tmp, sizeof(Selected_tmp), COEFF_DIR"/%s", video_get_scaler_coeff()); if(!FileExists(Selected_tmp)) snprintf(Selected_tmp, sizeof(Selected_tmp), COEFF_DIR); - SelectFile(Selected_tmp, 0, SCANO_DIR | SCANO_TXT, MENU_COEFF_FILE_SELECTED, MENU_8BIT_SYSTEM1); + SelectFile(Selected_tmp, 0, SCANO_DIR | SCANO_TXT, MENU_COEFF_FILE_SELECTED, MENU_COMMON1); } break; case 7: video_set_gamma_en(video_get_gamma_en() ? 0 : 1); - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; break; case 8: @@ -2413,12 +2414,12 @@ void HandleUI(void) { snprintf(Selected_tmp, sizeof(Selected_tmp), GAMMA_DIR"/%s", video_get_gamma_curve()); if (!FileExists(Selected_tmp)) snprintf(Selected_tmp, sizeof(Selected_tmp), GAMMA_DIR); - SelectFile(Selected_tmp, 0, SCANO_DIR | SCANO_TXT, MENU_GAMMA_FILE_SELECTED, MENU_8BIT_SYSTEM1); + SelectFile(Selected_tmp, 0, SCANO_DIR | SCANO_TXT, MENU_GAMMA_FILE_SELECTED, MENU_COMMON1); } break; case 9: audio_set_filter_en(audio_filter_en() ? 0 : 1); - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; break; case 10: @@ -2426,7 +2427,7 @@ void HandleUI(void) { snprintf(Selected_tmp, sizeof(Selected_tmp), AFILTER_DIR"/%s", audio_get_filter()); if (!FileExists(Selected_tmp)) snprintf(Selected_tmp, sizeof(Selected_tmp), AFILTER_DIR); - SelectFile(Selected_tmp, 0, SCANO_DIR | SCANO_TXT, MENU_AFILTER_FILE_SELECTED, MENU_8BIT_SYSTEM1); + SelectFile(Selected_tmp, 0, SCANO_DIR | SCANO_TXT, MENU_AFILTER_FILE_SELECTED, MENU_COMMON1); } break; case 11: @@ -2444,7 +2445,7 @@ void HandleUI(void) case 12: // Save settings - menustate = MENU_8BIT_MAIN1; + menustate = MENU_GENERIC_MAIN1; menusub = 0; if (is_archie()) @@ -2480,7 +2481,7 @@ void HandleUI(void) break; case 14: - menustate = MENU_8BIT_ABOUT1; + menustate = MENU_ABOUT1; menusub = 0; break; @@ -2503,7 +2504,7 @@ void HandleUI(void) if (is_minimig()) { menusub = 0; - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; } else if (is_archie()) { @@ -2518,7 +2519,7 @@ void HandleUI(void) else { menusub = 0; - menustate = MENU_8BIT_MAIN1; + menustate = MENU_GENERIC_MAIN1; } break; case CORE_TYPE_SHARPMZ: @@ -2600,7 +2601,7 @@ void HandleUI(void) case MENU_ARCADE_DIP2: if (menu) { - menustate = MENU_8BIT_MAIN1; + menustate = MENU_GENERIC_MAIN1; menusub = dip_submenu; arcade_sw_save(); } @@ -2683,7 +2684,7 @@ void HandleUI(void) case MENU_UART2: if (menu) { - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; menusub = 4; break; } @@ -2753,7 +2754,7 @@ void HandleUI(void) if (select) { ResetUART(); - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; menusub = 4; } break; @@ -2763,7 +2764,7 @@ void HandleUI(void) int mode = GetUARTMode() | (GetMidiLinkMode() << 8); sprintf(s, "uartmode.%s", user_io_get_core_name_ex()); FileSaveConfig(s, &mode, 4); - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; menusub = 4; } break; @@ -2845,7 +2846,7 @@ void HandleUI(void) while (*p == '/') p++; video_set_scaler_coeff(p); } - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; } break; @@ -2859,7 +2860,7 @@ void HandleUI(void) while (*p == '/') p++; video_set_gamma_curve(p); } - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; } break; @@ -2873,18 +2874,18 @@ void HandleUI(void) while (*p == '/') p++; audio_set_filter(p); } - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; } break; - case MENU_8BIT_INFO: + case MENU_MISC1: OsdSetSize(16); helptext_idx = 0; menumask = 0xF; - menustate = MENU_8BIT_INFO2; + menustate = MENU_MISC2; OsdSetTitle("Misc. Options", OSD_ARROW_RIGHT); - if (parentstate != MENU_8BIT_INFO) + if (parentstate != MENU_MISC1) { for (int i = 0; i < OsdGetSize() - 1; i++) OsdWrite(i, "", 0, 0); flag = 1; @@ -2892,7 +2893,7 @@ void HandleUI(void) flag |= altcfg() << 4; menusub = 3; } - parentstate = MENU_8BIT_INFO; + parentstate = MENU_MISC1; OsdWrite(1, " Information"); @@ -2944,7 +2945,7 @@ void HandleUI(void) OsdWrite(15, STD_EXIT, menusub == 3, 0, OSD_ARROW_RIGHT); break; - case MENU_8BIT_INFO2: + case MENU_MISC2: printSysInfo(); if ((select && menusub == 3) || menu) { @@ -2968,17 +2969,17 @@ void HandleUI(void) flag = (flag & 0xF) | (i << 4); } - menustate = MENU_8BIT_INFO; + menustate = MENU_MISC1; } else if(menusub == 1 && (right || left || minus || plus)) { set_core_volume((right || plus) ? 1 : -1); - menustate = MENU_8BIT_INFO; + menustate = MENU_MISC1; } else if (menusub == 2 && (right || left || minus || plus || select)) { set_volume((right || plus) ? 1 : (left || minus) ? -1 : 0); - menustate = MENU_8BIT_INFO; + menustate = MENU_MISC1; } else if (right) { @@ -2998,7 +2999,7 @@ void HandleUI(void) else if (is_minimig()) { menusub = 0; - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; } else if (is_archie()) { @@ -3013,7 +3014,7 @@ void HandleUI(void) else { menusub = 0; - menustate = MENU_8BIT_MAIN1; + menustate = MENU_GENERIC_MAIN1; } break; case CORE_TYPE_SHARPMZ: @@ -3035,7 +3036,7 @@ void HandleUI(void) if (!user_io_user_button()) { finish_map_setting(2); - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; menusub = 1; } break; @@ -3234,7 +3235,7 @@ void HandleUI(void) } else { - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; menusub = 1; } } @@ -3244,7 +3245,7 @@ void HandleUI(void) case MENU_JOYDIGMAP2: if (select || menu) { - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; menusub = 1; } break; @@ -3264,7 +3265,7 @@ void HandleUI(void) case MENU_JOYDIGMAP4: if (menu) { - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; menusub = 1; break; } @@ -3273,7 +3274,7 @@ void HandleUI(void) switch (menusub) { case 0: - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; menusub = 1; break; @@ -3340,24 +3341,24 @@ void HandleUI(void) if (select || menu) { finish_map_setting(menu); - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; menusub = 2; } break; - case MENU_8BIT_ABOUT1: + case MENU_ABOUT1: OsdSetSize(16); menumask = 0; helptext_idx = 0; OsdSetTitle("About", 0); - menustate = MENU_8BIT_ABOUT2; - parentstate = MENU_8BIT_ABOUT1; + menustate = MENU_ABOUT2; + parentstate = MENU_ABOUT1; StarsInit(); ScrollReset(); for (int i = 5; i < OsdGetSize(); i++) OsdWrite(i, "", 0, 0); break; - case MENU_8BIT_ABOUT2: + case MENU_ABOUT2: StarsUpdate(); OsdDrawLogo(0); OsdDrawLogo(1); @@ -3386,7 +3387,7 @@ void HandleUI(void) if (menu | select | left) { - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; menusub = 14; } break; @@ -3440,12 +3441,12 @@ void HandleUI(void) } else if (right) { - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; menusub = 0; } else if (left) { - menustate = MENU_8BIT_INFO; + menustate = MENU_MISC1; menusub = 3; } else if (menusub <= 1 && (select || recent)) @@ -3895,7 +3896,7 @@ void HandleUI(void) /******************************************************************/ /* minimig main menu */ /******************************************************************/ - case MENU_MAIN1: + case MENU_MINIMIG_MAIN1: menumask = 0x1FF0; // b01110000 Floppy turbo, Harddisk options & Exit. OsdSetTitle("Minimig", OSD_ARROW_RIGHT | OSD_ARROW_LEFT); helptext_idx = HELPTEXT_MAIN; @@ -3968,23 +3969,23 @@ void HandleUI(void) OsdWrite(15, STD_EXIT, menusub == 12, 0); - menustate = MENU_MAIN2; - parentstate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN2; + parentstate = MENU_MINIMIG_MAIN1; break; - case MENU_MAIN2: + case MENU_MINIMIG_MAIN2: if (menu) menustate = MENU_NONE1; else if (plus && (minimig_config.floppy.drives<3) && menusub < 4) { minimig_config.floppy.drives++; minimig_ConfigFloppy(minimig_config.floppy.drives, minimig_config.floppy.speed); - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; } else if (minus && (minimig_config.floppy.drives>0) && menusub < 4) { minimig_config.floppy.drives--; minimig_ConfigFloppy(minimig_config.floppy.drives, minimig_config.floppy.speed); - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; } else if (select || recent || minus || plus) { @@ -3995,14 +3996,14 @@ void HandleUI(void) { df[menusub].status = 0; FileClose(&df[menusub].file); - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; } else { df[menusub].status = 0; fs_Options = SCANO_DIR; - fs_MenuSelect = MENU_FILE_SELECTED; - fs_MenuCancel = MENU_MAIN1; + fs_MenuSelect = MENU_MINIMIG_ADFFILE_SELECTED; + fs_MenuCancel = MENU_MINIMIG_MAIN1; strcpy(fs_pFileExt, "ADF"); if(select) SelectFile(Selected_F[menusub], "ADF", fs_Options, fs_MenuSelect, fs_MenuCancel); else if (recent_init(0)) menustate = MENU_RECENT1; @@ -4012,39 +4013,39 @@ void HandleUI(void) { minimig_config.floppy.speed ^= 1; minimig_ConfigFloppy(minimig_config.floppy.drives, minimig_config.floppy.speed); - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; } else if (select) { if (menusub == 5) // Go to harddrives page. { - menustate = MENU_SETTINGS_HARDFILE1; + menustate = MENU_MINIMIG_HARDFILE1; menusub = 0; } else if (menusub == 6) { - menustate = MENU_SETTINGS_CHIPSET1; + menustate = MENU_MINIMIG_CHIPSET1; menusub = 0; } else if (menusub == 7) { - menustate = MENU_SETTINGS_MEMORY1; + menustate = MENU_MINIMIG_MEMORY1; menusub = 0; } else if (menusub == 8) { - menustate = MENU_SETTINGS_VIDEO1; + menustate = MENU_MINIMIG_VIDEO1; menusub = 0; } else if (menusub == 9) { menusub = 0; - menustate = MENU_SAVECONFIG_1; + menustate = MENU_MINIMIG_SAVECONFIG1; } else if (menusub == 10) { menusub = 0; - menustate = MENU_LOADCONFIG_1; + menustate = MENU_MINIMIG_LOADCONFIG1; } else if (menusub == 11) { @@ -4060,29 +4061,29 @@ void HandleUI(void) else if (c == KEY_BACKSPACE) // eject all floppies { for (int i = 0; i <= drives; i++) df[i].status = 0; - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; } else if (right) { - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; menusub = 0; } else if (left) { - menustate = MENU_8BIT_INFO; + menustate = MENU_MISC1; menusub = 3; } break; - case MENU_FILE_SELECTED: + case MENU_MINIMIG_ADFFILE_SELECTED: memcpy(Selected_F[menusub], selPath, sizeof(Selected_F[menusub])); recent_update(SelectedDir, selPath, SelectedLabel, 0); InsertFloppy(&df[menusub], selPath); if (menusub < drives) menusub++; - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; break; - case MENU_LOADCONFIG_1: + case MENU_MINIMIG_LOADCONFIG1: helptext_idx = 0; if (parentstate != menustate) menumask = 0x400; @@ -4123,14 +4124,14 @@ void HandleUI(void) while(m < OsdGetSize() - 1) OsdWrite(m++); OsdWrite(OsdGetSize() - 1, STD_EXIT, menusub == 10, 0); - menustate = MENU_LOADCONFIG_2; + menustate = MENU_MINIMIG_LOADCONFIG2; break; - case MENU_LOADCONFIG_2: + case MENU_MINIMIG_LOADCONFIG2: if (down) { if (menusub < 9) menusub++; - menustate = MENU_LOADCONFIG_1; + menustate = MENU_MINIMIG_LOADCONFIG1; } else if (select) { @@ -4142,13 +4143,13 @@ void HandleUI(void) } else { - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; menusub = 10; } } if (menu || left) // exit menu { - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; menusub = 10; } break; @@ -4358,7 +4359,7 @@ void HandleUI(void) if (menu) { - menustate = MENU_8BIT_MAIN1; + menustate = MENU_GENERIC_MAIN1; menusub = cheatsub; break; } @@ -4522,7 +4523,7 @@ void HandleUI(void) } else if(m == 2) { - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; sharpmz_reset_config(1); } else @@ -4531,7 +4532,7 @@ void HandleUI(void) uint32_t status[2] = { user_io_8bit_set_status(0, 0xffffffff, 0), user_io_8bit_set_status(0, 0xffffffff, 1) }; printf("Saving config to %s\n", filename); FileSaveConfig(filename, status, 8); - menustate = MENU_8BIT_MAIN1; + menustate = MENU_GENERIC_MAIN1; if (arcade_sw()->dip_num) { arcade_sw()->dip_cur = arcade_sw()->dip_def; @@ -4547,12 +4548,12 @@ void HandleUI(void) if (menu || (select && (menusub == 1))) // exit menu { - menustate = MENU_8BIT_SYSTEM1; + menustate = MENU_COMMON1; menusub = 11; } break; - case MENU_SAVECONFIG_1: + case MENU_MINIMIG_SAVECONFIG1: helptext_idx = 0; menumask = 0x7ff; parentstate = menustate; @@ -4594,10 +4595,10 @@ void HandleUI(void) while (m < OsdGetSize() - 1) OsdWrite(m++); OsdWrite(OsdGetSize() - 1, STD_EXIT, menusub == 10, 0); - menustate = MENU_SAVECONFIG_2; + menustate = MENU_MINIMIG_SAVECONFIG2; break; - case MENU_SAVECONFIG_2: + case MENU_MINIMIG_SAVECONFIG2: if (select) { int fastcfg = ((minimig_config.memory >> 4) & 0x03) | ((minimig_config.memory & 0x80) >> 5); @@ -4625,13 +4626,13 @@ void HandleUI(void) minimig_config.info[sizeof(minimig_config.info) - 1] = 0; if (menusub<10) minimig_cfg_save(menusub); - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; menusub = 9; } else if (menu || left) // exit menu { - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; menusub = 9; } break; @@ -4639,7 +4640,7 @@ void HandleUI(void) /******************************************************************/ /* chipset settings menu */ /******************************************************************/ - case MENU_SETTINGS_CHIPSET1: + case MENU_MINIMIG_CHIPSET1: helptext_idx = HELPTEXT_CHIPSET; menumask = 0xf9; OsdSetTitle("Chipset", OSD_ARROW_LEFT | OSD_ARROW_RIGHT); @@ -4673,35 +4674,35 @@ void HandleUI(void) for (int i = m; i < OsdGetSize() - 1; i++) OsdWrite(i, "", 0, 0); OsdWrite(OsdGetSize() - 1, STD_EXIT, menusub == 7, 0); - menustate = MENU_SETTINGS_CHIPSET2; + menustate = MENU_MINIMIG_CHIPSET2; break; - case MENU_SETTINGS_CHIPSET2: - saved_menustate = MENU_SETTINGS_CHIPSET1; + case MENU_MINIMIG_CHIPSET2: + saved_menustate = MENU_MINIMIG_CHIPSET1; if (select || minus || plus) { if (menusub == 0) { - menustate = MENU_SETTINGS_CHIPSET1; + menustate = MENU_MINIMIG_CHIPSET1; minimig_config.cpu = (minimig_config.cpu & 0xfc) | ((minimig_config.cpu & 1) ? 0 : 3); minimig_ConfigCPU(minimig_config.cpu); } else if (menusub == 1 && (minimig_config.cpu & 0x2)) { - menustate = MENU_SETTINGS_CHIPSET1; + menustate = MENU_MINIMIG_CHIPSET1; minimig_config.cpu ^= 4; minimig_ConfigCPU(minimig_config.cpu); } else if (menusub == 2 && (minimig_config.cpu & 0x2)) { - menustate = MENU_SETTINGS_CHIPSET1; + menustate = MENU_MINIMIG_CHIPSET1; minimig_config.cpu ^= 8; minimig_ConfigCPU(minimig_config.cpu); } else if (menusub == 3 && (minimig_config.cpu & 0x2)) { - menustate = MENU_SETTINGS_CHIPSET1; + menustate = MENU_MINIMIG_CHIPSET1; minimig_config.cpu ^= 16; minimig_ConfigCPU(minimig_config.cpu); } @@ -4744,24 +4745,24 @@ void HandleUI(void) } } - menustate = MENU_SETTINGS_CHIPSET1; + menustate = MENU_MINIMIG_CHIPSET1; minimig_ConfigChipset(minimig_config.chipset); } else if (menusub == 5) { minimig_config.autofire ^= 0x4; - menustate = MENU_SETTINGS_CHIPSET1; + menustate = MENU_MINIMIG_CHIPSET1; minimig_ConfigAutofire(minimig_config.autofire, 0x4); } else if (menusub == 6) { minimig_config.autofire ^= 0x8; - menustate = MENU_SETTINGS_CHIPSET1; + menustate = MENU_MINIMIG_CHIPSET1; minimig_ConfigAutofire(minimig_config.autofire, 0x8); } else if (menusub == 7) { - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; menusub = 6; } } @@ -4772,7 +4773,7 @@ void HandleUI(void) } else if (back || left) { - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; menusub = 6; } break; @@ -4780,7 +4781,7 @@ void HandleUI(void) /******************************************************************/ /* memory settings menu */ /******************************************************************/ - case MENU_SETTINGS_MEMORY1: + case MENU_MINIMIG_MEMORY1: helptext_idx = HELPTEXT_MEMORY; menumask = 0x3f; parentstate = menustate; @@ -4811,17 +4812,17 @@ void HandleUI(void) for (int i = 7; i < OsdGetSize() - 1; i++) OsdWrite(i, "", 0, 0); OsdWrite(OsdGetSize() - 1, STD_EXIT, menusub == 5, 0); - menustate = MENU_SETTINGS_MEMORY2; + menustate = MENU_MINIMIG_MEMORY2; break; - case MENU_SETTINGS_MEMORY2: - saved_menustate = MENU_SETTINGS_MEMORY1; + case MENU_MINIMIG_MEMORY2: + saved_menustate = MENU_MINIMIG_MEMORY1; if (select || minus || plus) { if (menusub == 0) { minimig_config.memory = ((minimig_config.memory + (minus ? -1 : 1)) & 0x03) | (minimig_config.memory & ~0x03); - menustate = MENU_SETTINGS_MEMORY1; + menustate = MENU_MINIMIG_MEMORY1; } else if (menusub == 1) { @@ -4839,26 +4840,26 @@ void HandleUI(void) if (!(minimig_config.cpu & 2) && c > 3) c = 0; } minimig_config.memory = ((c<<4) & 0x30) | ((c<<5) & 0x80) | (minimig_config.memory & ~0xB0); - menustate = MENU_SETTINGS_MEMORY1; + menustate = MENU_MINIMIG_MEMORY1; } else if (menusub == 2) { minimig_config.memory = ((minimig_config.memory + (minus ? -4 : 4)) & 0x0C) | (minimig_config.memory & ~0x0C); - menustate = MENU_SETTINGS_MEMORY1; + menustate = MENU_MINIMIG_MEMORY1; } else if (menusub == 3 && select) { ioctl_index = 1; - SelectFile(Selected_F[4], "ROM", 0, MENU_ROMFILE_SELECTED, MENU_SETTINGS_MEMORY1); + SelectFile(Selected_F[4], "ROM", 0, MENU_MINIMIG_ROMFILE_SELECTED, MENU_MINIMIG_MEMORY1); } else if (menusub == 4) { minimig_config.memory ^= 0x40; - menustate = MENU_SETTINGS_MEMORY1; + menustate = MENU_MINIMIG_MEMORY1; } else if (menusub == 5 && select) { - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; menusub = 7; } } @@ -4869,15 +4870,15 @@ void HandleUI(void) } else if (back || left) { - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; menusub = 7; } break; - case MENU_ROMFILE_SELECTED: + case MENU_MINIMIG_ROMFILE_SELECTED: memcpy(Selected_F[4], selPath, sizeof(Selected_F[4])); minimig_set_kickstart(selPath); - menustate = MENU_SETTINGS_MEMORY1; + menustate = MENU_MINIMIG_MEMORY1; break; /******************************************************************/ @@ -4888,7 +4889,7 @@ void HandleUI(void) // which could be disastrous if the user's writing to the drive at the time! // Make the menu work on the copy, not the original, and copy on acceptance, // not on rejection. - case MENU_SETTINGS_HARDFILE1: + case MENU_MINIMIG_HARDFILE1: helptext_idx = HELPTEXT_HARDFILE; OsdSetTitle("Harddisks", OSD_ARROW_LEFT | OSD_ARROW_RIGHT); @@ -4927,11 +4928,11 @@ void HandleUI(void) } OsdWrite(OsdGetSize() - 1, STD_EXIT, menusub == 9, 0); - menustate = MENU_SETTINGS_HARDFILE2; + menustate = MENU_MINIMIG_HARDFILE2; break; - case MENU_SETTINGS_HARDFILE2: - saved_menustate = MENU_SETTINGS_HARDFILE1; + case MENU_MINIMIG_HARDFILE2: + saved_menustate = MENU_MINIMIG_HARDFILE1; if (select || recent) { @@ -4940,7 +4941,7 @@ void HandleUI(void) if (select) { minimig_config.enable_ide = (minimig_config.enable_ide == 0); - menustate = MENU_SETTINGS_HARDFILE1; + menustate = MENU_MINIMIG_HARDFILE1; } } else if (menusub < 9) @@ -4951,14 +4952,14 @@ void HandleUI(void) { int num = (menusub - 1) / 2; minimig_config.hardfile[num].enabled = minimig_config.hardfile[num].enabled ? 0 : 1; - menustate = MENU_SETTINGS_HARDFILE1; + menustate = MENU_MINIMIG_HARDFILE1; } } else { fs_Options = SCANO_DIR | SCANO_UMOUNT; - fs_MenuSelect = MENU_HARDFILE_SELECTED; - fs_MenuCancel = MENU_SETTINGS_HARDFILE1; + fs_MenuSelect = MENU_MINIMIG_HARDFILE_SELECTED; + fs_MenuCancel = MENU_MINIMIG_HARDFILE1; strcpy(fs_pFileExt, "HDFVHDIMGDSK"); if (select) { @@ -4971,7 +4972,7 @@ void HandleUI(void) } else if (menusub == 9 && select) // return to previous menu { - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; menusub = 5; } } @@ -4982,7 +4983,7 @@ void HandleUI(void) } else if (back || left) { - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; menusub = 5; } break; @@ -4990,7 +4991,7 @@ void HandleUI(void) /******************************************************************/ /* hardfile selected menu */ /******************************************************************/ - case MENU_HARDFILE_SELECTED: + case MENU_MINIMIG_HARDFILE_SELECTED: { memcpy(Selected_S[(menusub - 2) / 2], selPath, sizeof(Selected_S[(menusub - 2) / 2])); recent_update(SelectedDir, selPath, SelectedLabel, 500); @@ -4999,11 +5000,11 @@ void HandleUI(void) if (len > sizeof(minimig_config.hardfile[num].filename) - 1) len = sizeof(minimig_config.hardfile[num].filename) - 1; if(len) memcpy(minimig_config.hardfile[num].filename, selPath, len); minimig_config.hardfile[num].filename[len] = 0; - menustate = checkHDF(minimig_config.hardfile[num].filename, &rdb) ? MENU_SETTINGS_HARDFILE1 : MENU_HARDFILE_SELECTED2; + menustate = checkHDF(minimig_config.hardfile[num].filename, &rdb) ? MENU_MINIMIG_HARDFILE1 : MENU_MINIMIG_HARDFILE_SELECTED2; } break; - case MENU_HARDFILE_SELECTED2: + case MENU_MINIMIG_HARDFILE_SELECTED2: m = 0; menumask = 0x1; if (!rdb) @@ -5041,22 +5042,22 @@ void HandleUI(void) menusub_last = menusub; menusub = 0; - menustate = MENU_HARDFILE_SELECTED3; + menustate = MENU_MINIMIG_HARDFILE_SELECTED3; break; - case MENU_HARDFILE_SELECTED3: + case MENU_MINIMIG_HARDFILE_SELECTED3: if (select || menu) { menusub = menusub_last; parentstate = menustate; - menustate = MENU_SETTINGS_HARDFILE1; + menustate = MENU_MINIMIG_HARDFILE1; } break; /******************************************************************/ /* video settings menu */ /******************************************************************/ - case MENU_SETTINGS_VIDEO1: + case MENU_MINIMIG_VIDEO1: menumask = 0x7f; parentstate = menustate; helptext_idx = 0; // helptexts[HELPTEXT_VIDEO]; @@ -5088,14 +5089,14 @@ void HandleUI(void) for (; m < OsdGetSize() - 1; m++) OsdWrite(m); OsdWrite(OsdGetSize() - 1, STD_EXIT, menusub == 6, 0); - menustate = MENU_SETTINGS_VIDEO2; + menustate = MENU_MINIMIG_VIDEO2; break; - case MENU_SETTINGS_VIDEO2: - saved_menustate = MENU_SETTINGS_VIDEO1; + case MENU_MINIMIG_VIDEO2: + saved_menustate = MENU_MINIMIG_VIDEO1; if (select || minus || plus) { - menustate = MENU_SETTINGS_VIDEO1; + menustate = MENU_MINIMIG_VIDEO1; if (menusub == 0) { minimig_config.chipset ^= CONFIG_NTSC; @@ -5140,7 +5141,7 @@ void HandleUI(void) } else if (menusub == 6) { - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; menusub = 8; } } @@ -5151,7 +5152,7 @@ void HandleUI(void) } else if (back || left) { - menustate = MENU_MAIN1; + menustate = MENU_MINIMIG_MAIN1; menusub = 8; } break; @@ -5304,7 +5305,7 @@ void HandleUI(void) } else if (left) { - menustate = MENU_8BIT_INFO; + menustate = MENU_MISC1; } if (!hold_cnt && reboot_req) fpga_load_rbf("menu.rbf"); @@ -6046,8 +6047,8 @@ int menu_allow_cfg_switch() { case MENU_ST_MAIN2: case MENU_ARCHIE_MAIN2: - case MENU_MAIN2: - case MENU_8BIT_SYSTEM2: + case MENU_MINIMIG_MAIN2: + case MENU_COMMON2: case MENU_SYSTEM2: return 1; @@ -6055,7 +6056,7 @@ int menu_allow_cfg_switch() if (is_menu() && (fs_Options & SCANO_CORES)) return 1; break; - case MENU_8BIT_MAIN2: + case MENU_GENERIC_MAIN2: if (!page) return 1; break; }