Changeset 5178 in orxonox.OLD

Timestamp:

Sep 13, 2005, 12:12:11 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: added class ShellInput for the InputLine, also worked a bit on ShellCompletion

Location:

trunk/src/lib/shell

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (5 diffs)
• shell.h (modified) (2 diffs)
• shell_completion.cc (modified) (2 diffs)
• shell_completion.h (modified) (2 diffs)
• shell_input.cc (copied) (copied from trunk/src/proto/proto_class.cc) (2 diffs)
• shell_input.h (copied) (copied from trunk/src/proto/proto_class.h) (1 diff)

trunk/src/lib/shell/Makefile.am

@@ -6 +6 @@
 libORXshell_a_SOURCES = shell.cc \
                         shell_buffer.cc \
+                        shell_input.cc \
                         shell_command.cc \
                         shell_completion.cc
@@ -12 +13 @@
 noinst_HEADERS= shell.h \
                 shell_buffer.h \
+                shell_input.h \
                 shell_command.h \
                 shell_completion.h

trunk/src/lib/shell/Makefile.in

@@ -55 +55 @@
 libORXshell_a_LIBADD =
 am_libORXshell_a_OBJECTS = shell.$(OBJEXT) shell_buffer.$(OBJEXT) \
-        shell_command.$(OBJEXT) shell_completion.$(OBJEXT)
+        shell_input.$(OBJEXT) shell_command.$(OBJEXT) \
+        shell_completion.$(OBJEXT)
 libORXshell_a_OBJECTS = $(am_libORXshell_a_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -63 +64 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/shell_buffer.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/shell_command.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/shell_completion.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/shell_completion.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/shell_input.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -187 +189 @@
 libORXshell_a_SOURCES = shell.cc \
                         shell_buffer.cc \
+                        shell_input.cc \
                         shell_command.cc \
                         shell_completion.cc
@@ -192 +195 @@
 noinst_HEADERS = shell.h \
                 shell_buffer.h \
+                shell_input.h \
                 shell_command.h \
                 shell_completion.h
@@ -246 +250 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_command.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_completion.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell_input.Po@am__quote@
 
 .cc.o:

trunk/src/lib/shell/shell.h

@@ -9 +9 @@
 #include "element_2d.h"
 #include "event_listener.h"
-//#include "shell_buffer.h"
 
 #include <stdarg.h>
-
-#define      SHELL_BUFFER_SIZE       16384
 
 // FORWARD DECLARATION
@@ -59 +56 @@
     void addCharacters(const char* characters);
     void removeCharacters(unsigned int characterCount = 1);
+    void setRepeatDelay(float repeatDelay, float repeatRate);
     bool executeCommand();
 
     void clear();
 
-    void setRepeatDelay(float repeatDelay, float repeatRate);
 
     // EventListener

trunk/src/lib/shell/shell_completion.cc

@@ -18 +18 @@
 #include "shell_completion.h"
 
+#include "base_object.h"
+#include "class_list.h"
+#include "list.h"
+#include "debug.h"
+
+#include "stdlibincl.h"
+
 using namespace std;
-
 
 /**
@@ -49 +55 @@
   // delete what has to be deleted here
 }
+
+
+
+/**
+ * autocompletes the Shell's inputLine
+ * @returns true, if a result was found, false otherwise
+ *
+ * @todo implement it!!
+ */
+bool ShellCompletion::autoComplete(const char* inputLine)
+{
+  //PRINTF(3)("AutoCompletion not implemented yet\n");
+
+  char* completionLine = new char[strlen(inputLine)+1];
+  strcpy(completionLine, inputLine);
+
+  char* commandBegin = strrchr(completionLine, ' ');
+  if (commandBegin == NULL)
+    commandBegin = completionLine;
+  else
+  {
+    if(commandBegin >= completionLine + strlen(completionLine))
+      commandBegin = completionLine + strlen(completionLine);
+    else
+      commandBegin++;
+  }
+
+  char* objectStart;
+  if (objectStart = strstr(commandBegin, "::"))
+  {
+    char* classIdentity = new char[objectStart - commandBegin +1];
+    strncpy(classIdentity, commandBegin, objectStart - commandBegin);
+    classIdentity[objectStart - commandBegin] = '\0';
+    this->objectComplete(objectStart+2, ClassList::StringToID(classIdentity));
+    delete[] classIdentity;
+  }
+  else
+    this->classComplete(commandBegin);
+
+  delete[] completionLine;
+}
+
+/**
+ * autocompletes a className
+ * @param classBegin the Beginning of a String to autoComplete
+ * @return true on success, false otherwise
+ */
+bool ShellCompletion::classComplete(const char* classBegin)
+{
+  if (unlikely(classBegin == NULL))
+    return false;
+  const tList<const char>* clList = ClassList::getClassList();
+  if (clList != NULL)
+  {
+    const tList<const char>* classList = this->createCompleteList(clList, classBegin);
+    if (classList != NULL)
+      this->generalComplete(classList, classBegin, "%s::", "::");
+    else
+      return false;
+  }
+  else
+    return false;
+  return true;
+}
+
+/**
+ * autocompletes an ObjectName
+ * @param objectBegin the beginning string of a Object
+ * @param classID the ID of the Class to search for.
+ * @return true on success, false otherwise
+ */
+bool ShellCompletion::objectComplete(const char* objectBegin, long classID)
+{
+  printf("%s\n", objectBegin);
+
+  if (unlikely(objectBegin == NULL))
+    return false;
+  tList<BaseObject>* boList = ClassList::getList(classID);
+  if (boList != NULL)
+  {
+    printf("\n", boList->firstElement()->getName());
+    const tList<const char>* objectList = this->createCompleteList(boList, objectBegin);
+    if (objectList != NULL)
+      this->generalComplete(objectList, objectBegin, "%s");
+    else
+      return false;
+  }
+  else
+    return false;
+  return true;
+}
+
+/**
+ * completes a Function
+ * @param functionBegin the beginning of the function String
+ */
+bool ShellCompletion::functionComplete(const char* functionBegin)
+{
+}
+
+/**
+ * completes the inputline on grounds of an inputList
+ * @param stringList the List to parse through
+ * @param begin the String to search in the inputList, and to extend with it.
+ * @param displayAs how to display the found value to the user, printf-style, !!with only one %s!! ex.: "::%s::"
+ * @param addBack what should be added at the end of the completion
+ * @param addFront what should be added to the front of one finished completion
+ * @return true if ok, false otherwise
+ */
+bool ShellCompletion::generalComplete(const tList<const char>* stringList, const char* begin, const char* displayAs, const char* addBack, const char* addFront)
+{
+  if (stringList->getSize() == 0)
+    return false;
+
+  const char* addString = stringList->firstElement();
+  unsigned int addLength = 0;
+  unsigned int inputLenght = strlen(begin);
+
+  if (addString != NULL)
+    addLength = strlen(addString);
+  tIterator<const char>* charIterator = stringList->getIterator();
+  const char* charElem = charIterator->firstElement();
+  while (charElem != NULL)
+  {
+    PRINTF(0)(displayAs, charElem);
+    for (unsigned int i = inputLenght; i < addLength; i++)
+      if (addString[i] != charElem[i])
+    {
+      addLength = i;
+      break;
+    }
+    charElem = charIterator->nextElement();
+  }
+  delete charIterator;
+
+  if (addLength >= inputLenght)
+  {
+    char* adder = new char[addLength+1];
+    strncpy(adder, addString, addLength);
+    adder[addLength] = '\0';
+
+
+/*    this->removeCharacters(inputLenght);
+    this->addCharacters(adder);
+    if (addBack != NULL && stringList->getSize() == 1)
+      this->addCharacters("::");
+    delete[] adder;*/
+  }
+  return true;
+}
+
+/**
+ * searches for classes, which beginn with classNameBegin
+ * @param inputList the List to parse through
+ * @param classNameBegin the beginning string
+ * @return a NEW char-array with ClassNames. The LIST should be deleted afterwards,
+ * !! The strings MUST NOT be deleted !!
+ */
+const tList<const char>* ShellCompletion::createCompleteList(const tList<const char>* inputList, const char* classNameBegin)
+{
+  if (inputList == NULL || classNameBegin == NULL)
+    return NULL;
+  unsigned int searchLength = strlen(classNameBegin);
+  if (this->completionList != NULL)
+    delete this->completionList;
+  this->completionList = new tList<const char>;
+
+//  tList<const char>* classList = ClassList::getClassList();
+
+  tIterator<const char>* iterator = inputList->getIterator();
+  const char* enumString = iterator->firstElement();
+  while (enumString != NULL)
+  {
+    if (strlen(enumString)>searchLength+1 &&
+        !strncasecmp(enumString, classNameBegin, searchLength))
+    {
+      this->completionList->add(enumString);
+    }
+    enumString = iterator->nextElement();
+  }
+  delete iterator;
+
+  return this->completionList;
+}
+
+/**
+ * searches for classes, which beginn with classNameBegin
+ * @param inputList the List to parse through
+ * @param classNameBegin the beginning string
+ * @return a NEW char-array with ClassNames. The LIST should be deleted afterwards,
+ * !! The strings MUST NOT be deleted !!
+ */
+const tList<const char>* ShellCompletion::createCompleteList(const tList<BaseObject>* inputList, const char* classNameBegin)
+{
+  if (inputList == NULL || classNameBegin == NULL)
+    return NULL;
+  unsigned int searchLength = strlen(classNameBegin);
+  if (this->completionList != NULL)
+    delete this->completionList;
+  this->completionList = new tList<const char>;
+
+  tIterator<BaseObject>* iterator = inputList->getIterator();
+  BaseObject* enumBO = iterator->firstElement();
+  while (enumBO != NULL)
+  {
+    if (enumBO->getName() != NULL &&
+        strlen(enumBO->getName())>searchLength+1 &&
+        !strncasecmp(enumBO->getName(), classNameBegin, searchLength))
+    {
+      this->completionList->add(enumBO->getName());
+    }
+    enumBO = iterator->nextElement();
+  }
+  delete iterator;
+
+  return this->completionList;
+}

trunk/src/lib/shell/shell_completion.h

@@ -8 +8 @@
 
 // FORWARD DECLARATION
-
+class BaseObject;
+template<class T> class tList;
+#ifndef NULL
+#define NULL 0            //!< a pointer to NULL
+#endif
 
 //! A class for ...
@@ -17 +21 @@
   virtual ~ShellCompletion();
 
+  bool autoComplete(const char* inputLine);
+  bool classComplete(const char* classBegin);
+  bool objectComplete(const char* objectBegin, long classID);
+  bool functionComplete(const char* functionBegin);
+
+  bool generalComplete(const tList<const char>* stringList, const char* begin, const char* displayAs = "%s", const char* addBack = NULL, const char* addFront = NULL);
+
+  const tList<const char>* createCompleteList(const tList<const char>* inputList, const char* classNameBegin);
+  const tList<const char>* createCompleteList(const tList<BaseObject>* inputList, const char* classNameBegin);
+//    const tList<const char>* createCompleteList(const tList<ShellCommandBase>* inputList, const char* classNameBegin);
+
 
  private:
-
+   tList<const char>*       completionList;          //!< A list of completions, that are io.
 };
 

trunk/src/lib/shell/shell_input.cc

@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "proto_class.h"
+#include "shell_input.h"
 
 using namespace std;
@@ -25 +25 @@
  * @todo this constructor is not jet implemented - do it
 */
-ProtoClass::ProtoClass ()
+ShellInput::ShellInput ()
 {
-   this->setClassID(CL_PROTO_ID, "ProtoClass");
 
-   /* If you make a new class, what is most probably the case when you write this file
-      don't forget to:
-       1. Add the new file new_class.cc to the ./src/Makefile.am
-       2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
-
-      Advanced Topics:
-      - if you want to let your object be managed via the ObjectManager make sure to read
-        the object_manager.h header comments. You will use this most certanly only if you
-        make many objects of your class, like a weapon bullet.
-   */
 }
-
 
 /**
  * standard deconstructor
 */
-ProtoClass::~ProtoClass ()
+ShellInput::~ShellInput ()
 {
   // delete what has to be deleted here

trunk/src/lib/shell/shell_input.h

@@ -1 +1 @@
 /*!
- * @file proto_class.h
+ * @file shell_input.h
  * @brief Definition of ...
 */
 
-#ifndef _PROTO_CLASS_H
-#define _PROTO_CLASS_H
-
-#include "base_object.h"
+#ifndef _SHELL_INPUT_H
+#define _SHELL_INPUT_H
 
 // FORWARD DECLARATION
-
+class Text;
+template<class T> class tList;
 
 
 //! A class for ...
-class ProtoClass : public BaseObject {
+class ShellInput {
 
  public:
-  ProtoClass();
-  virtual ~ProtoClass();
+  ShellInput();
+  virtual ~ShellInput();
+
+
+  // InputLine
+  void flush();
+  void addCharacter(char character);
+  void addCharacters(const char* characters);
+  void removeCharacters(unsigned int characterCount = 1);
+  void setRepeatDelay(float repeatDelay, float repeatRate);
 
 
  private:
+    // HANDLING TEXT INPUT
+   Text*                    inputLineText;          //!< The inputLine of the Shell
+   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.
+   float                    delayed;                //!< how much of the delay is remaining.
+   int                      pressedKey;             //!< the pressed key that will be repeated.
+
+   tList<char>*             inputHistory;           //!< The history of given commands.
 
 };
 
-#endif /* _PROTO_CLASS_H */
+#endif /* _SHELL_INPUT_H */