Changeset 7729 in orxonox.OLD for trunk/src/lib/shell

Timestamp:

May 19, 2006, 3:07:09 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better debug names
As DEBUG and ERROR are already given to windows.h and other files:
DEBUG is renamed to DEBUG_LEVEL
and all
NO, ERR, WARN, INFO, DEBUG, vDEBUG
are renamed to
ORX_NONE, ORX_ERR, ORX_WARN, ORX_INFO, ORX_DEBUG, ORX_vDEBUG

Location:

trunk/src/lib/shell

Files:

• shell_buffer.cc (modified) (2 diffs)
• shell_input.cc (modified) (3 diffs)
• shell_input.h (modified) (1 diff)

trunk/src/lib/shell/shell_buffer.cc

@@ -103 +103 @@
 
     SDL_mutexP(ShellBuffer::bufferMutex);
-#if DEBUG < 3
+#if DEBUG_LEVEL < 3
     if (ShellBuffer::singletonRef == NULL)
 #endif
       vprintf(line, arguments);
-#if DEBUG < 3
+#if DEBUG_LEVEL < 3
     else
 #else
@@ -180 +180 @@
 
   /**
-   * displays some nice output from the Shell
+   * @brief displays some nice output from the Shell
    */
   void ShellBuffer::debug() const

trunk/src/lib/shell/shell_input.cc

@@ -44 +44 @@
 
     this->inputLine = "";
-    this->historyIT = this->history.begin();
+    this->historyIT = ShellInput::history.begin();
     this->setHistoryLength(50);
     this->historyScrolling = false;
@@ -65 +65 @@
   }
 
+  std::list<std::string> ShellInput::history;
+
   /**
    * @brief standard deconstructor
    */
   ShellInput::~ShellInput ()
-{}
+  {}
 
   /**
@@ -173 +175 @@
 
     // adding the new Command to the History
-    this->history.push_back(this->inputLine);
+    if (history.back() != this->inputLine)
+      this->history.push_back(this->inputLine);
     if (this->history.size() > this->historyLength)
     {

trunk/src/lib/shell/shell_input.h

@@ -69 +69 @@
     Uint16                            pressedKey;       //!< the pressed key that will be repeated.
 
-    std::list<std::string>            history;          //!< The history of given commands.
+    static std::list<std::string>     history;          //!< The history of given commands.
     std::list<std::string>::iterator  historyIT;        //!< The locator that tells us, where we are in the history.
     unsigned int                      historyLength;    //!< The maximum length of the InputHistory.