cond. compile seek function

part of MENU_ASYNC
also turned ebentHandler non-virtual

Author: neu-rah

src/menu.cpp

@@ -39,6 +39,7 @@ Used prompt::printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,id
   return r;
 }
 
+#ifdef MENU_ASYNC
 prompt* menuNode::seek(idx_t* uri,idx_t len) {
   trace(Serial<<"menuNode::seek"<<endl);
   if (len&&uri[0]>=0&&uri[0]<sz()) {
@@ -47,7 +48,6 @@ prompt* menuNode::seek(idx_t* uri,idx_t len) {
     return e.seek(++uri,--len);
   } else return NULL;
 }
-#ifdef MENU_ASYNC
 bool menuNode::async(const char *uri,navRoot& root,idx_t lvl) {
   trace(Serial<<"menuNode::async"<<endl);
   if ((!*uri)||(uri[0]=='/'&&!uri[1])) return this;
@@ -216,7 +216,7 @@ Used outputsList::printMenu(navNode& nav) const {
 void menuOut::previewMenu(navRoot& root,menuNode& menu,idx_t panelNr) {
   trace(Serial<<"menuOut::previewMenu"<<endl);
   setColor(fgColor,false);
-  if (menu.asPad()) {
+  if (menu.has(_asPad)) {
     for(int i=0;i<menu.sz();i++) {
       prompt& p=menu[i];
       setColor(fgColor,false,p.enabled);
@@ -279,7 +279,7 @@ Used menuOut::printMenu(navNode &nav,idx_t panelNr) {
     idx_t topi=nav.root->level;
     if(topi&&nav.root->active().parentDraw()) topi--;
     idx_t ot=tops[topi];
-    bool asPad=nav.target->asPad();
+    bool asPad=nav.target->has(_asPad);
     idx_t st
       =((nav.target->style()&showTitle)||(nav.root->showTitle&&(!(nav.target->style()&noTitle))))
       &&!(asPad||(maxY(panelNr)<2));//do not use titles on single line devices!

src/menu.h

@@ -84,25 +84,27 @@ for correcting unsigned values validation
         inline bool is(eventMask chk) const {return (events()&chk)==chk;}
         inline bool has(eventMask chk) const {return events()&chk;}
 
-
         inline bool canWrap() const {return style()&wrapStyle;}
         inline bool canNav() const {return sysStyles()&_canNav;}//can receive navigation focus and process keys
         inline bool isMenu() const {return sysStyles()&_menuData;}//has menu data list and can be a navNode target
         inline bool isVariant() const {return sysStyles()&_isVariant;}//a menu as an enumerated field, connected to a variable value
         inline bool parentDraw() const {return sysStyles()&_parentDraw;}//a menu as an enumerated field, connected to a variable value
         inline bool asPad() const {return sysStyles()&_asPad;}//a menu as an enumerated field, connected to a variable value
+
         inline bool hasTitle(navNode& nav) const;
 
         virtual Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t panelNr=0);//raw print to output device
         virtual bool changed(const navNode &nav,const menuOut& out,bool sub=true) {return dirty;}
         //this is the system version of enter handler, its used by elements like toggle
         virtual result sysHandler(SYS_FUNC_PARAMS) {return proceed;}
-        virtual result eventHandler(eventMask e,navNode& nav,idx_t i) {
+        /*virtual*/ result eventHandler(eventMask e,navNode& nav,idx_t i) {
           return operator()(e,nav,*this);
         }
         inline result operator()(FUNC_PARAMS) const {return (*shadow)(FUNC_VALUES);}
         idx_t printRaw(menuOut& out,idx_t len) const;
-        virtual prompt* seek(idx_t* uri,idx_t len) {return len?NULL:this;}
+        #ifdef ASYNC_NAV
+          virtual prompt* seek(idx_t* uri,idx_t len) {return len?NULL:this;}
+        #endif
         #ifdef MENU_ASYNC
         virtual bool async(const char *uri,navRoot& root,idx_t lvl) {
           return ((!*uri)||(uri[0]=='/'&&!uri[1]));
@@ -267,7 +269,9 @@ for correcting unsigned values validation
         void clearChanged(const navNode &nav,const menuOut& out,bool sub) override;
         inline idx_t sz() const {return ((menuNodeShadow*)shadow)->_sz();}
         inline prompt* constMEM* data() const {return ((menuNodeShadow*)shadow)->_data();}
-        prompt* seek(idx_t* uri,idx_t len) override;
+        #ifdef ASYNC_NAV
+          prompt* seek(idx_t* uri,idx_t len) override;
+        #endif
         #ifdef MENU_ASYNC
           bool async(const char *uri,navRoot& root,idx_t lvl=0) override;
         #endif