Changeset 1324 for code/branches/console/src/core/Shell.cc

Timestamp:

May 19, 2008, 2:58:22 PM (16 years ago)

Author:

landauf

Message:

Added a command-history to the console. you can scroll through all previously entered commands by pressing [up] key.
The history is stored in orxonox.ini in the section [Shell]. You can configure the maximal amount of stored commands (default: 100).
This allows you to use the history after orxonox was restarted.
The history uses a cyclic vector (with the configured size), meaning the newest command will overwrite the oldest entry (if the maximal size was reached).

additionally I fixed some bugs in ConfigValueContainer and added a mod-function to Math.h, that does basically the same as %, but without returning a negative value in case of a negative input.

-1 % 10 = -1
-11 % 10 = -1

mod(-1, 10) = 9
mod(-11, 10) = 9

File:

• code/branches/console/src/core/Shell.cc (modified) (6 diffs)

code/branches/console/src/core/Shell.cc

@@ -80 +80 @@
         SetConfigValue(maxHistoryLength_, 100);
         SetConfigValue(historyOffset_, 0);
-        SetConfigValueVector(commandHistory_, std::vector<std::string>());
-
-std::cout << "gaga1: " << this->commandHistory_[this->historyOffset_] << std::endl;
+        SetConfigValueVector(commandHistory_, std::vector<std::string>(1, ""));
 
         if (this->historyOffset_ >= this->maxHistoryLength_)
@@ -93 +91 @@
             ModifyConfigValue(commandHistory_, remove, index);
         }
-
-std::cout << "gaga2: " << this->commandHistory_[this->historyOffset_] << std::endl;
     }
 
@@ -163 +159 @@
     void Shell::addToHistory(const std::string& command)
     {
-std::cout << "command: " << command << std::endl;
-std::cout << "offset: " << this->historyOffset_ << std::endl;
         ModifyConfigValue(commandHistory_, set, this->historyOffset_, command);
-//        this->commandHistory_[this->historyOffset_] = command;
         this->historyPosition_ = 0;
-std::cout << "gaga3: " << this->commandHistory_[this->historyOffset_] << std::endl;
         ModifyConfigValue(historyOffset_, set, (this->historyOffset_ + 1) % this->maxHistoryLength_);
-std::cout << "offset new: " << this->historyOffset_ << std::endl;
     }
 
     std::string Shell::getFromHistory() const
     {
-        return this->commandHistory_[(this->historyOffset_ - this->historyPosition_) % this->maxHistoryLength_];
+        unsigned int index = mod(((int)this->historyOffset_) - ((int)this->historyPosition_), this->maxHistoryLength_);
+        if (index < this->commandHistory_.size() && this->historyPosition_ != 0)
+            return this->commandHistory_[index];
+        else
+            return "";
     }
 
@@ -219 +214 @@
     void Shell::execute()
     {
-//        this->addToHistory(this->inputBuffer_.get());
+        this->addToHistory(this->inputBuffer_.get());
         this->addLine(this->inputBuffer_.get(), 0);
 
@@ -252 +247 @@
     {
         this->inputBuffer_.clear();
+        this->historyPosition_ = 0;
         SHELL_UPDATE_LISTENERS(inputChanged);
         SHELL_UPDATE_LISTENERS(cursorChanged);
@@ -282 +278 @@
     void Shell::history_up()
     {
-        if (this->historyPosition_ < (this->commandHistory_.size() - 1))
+        if (this->historyPosition_ < this->commandHistory_.size())
         {
             this->historyPosition_++;