Changed teh variable names to make the code more readable

menu.h

@@ -110,12 +110,14 @@ class MenuBar {
                 {
                     wattroff(win, A_STANDOUT);
                 }
+                if(!is_selected)
+                    return;
                 wrefresh(win);
 
                 char ch;
                 drawMenuItems(menu);
                 wrefresh(menuwin);
-                while(is_selected && (ch = wgetch(menuwin)))
+                while((ch = wgetch(menuwin)))
                 {
                     switch(ch)
                     {
@@ -126,13 +128,14 @@ class MenuBar {
                         menu.selectPrevItem();
                         break;
                     default:
-                        is_selected = false;
-                    }
-                    drawMenuItems(menu);
-                }
                         werase(menuwin);
                         wrefresh(menuwin);
                         reset();
+                        return;
+                    }
+                    drawMenuItems(menu);
+                    wrefresh(menuwin);
+                }
         }
 
         void drawMenuItems(Menu menu)

tui.cpp

@@ -17,49 +17,45 @@ int main(int argc, char **argv){
     start_color();
     init_pair(1, COLOR_WHITE,COLOR_BLUE);
 
-    int yMax,xMax;
+    int term_yMax,term_xMax;
-    getmaxyx(stdscr,yMax,xMax);
+    getmaxyx(stdscr,term_yMax,term_xMax);
 
-    WINDOW *win = newwin(yMax-1,xMax-1,1,1);
+    WINDOW *main_win = newwin(term_yMax-1,term_xMax-1,1,1);
-    box(win,0,0);
+    box(main_win,0,0);
 
-    string menu1[] = {"New","Open","Save","Exit"};
+    string File_Menu[] = {"Connect","Disconnect","Exit"};
-    string menu2[] = {"Copy","Cut","Paste"};
+    string View_Menu[] = {"Info","Machines","Log"};
-    string menu3[] = {"Sidebar","Terminal"};
 
-    Menu menus[3] = {
+    Menu main_menus[2] = {
-        Menu("File",'f',menu1,4),
+        Menu("File",'f',File_Menu,3),
-        Menu("Edit",'e',menu2,3),
+        Menu("View",'v',View_Menu,3),
-        Menu("View",'v',menu3,2),
     };
 
-    MenuBar menubar = MenuBar(win,menus,3);
+    MenuBar main_menubar = MenuBar(main_win,main_menus,2);
-    menubar.draw();
+    main_menubar.draw();
 
-    keypad(win, TRUE);
+    keypad(main_win, TRUE);
-    int ch;
+    int main_menus_input;
-    while((ch = wgetch(win))){
+    while((main_menus_input = wgetch(main_win))){
-        if(ch <= 255)
+        if(main_menus_input <= 255)
         {
-            menubar.handleTrigger(ch);
+            main_menubar.handleTrigger(main_menus_input);
-            menubar.draw();
+            main_menubar.draw();
         }
-        else if(ch == KEY_RESIZE)
+        else if(main_menus_input == KEY_RESIZE)
         {
             clear();
             refresh();
-            delwin(win);
+            delwin(main_win);
-            getmaxyx(stdscr,yMax,xMax);
+            getmaxyx(stdscr,term_yMax,term_xMax);
-            win = newwin(yMax-1,xMax-1,1,1);
+            main_win = newwin(term_yMax-1,term_xMax-1,1,1);
-            box(win,0,0);
+            box(main_win,0,0);
-            menubar.resize(win);
+            main_menubar.resize(main_win);
-            menubar.draw();
+            main_menubar.draw();
-            wrefresh(win);
+            wrefresh(main_win);
         }
     }
 
     endwin();
     return 0;
 }
-
-