diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c index 63475179b7..5f124e528e 100644 --- a/frontend/menu/rmenu.c +++ b/frontend/menu/rmenu.c @@ -491,61 +491,6 @@ static void render_text(void *data) if (render_ingame_menu_resize && rgui->frame_buf_show) { char viewport[32]; - char msg[128]; - struct platform_bind key_label_b = {0}; - struct platform_bind key_label_a = {0}; - struct platform_bind key_label_y = {0}; - struct platform_bind key_label_x = {0}; - struct platform_bind key_label_l1 = {0}; - struct platform_bind key_label_l2 = {0}; - struct platform_bind key_label_r1 = {0}; - struct platform_bind key_label_r2 = {0}; - struct platform_bind key_label_dpad_left = {0}; - struct platform_bind key_label_dpad_right = {0}; - struct platform_bind key_label_dpad_up = {0}; - struct platform_bind key_label_dpad_down = {0}; - - strlcpy(key_label_b.desc, "Unknown", sizeof(key_label_b.desc)); - key_label_b.joykey = 1ULL << RETRO_DEVICE_ID_JOYPAD_B; - strlcpy(key_label_a.desc, "Unknown", sizeof(key_label_a.desc)); - key_label_a.joykey = 1ULL << RETRO_DEVICE_ID_JOYPAD_A; - strlcpy(key_label_x.desc, "Unknown", sizeof(key_label_x.desc)); - key_label_x.joykey = 1ULL << RETRO_DEVICE_ID_JOYPAD_X; - strlcpy(key_label_y.desc, "Unknown", sizeof(key_label_y.desc)); - key_label_y.joykey = 1ULL << RETRO_DEVICE_ID_JOYPAD_Y; - strlcpy(key_label_l1.desc, "Unknown", sizeof(key_label_l1.desc)); - key_label_l1.joykey = 1ULL << RETRO_DEVICE_ID_JOYPAD_L; - strlcpy(key_label_r1.desc, "Unknown", sizeof(key_label_r1.desc)); - key_label_r1.joykey = 1ULL << RETRO_DEVICE_ID_JOYPAD_R; - strlcpy(key_label_l2.desc, "Unknown", sizeof(key_label_l2.desc)); - key_label_l2.joykey = 1ULL << RETRO_DEVICE_ID_JOYPAD_L2; - strlcpy(key_label_r2.desc, "Unknown", sizeof(key_label_r2.desc)); - key_label_r2.joykey = 1ULL << RETRO_DEVICE_ID_JOYPAD_R2; - strlcpy(key_label_dpad_left.desc, "Unknown", sizeof(key_label_dpad_left.desc)); - key_label_dpad_left.joykey = 1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT; - strlcpy(key_label_dpad_right.desc, "Unknown", sizeof(key_label_dpad_left.desc)); - key_label_dpad_right.joykey = 1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT; - strlcpy(key_label_dpad_up.desc, "Unknown", sizeof(key_label_dpad_up.desc)); - key_label_dpad_up.joykey = 1ULL << RETRO_DEVICE_ID_JOYPAD_UP; - strlcpy(key_label_dpad_down.desc, "Unknown", sizeof(key_label_dpad_down.desc)); - key_label_dpad_down.joykey = 1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN; - - if (driver.input->set_keybinds) - { - driver.input->set_keybinds(&key_label_l1, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL)); - driver.input->set_keybinds(&key_label_r1, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL)); - driver.input->set_keybinds(&key_label_l2, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL)); - driver.input->set_keybinds(&key_label_r2, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL)); - driver.input->set_keybinds(&key_label_b, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL)); - driver.input->set_keybinds(&key_label_a, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL)); - driver.input->set_keybinds(&key_label_y, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL)); - driver.input->set_keybinds(&key_label_x, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL)); - driver.input->set_keybinds(&key_label_dpad_left, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL)); - driver.input->set_keybinds(&key_label_dpad_right, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL)); - driver.input->set_keybinds(&key_label_dpad_up, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL)); - driver.input->set_keybinds(&key_label_dpad_down, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL)); - } - char viewport_buf[256]; snprintf(viewport, sizeof(viewport), "Viewport X: #%d Y: %d (%dx%d)", g_extern.console.screen.viewports.custom_vp.x, g_extern.console.screen.viewports.custom_vp.y, g_extern.console.screen.viewports.custom_vp.width, g_extern.console.screen.viewports.custom_vp.height); @@ -558,155 +503,6 @@ static void render_text(void *data) if (driver.video_poke->set_osd_msg) driver.video_poke->set_osd_msg(driver.video_data, viewport_buf, &font_parms); - - snprintf(msg, sizeof(msg), "[%s]", key_label_dpad_left.desc); - - font_parms.y = POSITION_Y_BEGIN + (POSITION_Y_INCREMENT * 4); - font_parms.color = WHITE; - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, msg, &font_parms); - - font_parms.x = POSITION_X_CENTER; - font_parms.y = POSITION_Y_BEGIN + (POSITION_Y_INCREMENT * 4); - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, "- Viewport X--", &font_parms); - - snprintf(msg, sizeof(msg), "[%s]", key_label_dpad_right.desc); - - font_parms.x = POSITION_X; - font_parms.y = POSITION_Y_BEGIN + (POSITION_Y_INCREMENT * 5); - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, msg, &font_parms); - - font_parms.x = POSITION_X_CENTER; - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, "- Viewport X++", &font_parms); - - snprintf(msg, sizeof(msg), "[%s]", key_label_dpad_up.desc); - font_parms.x = POSITION_X; - font_parms.y = POSITION_Y_BEGIN + (POSITION_Y_INCREMENT * 6); - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, msg, &font_parms); - - font_parms.x = POSITION_X_CENTER; - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, "- Viewport Y++", &font_parms); - - snprintf(msg, sizeof(msg), "[%s]", key_label_dpad_down.desc); - - font_parms.x = POSITION_X; - font_parms.y = POSITION_Y_BEGIN + (POSITION_Y_INCREMENT * 7); - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, msg, &font_parms); - - font_parms.x = POSITION_X_CENTER; - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, "- Viewport Y--", &font_parms); - - snprintf(msg, sizeof(msg), "[%s]", key_label_l1.desc); - - font_parms.x = POSITION_X; - font_parms.y = POSITION_Y_BEGIN + (POSITION_Y_INCREMENT * 8); - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, msg, &font_parms); - - font_parms.x = POSITION_X_CENTER; - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, "- Viewport W--", &font_parms); - - snprintf(msg, sizeof(msg), "[%s]", key_label_r1.desc); - - font_parms.x = POSITION_X; - font_parms.y = POSITION_Y_BEGIN + (POSITION_Y_INCREMENT * 9); - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, msg, &font_parms); - - font_parms.x = POSITION_X_CENTER; - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, "- Viewport W++", &font_parms); - - snprintf(msg, sizeof(msg), "[%s]", key_label_l2.desc); - - font_parms.x = POSITION_X; - font_parms.y = POSITION_Y_BEGIN + (POSITION_Y_INCREMENT * 10); - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, msg, &font_parms); - - font_parms.x = POSITION_X_CENTER; - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, "- Viewport H++", &font_parms); - - snprintf(msg, sizeof(msg), "[%s]", key_label_r2.desc); - - font_parms.x = POSITION_X; - font_parms.y = POSITION_Y_BEGIN + (POSITION_Y_INCREMENT * 11); - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, msg, &font_parms); - - font_parms.x = POSITION_X_CENTER; - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, "- Viewport H--", &font_parms); - - snprintf(msg, sizeof(msg), "[%s]", key_label_x.desc); - - font_parms.x = POSITION_X; - font_parms.y = POSITION_Y_BEGIN + (POSITION_Y_INCREMENT * 12); - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, msg, &font_parms); - - font_parms.x = POSITION_X_CENTER; - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, "- Reset To Defaults", &font_parms); - - snprintf(msg, sizeof(msg), "[%s]", key_label_y.desc); - - font_parms.x = POSITION_X; - font_parms.y = POSITION_Y_BEGIN + (POSITION_Y_INCREMENT * 13); - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, msg, &font_parms); - - font_parms.x = POSITION_X_CENTER; - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, "- Show Game", &font_parms); - - snprintf(msg, sizeof(msg), "[%s]", key_label_a.desc); - font_parms.x = POSITION_X; - font_parms.y = POSITION_Y_BEGIN + (POSITION_Y_INCREMENT * 14); - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, msg, &font_parms); - - font_parms.x = POSITION_X_CENTER; - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, "- Go back", &font_parms); - - snprintf(msg, sizeof(msg), "Press [%s] to reset to defaults.", key_label_x.desc); - font_parms.x = POSITION_X; - font_parms.y = COMMENT_POSITION_Y; - - if (driver.video_poke->set_osd_msg) - driver.video_poke->set_osd_msg(driver.video_data, msg, &font_parms); } }