eaw/Main_MiSTer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved MGL handling.

Browse Source
This commit is contained in:
Sorgelig
2022-02-28 02:12:48 +08:00
parent 41b8b1fc30
commit 1c250abbce
4 changed files with 96 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
menu.cpp
View File

@@ -1016,30 +1016,20 @@ void HandleUI(void)
static int store_name;
static int vfilter_type;
static int mgl_done = 0;
static int mgl_active = 0;
static int mgl_submenu = -1;
static char cp_MenuCancel;
uint32_t c = 0;
if (!mgl_done)
mgl_struct *mgl = mgl_get();
if (!mgl->done)
{
mgl_struct *mgl = mgl_get();
if (mgl->valid != 0xF ||
is_menu() || is_minimig() || is_st() || is_archie()
|| user_io_core_type() == CORE_TYPE_SHARPMZ) mgl_done = 1;
else
if (mgl->timer && CheckTimer(mgl->timer))
{
if (mgl->timer && CheckTimer(mgl->timer))
{
mgl_active = 1;
mgl_done = 1;
}
mgl->active = 1;
mgl->done = 1;
}
}
else if(!mgl_active)
else if(!mgl->active)
{
// get user control codes
c = menu_key_get();
@@ -1320,7 +1310,7 @@ void HandleUI(void)
if (CheckTimer(menu_timer)) menustate = MENU_NONE1;
// fall through
case MENU_NONE2:
if (menu || (is_menu() && !video_fb_state()) || mgl_active)
if (menu || (is_menu() && !video_fb_state()) || mgl->active)
{
OsdSetSize(16);
if(!is_menu() && (get_key_mod() & (LALT | RALT))) //Alt+Menu
@@ -1358,7 +1348,7 @@ void HandleUI(void)
}
menusub = 0;
OsdClear();
if (mgl_active) OsdDisable();
if (mgl->active) OsdDisable();
else OsdEnable(DISABLE_KEYBOARD);
}
break;
@@ -1696,7 +1686,7 @@ void HandleUI(void)
if (p[idx] == 'C') idx++;
int num = (p[idx] >= '0' && p[idx] <= '9') ? p[idx] - '0' : 0;
if (mgl_active && num == mgl_get()->index && (p[0] == mgl_get()->type)) mgl_submenu = selentry;
if (mgl->active && num == mgl->index && (p[0] == mgl->type)) mgl->submenu = selentry;
if (is_x86() && x86_get_image_name(num))
{
@@ -1898,7 +1888,7 @@ void HandleUI(void)
saved_menustate = MENU_GENERIC_MAIN1;
// F/S option not found -> deactivate mgl.
if (mgl_active && mgl_submenu < 0) mgl_active = 0;
if (mgl->active && mgl->submenu < 0) mgl->active = 0;
if (menu_save_timer && !CheckTimer(menu_save_timer))
{
@@ -1926,11 +1916,11 @@ void HandleUI(void)
page = 0;
}
}
else if (select || recent || minus || plus || mgl_active)
else if (select || recent || minus || plus || mgl->active)
{
if (mgl_active)
if (mgl->active)
{
menusub = mgl_submenu;
menusub = mgl->submenu;
select = 1;
}
@@ -2043,7 +2033,7 @@ void HandleUI(void)
}
}
if (mgl_active) menustate = MENU_GENERIC_FILE_SELECTED;
if (mgl->active) menustate = MENU_GENERIC_FILE_SELECTED;
else if (select) SelectFile(Selected_F[ioctl_index & 15], ext, fs_Options, fs_MenuSelect, fs_MenuCancel);
else if (recent_init(ioctl_index)) menustate = MENU_RECENT1;
}
@@ -2093,7 +2083,7 @@ void HandleUI(void)
if (is_psx()) fs_Options |= SCANO_NOZIP;
if (mgl_active) menustate = MENU_GENERIC_IMAGE_SELECTED;
if (mgl->active) menustate = MENU_GENERIC_IMAGE_SELECTED;
else if (select) SelectFile(Selected_tmp, ext, fs_Options, fs_MenuSelect, fs_MenuCancel);
else if (recent_init(ioctl_index + 500)) menustate = MENU_RECENT1;
}
@@ -2225,14 +2215,14 @@ void HandleUI(void)
case MENU_GENERIC_FILE_SELECTED:
{
if (mgl_active) snprintf(selPath, sizeof(selPath), "%s/%s", HomeDir(), mgl_get()->path);
if (mgl->active) snprintf(selPath, sizeof(selPath), "%s/%s", HomeDir(), mgl->path);
MenuHide();
printf("File selected: %s\n", selPath);
memcpy(Selected_F[ioctl_index & 15], selPath, sizeof(Selected_F[ioctl_index & 15]));
if (!mgl_active && selPath[0]) recent_update(SelectedDir, Selected_F[ioctl_index & 15], SelectedLabel, ioctl_index);
mgl_active = 0;
if (!mgl->active && selPath[0]) recent_update(SelectedDir, Selected_F[ioctl_index & 15], SelectedLabel, ioctl_index);
mgl->active = 0;
if (store_name)
{
@@ -2270,7 +2260,7 @@ void HandleUI(void)
case MENU_GENERIC_IMAGE_SELECTED:
{
if (mgl_active) snprintf(selPath, sizeof(selPath), "%s/%s", HomeDir(), mgl_get()->path);
if (mgl->active) snprintf(selPath, sizeof(selPath), "%s/%s", HomeDir(), mgl->path);
if (store_name)
{
@@ -2284,8 +2274,8 @@ void HandleUI(void)
printf("Image selected: %s\n", selPath);
memcpy(Selected_S[(int)ioctl_index], selPath, sizeof(Selected_S[(int)ioctl_index]));
if (!mgl_active) recent_update(SelectedDir, Selected_S[(int)ioctl_index], SelectedLabel, ioctl_index + 500);
mgl_active = 0;
if (!mgl->active) recent_update(SelectedDir, Selected_S[(int)ioctl_index], SelectedLabel, ioctl_index + 500);
mgl->active = 0;
char idx = user_io_ext_idx(selPath, fs_pFileExt) << 6 | ioctl_index;
if (addon[0] == 'f' && addon[1] != '1') process_addon(addon, idx);

1
support/arcade/mra_loader.cpp
View File

@@ -1283,6 +1283,7 @@ static int scan_mgl(XMLEvent evt, const XMLNode* node, SXML_CHAR* text, const in
mgl_struct* mgl_parse(const char *xml)
{
memset(&mgl, 0, sizeof(mgl));
mgl.submenu = -1;
SAX_Callbacks sax;
SAX_Callbacks_init(&sax);

3
support/arcade/mra_loader.h
View File

@@ -35,6 +35,9 @@ struct mgl_struct
int index;
int valid;
int parsed;
int done;
int active;
int submenu;
uint32_t timer;
};

132
user_io.cpp
View File

@@ -1138,7 +1138,7 @@ void user_io_init(const char *path, const char *xml)
}
video_mode_load();
if(strlen(cfg.font)) LoadFont(cfg.font);
if (strlen(cfg.font)) LoadFont(cfg.font);
load_volume();
user_io_send_buttons(1);
@@ -1150,17 +1150,17 @@ void user_io_init(const char *path, const char *xml)
printf("Unable to identify core (%x)!\n", core_type);
break;
case CORE_TYPE_SHARPMZ:
case CORE_TYPE_SHARPMZ:
printf("Identified Sharp MZ Series core");
user_io_set_core_name("sharpmz");
sharpmz_init();
sharpmz_init();
parse_buttons();
break;
case CORE_TYPE_8BIT:
// try to load config
name = user_io_create_config_name();
if(strlen(name) > 0)
if (strlen(name) > 0)
{
uint32_t status[2] = { 0, 0 };
if (!is_st() && !is_minimig())
@@ -1307,7 +1307,7 @@ void user_io_init(const char *path, const char *xml)
send_rtc(3);
// release reset
if(!is_minimig() && !is_st()) user_io_status(0, UIO_STATUS_RESET);
if (!is_minimig() && !is_st()) user_io_status(0, UIO_STATUS_RESET);
if (xml && isXmlName(xml) == 1) arcade_check_error();
break;
}
@@ -1353,7 +1353,14 @@ void user_io_init(const char *path, const char *xml)
SetMidiLinkMode(midilink);
SetUARTMode(uartmode);
if (mgl_get()->valid == 0xF) mgl_get()->timer = GetTimer(mgl_get()->delay * 1000);
if (mgl_get()->valid != 0xF || is_menu() || is_minimig() || is_st() || is_archie() || user_io_core_type() == CORE_TYPE_SHARPMZ)
{
mgl_get()->done = 1;
}
else
{
mgl_get()->timer = GetTimer(mgl_get()->delay * 1000);
}
}
static int joyswap = 0;
@@ -2913,7 +2920,6 @@ void user_io_poll()
if (core_type == CORE_TYPE_SHARPMZ) sharpmz_poll();
static uint8_t leds = 0;
static uint8_t ps2_scancode_f0 = 0;
if (use_ps2ctl && !is_minimig() && !is_archie())
{
@@ -2932,67 +2938,54 @@ void user_io_poll()
{
cmd = kbd_ctl;
if (ps2_scancode_f0 == 0)
switch (cmd)
{
switch (cmd)
{
case 0xff:
ps2_kbd_scan_set = 2;
kbd_reply(0xFA);
kbd_reply(0xAA);
break;
case 0xff:
ps2_kbd_scan_set = 2;
kbd_reply(0xFA);
kbd_reply(0xAA);
break;
case 0xf2:
kbd_reply(0xFA);
kbd_reply(0xAB);
kbd_reply(0x83);
break;
case 0xF0: // scan get/set
kbd_reply(0xFA);
ps2_scancode_f0 = 1;
break;
case 0xf2:
kbd_reply(0xFA);
kbd_reply(0xAB);
kbd_reply(0x83);
break;
case 0xF6: // set default parameters
kbd_reply(0xFA);
ps2_kbd_scan_set = 2;
break;
case 0xf0: // scan get/set
kbd_reply(0xFA);
byte++;
break;
case 0xf4:
case 0xf5:
case 0xfa:
kbd_reply(0xFA);
break;
case 0xf6: // set default parameters
kbd_reply(0xFA);
ps2_kbd_scan_set = 2;
break;
case 0xed:
kbd_reply(0xFA);
byte++;
break;
case 0xf3: // set type rate
kbd_reply(0xFA);
byte++;
break;
case 0xee:
kbd_reply(0xEE);
break;
case 0xf4:
case 0xf5:
case 0xfa:
kbd_reply(0xFA);
break;
default:
kbd_reply(0xFE);
break;
}
case 0xed:
kbd_reply(0xFA);
byte++;
break;
case 0xee:
kbd_reply(0xEE);
break;
default:
kbd_reply(0xFE);
break;
}
else
{
if (cmd <= 3) {
kbd_reply(0xFA);
if (!cmd) // get
kbd_reply(ps2_kbd_scan_set);
else // set
ps2_kbd_scan_set = cmd;
ps2_scancode_f0 = 0;
}
else {
kbd_reply(0xFE); // RESEND
}
}
}
else
{
@@ -3001,10 +2994,27 @@ void user_io_poll()
case 0xed:
kbd_reply(0xFA);
byte = 0;
if (kbd_ctl & 4) leds |= KBD_LED_CAPS_STATUS;
else leds &= ~KBD_LED_CAPS_STATUS;
break;
case 0xf0:
byte = 0;
if (kbd_ctl <= 3)
{
kbd_reply(0xFA);
if (!kbd_ctl) kbd_reply(ps2_kbd_scan_set); // get
else ps2_kbd_scan_set = kbd_ctl; // set
}
else
{
kbd_reply(0xFE); // RESEND
}
break;
case 0xf3: // set type rate
kbd_reply(0xFA);
byte = 0;
break;
default: