joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 20:01:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove more

Browse Source
This commit is contained in:
Jonathan Campbell 2019-04-13 18:49:07 -07:00
parent 766bd82bf2
commit 9a6bee7b56
4 changed files with 0 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/gui/menu.cpp
View File

@ -176,26 +176,11 @@ static const char *def_menu_video_output[] =
NULL
};
/* video output menu ("VideoCompatMenu") */
static const char *def_menu_video_compat[] =
{
"vga_9widetext",
"doublescan",
NULL
};
/* video output menu ("VideoPC98Menu") */
static const char *def_menu_video_pc98[] =
{
"pc98_5mhz_gdc",
"pc98_allow_200scanline",
"pc98_allow_4partitions",
"--",
"pc98_enable_egc",
"pc98_enable_grcg",
"pc98_enable_analog",
"pc98_enable_analog256",
"pc98_enable_188user",
NULL
};
@ -221,7 +206,6 @@ static const char *def_menu_video[] =
"scaler_forced",
"VideoScalerMenu",
"VideoOutputMenu",
"VideoCompatMenu",
"VideoPC98Menu",
NULL
};
@ -231,8 +215,6 @@ static const char *def_menu_dos[] =
{
"DOSMouseMenu",
"--",
"DOSPC98Menu",
"--",
"mapper_swapimg",
"mapper_swapcd",
NULL
@ -245,14 +227,6 @@ static const char *def_menu_dos_mouse[] =
NULL
};
/* DOS pc-98 menu ("DOSPC98Menu") */
static const char *def_menu_dos_pc98[] =
{
"dos_pc98_pit_4mhz",
"dos_pc98_pit_5mhz",
NULL
};
/* sound menu ("SoundMenu") */
static const char *def_menu_sound[] =
{
@ -934,9 +908,6 @@ void ConstructMenu(void) {
/* video output menu */
ConstructSubMenu(mainMenu.get_item("VideoOutputMenu").get_master_id(), def_menu_video_output);
/* video compat menu */
ConstructSubMenu(mainMenu.get_item("VideoCompatMenu").get_master_id(), def_menu_video_compat);
/* video PC-98 menu */
ConstructSubMenu(mainMenu.get_item("VideoPC98Menu").get_master_id(), def_menu_video_pc98);
@ -948,9 +919,6 @@ void ConstructMenu(void) {
/* DOS mouse menu */
ConstructSubMenu(mainMenu.get_item("DOSMouseMenu").get_master_id(), def_menu_dos_mouse);
/* DOS PC-98 menu */
ConstructSubMenu(mainMenu.get_item("DOSPC98Menu").get_master_id(), def_menu_dos_pc98);
}
bool MENU_SetBool(std::string secname, std::string value) {

4
src/gui/render.cpp
View File

@ -694,8 +694,6 @@ void RENDER_OnSectionPropChange(Section *x) {
if (vga.draw.doublescan_set != p_doublescan || vga.draw.char9_set != p_char9)
VGA_StartResize();
mainMenu.get_item("vga_9widetext").check(vga.draw.char9_set).refresh_item(mainMenu);
mainMenu.get_item("doublescan").check(vga.draw.doublescan_set).refresh_item(mainMenu);
mainMenu.get_item("mapper_aspratio").check(render.aspect).refresh_item(mainMenu);
RENDER_UpdateFromScalerSetting();
@ -801,8 +799,6 @@ void RENDER_Init() {
render.frameskip.max=(Bitu)section->Get_int("frameskip");
mainMenu.get_item("vga_9widetext").check(vga.draw.char9_set).refresh_item(mainMenu);
mainMenu.get_item("doublescan").check(vga.draw.doublescan_set).refresh_item(mainMenu);
mainMenu.get_item("mapper_aspratio").check(render.aspect).refresh_item(mainMenu);
/* BUG FIX: Some people's dosbox.conf files have frameskip=-1 WTF?? */

248
src/gui/sdlmain.cpp
View File

@ -5321,39 +5321,6 @@ void update_pc98_clock_pit_menu(void) {
if (pc98rate == 0) pc98rate = 5; /* Pick the most likely to work with DOS games (FIXME: This is a GUESS!! Is this correct?) */
else if (pc98rate < 5) pc98rate = 4;
else pc98rate = 5;
mainMenu.get_item("dos_pc98_pit_4mhz").check(pc98rate == 4).refresh_item(mainMenu);
mainMenu.get_item("dos_pc98_pit_5mhz").check(pc98rate == 5).refresh_item(mainMenu);
}
bool dos_pc98_clock_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const menuitem) {
(void)menu;//UNUSED
(void)menuitem;//UNUSED
void TIMER_OnPowerOn(Section*);
void TIMER_OnEnterPC98_Phase2_UpdateBDA(void);
const char *ts = menuitem->get_name().c_str();
if (!strncmp(ts,"dos_pc98_pit_",13))
ts += 13;
else
return true;
std::string tmp = "pc-98 timer master frequency=";
{
char tmp1[64];
sprintf(tmp1,"%u",atoi(ts));
tmp += tmp1;
}
Section_prop * dosbox_section = static_cast<Section_prop *>(control->GetSection("pc-98"));
dosbox_section->HandleInputline(tmp.c_str());
TIMER_OnPowerOn(NULL);
TIMER_OnEnterPC98_Phase2_UpdateBDA();
update_pc98_clock_pit_menu();
return true;
}
void SetScaleForced(bool forced);
@ -5393,28 +5360,6 @@ bool dos_mouse_sensitivity_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::ite
return true;
}
bool vid_pc98_5mhz_gdc_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const menuitem) {
(void)menu;//UNUSED
(void)menuitem;//UNUSED
if (IS_PC98_ARCH) {
void gdc_5mhz_mode_update_vars(void);
extern bool gdc_5mhz_mode;
gdc_5mhz_mode = !gdc_5mhz_mode;
gdc_5mhz_mode_update_vars();
Section_prop * dosbox_section = static_cast<Section_prop *>(control->GetSection("pc-98"));
if (gdc_5mhz_mode)
dosbox_section->HandleInputline("pc-98 start gdc at 5mhz=1");
else
dosbox_section->HandleInputline("pc-98 start gdc at 5mhz=0");
mainMenu.get_item("pc98_5mhz_gdc").check(gdc_5mhz_mode).refresh_item(mainMenu);
}
return true;
}
bool vid_pc98_200scanline_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const menuitem) {
(void)menu;//UNUSED
(void)menuitem;//UNUSED
@ -5456,141 +5401,6 @@ bool vid_pc98_4parts_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * co
return true;
}
bool vid_pc98_enable_188user_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const menuitem) {
(void)menu;//UNUSED
(void)menuitem;//UNUSED
void gdc_egc_enable_update_vars(void);
// extern bool enable_pc98_egc;
// extern bool enable_pc98_grcg;
// extern bool enable_pc98_16color;
extern bool enable_pc98_188usermod;
if(IS_PC98_ARCH) {
enable_pc98_188usermod = !enable_pc98_188usermod;
gdc_egc_enable_update_vars();
Section_prop * dosbox_section = static_cast<Section_prop *>(control->GetSection("pc-98"));
if (enable_pc98_188usermod)
dosbox_section->HandleInputline("pc-98 enable 188 user cg=1");
else
dosbox_section->HandleInputline("pc-98 enable 188 user cg=0");
mainMenu.get_item("pc98_enable_188user").check(enable_pc98_188usermod).refresh_item(mainMenu);
}
return true;
}
bool vid_pc98_enable_egc_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const menuitem) {
(void)menu;//UNUSED
(void)menuitem;//UNUSED
void gdc_egc_enable_update_vars(void);
extern bool enable_pc98_egc;
extern bool enable_pc98_grcg;
extern bool enable_pc98_16color;
// extern bool enable_pc98_188usermod;
if(IS_PC98_ARCH) {
enable_pc98_egc = !enable_pc98_egc;
gdc_egc_enable_update_vars();
Section_prop * dosbox_section = static_cast<Section_prop *>(control->GetSection("pc-98"));
if (enable_pc98_egc) {
dosbox_section->HandleInputline("pc-98 enable egc=1");
if(!enable_pc98_grcg) { //Also enable GRCG if GRCG is disabled when enabling EGC
enable_pc98_grcg = !enable_pc98_grcg;
mem_writeb(0x54C,(enable_pc98_grcg ? 0x02 : 0x00) | (enable_pc98_16color ? 0x04 : 0x00));
dosbox_section->HandleInputline("pc-98 enable grcg=1");
}
}
else
dosbox_section->HandleInputline("pc-98 enable egc=0");
mainMenu.get_item("pc98_enable_egc").check(enable_pc98_egc).refresh_item(mainMenu);
mainMenu.get_item("pc98_enable_grcg").check(enable_pc98_grcg).refresh_item(mainMenu);
}
return true;
}
bool vid_pc98_enable_grcg_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const menuitem) {
(void)menu;//UNUSED
(void)menuitem;//UNUSED
extern bool enable_pc98_grcg;
extern bool enable_pc98_egc;
void gdc_grcg_enable_update_vars(void);
if(IS_PC98_ARCH) {
enable_pc98_grcg = !enable_pc98_grcg;
gdc_grcg_enable_update_vars();
Section_prop * dosbox_section = static_cast<Section_prop *>(control->GetSection("pc-98"));
if (enable_pc98_grcg)
dosbox_section->HandleInputline("pc-98 enable grcg=1");
else
dosbox_section->HandleInputline("pc-98 enable grcg=0");
if ((!enable_pc98_grcg) && enable_pc98_egc) { // Also disable EGC if switching off GRCG
void gdc_egc_enable_update_vars(void);
enable_pc98_egc = !enable_pc98_egc;
gdc_egc_enable_update_vars();
dosbox_section->HandleInputline("pc-98 enable egc=0");
}
mainMenu.get_item("pc98_enable_egc").check(enable_pc98_egc).refresh_item(mainMenu);
mainMenu.get_item("pc98_enable_grcg").check(enable_pc98_grcg).refresh_item(mainMenu);
}
return true;
}
bool vid_pc98_enable_analog_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const menuitem) {
(void)menu;//UNUSED
(void)menuitem;//UNUSED
//NOTE: I thought that even later PC-9801s and some PC-9821s could use EGC features in digital 8-colors mode?
extern bool enable_pc98_16color;
void gdc_16color_enable_update_vars(void);
if(IS_PC98_ARCH) {
enable_pc98_16color = !enable_pc98_16color;
gdc_16color_enable_update_vars();
Section_prop * dosbox_section = static_cast<Section_prop *>(control->GetSection("pc-98"));
if (enable_pc98_16color)
dosbox_section->HandleInputline("pc-98 enable 16-color=1");
else
dosbox_section->HandleInputline("pc-98 enable 16-color=0");
mainMenu.get_item("pc98_enable_analog").check(enable_pc98_16color).refresh_item(mainMenu);
}
return true;
}
bool vid_pc98_enable_analog256_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const menuitem) {
(void)menu;//UNUSED
(void)menuitem;//UNUSED
//NOTE: I thought that even later PC-9801s and some PC-9821s could use EGC features in digital 8-colors mode?
extern bool enable_pc98_256color;
void gdc_16color_enable_update_vars(void);
if(IS_PC98_ARCH) {
enable_pc98_256color = !enable_pc98_256color;
gdc_16color_enable_update_vars();
Section_prop * dosbox_section = static_cast<Section_prop *>(control->GetSection("pc-98"));
if (enable_pc98_256color)
dosbox_section->HandleInputline("pc-98 enable 256-color=1");
else
dosbox_section->HandleInputline("pc-98 enable 256-color=0");
mainMenu.get_item("pc98_enable_analog256").check(enable_pc98_256color).refresh_item(mainMenu);
}
return true;
}
bool output_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const menuitem) {
(void)menu;//UNUSED
@ -5625,20 +5435,6 @@ bool output_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const menui
bool MENU_SetBool(std::string secname, std::string value);
bool vga_9widetext_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const menuitem) {
(void)menu;//UNUSED
(void)menuitem;//UNUSED
MENU_SetBool("render", "char9");
return true;
}
bool doublescan_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const menuitem) {
(void)menu;//UNUSED
(void)menuitem;//UNUSED
MENU_SetBool("render", "doublescan");
return true;
}
bool scaler_set_menu_callback(DOSBoxMenu * const menu,DOSBoxMenu::item * const menuitem) {
(void)menu;//UNUSED
@ -6269,15 +6065,6 @@ int main(int argc, char* argv[]) SDL_MAIN_NOEXCEPT {
set_callback_function(scaler_set_menu_callback);
}
}
{
DOSBoxMenu::item &item = mainMenu.alloc_item(DOSBoxMenu::submenu_type_id,"VideoCompatMenu");
item.set_text("Compatibility");
mainMenu.alloc_item(DOSBoxMenu::item_type_id,"vga_9widetext").set_text("Allow 9-pixel wide text mode").
set_callback_function(vga_9widetext_menu_callback);
mainMenu.alloc_item(DOSBoxMenu::item_type_id,"doublescan").set_text("Doublescan").
set_callback_function(doublescan_menu_callback);
}
{
DOSBoxMenu::item &item = mainMenu.alloc_item(DOSBoxMenu::submenu_type_id,"VideoOutputMenu");
item.set_text("Output");
@ -6293,22 +6080,10 @@ int main(int argc, char* argv[]) SDL_MAIN_NOEXCEPT {
DOSBoxMenu::item &item = mainMenu.alloc_item(DOSBoxMenu::submenu_type_id,"VideoPC98Menu");
item.set_text("PC-98");
mainMenu.alloc_item(DOSBoxMenu::item_type_id,"pc98_5mhz_gdc").set_text("5MHz GDC clock").
set_callback_function(vid_pc98_5mhz_gdc_menu_callback);
mainMenu.alloc_item(DOSBoxMenu::item_type_id,"pc98_allow_200scanline").set_text("Allow 200-line scanline effect").
set_callback_function(vid_pc98_200scanline_menu_callback);
mainMenu.alloc_item(DOSBoxMenu::item_type_id,"pc98_allow_4partitions").set_text("Allow 4 display partitions in graphics layer").
set_callback_function(vid_pc98_4parts_menu_callback);
mainMenu.alloc_item(DOSBoxMenu::item_type_id,"pc98_enable_egc").set_text("Enable EGC").
set_callback_function(vid_pc98_enable_egc_menu_callback);
mainMenu.alloc_item(DOSBoxMenu::item_type_id,"pc98_enable_grcg").set_text("Enable GRCG").
set_callback_function(vid_pc98_enable_grcg_menu_callback);
mainMenu.alloc_item(DOSBoxMenu::item_type_id,"pc98_enable_analog").set_text("Enable analog display").
set_callback_function(vid_pc98_enable_analog_menu_callback);
mainMenu.alloc_item(DOSBoxMenu::item_type_id,"pc98_enable_analog256").set_text("Enable analog 256-color display").
set_callback_function(vid_pc98_enable_analog256_menu_callback);
mainMenu.alloc_item(DOSBoxMenu::item_type_id,"pc98_enable_188user").set_text("Enable 188+ user CG cells").
set_callback_function(vid_pc98_enable_188user_menu_callback);
}
{
DOSBoxMenu::item &item = mainMenu.alloc_item(DOSBoxMenu::submenu_type_id,"VideoDebugMenu");
@ -6339,18 +6114,6 @@ int main(int argc, char* argv[]) SDL_MAIN_NOEXCEPT {
set_callback_function(dos_mouse_sensitivity_menu_callback);
}
}
{
DOSBoxMenu::item &item = mainMenu.alloc_item(DOSBoxMenu::submenu_type_id,"DOSPC98Menu");
item.set_text("PC-98 PIT master clock");
{
mainMenu.alloc_item(DOSBoxMenu::item_type_id,"dos_pc98_pit_4mhz").set_text("4MHz/8MHz").
set_callback_function(dos_pc98_clock_menu_callback);
mainMenu.alloc_item(DOSBoxMenu::item_type_id,"dos_pc98_pit_5mhz").set_text("5MHz/10MHz").
set_callback_function(dos_pc98_clock_menu_callback);
}
}
}
{
DOSBoxMenu::item &item = mainMenu.alloc_item(DOSBoxMenu::submenu_type_id,"CaptureMenu");
@ -6465,19 +6228,8 @@ int main(int argc, char* argv[]) SDL_MAIN_NOEXCEPT {
mainMenu.get_item("scaler_forced").check(render.scale.forced);
mainMenu.get_item("vga_9widetext").enable(!IS_PC98_ARCH);
mainMenu.get_item("doublescan").enable(!IS_PC98_ARCH);
mainMenu.get_item("pc98_5mhz_gdc").enable(IS_PC98_ARCH);
mainMenu.get_item("pc98_allow_200scanline").enable(IS_PC98_ARCH);
mainMenu.get_item("pc98_allow_4partitions").enable(IS_PC98_ARCH);
mainMenu.get_item("pc98_enable_egc").enable(IS_PC98_ARCH);
mainMenu.get_item("pc98_enable_grcg").enable(IS_PC98_ARCH);
mainMenu.get_item("pc98_enable_analog").enable(IS_PC98_ARCH);
mainMenu.get_item("pc98_enable_analog256").enable(IS_PC98_ARCH);
mainMenu.get_item("pc98_enable_188user").enable(IS_PC98_ARCH);
mainMenu.get_item("dos_pc98_pit_4mhz").enable(IS_PC98_ARCH);
mainMenu.get_item("dos_pc98_pit_5mhz").enable(IS_PC98_ARCH);
mainMenu.get_item("show_console").check(showconsole_init).refresh_item(mainMenu);
OutputSettingMenuUpdate();

7
src/hardware/vga.cpp
View File

@ -544,7 +544,6 @@ void VGA_Reset(Section*) {
// To enable these games we default to 5.0MHz.
// NTS: There are also games that refuse to run if 5MHz switched on (TH03)
gdc_5mhz_mode = section->Get_bool("pc-98 start gdc at 5mhz");
mainMenu.get_item("pc98_5mhz_gdc").check(gdc_5mhz_mode).refresh_item(mainMenu);
enable_pc98_egc = section->Get_bool("pc-98 enable egc");
enable_pc98_grcg = section->Get_bool("pc-98 enable grcg");
@ -579,12 +578,6 @@ void VGA_Reset(Section*) {
mainMenu.get_item("pc98_allow_4partitions").check(pc98_allow_4_display_partitions).refresh_item(mainMenu);
// TODO: "auto" will default to true if old PC-9801, false if PC-9821, or
// a more refined automatic choice according to actual hardware.
mainMenu.get_item("pc98_enable_egc").check(enable_pc98_egc).refresh_item(mainMenu);
mainMenu.get_item("pc98_enable_grcg").check(enable_pc98_grcg).refresh_item(mainMenu);
mainMenu.get_item("pc98_enable_analog").check(enable_pc98_16color).refresh_item(mainMenu);
mainMenu.get_item("pc98_enable_analog256").check(enable_pc98_256color).refresh_item(mainMenu);
mainMenu.get_item("pc98_enable_188user").check(enable_pc98_188usermod).refresh_item(mainMenu);
}
vga_force_refresh_rate = -1;