X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmenu.cpp;h=896591bc1351fe3c3d2e866c7a6bb569bb7cc717;hb=b56d18cd12b1892a7588b1fe620b1df26f7e7d4f;hp=7e91b9d99cab932fa9b9dbc459c9c6e461a7c5bc;hpb=7a28c2f5c77e6ef289ff3f4b735b8dc446a59537;p=supertux.git

diff --git a/src/menu.cpp b/src/menu.cpp
index 7e91b9d99..896591bc1 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -31,45 +31,70 @@
 #include "high_scores.h"
 
 /* (global) menu variables */
-int menuaction;
-int show_menu;
-int menu_change;
-texture_type checkbox, checkbox_checked, back, arrow_left, arrow_right;
-
-menu_type main_menu, game_menu, options_menu, highscore_menu, load_game_menu, save_game_menu;
-menu_type* current_menu, * last_menu;
+MenuAction menuaction = MENU_ACTION_NONE;
+bool show_menu;
+bool menu_change;
+
+Surface* checkbox;
+Surface* checkbox_checked;
+Surface* back;
+Surface* arrow_left;
+Surface* arrow_right;
+
+Menu* main_menu      = 0;
+Menu* game_menu      = 0;
+Menu* worldmap_menu  = 0;
+Menu* options_menu   = 0;
+Menu* options_controls_menu   = 0;
+Menu* highscore_menu = 0;
+Menu* load_game_menu = 0;
+Menu* save_game_menu = 0;
+Menu* contrib_menu   = 0;
+Menu* contrib_subset_menu   = 0;
+
+Menu* current_menu = 0;
 
 /* input implementation variables */
 int delete_character;
 char mn_input_char;
 
 /* Set the current menu */
-void menu_set_current(menu_type* pmenu)
+void
+Menu::set_current(Menu* pmenu)
 {
   if(pmenu != current_menu)
     {
-      menu_change = YES;
-      last_menu = current_menu;
+      menu_change  = true;
+      Menu* tmp = current_menu;
       current_menu = pmenu;
-      timer_start(&pmenu->effect, 500);
+      if(tmp)
+        if(tmp->last_menu != pmenu)
+          current_menu->last_menu = tmp;
+
+      pmenu->effect.start(500);
     }
 }
 
 /* Return a pointer to a new menu item */
-menu_item_type* menu_item_create(int kind, char *text, int init_toggle, void* target_menu)
+MenuItem*
+MenuItem::create(MenuItemKind kind_, const char *text_, int init_toggle_, Menu* target_menu_)
 {
-  menu_item_type *pnew_item = (menu_item_type*) malloc(sizeof(menu_item_type));
-  pnew_item->kind = kind;
-  pnew_item->text = (char*) malloc(sizeof(char) * (strlen(text) + 1));
-  strcpy(pnew_item->text,text);
-  if(kind == MN_TOGGLE)
-    pnew_item->toggled = init_toggle;
+  MenuItem *pnew_item = new MenuItem;
+  
+  pnew_item->kind = kind_;
+  pnew_item->text = (char*) malloc(sizeof(char) * (strlen(text_) + 1));
+  strcpy(pnew_item->text, text_);
+
+  if(kind_ == MN_TOGGLE)
+    pnew_item->toggled = init_toggle_;
   else
-    pnew_item->toggled = NO;
-  pnew_item->target_menu = target_menu;
+    pnew_item->toggled = false;
+
+  pnew_item->target_menu = target_menu_;
   pnew_item->input = (char*) malloc(sizeof(char));
   pnew_item->input[0] = '\0';
-  if(kind == MN_STRINGSELECT)
+
+  if(kind_ == MN_STRINGSELECT)
     {
       pnew_item->list = (string_list_type*) malloc(sizeof(string_list_type));
       string_list_init(pnew_item->list);
@@ -79,178 +104,236 @@ menu_item_type* menu_item_create(int kind, char *text, int init_toggle, void* ta
   return pnew_item;
 }
 
-void menu_item_change_text(menu_item_type* pmenu_item,const  char *text)
+void
+MenuItem::change_text(const  char *text_)
 {
-  if(text)
+  if (text_)
     {
-      free(pmenu_item->text);
-      pmenu_item->text = (char*) malloc(sizeof(char )*(strlen(text)+1));
-      strcpy(pmenu_item->text,text);
+      free(text);
+      text = (char*) malloc(sizeof(char )*(strlen(text_)+1));
+      strcpy(text, text_);
     }
 }
-void menu_item_change_input(menu_item_type* pmenu_item,const  char *text)
+
+void
+MenuItem::change_input(const  char *text_)
 {
   if(text)
     {
-      free(pmenu_item->input);
-      pmenu_item->input = (char*) malloc(sizeof(char )*(strlen(text)+1));
-      strcpy(pmenu_item->input,text);
+      free(input);
+      input = (char*) malloc(sizeof(char )*(strlen(text_)+1));
+      strcpy(input, text_);
     }
 }
 
 /* Free a menu and all its items */
-void menu_free(menu_type* pmenu)
+Menu::~Menu()
 {
-  int i;
-  if(pmenu->num_items != 0 && pmenu->item != NULL)
+  if(item.size() != 0)
     {
-      for(i = 0; i < pmenu->num_items; ++i)
+      for(unsigned int i = 0; i < item.size(); ++i)
         {
-          free(pmenu->item[i].text);
-          free(pmenu->item[i].input);
-          string_list_free(pmenu->item[i].list);
+          free(item[i].text);
+          free(item[i].input);
+          string_list_free(item[i].list);
         }
-      free(pmenu->item);
     }
 }
 
-/* Initialize a menu */
-void menu_init(menu_type* pmenu)
+Menu::Menu()
+{
+  pos_x        = screen->w/2;
+  pos_y        = screen->h/2;
+  has_backitem = false;
+  last_menu    = 0;
+  arrange_left = 0;
+  active_item  = 0;
+  last_menu    = 0;
+  effect.init(false);
+}
+
+void Menu::set_pos(int x, int y, float rw, float rh)
 {
-  pmenu->arrange_left = 0;
-  pmenu->num_items = 0;
-  pmenu->active_item = 0;
-  pmenu->item = NULL;
-  timer_init(&pmenu->effect,NO);
+  pos_x = x + (int)((float)width() * rw);
+  pos_y = y + (int)((float)height() * rh);
+}
+
+void
+Menu::additem(MenuItemKind kind_, const std::string& text_, int toggle_, Menu* menu_)
+{
+  if(kind_ == MN_BACK)
+    has_backitem = true;
+
+  additem(MenuItem::create(kind_, text_.c_str(), toggle_, menu_));
 }
 
 /* Add an item to a menu */
-void menu_additem(menu_type* pmenu, menu_item_type* pmenu_item)
+void
+Menu::additem(MenuItem* pmenu_item)
 {
-  ++pmenu->num_items;
-  pmenu->item = (menu_item_type*) realloc(pmenu->item, sizeof(menu_item_type) * pmenu->num_items);
-  memcpy(&pmenu->item[pmenu->num_items-1],pmenu_item,sizeof(menu_item_type));
-  free(pmenu_item);
+  if(pmenu_item->kind == MN_BACK)
+    has_backitem = true;
+
+  item.push_back(*pmenu_item);
+  delete pmenu_item;
 }
 
-/* Process actions done on the menu */
-void menu_action(menu_type* pmenu)
+void
+Menu::clear()
 {
-  int i;
+  item.clear();
+}
 
-  if(pmenu->num_items != 0 && pmenu->item != NULL)
+/* Process actions done on the menu */
+void
+Menu::action()
+{
+  if(item.size() != 0)
     {
       switch(menuaction)
         {
-        case MN_UP:
-          if(pmenu->active_item > 0)
-            --pmenu->active_item;
+        case MENU_ACTION_UP:
+          if (active_item > 0)
+            --active_item;
           else
-            pmenu->active_item = pmenu->num_items-1;
+            active_item = int(item.size())-1;
           break;
-        case MN_DOWN:
-          if(pmenu->active_item < pmenu->num_items-1)
-            ++pmenu->active_item;
+
+        case MENU_ACTION_DOWN:
+          if(active_item < int(item.size())-1)
+            ++active_item;
           else
-            pmenu->active_item = 0;
+            active_item = 0;
           break;
-        case MN_LEFT:
-          if(pmenu->item[pmenu->active_item].kind == MN_STRINGSELECT && pmenu->item[pmenu->active_item].list->num_items != 0)
+
+        case MENU_ACTION_LEFT:
+          if(item[active_item].kind == MN_STRINGSELECT
+              && item[active_item].list->num_items != 0)
             {
-              if(pmenu->item[pmenu->active_item].list->active_item > 0)
-                --pmenu->item[pmenu->active_item].list->active_item;
+              if(item[active_item].list->active_item > 0)
+                --item[active_item].list->active_item;
               else
-                pmenu->item[pmenu->active_item].list->active_item = pmenu->item[pmenu->active_item].list->num_items-1;
+                item[active_item].list->active_item = item[active_item].list->num_items-1;
             }
           break;
-        case MN_RIGHT:
-          if(pmenu->item[pmenu->active_item].kind == MN_STRINGSELECT && pmenu->item[pmenu->active_item].list->num_items != 0)
+
+        case MENU_ACTION_RIGHT:
+          if(item[active_item].kind == MN_STRINGSELECT
+              && item[active_item].list->num_items != 0)
             {
-              if(pmenu->item[pmenu->active_item].list->active_item < pmenu->item[pmenu->active_item].list->num_items-1)
-                ++pmenu->item[pmenu->active_item].list->active_item;
+              if(item[active_item].list->active_item < item[active_item].list->num_items-1)
+                ++item[active_item].list->active_item;
               else
-                pmenu->item[pmenu->active_item].list->active_item = 0;
+                item[active_item].list->active_item = 0;
             }
           break;
-        case MN_HIT:
-          if(pmenu->item[pmenu->active_item].kind == MN_GOTO && pmenu->item[pmenu->active_item].target_menu != NULL)
-            menu_set_current((menu_type*)pmenu->item[pmenu->active_item].target_menu);
-          else if(pmenu->item[pmenu->active_item].kind == MN_TOGGLE)
-            {
-              pmenu->item[pmenu->active_item].toggled = !pmenu->item[pmenu->active_item].toggled;
-              menu_change = YES;
-            }
-          else if(pmenu->item[pmenu->active_item].kind == MN_ACTION || pmenu->item[pmenu->active_item].kind == MN_TEXTFIELD || pmenu->item[pmenu->active_item].kind == MN_NUMFIELD)
-            {
-              pmenu->item[pmenu->active_item].toggled = YES;
-            }
-          else if(pmenu->item[pmenu->active_item].kind == MN_BACK)
-            {
-              if(last_menu != NULL)
-                menu_set_current(last_menu);
-            }
+
+        case MENU_ACTION_HIT:
+          {
+            switch (item[active_item].kind)
+              {
+              case MN_GOTO:
+                if (item[active_item].target_menu != NULL)
+                  Menu::set_current(item[active_item].target_menu);
+                else
+                  puts("NULLL");
+                break;
+
+              case MN_TOGGLE:
+                item[active_item].toggled = !item[active_item].toggled;
+                menu_change = true;
+                break;
+
+              case MN_ACTION:
+              case MN_TEXTFIELD:
+              case MN_NUMFIELD:
+              case MN_CONTROLFIELD:
+                item[active_item].toggled = true;
+                break;
+
+              case MN_BACK:
+                if(last_menu != NULL)
+                  Menu::set_current(last_menu);
+                break;
+              default:
+                break;
+              }
+          }
           break;
-        case MN_REMOVE:
-          if(pmenu->item[pmenu->active_item].kind == MN_TEXTFIELD || pmenu->item[pmenu->active_item].kind == MN_NUMFIELD)
+
+        case MENU_ACTION_REMOVE:
+          if(item[active_item].kind == MN_TEXTFIELD
+              || item[active_item].kind == MN_NUMFIELD)
             {
-              if(pmenu->item[pmenu->active_item].input != NULL)
+              if(item[active_item].input != NULL)
                 {
-                  i = strlen(pmenu->item[pmenu->active_item].input);
+                  int i = strlen(item[active_item].input);
 
                   while(delete_character > 0)	/* remove charactes */
                     {
-                      pmenu->item[pmenu->active_item].input[i-1] = '\0';
+                      item[active_item].input[i-1] = '\0';
                       delete_character--;
                     }
                 }
             }
           break;
-        case MN_INPUT:
-          if(pmenu->item[pmenu->active_item].kind == MN_TEXTFIELD || (pmenu->item[pmenu->active_item].kind == MN_NUMFIELD && mn_input_char >= '0' && mn_input_char <= '9'))
+
+        case MENU_ACTION_INPUT:
+          if(item[active_item].kind == MN_TEXTFIELD
+              || (item[active_item].kind == MN_NUMFIELD && mn_input_char >= '0' && mn_input_char <= '9'))
             {
-              if(pmenu->item[pmenu->active_item].input != NULL)
+              if(item[active_item].input != NULL)
                 {
-                  i = strlen(pmenu->item[pmenu->active_item].input);
-                  pmenu->item[pmenu->active_item].input = (char*) realloc(pmenu->item[pmenu->active_item].input,sizeof(char)*(i + 2));
-                  pmenu->item[pmenu->active_item].input[i] = mn_input_char;
-                  pmenu->item[pmenu->active_item].input[i+1] = '\0';
+                  int i = strlen(item[active_item].input);
+                  item[active_item].input = (char*) realloc(item[active_item].input,sizeof(char)*(i + 2));
+                  item[active_item].input[i] = mn_input_char;
+                  item[active_item].input[i+1] = '\0';
                 }
               else
                 {
-                  pmenu->item[pmenu->active_item].input = (char*) malloc(2*sizeof(char));
-                  pmenu->item[pmenu->active_item].input[0] = mn_input_char;
-                  pmenu->item[pmenu->active_item].input[1] = '\0';
+                  item[active_item].input = (char*) malloc(2*sizeof(char));
+                  item[active_item].input[0] = mn_input_char;
+                  item[active_item].input[1] = '\0';
                 }
             }
           break;
+
+        case MENU_ACTION_NONE:
+          break;
         }
     }
 
-  if(pmenu->item[pmenu->active_item].kind == MN_DEACTIVE || pmenu->item[pmenu->active_item].kind == MN_LABEL || pmenu->item[pmenu->active_item].kind == MN_HL)
+  MenuItem& new_item = item[active_item];
+  if(new_item.kind == MN_DEACTIVE
+      || new_item.kind == MN_LABEL
+      || new_item.kind == MN_HL)
     {
-      if(menuaction != MN_UP && menuaction != MN_DOWN)
-        menuaction = MN_DOWN;
+      // Skip the horzontal line item
+      if(menuaction != MENU_ACTION_UP && menuaction != MENU_ACTION_DOWN)
+        menuaction = MENU_ACTION_DOWN;
 
-      if(pmenu->num_items > 1)
-        menu_action(pmenu);
+      if(item.size() > 1)
+        action();
     }
-
 }
 
-/* Check, if the value of the active menu item has changed. */
-int menu_check(menu_type* pmenu)
+int
+Menu::check()
 {
-  if(pmenu->num_items != 0 && pmenu->item != NULL)
+  if (item.size() != 0)
     {
-      if((pmenu->item[pmenu->active_item].kind == MN_ACTION || pmenu->item[pmenu->active_item].kind == MN_TEXTFIELD || pmenu->item[pmenu->active_item].kind == MN_NUMFIELD) && pmenu->item[pmenu->active_item].toggled == YES)
+      if((item[active_item].kind == MN_ACTION
+          || item[active_item].kind == MN_TEXTFIELD
+          || item[active_item].kind == MN_NUMFIELD)
+          && item[active_item].toggled)
         {
-          pmenu->item[pmenu->active_item].toggled = NO;
+          item[active_item].toggled = false;
           show_menu = 0;
-          return pmenu->active_item;
+          return active_item;
         }
-      else if(pmenu->item[pmenu->active_item].kind == MN_TOGGLE || pmenu->item[pmenu->active_item].kind == MN_GOTO)
+      else if(item[active_item].kind == MN_TOGGLE || item[active_item].kind == MN_GOTO)
         {
-          return pmenu->active_item;
+          return active_item;
         }
       else
         return -1;
@@ -259,237 +342,355 @@ int menu_check(menu_type* pmenu)
     return -1;
 }
 
-/* Draw the current menu. */
-void menu_draw(menu_type* pmenu)
+void
+Menu::draw_item(int index, // Position of the current item in the menu
+                int menu_width,
+                int menu_height)
 {
-  int i, y, a, b, e, f, menu_height, menu_width;
+  const MenuItem& pitem = item[index];
 
-  /* The width of the menu has to be more than the width of the text with the most characters */
-  menu_width = 0;
-  for(i = 0; i < pmenu->num_items; ++i)
-    {
-      y = strlen(pmenu->item[i].text) + (pmenu->item[i].input ? strlen(pmenu->item[i].input) + 1 : 0) + strlen(string_list_active(pmenu->item[i].list));
-      if( y > menu_width )
-        {
-          menu_width = y;
-          if( pmenu->item[i].kind == MN_TOGGLE)
-            menu_width += 2;
-        }
-    }
-  if(pmenu->arrange_left == YES)
-    a = menu_width * 16;
-  else
-    a = 0;
+  int font_width  = 16;
+  int effect_offset = 0;
+  {
+    int effect_time = 0;
 
-  menu_width = menu_width * 16 + 48;
-  menu_height = (pmenu->num_items) * 24;
+    if(effect.check())
+      effect_time = effect.get_left() / 4;
 
-  /* Draw a transparent background */
-  fillrect(screen->w/2 - menu_width/2,screen->h/2-(((pmenu->num_items)*24)/2),menu_width,menu_height,150,150,150,100);
+    effect_offset = (index % 2) ? effect_time : -effect_time;
+  }
+
+  int x_pos       = pos_x;
+  int y_pos       = pos_y + 24*index - menu_height/2 + 12 + effect_offset;
+  int shadow_size = 2;
+  int text_width  = strlen(pitem.text) * font_width;
+  int input_width = strlen(pitem.input) * font_width;
+  int list_width  = strlen(string_list_active(pitem.list)) * font_width;
+  Text* text_font = white_text;
+
+  if (arrange_left)
+    x_pos += 24 - menu_width/2 + (text_width + input_width + list_width)/2;
 
-  if(timer_check(&pmenu->effect))
+  if(index == active_item)
     {
-      e = timer_get_left(&pmenu->effect) / 4;
+      shadow_size = 3;
+      text_font = blue_text;
     }
-  else
+
+  switch (pitem.kind)
     {
-      e = 0;
+    case MN_DEACTIVE:
+      {
+        black_text->draw_align(pitem.text,
+                               x_pos, y_pos,
+                               A_HMIDDLE, A_VMIDDLE, 2);
+        break;
+      }
+
+    case MN_HL:
+      {
+        int x = pos_x - menu_width/2;
+        int y = y_pos - 12 - effect_offset;
+        /* Draw a horizontal line with a little 3d effect */
+        fillrect(x, y + 6,
+                 menu_width, 4,
+                 150,200,255,225);
+        fillrect(x, y + 6,
+                 menu_width, 2,
+                 255,255,255,255);
+        break;
+      }
+    case MN_LABEL:
+      {
+        white_big_text->draw_align(pitem.text,
+                                   x_pos, y_pos,
+                                   A_HMIDDLE, A_VMIDDLE, 2);
+        break;
+      }
+    case MN_TEXTFIELD:
+    case MN_NUMFIELD:
+    case MN_CONTROLFIELD:
+      {
+        int input_pos = input_width/2;
+        int text_pos  = (text_width + font_width)/2;
+
+        fillrect(x_pos - input_pos + text_pos - 1, y_pos - 10,
+                 input_width + font_width + 2, 20,
+                 255,255,255,255);
+        fillrect(x_pos - input_pos + text_pos, y_pos - 9,
+                 input_width + font_width, 18,
+                 0,0,0,128);
+
+        gold_text->draw_align(pitem.input,
+                              x_pos + text_pos, y_pos,
+                              A_HMIDDLE, A_VMIDDLE, 2);
+
+        text_font->draw_align(pitem.text,
+                              x_pos - (input_width + font_width)/2, y_pos,
+                              A_HMIDDLE, A_VMIDDLE, shadow_size);
+        break;
+      }
+    case MN_STRINGSELECT:
+      {
+        int list_pos_2 = list_width + font_width;
+        int list_pos   = list_width/2;
+        int text_pos   = (text_width + font_width)/2;
+
+        /* Draw arrows */
+        arrow_left->draw(  x_pos - list_pos + text_pos - 17, y_pos - 8);
+        arrow_right->draw( x_pos - list_pos + text_pos - 1 + list_pos_2, y_pos - 8);
+
+        /* Draw input background */
+        fillrect(x_pos - list_pos + text_pos - 1, y_pos - 10,
+                 list_pos_2 + 2, 20,
+                 255,255,255,255);
+        fillrect(x_pos - list_pos + text_pos, y_pos - 9,
+                 list_pos_2, 18,
+                 0,0,0,128);
+
+        gold_text->draw_align(string_list_active(pitem.list),
+                        x_pos + text_pos, y_pos,
+                        A_HMIDDLE, A_VMIDDLE,2);
+
+        text_font->draw_align(pitem.text,
+                        x_pos - list_pos_2/2, y_pos,
+                        A_HMIDDLE, A_VMIDDLE, shadow_size);
+        break;
+      }
+    case MN_BACK:
+      {
+        text_font->draw_align(pitem.text, x_pos, y_pos, A_HMIDDLE, A_VMIDDLE, shadow_size);
+        back->draw( x_pos + text_width/2  + font_width, y_pos - 8);
+        break;
+      }
+
+    case MN_TOGGLE:
+      {
+        text_font->draw_align(pitem.text, x_pos, y_pos, A_HMIDDLE, A_VMIDDLE, shadow_size);
+
+        if(pitem.toggled)
+          checkbox_checked->draw(
+                       x_pos + (text_width+font_width)/2,
+                       y_pos - 8);
+        else
+          checkbox->draw(
+                       x_pos + (text_width+font_width)/2,
+                       y_pos - 8);
+        break;
+      }
+    case MN_ACTION:
+      text_font->draw_align(pitem.text, x_pos, y_pos, A_HMIDDLE, A_VMIDDLE, shadow_size);
+      break;
+
+    case MN_GOTO:
+      text_font->draw_align(pitem.text, x_pos, y_pos, A_HMIDDLE, A_VMIDDLE, shadow_size);
+      break;
     }
+}
 
-  for(i = 0; i < pmenu->num_items; ++i)
+int Menu::width()
+{
+  /* The width of the menu has to be more than the width of the text
+     with the most characters */
+  int menu_width = 0;
+  for(unsigned int i = 0; i < item.size(); ++i)
     {
-      if(pmenu->arrange_left == YES)
-        b = (a - ((strlen(pmenu->item[i].text)+strlen(pmenu->item[i].input)+ strlen(string_list_active(pmenu->item[i].list))) * 16)) / 2;
-      else
-        b = 0;
-
-      if(e != 0)
+      int w = strlen(item[i].text) + (item[i].input ? strlen(item[i].input) + 1 : 0) + strlen(string_list_active(item[i].list));
+      if( w > menu_width )
         {
-          if(i % 2)
-            f = e;
-          else
-            f = -e;
+          menu_width = w;
+          if( item[i].kind == MN_TOGGLE)
+            menu_width += 2;
         }
-      else
-        f = 0;
+    }
 
-      if(pmenu->item[i].kind == MN_DEACTIVE)
-        {
-          text_drawf(&black_text,pmenu->item[i].text, - b,(i)*24 - menu_height/2 + 10 + f,A_HMIDDLE, A_VMIDDLE,2,NO_UPDATE);
-        }
-      else if(pmenu->item[i].kind == MN_HL)
-        {
-          /* Draw a horizontal line with a little 3d effect */
-          fillrect(screen->w/2 - menu_width/2,(i)*24 - menu_height/2 + 6 + screen->h /2,menu_width,4,210,50,50,225);
-          fillrect(screen->w/2 - menu_width/2,(i)*24 - menu_height/2 + 10 + screen->h /2,menu_width,2,0,0,0,255);
-        }
-      else if(pmenu->item[i].kind == MN_LABEL)
-        {
-          text_drawf(&white_big_text,pmenu->item[i].text, - b,(i)*24 - menu_height/2 + 10,A_HMIDDLE, A_VMIDDLE,2,NO_UPDATE);
-        }
-      else if(pmenu->item[i].kind == MN_TEXTFIELD || pmenu->item[i].kind == MN_NUMFIELD)
-        {
-          fillrect(-b +screen->w/2 - ((strlen(pmenu->item[i].input)*16)/2) + ((strlen(pmenu->item[i].text) + 1)*16)/2 - 1,(i)*24 - menu_height/2 + 10 + screen->h /2 - 10 + f,(strlen(pmenu->item[i].input)+1)*16 + 2,20,255,255,255,255);
-          fillrect(- b +screen->w/2 - ((strlen(pmenu->item[i].input)*16)/2) + ((strlen(pmenu->item[i].text) + 1)*16)/2,(i)*24 - menu_height/2 + 10 + screen->h /2 - 9 + f,(strlen(pmenu->item[i].input)+1)*16,18,0,0,0,128);
-          text_drawf(&gold_text,pmenu->item[i].input, - b + ((strlen(pmenu->item[i].text)+1) * 16)/2,(i)*24 - menu_height/2 + 10 + f,A_HMIDDLE, A_VMIDDLE,2,NO_UPDATE);
-          if(i == pmenu->active_item)
-            {
-              text_drawf(&blue_text,pmenu->item[i].text, - b  -(((strlen(pmenu->item[i].input)+1) * 16)/2),(i)*24 - menu_height/2 + 10 + f,A_HMIDDLE, A_VMIDDLE,3,NO_UPDATE);
-            }
-          else
-            {
-              text_drawf(&white_text,pmenu->item[i].text, - b  -(((strlen(pmenu->item[i].input)+1) * 16)/2),(i)*24 - menu_height/2 +10 + f,A_HMIDDLE, A_VMIDDLE,2,NO_UPDATE);
-            }
-        }
-      else if(pmenu->item[i].kind == MN_STRINGSELECT)
-        {
-          /* Draw arrows */
-          texture_draw(&arrow_left,-b +screen->w/2 - ((strlen(string_list_active(pmenu->item[i].list))*16)/2) + ((strlen(pmenu->item[i].text) + 1)*16)/2 - 17,(i)*24 - menu_height/2 + 10 + screen->h / 2 -8 + f,NO_UPDATE);
-          texture_draw(&arrow_right,-b +screen->w/2 - ((strlen(string_list_active(pmenu->item[i].list))*16)/2) + ((strlen(pmenu->item[i].text) + 1)*16)/2 - 1 + (strlen(string_list_active(pmenu->item[i].list))+1)*16,(i)*24 - menu_height/2 + 10 + screen->h / 2 -8 + f,NO_UPDATE);
-          /* Draw input background */
-          fillrect(-b +screen->w/2 - ((strlen(string_list_active(pmenu->item[i].list))*16)/2) + ((strlen(pmenu->item[i].text) + 1)*16)/2 - 1,(i)*24 - menu_height/2 + 10 + screen->h /2 - 10 + f,(strlen(string_list_active(pmenu->item[i].list))+1)*16 + 2,20,255,255,255,255);
-          fillrect(- b +screen->w/2 - ((strlen(string_list_active(pmenu->item[i].list))*16)/2) + ((strlen(pmenu->item[i].text) + 1)*16)/2,(i)*24 - menu_height/2 + 10 + screen->h /2 - 9 + f,(strlen(string_list_active(pmenu->item[i].list))+1)*16,18,0,0,0,128);
-
-          text_drawf(&gold_text,string_list_active(pmenu->item[i].list), - b + ((strlen(pmenu->item[i].text)+1) * 16)/2,(i)*24 - menu_height/2 + 10 + f,A_HMIDDLE, A_VMIDDLE,2,NO_UPDATE);
-          if(i == pmenu->active_item)
-            {
-              text_drawf(&blue_text,pmenu->item[i].text, - b  -(((strlen(string_list_active(pmenu->item[i].list))+1) * 16)/2),(i)*24 - menu_height/2 + 10 + f,A_HMIDDLE, A_VMIDDLE,3,NO_UPDATE);
-            }
-          else
-            {
-              text_drawf(&white_text,pmenu->item[i].text, - b  -(((strlen(string_list_active(pmenu->item[i].list))+1) * 16)/2),(i)*24 - menu_height/2 +10 + f,A_HMIDDLE, A_VMIDDLE,2,NO_UPDATE);
-            }
-        }
-      else if(i == pmenu->active_item)
-        {
-          text_drawf(&blue_text,pmenu->item[i].text, - b,(i)*24 - menu_height/2 + 10 + f ,A_HMIDDLE, A_VMIDDLE,3,NO_UPDATE);
-        }
-      else
-        {
-          text_drawf(&white_text,pmenu->item[i].text, - b,(i)*24 - menu_height/2 + 10 + f ,A_HMIDDLE, A_VMIDDLE,2,NO_UPDATE);
-        }
-      if(pmenu->item[i].kind == MN_TOGGLE)
-        {
+  return (menu_width * 16 + 24);
+}
 
-          if(pmenu->item[i].toggled == YES)
-            texture_draw(&checkbox_checked, - b + screen->w / 2 + (strlen(pmenu->item[i].text) * 16)/2  + 16,(i)*24 - menu_height/2 + 10 + screen->h / 2 -8 + f,NO_UPDATE);
-          else
-            texture_draw(&checkbox, - b + screen->w / 2 + (strlen(pmenu->item[i].text) * 16)/2 + 16,(i)*24 - menu_height/2 + 10 + screen->h / 2 - 8 + f,NO_UPDATE);
-        }
-      else if(pmenu->item[i].kind == MN_BACK)
-        {
-          texture_draw(&back, - b + screen->w / 2 + (strlen(pmenu->item[i].text) * 16)/2  + 16,(i)*24 - menu_height/2 + 10 + screen->h / 2 -8 + f,NO_UPDATE);
-        }
+int Menu::height()
+{
+  return item.size() * 24;
+}
+
+/* Draw the current menu. */
+void
+Menu::draw()
+{
+  int menu_height = height();
+  int menu_width = width();
+
+  /* Draw a transparent background */
+  fillrect(pos_x - menu_width/2,
+           pos_y - 24*item.size()/2 - 10,
+           menu_width,menu_height + 20,
+           150,180,200,125);
+
+  for(unsigned int i = 0; i < item.size(); ++i)
+    {
+      draw_item(i, menu_width, menu_height);
     }
 }
 
 /* Reset/Set global defaults */
 void menu_reset(void)
 {
-  menu_change = NO;
-  show_menu = NO;
-  menuaction = -1;
+  menu_change  = false;
+  show_menu    = false;
+  menuaction   = MENU_ACTION_NONE;
   current_menu = NULL;
-  last_menu = NULL;
 
   delete_character = 0;
-  mn_input_char = '\0';
+  mn_input_char    = '\0';
 }
 
 /* --- MENU --- */
 /* Draw the current menu and execute the (menu)events */
 void menu_process_current(void)
 {
-  menu_change = NO;
+  if(!show_menu)
+    return;
+
+  menu_change = false;
 
   if(current_menu != NULL)
     {
-      menu_action(current_menu);
-      menu_draw(current_menu);
+      current_menu->action();
+      current_menu->draw();
     }
 
-  menuaction = -1;
+  menuaction = MENU_ACTION_NONE;
 }
 
 /* Check for menu event */
-void menu_event(SDL_keysym* keysym)
+void
+Menu::event(SDL_Event& event)
 {
-  SDLKey key = keysym->sym;
-  SDLMod keymod;
-  char ch[2];
-  keymod = SDL_GetModState();
-
-  /* If the current unicode character is an ASCII character,
-     assign it to ch. */
-  if ( (keysym->unicode & 0xFF80) == 0 )
-    {
-      ch[0] = keysym->unicode & 0x7F;
-      ch[1] = '\0';
-    }
-  else
-    {
-      /* An International Character. */
-    }
+  if(show_menu == false && event.key.keysym.sym != SDLK_ESCAPE)
+    return;
 
-  switch(key)
+  SDLKey key;
+  switch(event.type)
     {
-    case SDLK_UP:		/* Menu Up */
-      menuaction = MN_UP;
-      menu_change = YES;
-      break;
-    case SDLK_DOWN:		/* Menu Down */
-      menuaction = MN_DOWN;
-      menu_change = YES;
-      break;
-    case SDLK_LEFT:		/* Menu Up */
-      menuaction = MN_LEFT;
-      menu_change = YES;
-      break;
-    case SDLK_RIGHT:		/* Menu Down */
-      menuaction = MN_RIGHT;
-      menu_change = YES;
-      break;
-    case SDLK_SPACE:
-      if(current_menu->item[current_menu->active_item].kind == MN_TEXTFIELD)
-      {
-      menuaction = MN_INPUT;
-      menu_change = YES;
-      mn_input_char = ' ';
+    case SDL_KEYDOWN:
+      key = event.key.keysym.sym;
+      SDLMod keymod;
+      char ch[2];
+      keymod = SDL_GetModState();
+      int x,y;
+
+      /* If the current unicode character is an ASCII character,
+         assign it to ch. */
+      if ( (event.key.keysym.unicode & 0xFF80) == 0 )
+        {
+          ch[0] = event.key.keysym.unicode & 0x7F;
+          ch[1] = '\0';
+        }
+      else
+        {
+          /* An International Character. */
+        }
+
+      switch(key)
+        {
+        case SDLK_UP:		/* Menu Up */
+          menuaction = MENU_ACTION_UP;
+          menu_change = true;
+          break;
+        case SDLK_DOWN:		/* Menu Down */
+          menuaction = MENU_ACTION_DOWN;
+          menu_change = true;
+          break;
+        case SDLK_LEFT:		/* Menu Up */
+          menuaction = MENU_ACTION_LEFT;
+          menu_change = true;
+          break;
+        case SDLK_RIGHT:		/* Menu Down */
+          menuaction = MENU_ACTION_RIGHT;
+          menu_change = true;
+          break;
+        case SDLK_SPACE:
+          if(item[active_item].kind == MN_TEXTFIELD)
+            {
+              menuaction = MENU_ACTION_INPUT;
+              menu_change = true;
+              mn_input_char = ' ';
+              break;
+            }
+        case SDLK_RETURN: /* Menu Hit */
+          menuaction = MENU_ACTION_HIT;
+          menu_change = true;
+          break;
+        case SDLK_DELETE:
+        case SDLK_BACKSPACE:
+          menuaction = MENU_ACTION_REMOVE;
+          menu_change = true;
+          delete_character++;
+          break;
+        case SDLK_ESCAPE:
+          if(show_menu && has_backitem == true && last_menu != NULL)
+            Menu::set_current(last_menu);
+          else if(show_menu)
+            show_menu = false;
+          else
+            show_menu = true;
+        default:
+          if( (key >= SDLK_0 && key <= SDLK_9) || (key >= SDLK_a && key <= SDLK_z) || (key >= SDLK_SPACE && key <= SDLK_SLASH))
+            {
+              menuaction = MENU_ACTION_INPUT;
+              menu_change = true;
+              mn_input_char = *ch;
+            }
+          else
+            {
+              mn_input_char = '\0';
+            }
+          break;
+        }
       break;
-      }
-    case SDLK_RETURN: /* Menu Hit */
-      menuaction = MN_HIT;
-      menu_change = YES;
+    case  SDL_JOYAXISMOTION:
+      if(event.jaxis.axis == JOY_Y)
+        {
+          if (event.jaxis.value > 1024)
+            menuaction = MENU_ACTION_DOWN;
+          else if (event.jaxis.value < -1024)
+            menuaction = MENU_ACTION_UP;
+        }
       break;
-    case SDLK_DELETE:
-    case SDLK_BACKSPACE:
-      menuaction = MN_REMOVE;
-      menu_change = YES;
-      delete_character++;
+    case  SDL_JOYBUTTONDOWN:
+      menuaction = MENU_ACTION_HIT;
       break;
-    default:
-      if( (key >= SDLK_0 && key <= SDLK_9) || (key >= SDLK_a && key <= SDLK_z) || (key >= SDLK_SPACE && key <= SDLK_SLASH))
+    case SDL_MOUSEBUTTONDOWN:
+      x = event.motion.x;
+      y = event.motion.y;
+      if(x > pos_x - width()/2 &&
+          x < pos_x + width()/2 &&
+          y > pos_y - height()/2 &&
+          y < pos_y + height()/2)
         {
-          menuaction = MN_INPUT;
-          menu_change = YES;
-          mn_input_char = *ch;
+          menuaction = MENU_ACTION_HIT;
         }
-      else
+      break;
+    case SDL_MOUSEMOTION:
+      x = event.motion.x;
+      y = event.motion.y;
+      if(x > pos_x - width()/2 &&
+          x < pos_x + width()/2 &&
+          y > pos_y - height()/2 &&
+          y < pos_y + height()/2)
         {
-          mn_input_char = '\0';
+          active_item = (y - (pos_y - height()/2)) / 24;
+          menu_change = true;
+	  mouse_cursor->set_state(MC_LINK);
         }
+	else
+	{
+	  mouse_cursor->set_state(MC_NORMAL);
+	}
+      break;
+    default:
       break;
     }
-
-
-  /* FIXME: NO JOYSTICK SUPPORT */
-  /*#ifdef JOY_YES
-  else if (event.type == SDL_JOYBUTTONDOWN)
-   {
-      Joystick button: Continue:
-
-     done = 1;
-   }
-  #endif*/
 }
 
+
+// EOF //