Changeset 5986 for code/branches/console/src/libraries/core/Shell.cc

Timestamp:

Oct 22, 2009, 11:32:30 PM (16 years ago)

Author:

scheusso

Message:

added a new feature to the IOConsole: you can now search the history (like in bash shells) with PgUP
just enter a few signs/characters of a command you once typed in and press PgUP to complete the command
if the found command is not the one you were looking for just press PgUP again

File:

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

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

@@ -30 +30 @@
 
 #include "util/OutputHandler.h"
+#include "util/StringUtils.h"
 #include "CommandExecutor.h"
 #include "CoreIncludes.h"
@@ -132 +133 @@
         this->inputBuffer_->registerListener(this, &Shell::scroll_up, KeyCode::PageUp);
         this->inputBuffer_->registerListener(this, &Shell::scroll_down, KeyCode::PageDown);
+        this->inputBuffer_->registerListener(this, &Shell::history_search_up, KeyCode::AltPageUp);
+        this->inputBuffer_->registerListener(this, &Shell::history_search_down, KeyCode::AltPageDown);
     }
 
@@ -357 +360 @@
     }
 
+    void Shell::history_search_up()
+    {
+        if (this->historyPosition_ == this->historyOffset_)
+            return;
+        unsigned int cursorPosition = this->getCursorPosition();
+        std::string input_str( this->getInput().substr(0,cursorPosition) ); //only search for the expression from the beginning of the inputline untill the cursor position
+        for (unsigned int newPos = this->historyPosition_+1; newPos<=this->historyOffset_; newPos++)
+        {
+            if (getLowercase(this->commandHistory_[this->historyOffset_ - newPos]).find(getLowercase(input_str)) == 0) //search case insensitive
+            {
+                this->historyPosition_ = newPos;
+                this->inputBuffer_->set(this->getFromHistory());
+                this->setCursorPosition( cursorPosition );
+                return;
+            }
+        }
+    }
+
+    void Shell::history_search_down()
+    {
+        if (this->historyPosition_ == 0)
+            return;
+        unsigned int cursorPosition = this->getCursorPosition();
+        std::string input_str( this->getInput().substr(0,cursorPosition) ); //only search for the expression from the beginn$
+        for (unsigned int newPos = this->historyPosition_-1; newPos>0; newPos--)
+        {
+            if (getLowercase(this->commandHistory_[this->historyOffset_ - newPos]).find(getLowercase(input_str)) == 0) //sear$
+            {
+                this->historyPosition_ = newPos;
+                this->inputBuffer_->set(this->getFromHistory());
+                this->setCursorPosition( cursorPosition );
+                return;
+            }
+        }
+    }
+
     void Shell::scroll_up()
     {