Merge pull request #120 from neu-rah/dev

fixed text edit cursor position on u8g2

Author: neu-rah

TODO.txt

@@ -1,5 +1,10 @@
 Arduino Menu Library
 
+- put navRoot.sleepTask as protected and add `bool suspended()` function
+- make clipping out of menu logic! check with hardware on gfx
+  => do so with panels independence!
+- simplify showTitle! current requires checking root and local overrides (and to be correct output size)
+- use setFont (API extension)
 - password fields
 - scroll long prompts (not for serial)
 - allow disabled items to receive events! for help print purposes
@@ -20,7 +25,10 @@ Arduino Menu Library
   - constructing the callback table...
     a)   navRoot.begin() but then webmenu had to register
     b) * use esp8266Out.begin()
-
+  -problems:
+    index what? actions, prompts? fields are templates!
+    the esp8266Out is not related to a menu
+    => put the table into navRoot... but only if we have a web output
 - central menu init by calling menu begin
   => check's ex: if numeric input available then output numeric indexes
 - help texts

examples/U8G2/U8G2/U8G2.ino

@@ -63,7 +63,7 @@ using namespace Menu;
 #elif (U8G2OUT==SSD1306)
   #include <Wire.h>
   #define fontName u8g2_font_5x7_tf
-  #define fontX 5
+  #define fontX 6
   #define fontY 8
   #define offsetX 0
   #define offsetY 0
@@ -89,27 +89,8 @@ const colorDef<uint8_t> colors[] MEMMODE={
 
 result doAlert(eventMask e, prompt &item);
 
-result showEvent(eventMask e,navNode& nav,prompt& item) {
-  Serial.print("event: ");
-  Serial.println(e);
-  return proceed;
-}
-
 int test=55;
 
-result action1(eventMask e) {
-  Serial.print(e);
-  Serial.println(" action1 executed, proceed menu");
-  Serial.flush();
-  return proceed;
-}
-
-result action2(eventMask e,navNode& nav, prompt &item) {
-  Serial.print(e);
-  Serial.print(" action2 executed, quiting menu");
-  return quit;
-}
-
 int ledCtrl=HIGH;
 
 result ledOn() {
@@ -141,21 +122,19 @@ CHOOSE(chooseTest,chooseMenu,"Choose",doNothing,noEvent,noStyle
   ,VALUE("Last",-1,doNothing,noEvent)
 );
 
-//customizing a prompt look!
-//by extending the prompt class
-class altPrompt:public prompt {
-public:
-  altPrompt(constMEM promptShadow& p):prompt(p) {}
-  Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t panelNr) override {
-    return out.printRaw("special prompt!",len);;
-  }
-};
-
-MENU(subMenu,"Sub-Menu",showEvent,anyEvent,noStyle
-  ,OP("Sub1",showEvent,anyEvent)
-  ,OP("Sub2",showEvent,anyEvent)
-  ,OP("Sub3",showEvent,anyEvent)
-  ,altOP(altPrompt,"",showEvent,anyEvent)
+// //customizing a prompt look!
+// //by extending the prompt class
+// class altPrompt:public prompt {
+// public:
+//   altPrompt(constMEM promptShadow& p):prompt(p) {}
+//   Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t panelNr) override {
+//     return out.printRaw("special prompt!",len);;
+//   }
+// };
+
+MENU(subMenu,"Sub-Menu",doNothing,noEvent,noStyle
+  ,OP("Sub1",doNothing,noEvent)
+  // ,altOP(altPrompt,"",doNothing,noEvent)
   ,EXIT("<Back")
 );
 
@@ -164,9 +143,9 @@ char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
 char buf1[]="0x11";
 
 MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
-  ,OP("Op1",action1,anyEvent)
-  ,OP("Op2",action2,enterEvent)
-  ,FIELD(test,"Test","%",0,100,10,1,doNothing,noEvent,wrapStyle)
+  ,OP("Op1",doNothing,noEvent)
+  ,OP("Op2",doNothing,noEvent)
+  //,FIELD(test,"Test","%",0,100,10,1,doNothing,noEvent,wrapStyle)
   ,SUBMENU(subMenu)
   ,SUBMENU(setLed)
   ,OP("LED On",ledOn,enterEvent)
@@ -175,7 +154,7 @@ MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
   ,SUBMENU(chooseMenu)
   ,OP("Alert test",doAlert,enterEvent)
   ,EDIT("Hex",buf1,hexNr,doNothing,noEvent,noStyle)
-  ,EXIT("<Back")
+  ,EXIT("<Exit")
 );
 
 #define MAX_DEPTH 2
@@ -243,6 +222,7 @@ void setup() {
   #endif
   u8g2.begin();
   u8g2.setFont(fontName);
+  u8g2.setBitmapMode(0);
 
   //disable second option
   mainMenu[1].enabled=disabledStatus;

examples/adafruitGfx/lcdMono/lcdMono/lcdMono.ino

@@ -63,12 +63,17 @@ TOGGLE(ledCtrl,setLed,"Led: ",doNothing,noEvent,noStyle//,doExit,enterEvent,noSt
   ,VALUE("Off",LOW,doNothing,noEvent)
 );
 
+char* constMEM hexDigit MEMMODE="0123456789ABCDEF";
+char* constMEM hexNr[] MEMMODE={"0","x",hexDigit,hexDigit};
+char buf1[]="0x11";
+
 MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
   ,FIELD(test,"Test","%",0,100,10,1,doNothing,noEvent,wrapStyle)
   ,SUBMENU(setLed)
   ,OP("LED On",ledOn,enterEvent)
   ,OP("LED Off",ledOff,enterEvent)
   ,OP("Alert test",doAlert,enterEvent)
+  ,EDIT("Hex",buf1,hexNr,doNothing,noEvent,noStyle)
   ,EXIT("<Back")
 );
 
@@ -86,7 +91,8 @@ const colorDef<uint16_t> colors[] MEMMODE={
 
 #define gfxWidth 84
 #define gfxHeight 48
-#define fontX 5
+#define fontX 6
+//5
 #define fontY 9
 #define MAX_DEPTH 2
 
@@ -182,6 +188,7 @@ void setup() {
   delay(2000);
   gfx.clearDisplay();
   gfx.display(); // show splashscreen
+  // gfx.drawRect(0, 0, 84, 48, 1);
 }
 
 void loop() {

examples/adafruitGfx/tft/tft/tft.ino

@@ -113,7 +113,7 @@ char buf1[]="0x11";
 MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
   ,OP("Op1",doNothing,noEvent)
   ,OP("Op2",doNothing,noEvent)
-  ,FIELD(test,"Test","%",0,100,10,1,doNothing,noEvent,wrapStyle)
+  // ,FIELD(test,"Test","%",0,100,10,1,doNothing,noEvent,wrapStyle)
   ,SUBMENU(subMenu)
   ,SUBMENU(setLed)
   ,OP("LED On",ledOn,enterEvent)

library.properties

@@ -1,11 +1,11 @@
 name=ArduinoMenu library
-version=4.0.1
+version=4.0.2
 author=Rui Azevedo, [email protected]
 maintainer=neu-rah, [email protected]
 sentence=AVR generic menu/interactivity system
 paragraph=Easy to define menu system with sub-menus and associated function to call. Works either over serial or nultiple combinations of IO
 category=Display
 url=https://github.com/neu-rah/ArduinoMenu
-dot_a_linkage=false
+dot_a_linkage=true
 architectures=*
 includes=menu.h

src/menu.cpp

@@ -12,6 +12,8 @@ result Menu::inaction(menuOut& o,idleEvent) {
   return proceed;
 }
 
+bool prompt::hasTitle(navNode& nav) const {return (nav.target->has(showTitle)||(nav.root->showTitle&&!nav.target->has(noTitle)));}
+
 idx_t prompt::printRaw(menuOut& out,idx_t len) const {
   trace(Serial<<"prompt::printRaw"<<endl);
   return print_P(out,getText(),len);
@@ -131,18 +133,19 @@ Used textField::printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len
     out.write(editing?":":" ");
     l++;
   }
-  idx_t c=l;
+  // idx_t c=l;
   //idx_t top=out.tops[root.level];
-  idx_t tit=root.showTitle?1:0;
-  idx_t line=idx+tit;
+  idx_t tit=hasTitle(root.node())?1:0;
+  idx_t line=idx+tit;//-out.tops[root.level];
   while(buffer()[at]&&l++<len)
     if (at==cursor&&editing) {
-      c=l;
-      l+=out.startCursor(root,c,line,charEdit);//draw textual cursor or color code start
+      // Serial<<"idx:"<<idx<<" line:"<<line<<" at:"<<at<<" l:"<<l<<endl;
+      // c=l+1;
+      l+=out.startCursor(root,l,line,charEdit);//draw textual cursor or color code start
       out.write(buffer()[at++]);//draw focused character
-      l+=out.endCursor(root,c,line,charEdit);//draw textual cursor or color code end
+      l+=out.endCursor(root,l,line,charEdit);//draw textual cursor or color code end
     } else out.write(buffer()[at++]);
-  l+=out.editCursor(root,c,line,editing,charEdit);//reposition a non text cursor
+  l+=out.editCursor(root,l,line,editing,charEdit);//reposition a non text cursor
   return l;
 }
 

src/menu.h

@@ -19,7 +19,12 @@ for correcting unsigned values validation
   #define RSITE_ARDUINO_MENU_SYSTEM
   #include <Arduino.h>
   #if defined(DEBUG)
-    #include <streamFlow.h>
+    // #ifdef _U8G2LIB_HH
+      //because U8G2 already uses Streaming
+      #include <Streaming.h>
+    // #else
+      // #include <streamFlow.h>
+    // #endif
   #endif
   #include "menuBase.h"
   #include "shadows.h"
@@ -80,12 +85,15 @@ 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
@@ -574,22 +582,22 @@ for correcting unsigned values validation
         void refresh() {//force redraw of all outputs on next output call
           for(int n=0;n<cnt;n++) ((menuOut*)memPtr(outs[n]))->drawn=NULL;
         }
-        void clearLine(idx_t ln,idx_t panelNr=0,colorDefs color=bgColor,bool selected=false,status stat=enabledStatus) const {
-          for(int n=0;n<cnt;n++) ((menuOut*)memPtr(outs[n]))->clearLine(ln,panelNr,color,selected,stat);
-        }
+        // void clearLine(idx_t ln,idx_t panelNr=0,colorDefs color=bgColor,bool selected=false,status stat=enabledStatus) const {
+        //   for(int n=0;n<cnt;n++) ((menuOut*)memPtr(outs[n]))->clearLine(ln,panelNr,color,selected,stat);
+        // }
         void clearChanged(navNode& nav) const {
           for(int n=0;n<cnt;n++) ((menuOut*)memPtr(outs[n]))->clearChanged(nav);
         }
         void clear() {for(int n=0;n<cnt;n++) ((menuOut*)memPtr(outs[n]))->clear();}
-        void setCursor(idx_t x,idx_t y) {
-          for(int n=0;n<cnt;n++) ((menuOut*)memPtr(outs[n]))->setCursor(x,y);
-        }
-        void setColor(colorDefs c,bool selected=false,status s=enabledStatus) {
-          for(int n=0;n<cnt;n++) ((menuOut*)memPtr(outs[n]))->setColor(c,selected,s);
-        }
-        void drawCursor(idx_t ln,bool selected,status stat,idx_t panelNr=0) {
-          for(int n=0;n<cnt;n++) ((menuOut*)memPtr(outs[n]))->drawCursor(ln,selected,stat,panelNr);
-        }
+        // void setCursor(idx_t x,idx_t y) {
+        //   for(int n=0;n<cnt;n++) ((menuOut*)memPtr(outs[n]))->setCursor(x,y);
+        // }
+        // void setColor(colorDefs c,bool selected=false,status s=enabledStatus) {
+        //   for(int n=0;n<cnt;n++) ((menuOut*)memPtr(outs[n]))->setColor(c,selected,s);
+        // }
+        // void drawCursor(idx_t ln,bool selected,status stat,idx_t panelNr=0) {
+        //   for(int n=0;n<cnt;n++) ((menuOut*)memPtr(outs[n]))->drawCursor(ln,selected,stat,panelNr);
+        // }
         void doNav(navCmd cmd,class navNode &nav) {for(int n=0;n<cnt;n++) ((menuOut*)memPtr(outs[n]))->doNav(cmd,nav);}
         result idle(idleFunc f,idleEvent e) {
           #ifdef DEBUG
@@ -677,7 +685,7 @@ for correcting unsigned values validation
           for(idx_t n=0;n<=d;n++)//initialize path chain for this root (v4.0)
             path[n].root=this;
         }
-        void useMenu(constMEM menuNode &menu) {
+        void useMenu(menuNode &menu) {
           navFocus=&menu;
           path[0].target=&menu;
           reset();
@@ -812,7 +820,7 @@ for correcting unsigned values validation
     #ifdef DEBUG
       inline String& operator<<(String&s,prompt &p) {return s+=p.getText();}
       inline Stream& operator<<(Stream&o,prompt& p) {print_P(o,p.getText());return o;}
-      inline Stream& operator<<(Stream&o,const navNode& p) {return o<<*p.target;}
+      inline Stream& operator<<(Stream&o,const navNode& p) {return o<<*(prompt*)p.target;}
       inline Stream& operator<<(Stream&o,const navRoot& p) {return o<<p.node();}
     #endif
   }//namespace Menu

src/menuBase.h

@@ -188,29 +188,29 @@ www.r-site.net
 
     #ifdef DRAW_2D
       typedef class Area {
-      protected:
-        inline Area op(Area& (Area::*o)(const Area&),const Area&p) const {
-          Area tmp(*this);
-          return (tmp.*o)(p);
-        }
-      public:
-        idx_t w;
-        idx_t h;
-        inline Area() {}
-        inline Area(idx_t w,idx_t h):w(w),h(h) {}
-        inline Area(const Area& o):w(o.w),h(o.h) {}
-        inline Area(idx_t x):w(x),h(0) {}
-        inline operator idx_t() {return w;}
-        inline Area  operator-() {return Area(-h,-w);}
-        inline Area& operator+=(const Area& o) {w+=o.w;h+=o.h;return *this;}
-        inline Area& operator-=(const Area& o) {w-=o.w;h-=o.h;return *this;}
-        inline Area& operator&=(const Area& o) {
-          if (w<o.w) w=o.w;
-          if (h<o.h) h=o.h;
-          return *this;
-        }
-        inline Area  operator+ (const Area& o) const {return op(&Area::operator+=,o);}
-        inline Area  operator- (const Area& o) const {return op(&Area::operator-=,o);}
+        protected:
+          inline Area op(Area& (Area::*o)(const Area&),const Area&p) const {
+            Area tmp(*this);
+            return (tmp.*o)(p);
+          }
+        public:
+          idx_t w;
+          idx_t h;
+          inline Area() {}
+          inline Area(idx_t w,idx_t h):w(w),h(h) {}
+          inline Area(const Area& o):w(o.w),h(o.h) {}
+          inline Area(idx_t x):w(x),h(0) {}
+          inline operator idx_t() {return w;}
+          inline Area  operator-() {return Area(-h,-w);}
+          inline Area& operator+=(const Area& o) {w+=o.w;h+=o.h;return *this;}
+          inline Area& operator-=(const Area& o) {w-=o.w;h-=o.h;return *this;}
+          inline Area& operator&=(const Area& o) {
+            if (w<o.w) w=o.w;
+            if (h<o.h) h=o.h;
+            return *this;
+          }
+          inline Area  operator+ (const Area& o) const {return op(&Area::operator+=,o);}
+          inline Area  operator- (const Area& o) const {return op(&Area::operator-=,o);}
       } Used;
     #else
       typedef idx_t Used;

src/menuIO/esp8266Out.h

@@ -11,23 +11,20 @@
   #include <ESP8266mDNS.h>
   //#include <Hash.h>
   //#include <FS.h>
+  #include <vector>
+
+  using namespace std;
 
   namespace Menu {
 
     class esp8266Out:public menuOut {
       public:
-        //typedef const char* webColor;
-        //const colorDef<webColor> (&colors)[nColors];
         esp8266Out(
           //const colorDef<webColor> (&c)[nColors],
           idx_t* t,
           panelsList& p,
           menuOut::styles styles=(menuOut::styles)(redraw|expandEnums)
         ):menuOut(t,p,styles) {}
-        //size_t write(uint8_t ch) override {return client->write(ch);}
-        /*inline webColor getColor(colorDefs color=bgColor,bool selected=false,status stat=enabledStatus,bool edit=false) const {
-          return (webColor)memPtr(&(stat==enabledStatus?colors[color].enabled[selected+edit]:colors[color].disabled[selected]));
-        }*/
         menuOut& fill(
           int x1, int y1, int x2, int y2,char ch=' ',
           colorDefs color=bgColor,

src/menuIO/serialIO.h

@@ -0,0 +1,3 @@
+/* -*- C++ -*- */
+#include "serialIn.h"
+#include "serialOut.h"