Marvin console improvements (#385)

* moveable cursor for marvin console

Author: thokkat

game/marvin.cpp

@@ -211,14 +211,16 @@ Marvin::CmdVal Marvin::recognize(std::string_view inp) {
   return suggestion;
   }
 
-void Marvin::autoComplete(std::string& v) {
+bool Marvin::autoComplete(std::string& v) {
   auto ret = recognize(v);
   if(ret.cmd.type==C_Incomplete && !ret.complete.empty()) {
     for(auto& i:ret.complete)
       v.push_back(i);
     if(ret.fullword)
       v.push_back(' ');
+    return true;
     }
+  return false;
   }
 
 bool Marvin::exec(std::string_view v) {

game/marvin.h

@@ -11,7 +11,7 @@ class Marvin {
 
     Tempest::Signal<void(std::string_view)> print;
 
-    void autoComplete(std::string& v);
+    bool autoComplete(std::string& v);
     bool exec(std::string_view v);
 
   private:

game/ui/consolewidget.cpp

@@ -82,7 +82,6 @@ void ConsoleWidget::close() {
 
   ov->takeWidget(this);
   delete ov;
-  log.back().clear();
   }
 
 int ConsoleWidget::exec() {
@@ -116,7 +115,7 @@ void ConsoleWidget::paintEvent(PaintEvent& e) {
     fnt.drawText(p, margins().left, y, log[i]);
     y-=fnt.pixelSize();
     if(i+1==log.size()) {
-      int x = margins().left + fnt.textSize(log[i]).w;
+      int x = margins().left + fnt.textSize(log[i].data(),log[i].data()+cursPos).w;
       float a = float(Application::tickCount()%2000)/2000.f;
       p.setBrush(Color(1,1,1,a));
       p.drawRect(x,y,1,fnt.pixelSize());
@@ -137,36 +136,64 @@ void ConsoleWidget::keyDownEvent(KeyEvent& e) {
     close();
     }
 
+  if(e.key==Event::K_Left) {
+    if (cursPos>0)
+      cursPos--;
+    return;
+    }
+  if(e.key==Event::K_Right) {
+    if(cursPos<log.back().size())
+      cursPos++;
+    return;
+    }
   if(e.key==Event::K_Up) {
     histPos++;
-    if(histPos<cmdHist.size())
-      log.back() = cmdHist[cmdHist.size()-1-histPos]; else
-      histPos    = size_t(cmdHist.size()-1);
+    if(histPos<cmdHist.size()) {
+      if(histPos==0)
+        currCmd = log.back();
+      log.back() = cmdHist[cmdHist.size()-1-histPos];
+      cursPos    = log.back().size();
+      }
+    else {
+      histPos = size_t(cmdHist.size()-1);
+      }
     return;
     }
   if(e.key==Event::K_Down) {
     if(histPos==size_t(-1))
       return;
     histPos--;
     if(histPos<cmdHist.size())
-      log.back() = cmdHist[cmdHist.size()-1-histPos]; else
-      log.back() = "";
+      log.back() = cmdHist[cmdHist.size()-1-histPos];
+    else
+      log.back() = currCmd;
+    cursPos = log.back().size();
     return;
     }
 
   if(e.key==Event::K_C && (e.modifier&Event::M_Command)==Event::M_Command) {
     log.emplace_back("");
+    cursPos = 0;
+    currCmd = "";
+    histPos = size_t(-1);
     return;
     }
 
   if(e.key==Event::K_Back) {
-    if(log.back().size()>0)
-      log.back().pop_back();
+    if(0<cursPos && cursPos<=log.back().size()) {
+      log.back().erase(--cursPos,1);
+      }
+    return;
+    }
+  if(e.key==Event::K_Delete) {
+    if(log.back().size()>cursPos) {
+      log.back().erase(cursPos,1);
+      }
     return;
     }
   if(e.key==Event::K_Tab) {
-    if(log.back().size()>0)
-      marvin.autoComplete(log.back());
+    if(log.back().size()>0 && marvin.autoComplete(log.back()))
+      cursPos = log.back().size();
     return;
     }
   if(e.key==Event::K_Return) {
@@ -175,6 +202,9 @@ void ConsoleWidget::keyDownEvent(KeyEvent& e) {
       if(!marvin.exec(log.back()))
         log.back() = "Unknown command : " + log.back();
       log.emplace_back("");
+      cursPos = 0;
+      currCmd = "";
+      histPos = size_t(-1);
       }
     return;
     }
@@ -185,8 +215,8 @@ void ConsoleWidget::keyDownEvent(KeyEvent& e) {
     ch = char(e.code);
   if(ch=='\0')
     return;
-  log.back().push_back(ch);
-  histPos = size_t(-1);
+  log.back().insert(cursPos,1,ch);
+  cursPos++;
   }
 
 void ConsoleWidget::keyRepeatEvent(KeyEvent& e) {

game/ui/consolewidget.h

@@ -29,7 +29,9 @@ class ConsoleWidget : public Tempest::Widget {
     const Tempest::Texture2d* background = nullptr;
     Tempest::Shortcut         closeSk;
     std::vector<std::string>  log, cmdHist;
+    std::string               currCmd;
     size_t                    histPos = size_t(-1);
+    size_t                    cursPos = 0;
     Marvin                    marvin;
   };