allow main menus to not use Exit option

Author: neu-rah

menu.cpp

@@ -9,7 +9,7 @@ char menu::enabledCursor='>';
 char menu::disabledCursor='-';
 prompt menu::exitOption(menu::exit);
 
-int menu::menuKeys(menuOut &p,Stream& c) {
+int menu::menuKeys(menuOut &p,Stream& c,bool canExit) {
   int op=-2;
   do {
     while(!c.available());// delay(20);
@@ -20,13 +20,13 @@ int menu::menuKeys(menuOut &p,Stream& c) {
           if (sel>0) {
             sel--;
             if (sel+1>=p.maxY) p.top=sel-p.maxY;
-            printMenu(p);
+            printMenu(p,canExit);
           }
         } else if (ch=='+') {
-          if (sel<sz) {
+          if (sel<(sz-(canExit?0:1))) {
             sel++;
             if ((sz-sel+1)>=p.maxY) p.top=sel;
-            printMenu(p);
+            printMenu(p,canExit);
           }
         } else if (ch==27) {
         	op=-1;
@@ -37,23 +37,23 @@ int menu::menuKeys(menuOut &p,Stream& c) {
       c.read();
       op=sel==sz?-1:sel;
     }
-  } while(op<-1||op>=sz);
+  } while(canExit&&(op<-1||op>=sz));
   return op;
 }
 
-void menu::activate(menuOut& p,Stream& c) {
+void menu::activate(menuOut& p,Stream& c,bool canExit) {
   sel=0;
   p.top=0;
   int op=-1;
   do {
-    printMenu(p);
+    printMenu(p,canExit);
 		c.flush();//reset the encoder
 		while(c.available()) c.read();//clean the stream
-    op=menuKeys(p,c);
+    op=menuKeys(p,c,canExit);
     if (op>=0&&op<sz) {
     	sel=op;
       if (data[op]->enabled)
-      	data[op]->activate(p,c);
+      	data[op]->activate(p,c,true);
       	p.drawn=0;//redraw menu
     }
   } while(op!=-1);

menu.h

@@ -118,7 +118,7 @@ for encoders, joysticks, keyboards or touch a stream must be made out of them
     virtual void print(int)=0;
     virtual void println(int)=0;
     virtual void print(prompt &o,bool selected,int idx,int posY,int width)=0;
-		virtual void printMenu(menu&)=0;
+		virtual void printMenu(menu&,bool drawExit)=0;
   };
 
   ////////////////////////////////////////////////////////////////////
@@ -156,7 +156,7 @@ for encoders, joysticks, keyboards or touch a stream must be made out of them
     prompt(const char * text,promptAction action)
     	:text(text),action(action),enabled(true) {}
     virtual size_t printTo(Print& p) {p.print(text);return strlen(text);}
-    virtual void activate(menuOut& p,Stream&c) {action(*this,p,c);}
+    virtual void activate(menuOut& p,Stream&c,bool) {action(*this,p,c);}
   };
 
   //a menu or sub-menu
@@ -172,10 +172,10 @@ for encoders, joysticks, keyboards or touch a stream must be made out of them
     prompt* const* data;
     menu(const char * text,int sz,prompt* const data[]):prompt(text),sz(sz),data(data),sel(0),width(16) {}
 
-    int menuKeys(menuOut &p,Stream& c);
-    void printMenu(menuOut& p) {p.printMenu(*this);}
+    int menuKeys(menuOut &p,Stream& c,bool drawExit);
+    inline void printMenu(menuOut& p,bool drawExit) {p.printMenu(*this,drawExit);}
 
-    void activate(menuOut& p,Stream& c);
+    void activate(menuOut& p,Stream& c,bool canExit=false);
   };
 
 #endif

menuLCD.h

@@ -20,7 +20,7 @@
 			print(selected?(o.enabled?menu::enabledCursor:menu::disabledCursor):' ');
 			print(o.text);
 		}
-		virtual void printMenu(menu& m) {
+		virtual void printMenu(menu& m,bool drawExit) {
 			clear();
 			if (m.sel-top>=maxY) top=m.sel-maxY+1;//selected option outside device (bottom)
 			else if (m.sel<top) top=m.sel;//selected option outside device (top)
@@ -30,7 +30,7 @@
 				  print(*m.data[i],i==m.sel,i+1,i-top,m.width);
 				}
 			}
-			if (i-top<maxY)
+			if (drawExit&&i-top<maxY)
 				print(menu::exitOption,m.sel==m.sz,0,i-top,m.width);
 		}
   };

menuPrint.h

@@ -21,11 +21,11 @@
 			print(selected?(o.enabled?menu::enabledCursor:menu::disabledCursor):' ');
 			println(o.text);
 		}
-		virtual void printMenu(menu& m) {
+		virtual void printMenu(menu& m,bool drawExit) {
 			clear();
 			int i=0;for(;i<m.sz;i++)
 				  print(*m.data[i],i==m.sel,i+1,i-top,m.width);
-			print(menu::exitOption,m.sel==m.sz,0,i-top,m.width);
+			if (drawExit) print(menu::exitOption,m.sel==m.sz,0,i-top,m.width);
 		}
   };