Changeset 5245 in orxonox.OLD for trunk/src

Timestamp:

Sep 24, 2005, 8:47:02 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: autoCompletion now gives a very nice output

Location:

trunk/src/lib/shell

Files:

• shell.cc (modified) (2 diffs)
• shell.h (modified) (1 diff)
• shell_completion.cc (modified) (11 diffs)
• shell_completion.h (modified) (1 diff)
• shell_input.cc (modified) (1 diff)
• shell_input.h (modified) (4 diffs)

trunk/src/lib/shell/shell.cc

@@ -54 +54 @@
   // register the shell at the ShellBuffer
   ShellBuffer::getInstance()->registerShell(this);
-
+  // EVENT-Handler subscription of '`' to all States.
+  EventHandler::getInstance()->subscribe(this, ES_ALL, SDLK_BACKQUOTE);
 
   // Element2D and generals
@@ -72 +73 @@
   this->rebuildText();
 
-  // EVENT-Handler subscription of '`' to all States.
-  EventHandler::getInstance()->subscribe(this, ES_ALL, SDLK_BACKQUOTE);
 }
 

trunk/src/lib/shell/shell.h

@@ -4 +4 @@
  *
  * @todo Buffer Display in different Colors for different debug mode.
+ * @todo move up and down in Buffer
  */
 

trunk/src/lib/shell/shell_completion.cc

@@ -60 +60 @@
  * autocompletes the Shell's inputLine
  * @returns true, if a result was found, false otherwise
- *
- * @todo implement it!!
  */
 bool ShellCompletion::autoComplete(ShellInput* input)
@@ -169 +167 @@
   if (clList != NULL)
   {
-    if (!this->addToCompleteList(clList, classBegin))
+    if (!this->addToCompleteList(clList, classBegin, SHELLC_CLASS))
       return false;
   }
@@ -190 +188 @@
   if (boList != NULL)
   {
-    //printf("%s\n", boList->firstElement()->getName());
-    if (!this->addToCompleteList(boList, objectBegin))
+    SHELLC_TYPE type = SHELLC_OBJECT;
+    if (classID == CL_SHELL_COMMAND_CLASS)
+      type = SHELLC_CLASS;
+    if (!this->addToCompleteList(boList, objectBegin, type))
       return false;
   }
@@ -211 +211 @@
   ShellCommandClass::getCommandListOfClass(ClassList::IDToString(classID), &fktList);
   //printf("%s\n", boList->firstElement()->getName());
-  if (!this->addToCompleteList(&fktList, functionBegin))
+  if (!this->addToCompleteList(&fktList, functionBegin, SHELLC_FUNCTION))
     return false;
   return true;
@@ -228 +228 @@
   ShellCommandClass::getCommandListOfAlias(&aliasList);
   //printf("%s\n", boList->firstElement()->getName());
-  if (!this->addToCompleteList(&aliasList, aliasBegin))
+  if (!this->addToCompleteList(&aliasList, aliasBegin, SHELLC_ALIAS))
     return false;
   return true;
@@ -259 +259 @@
   tIterator<ShellC_Element>* charIterator = completionList->getIterator();
   ShellC_Element* charElem = charIterator->firstElement();
+  SHELLC_TYPE changeType = SHELLC_NONE;
   while (charElem != NULL)
   {
-    PRINTF(0)(displayAs, charElem->name);
+    if (charElem->type != changeType)
+    {
+      if (changeType != SHELLC_NONE)
+        PRINT(0)("\n");
+      PRINT(0)("%s: ", ShellCompletion::typeToString(charElem->type));
+      changeType = charElem->type;
+    }
+    PRINTF(0)("%s ", charElem->name);
     for (unsigned int i = inputLenght; i < addLength; i++)
       if (addString[i] != charElem->name[i])
       {
        addLength = i;
-       break;
+//       break;
       }
     charElem = charIterator->nextElement();
   }
   delete charIterator;
+  PRINT(0)("\n");
 
   if (addLength >= inputLenght)
@@ -301 +310 @@
  * !! The strings MUST NOT be deleted !!
  */
-bool ShellCompletion::addToCompleteList(const tList<const char>* inputList, const char* completionBegin)
+bool ShellCompletion::addToCompleteList(const tList<const char>* inputList, const char* completionBegin, SHELLC_TYPE type)
 {
   if (inputList == NULL || completionBegin == NULL)
@@ -317 +326 @@
       ShellC_Element* newElem = new ShellC_Element;
       newElem->name = enumString;
+      newElem->type = type;
       this->completionList->add(newElem);
     }
@@ -332 +342 @@
  * !! The strings MUST NOT be deleted !!
  */
-bool ShellCompletion::addToCompleteList(const tList<BaseObject>* inputList, const char* completionBegin)
+bool ShellCompletion::addToCompleteList(const tList<BaseObject>* inputList, const char* completionBegin, SHELLC_TYPE type)
 {
   if (inputList == NULL || completionBegin == NULL)
@@ -348 +358 @@
       ShellC_Element* newElem = new ShellC_Element;
       newElem->name = enumBO->getName();
+      newElem->type = type;
       this->completionList->add(newElem);
-      printf("%s\n",enumBO->getName());
     }
     enumBO = iterator->nextElement();
@@ -378 +388 @@
   this->completionList = new tList<ShellC_Element>;
 }
+
+const char* ShellCompletion::typeToString(SHELLC_TYPE type)
+{
+  switch (type)
+  {
+    default:// SHELLC_NONE
+      return "error";
+    case  SHELLC_CLASS:
+      return "class";
+    case SHELLC_OBJECT:
+      return "object";
+    case SHELLC_FUNCTION:
+      return "function";
+    case SHELLC_ALIAS:
+      return "alias";
+  }
+}

trunk/src/lib/shell/shell_completion.h

@@ -48 +48 @@
   bool generalComplete(const char* begin, const char* displayAs = "%s", const char* addBack = NULL, const char* addFront = NULL);
 
-  bool addToCompleteList(const tList<const char>* inputList, const char* completionBegin);
-  bool addToCompleteList(const tList<BaseObject>* inputList, const char* completionBegin);
+  bool addToCompleteList(const tList<const char>* inputList, const char* completionBegin, SHELLC_TYPE type);
+  bool addToCompleteList(const tList<BaseObject>* inputList, const char* completionBegin, SHELLC_TYPE type);
   void emptyCompletionList();
+
+  static const char* ShellCompletion::typeToString(SHELLC_TYPE type);
 
  private:

trunk/src/lib/shell/shell_input.cc

@@ -50 +50 @@
   this->history = new tList<char>;
   this->historyIT = this->history->getIterator();
-  this->historyLength = 10;
+  this->setHistoryLength(50);
   this->historyScrolling = false;
   this->delayed = 0;

trunk/src/lib/shell/shell_input.h

@@ -1 +1 @@
 /*!
  * @file shell_input.h
- * @brief Definition of ...
- * @todo AutoCompletion should print nice output
- * @todo move up and down in Buffer
- * @todo display old shell Commands
+ * @brief Shell Input is an InputLine for the Shell.
 */
 
@@ -18 +15 @@
 class ShellCompletion;
 
-
-//! A class for ...
+//! An InputLine for the Shell
+/**
+ * The ShellInput has the ability to catch and display user input.
+ * The ShellInput is auto-completed after the user presses [TAB]
+ * The ShellInput is executed (and sent back to the Application) on Pressing [ENTER]
+ * [UP] and [DOWN] move through the history of allready given commands.
+ */
 class ShellInput : public Text,  public EventListener {
 
@@ -38 +40 @@
   bool executeCommand();
 
+  /** sets the count of the History's entries */
+  void setHistoryLength(unsigned int historyLength) { this->historyLength = historyLength; };
   void historyMoveUp();
   void historyMoveDown();
@@ -50 +54 @@
    ShellCompletion*         completion;             //!< The Completion Interface.
 
-
-   char*                    inputLine;              //!< the Char-Array of the Buffer @todo not needed anymore
+   char*                    inputLine;              //!< the Char-Array of the Buffer
    float                    repeatRate;             //!< The Repeat-Delay.
    float                    repeatDelay;            //!< The delay of the first Character of a given Character.