X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Foptions_menu.cpp;h=644028cebe079aeacecd55a4927bf0043988a790;hb=6dfb72a982a52129cb2b55cd41222914a819ecb4;hp=eb381a21d453e6dc7fda0c17df2d43f87aca16a6;hpb=80e0230d849dc160995a54a54a228c285a721d44;p=supertux.git diff --git a/src/options_menu.cpp b/src/options_menu.cpp index eb381a21d..644028ceb 100644 --- a/src/options_menu.cpp +++ b/src/options_menu.cpp @@ -26,12 +26,17 @@ #include "control/joystickkeyboardcontroller.hpp" #include "main.hpp" #include "gettext.hpp" +#include "video/renderer.hpp" #include "gameconfig.hpp" Menu* options_menu = 0; enum OptionsMenuIDs { MNID_FULLSCREEN, + MNID_FULLSCREEN_RESOLUTION, + MNID_MAGNIFICATION, + MNID_ASPECTRATIO, + MNID_PROFILES, MNID_SOUND, MNID_MUSIC }; @@ -42,7 +47,7 @@ public: LanguageMenu() { add_label(_("Language")); add_hl(); - add_entry(0, std::string("(")+_("auto-detect language")+")"); + add_entry(0, std::string("<")+_("auto-detect")+">"); add_entry(1, "English"); int mnid = 10; @@ -108,21 +113,116 @@ OptionsMenu::OptionsMenu() add_label(_("Options")); add_hl(); - + + // Language change should only be possible in the main menu, since elsewhere it might not always work fully // FIXME: Implement me: if (get_parent() == main_menu) - add_submenu(_("Change Profile"), get_profile_menu()); + add_submenu(_("Select Language"), language_menu.get()) + ->set_help(_("Select a different language to display text in")); + + add_submenu(_("Select Profile"), get_profile_menu()) + ->set_help(_("Select a profile to play with")); + + add_toggle(MNID_PROFILES, _("Profile on Startup"), config->sound_enabled) + ->set_help(_("Select your profile immediately after start-up")); + + add_toggle(MNID_FULLSCREEN,_("Fullscreen"), config->use_fullscreen) + ->set_help(_("Fill the entire screen")); + + MenuItem* fullscreen_res = add_string_select(MNID_FULLSCREEN_RESOLUTION, _("Resolution")); + fullscreen_res->set_help(_("Determine the resolution used in fullscreen mode (you must toggle fullscreen to complete the change)")); + + MenuItem* magnification = add_string_select(MNID_MAGNIFICATION, _("Magnification")); + magnification->set_help(_("Change the magnification of the game area")); + + // These values go from screen:640/projection:1600 to + // screen:1600/projection:640 (i.e. 640, 800, 1024, 1280, 1600) + magnification->list.push_back("auto"); + magnification->list.push_back("40%"); + magnification->list.push_back("50%"); + magnification->list.push_back("62.5%"); + magnification->list.push_back("80%"); + magnification->list.push_back("100%"); + magnification->list.push_back("125%"); + magnification->list.push_back("160%"); + magnification->list.push_back("200%"); + magnification->list.push_back("250%"); + + SDL_Rect** modes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_OPENGL); + + if (modes == (SDL_Rect **)0) + { // No resolutions at all available, bad + + } + else if(modes == (SDL_Rect **)-1) + { // All resolutions should work, so we fall back to hardcoded defaults + fullscreen_res->list.push_back("640x480"); + fullscreen_res->list.push_back("800x600"); + fullscreen_res->list.push_back("1024x768"); + fullscreen_res->list.push_back("1152x864"); + fullscreen_res->list.push_back("1280x960"); + fullscreen_res->list.push_back("1280x1024"); + fullscreen_res->list.push_back("1440x900"); + fullscreen_res->list.push_back("1680x1050"); + fullscreen_res->list.push_back("1600x1200"); + fullscreen_res->list.push_back("1920x1080"); + fullscreen_res->list.push_back("1920x1200"); + } + else + { + for(int i = 0; modes[i]; ++i) + { + std::ostringstream out; + out << modes[i]->w << "x" << modes[i]->h; + fullscreen_res->list.push_back(out.str()); + } + } + + MenuItem* aspect = add_string_select(MNID_ASPECTRATIO, _("Aspect Ratio")); + aspect->set_help(_("Adjust the aspect ratio")); + + aspect->list.push_back("auto"); + aspect->list.push_back("5:4"); + aspect->list.push_back("4:3"); + aspect->list.push_back("16:10"); + aspect->list.push_back("16:9"); + aspect->list.push_back("1368:768"); - add_submenu(_("Select Language"), language_menu.get()); - add_toggle(MNID_FULLSCREEN,_("Fullscreen"), config->use_fullscreen); + if (config->aspect_width != 0 && config->aspect_height != 0) + { + std::ostringstream out; + out << config->aspect_width << ":" << config->aspect_height; + std::string aspect_ratio = out.str(); + for(std::vector::iterator i = aspect->list.begin(); i != aspect->list.end(); ++i) + { + if(*i == aspect_ratio) + { + aspect_ratio.clear(); + break; + } + } + + if (!aspect_ratio.empty()) + { + aspect->selected = aspect->list.size(); + aspect->list.push_back(aspect_ratio); + } + } + if (sound_manager->is_audio_enabled()) { - add_toggle(MNID_SOUND, _("Sound"), config->sound_enabled); - add_toggle(MNID_MUSIC, _("Music"), config->music_enabled); + add_toggle(MNID_SOUND, _("Sound"), config->sound_enabled) + ->set_help(_("Disable all sound effects")); + add_toggle(MNID_MUSIC, _("Music"), config->music_enabled) + ->set_help(_("Disable all music")); } else { add_deactive(MNID_SOUND, _("Sound (disabled)")); - add_deactive(MNID_SOUND, _("Music (disabled)")); + add_deactive(MNID_MUSIC, _("Music (disabled)")); } - add_submenu(_("Setup Keyboard"), main_controller->get_key_options_menu()); - add_submenu(_("Setup Joystick"),main_controller->get_joystick_options_menu()); + + add_submenu(_("Setup Keyboard"), main_controller->get_key_options_menu()) + ->set_help(_("Configure key-action mappings")); + + add_submenu(_("Setup Joystick"),main_controller->get_joystick_options_menu()) + ->set_help(_("Configure joystick control-action mappings")); add_hl(); add_back(_("Back")); } @@ -135,13 +235,56 @@ void OptionsMenu::menu_action(MenuItem* item) { switch (item->id) { + case MNID_ASPECTRATIO: + { + if (item->list[item->selected] == "auto") + { + config->aspect_width = 0; // Magic values + config->aspect_height = 0; + Renderer::instance()->apply_config(); + Menu::recalc_pos(); + } + else if(sscanf(item->list[item->selected].c_str(), "%d:%d", &config->aspect_width, &config->aspect_height) == 2) + { + Renderer::instance()->apply_config(); + Menu::recalc_pos(); + } + else + { + assert(!"This must not be reached"); + } + } + break; + + case MNID_MAGNIFICATION: + if (item->list[item->selected] == "auto") + { + config->magnification = 0.0f; // Magic value + } + else if(sscanf(item->list[item->selected].c_str(), "%f", &config->magnification) == 1) + { + config->magnification /= 100.0f; + } + Renderer::instance()->apply_config(); + Menu::recalc_pos(); + break; + + case MNID_FULLSCREEN_RESOLUTION: + if(sscanf(item->list[item->selected].c_str(), "%dx%d", &config->fullscreen_width, &config->fullscreen_height) == 2) + { + // do nothing, changes are only applied when toggling fullscreen mode + } + break; + case MNID_FULLSCREEN: if(config->use_fullscreen != options_menu->is_toggled(MNID_FULLSCREEN)) { config->use_fullscreen = !config->use_fullscreen; - init_video(); + init_video(); // FIXME: Should call apply_config instead + Menu::recalc_pos(); config->save(); } break; + case MNID_SOUND: if(config->sound_enabled != options_menu->is_toggled(MNID_SOUND)) { config->sound_enabled = !config->sound_enabled; @@ -149,6 +292,7 @@ OptionsMenu::menu_action(MenuItem* item) config->save(); } break; + case MNID_MUSIC: if(config->music_enabled != options_menu->is_toggled(MNID_MUSIC)) { config->music_enabled = !config->music_enabled; @@ -156,6 +300,7 @@ OptionsMenu::menu_action(MenuItem* item) config->save(); } break; + default: break; }