Changeset 5784 in orxonox.OLD

Timestamp:

Nov 26, 2005, 8:48:11 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: shell without tList now

Location:

trunk/src/lib/shell

Files:

• shell.h (modified) (1 diff)
• shell_buffer.h (modified) (1 diff)
• shell_command.h (modified) (1 diff)
• shell_completion.h (modified) (1 diff)
• shell_input.cc (modified) (8 diffs)
• shell_input.h (modified) (2 diffs)

trunk/src/lib/shell/shell.h

@@ -23 +23 @@
 class ShellInput;
 class Material;
-template<class T> class tIterator;
 
 //! A class that is able to redirect all output to a openGL-Shell, and that one can use to input some commands

trunk/src/lib/shell/shell_buffer.h

@@ -15 +15 @@
 // FORWARD DECLARATION
 class Shell;
-template<class T> class tList;
+
 #ifndef NULL
 #define NULL 0            //!< a pointer to NULL

trunk/src/lib/shell/shell_command.h

@@ -17 +17 @@
 
 // FORWARD DECLARATION
-template<class T> class tList;
 class ShellCommandClass;
 class ShellCommandAlias;

trunk/src/lib/shell/shell_completion.h

@@ -15 +15 @@
 class BaseObject;
 class ShellInput;
-template<class T> class tList;
 #ifndef NULL
 #define NULL 0            //!< a pointer to NULL

trunk/src/lib/shell/shell_input.cc

@@ -49 +49 @@
   this->inputLine = new char[1];
   this->inputLine[0] = '\0';
-  this->history = new tList<char>;
-  this->historyIT = this->history->getIterator();
+  this->historyIT = this->history.begin();
   this->setHistoryLength(50);
   this->historyScrolling = false;
@@ -75 +74 @@
   delete this->completion;
 
-  char* histEl = this->historyIT->firstElement();
-  while (histEl != NULL)
-  {
-    delete[] histEl;
-    histEl = this->historyIT->nextElement();
-  }
-  delete this->historyIT;
-  delete this->history;
+  while (!this->history.empty())
+  {
+    delete[] this->history.front();
+    this->history.pop_front();
+  }
 }
 
@@ -139 +135 @@
   if (this->historyScrolling)
   {
-    delete[] this->history->lastElement();
-    this->history->remove(this->history->lastElement());
+    delete[] this->history.back();
+    this->history.pop_back();
     this->historyScrolling = false;
   }
@@ -160 +156 @@
   if (this->historyScrolling)
   {
-    delete[] this->history->lastElement();
-    this->history->remove(this->history->lastElement());
+    delete[] this->history.back();
+    this->history.pop_back();
     this->historyScrolling = false;
   }
@@ -181 +177 @@
   if (this->historyScrolling)
   {
-    delete[] this->history->lastElement();
-    this->history->remove(this->history->lastElement());
+    delete[] this->history.back();
+    this->history.pop_back();
     this->historyScrolling = false;
   }
@@ -220 +216 @@
   if (this->historyScrolling)
   {
-    delete[] this->history->lastElement();
-    this->history->remove(this->history->lastElement());
+    delete[] this->history.back();
+    this->history.pop_back();
     this->historyScrolling = false;
   }
 
   // adding the new Command to the History
-  this->history->add(newCommand);
-  if (this->history->getSize() > this->historyLength)
-  {
-    delete[] this->history->firstElement();
-    this->history->remove(this->history->firstElement());
+  this->history.push_back(newCommand);
+  if (this->history.size() > this->historyLength)
+  {
+    delete[] this->history.front();
+    this->history.pop_front();
   }
 
@@ -248 +244 @@
     char* currentText = new char[strlen(this->inputLine)+1];
     strcpy(currentText, this->inputLine);
-    this->history->add(currentText);
+    this->history.push_back(currentText);
     this->historyScrolling = true;
-    this->historyIT->lastElement();
-  }
-
-  char* prevElem = this->historyIT->prevStep();
+    this->historyIT = this->history.end();
+  }
+
+  char* prevElem = *(this->historyIT--);
   if (prevElem == NULL)
     return;
@@ -270 +266 @@
   if (!this->historyScrolling)
     return;
-  char* nextElem = this->historyIT->nextStep();
+  char* nextElem = *(this->historyIT++);
   if (nextElem == NULL)
     return;

trunk/src/lib/shell/shell_input.h

@@ -12 +12 @@
 #include "text.h"
 #include "event_listener.h"
+#include <list>
 
 // FORWARD DECLARATION
-template<class T> class tList;
-template<class T> class tIterator;
 class ShellCompletion;
 
@@ -55 +54 @@
  private:
     // HANDLING TEXT INPUT
-   ShellCompletion*         completion;             //!< The Completion Interface.
+   ShellCompletion*            completion;             //!< The Completion Interface.
 
-   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.
+   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>*             history;                //!< The history of given commands.
-   tIterator<char>*         historyIT;
-   unsigned int             historyLength;          //!< The maximum length of the InputHistory.
-   bool                     historyScrolling;       //!< true if we are scrolling through the history.
+   std::list<char*>            history;                //!< The history of given commands.
+   std::list<char*>::iterator  historyIT;
+   unsigned int                historyLength;          //!< The maximum length of the InputHistory.
+   bool                        historyScrolling;       //!< true if we are scrolling through the history.
 };