Changeset 5986

Timestamp:

Oct 22, 2009, 11:32:30 PM (14 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

Location:

code/branches/console/src/libraries/core

Files:

• IOConsole.cc (modified) (1 diff)
• Shell.cc (modified) (3 diffs)
• Shell.h (modified) (1 diff)
• input/InputPrereqs.h (modified) (3 diffs)

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

@@ -127 +127 @@
                     this->buffer_->buttonPressed(KeyEvent(KeyCode::End,      0, 0));
                 else if (this->escapeSequence_ == "5~")
-                    this->buffer_->buttonPressed(KeyEvent(KeyCode::PageUp,   0, 0));
+                    this->buffer_->buttonPressed(KeyEvent(KeyCode::AltPageUp,   0, 0));
                 else if (this->escapeSequence_ == "6~")
-                    this->buffer_->buttonPressed(KeyEvent(KeyCode::PageDown, 0, 0));
+                    this->buffer_->buttonPressed(KeyEvent(KeyCode::AltPageDown, 0, 0));
                 else if (this->escapeSequence_.size() > 4)
                     // User probably very quickly pressed ESC and [

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()
     {

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

@@ -129 +129 @@
             void history_up();
             void history_down();
+            void history_search_up();
+            void history_search_down();
             void scroll_up();
             void scroll_down();

code/branches/console/src/libraries/core/input/InputPrereqs.h

@@ -179 +179 @@
             Up            = OIS::KC_UP,              // UpArrow on arrow keypad
             PageUp        = OIS::KC_PGUP,            // PgUp on arrow keypad
+            AltPageUp     = OIS::KC_PGUP+1,          // Alternative PgUp for the IOConsole
             Left          = OIS::KC_LEFT,            // LeftArrow on arrow keypad
             Right         = OIS::KC_RIGHT,           // RightArrow on arrow keypad
@@ -184 +185 @@
             Down          = OIS::KC_DOWN,            // DownArrow on arrow keypad
             PageDown      = OIS::KC_PGDOWN,          // PgDn on arrow keypad
+            AltPageDown   = OIS::KC_END-1,           // Alternative PgUp for IOConsole
             Insert        = OIS::KC_INSERT,          // Insert on arrow keypad
             Delete        = OIS::KC_DELETE,          // Delete on arrow keypad
@@ -286 +288 @@
             "UP",
             "PageUp",
-            "",
+            "", // used for AltPageUp
             "Left",
             "",
             "Right",
-            "",
+            "", // used for AltPageDown
             "End", "Down", "PageDown", "Insert", "Delete",
             "","","","","","","",