Fix for coverity #29369

[supertux.git] / src / gui / menu.hpp

diff --git a/src/gui/menu.hpp b/src/gui/menu.hpp
index b74e931..8fc4ad5 100644 (file)
--- a/src/gui/menu.hpp
+++ b/src/gui/menu.hpp
@@ -21,45 +21,15 @@
 #include <memory>
 #include <SDL.h>
 
+#include "math/vector.hpp"
 #include "video/color.hpp"
+#include "video/surface_ptr.hpp"
 
 class DrawingContext;
 class MenuItem;
-class Surface;
-
-bool confirm_dialog(Surface* background, std::string text);
 
 class Menu
 {
-  static Color default_color;
-  static Color active_color;
-  static Color inactive_color;
-  static Color label_color;
-  static Color field_color;
-private:
-  static std::vector<Menu*> last_menus;
-
-  /** Pointers to all currently available menus, used to handle repositioning on window resize */
-  static std::list<Menu*>   all_menus;
-
-  static Menu* previous;
-  static Menu* current_;
-
-public:
-  /** Set the current menu, if pmenu is NULL, hide the current menu */
-  static void set_current(Menu* pmenu);
-
-  static void push_current(Menu* pmenu);
-  static void pop_current();
-
-  static void recalc_pos();
-
-  /** Return the current active menu or NULL if none is active */
-  static Menu* current()
-  {
-    return current_;
-  }
-
 private:
   /* Action done on the menu */
   enum MenuAction {
@@ -84,22 +54,21 @@ public:
   MenuItem* add_toggle(int id, const std::string& text, bool toggled = false);
   MenuItem* add_inactive(int id, const std::string& text);
   MenuItem* add_back(const std::string& text);
-  MenuItem* add_submenu(const std::string& text, Menu* submenu, int id = -1);
+  MenuItem* add_submenu(const std::string& text, int submenu);
   MenuItem* add_controlfield(int id, const std::string& text,
                              const std::string& mapping = "");
   MenuItem* add_string_select(int id, const std::string& text);
 
-  virtual void menu_action(MenuItem* item);
+  virtual void menu_action(MenuItem* item) = 0;
 
-  void update();
+  void process_input();
+
+  /** Perform actions to bring the menu up to date with configuration changes */
+  virtual void refresh() {}
 
   /** Remove all entries from the menu */
   void clear();
 
-  /** Return the index of the menu item that was 'hit' (ie. the user
-      clicked on it) in the last event() call */
-  int check ();
-
   MenuItem& get_item(int index)
   {
     return *(items[index]);
@@ -112,57 +81,42 @@ public:
   void set_active_item(int id);
 
   void draw(DrawingContext& context);
-  void set_pos(float x, float y, float rw = 0, float rh = 0);
+  Vector get_center_pos() const { return pos; }
+  void set_center_pos(float x, float y);
 
   void event(const SDL_Event& event);
 
   bool is_toggled(int id) const;
   void set_toggled(int id, bool toggled);
 
-  Menu* get_parent() const;
-
-protected:
-  void additem(MenuItem* pmenu_item);
   float get_width() const;
   float get_height() const;
 
+  virtual void on_window_resize();
+
+protected:
+  MenuItem* add_item(std::unique_ptr<MenuItem> menu_item);
+
 private:
+  void process_action(MenuAction menuaction);
   void check_controlfield_change_event(const SDL_Event& event);
   void draw_item(DrawingContext& context, int index);
 
 private:
-  /** Number of the item that got 'hit' (ie. pressed) in the last
-      event()/update() call, -1 if none */
-  int hit_item;
-
   // position of the menu (ie. center of the menu, not top/left)
-  float pos_x;
-  float pos_y;
-
-  /** input event for the menu (up, down, left, right, etc.) */
-  MenuAction menuaction;
+  Vector pos;
 
   /* input implementation variables */
   int   delete_character;
   char  mn_input_char;
   float menu_repeat_time;
 
-  bool close;
-
 public:
-  std::vector<MenuItem*> items;
+  std::vector<std::unique_ptr<MenuItem> > items;
 
 private:
-  float effect_progress;
-  float effect_start_time;
   int arrange_left;
   int active_item;
-
-  std::auto_ptr<Surface> checkbox;
-  std::auto_ptr<Surface> checkbox_checked;
-  std::auto_ptr<Surface> back;
-  std::auto_ptr<Surface> arrow_left;
-  std::auto_ptr<Surface> arrow_right;
 };
 
 #endif