X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Foptions_menu.cpp;h=d94402ef3266469a57090931a86ea7b855a65ed3;hb=6b0c80bde84af0bf9323320d99f2fccd7c9eeedd;hp=eb381a21d453e6dc7fda0c17df2d43f87aca16a6;hpb=80e0230d849dc160995a54a54a228c285a721d44;p=supertux.git

diff --git a/src/options_menu.cpp b/src/options_menu.cpp
index eb381a21d..d94402ef3 100644
--- a/src/options_menu.cpp
+++ b/src/options_menu.cpp
@@ -26,12 +26,16 @@
 #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_MAGINFICATION,
+  MNID_ASPECTRATIO,
   MNID_SOUND,
   MNID_MUSIC
 };
@@ -108,21 +112,107 @@ OptionsMenu::OptionsMenu()
 
   add_label(_("Options"));
   add_hl();
+
+  add_submenu(_("Select Language"), language_menu.get())
+    ->set_help(_("Switch to another language"));
+
+  add_submenu(_("Select Profile"), get_profile_menu())
+    ->set_help(_("Switch between different savegames"));
+
+  add_toggle(MNID_SOUND, _("Profile on Startup"), config->sound_enabled)
+    ->set_help(_("Display the profile menu when the game is newly started"));
+  
+  add_toggle(MNID_FULLSCREEN,_("Fullscreen"), config->use_fullscreen)
+    ->set_help(_("Let the game cover the whole screen"));
+
+  MenuItem* fullscreen_res = add_string_select(MNID_FULLSCREEN_RESOLUTION, _("Resolution"));
+  fullscreen_res->set_help(_("Change the Resolution to be used in Fullscreen Mode, you have to toggle fullscreen mode to let this change take effect"));
+
+  MenuItem* maginfication = add_string_select(MNID_MAGINFICATION, _("Maginfication"));
+  maginfication->set_help(_("Change the magnification of the game area"));
+
+  // These values go from screen:640/projection:1600 to screen:1600/projection:640
+  maginfication->list.push_back("40%");
+  maginfication->list.push_back("50%");
+  maginfication->list.push_back("62.5%");
+  maginfication->list.push_back("80%");
+  maginfication->list.push_back("100%");
+  maginfication->list.push_back("125%");
+  maginfication->list.push_back("160%");
+  maginfication->list.push_back("200%");
+  maginfication->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 sould 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"));
   
-  // FIXME: Implement me: if (get_parent() == main_menu)
-    add_submenu(_("Change Profile"), get_profile_menu());
+  aspect->list.push_back("4:3");
+  aspect->list.push_back("5:4");
+  aspect->list.push_back("16:10");
+  aspect->list.push_back("16:9");
 
-  add_submenu(_("Select Language"), language_menu.get());
-  add_toggle(MNID_FULLSCREEN,_("Fullscreen"), config->use_fullscreen);
+  std::ostringstream out;
+  out << config->aspect_width << ":" << config->aspect_height;
+  std::string aspect_ratio = out.str();
+  for(std::vector<std::string>::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 in the game"));
+    add_toggle(MNID_MUSIC, _("Music"), config->music_enabled)
+      ->set_help(_("Disable all music in the game"));
   } else {
     add_deactive(MNID_SOUND, _("Sound (disabled)"));
     add_deactive(MNID_SOUND, _("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 how your keyboard maps to the game"));
+
+  add_submenu(_("Setup Joystick"),main_controller->get_joystick_options_menu())
+    ->set_help(_("Configure how your joystick maps to the game"));
   add_hl();
   add_back(_("Back"));
 }
@@ -135,6 +225,33 @@ void
 OptionsMenu::menu_action(MenuItem* item)
 {
   switch (item->id) {
+    case MNID_ASPECTRATIO:
+      { 
+        if(sscanf(item->list[item->selected].c_str(), "%d:%d", &config->aspect_width, &config->aspect_height) == 2)
+          {
+            Renderer::instance()->apply_config();
+            Menu::recalc_pos();
+          }
+      }
+      break;
+
+    case MNID_MAGINFICATION:
+      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)
+        {
+          Renderer::instance()->apply_config();
+          Menu::recalc_pos();
+        }      
+      break;
+
     case MNID_FULLSCREEN:
       if(config->use_fullscreen != options_menu->is_toggled(MNID_FULLSCREEN)) {
         config->use_fullscreen = !config->use_fullscreen;