1 files changed, 75 insertions, 74 deletions

diff --git a/src/ncur/menu.cpp b/src/ncur/menu.cpp
index dcacc9b..c5734a5 100755
--- a/src/ncur/menu.cpp
+++ b/src/ncur/menu.cpp
@@ -6,111 +6,112 @@
 #ifndef MENU_CPP
 #define MENU_CPP
 
-using namespace std;
 
-menu::menu( int i_startx, int i_starty, int i_width, int i_height, char *c_header, char **choices, int i_numchoices, const chtype ch )
+using namespace std; menu::menu( int i_startx, int i_starty, int i_width, int i_height, char *c_header, char **choices, int i_numchoices, const chtype ch )
 {
-  this->i_startx = i_startx;
-  this->i_starty = i_starty;
-  this->i_height = i_height;
-  this->i_width  = i_width;
-  this->c_header = c_header;
-  this->choices  = choices;
-  this->i_numchoices = i_numchoices;
-
-  initialize( ch );
+    this->i_startx = i_startx;
+    this->i_starty = i_starty;
+    this->i_height = i_height;
+    this->i_width  = i_width;
+    this->c_header = c_header;
+    this->choices  = choices;
+    this->i_numchoices = i_numchoices;
+
+    initialize( ch );
 }
 
 menu::~menu()
 {
-  /*
-   wborder(win, ' ', ' ', ' ',' ',' ',' ',' ',' ');
-   wrefresh(win);
-   delwin(win);
-  */
+    /*
+     wborder(win, ' ', ' ', ' ',' ',' ',' ',' ',' ');
+     wrefresh(win);
+     delwin(win);
+    */
 }
 
 void
 menu::initialize( const chtype ch )
 {
-  this->i_highlight = 1;
-  this->i_choice = 0;
+    this->i_highlight = 1;
+    this->i_choice = 0;
 
-  win = newwin( i_height, i_width, i_starty, i_startx );
-  wbkgd(win, ch);
+    win = newwin( i_height, i_width, i_starty, i_startx );
+    wbkgd(win, ch);
 }
 
 void
 menu::display()
 {
-  int x, y, i;
+    int x, y, i;
 
-  x = 2;
-  y = 2;
+    x = 2;
+    y = 2;
 
-  box( win, 0, 0 );
-  mvwprintw( win, y++, x, "%s", c_header );
+    box( win, 0, 0 );
+    mvwprintw( win, y++, x, "%s", c_header );
 
-  for( i = 0; i < i_numchoices; i++ )
-  {
-    ++y;
-
-    if( i_highlight == i+1 ) // Highlight the current selection.
-    {
-      wattron( win, A_REVERSE);
-      mvwprintw( win, y, x, "%d. %s", i, choices[i]);
-      wattroff( win, A_REVERSE);
-    } else
+    for( i=0; i<i_numchoices; i++ )
     {
-      mvwprintw( win, y, x, "%d. %s", i, choices[i]);
+        y++;
+
+        if( i_highlight == i + 1 ) /* High light the present choice */
+        {
+            wattron( win, A_REVERSE);
+            mvwprintw( win, y, x, "%d. %s", i, choices[i]);
+            wattroff( win, A_REVERSE);
+        }
+        else
+        {
+            mvwprintw( win, y, x, "%d. %s", i, choices[i]);
+        }
     }
-  }
 
-  wrefresh( win );
+    wrefresh( win );
 }
 
 void
 menu::start( void (*swich_case_menu_action)(int) )
 {
-  refresh();
-  bool b_flag = 1;
+    refresh();
+    bool b_flag = 1;
 
-  while( b_flag )
-  {
-    keypad(win, 1);
-    display();
-    c = wgetch( win );
-
-    switch(c)
+    while( b_flag )
     {
-    case KEY_UP:
-      if( i_highlight == 1 )
-        i_highlight = i_numchoices;
-      else
-        --i_highlight;
-      break;
-
-    case KEY_DOWN:
-      if( i_highlight == i_numchoices )
-        i_highlight = 1;
-      else
-        ++i_highlight;
-      break;
-
-    case 10:
-      i_choice = i_highlight;
-      break;
-
-    default:
-      mvprintw( NCUR_MENU_CHAR_X, NCUR_MENU_CHAR_Y, "%3d %c ", c, c);
-      refresh();
-      break;
+        keypad(win, 1);
+        display();
+        c = wgetch( win );
+
+        switch(c)
+        {
+        case KEY_UP:
+            if( i_highlight == 1 )
+                i_highlight = i_numchoices;
+            else
+                --i_highlight;
+            break;
+
+        case KEY_DOWN:
+            if( i_highlight == i_numchoices )
+                i_highlight = 1;
+            else
+                ++i_highlight;
+            break;
+
+        case 10:
+            i_choice = i_highlight;
+            break;
+
+        default:
+            mvprintw( NCUR_MENU_CHAR_X, NCUR_MENU_CHAR_Y, "%3d %c ", c, c);
+            refresh();
+            break;
+        }
+
+
+        // Menu action.
+        ( *swich_case_menu_action ) ( i_choice );
+        i_choice = 0;
     }
-
-    // Menu action.
-    ( *swich_case_menu_action ) ( i_choice );
-    i_choice = 0;
-  }
 }
 
 #endif