Changeset 8803 for code/branches

Timestamp:

Jul 30, 2011, 10:05:49 PM (13 years ago)

Author:

landauf

Message:

no \n needed after executed command in shell.
different color for return value of a command.
fixed width of text InGameConsole (at least on my system).

Location:

code/branches/output/src

Files:

• libraries/core/command/ArgumentCompletionFunctions.cc (modified) (1 diff)
• libraries/core/command/IOConsolePOSIX.cc (modified) (1 diff)
• libraries/core/command/IOConsoleWindows.cc (modified) (1 diff)
• libraries/core/command/Shell.cc (modified) (1 diff)
• libraries/core/command/Shell.h (modified) (1 diff)
• orxonox/overlays/InGameConsole.cc (modified) (3 diffs)

code/branches/output/src/libraries/core/command/ArgumentCompletionFunctions.cc

@@ -90 +90 @@
             ArgumentCompletionList _groupsandcommands(const std::string& fragment, bool bOnlyShowHidden)
             {
-                // note: this function returns only arguments that begin with "fragment", which would't be necessary for the
+                // note: this function returns only arguments that begin with "fragment", which wouldn't be necessary for the
                 //       auto-completion, but it's necessary to place the line-break "\n" between groups and commands
                 //       only if both groups AND commands are in the list.

code/branches/output/src/libraries/core/command/IOConsolePOSIX.cc

@@ -382 +382 @@
     void IOConsole::executed()
     {
-        this->shell_->addOutput(this->promptString_ + this->shell_->getInput() + '\n', Shell::Command);
+        this->shell_->addOutput(this->promptString_ + this->shell_->getInput(), Shell::Command);
     }
 

code/branches/output/src/libraries/core/command/IOConsoleWindows.cc

@@ -329 +329 @@
     void IOConsole::executed()
     {
-        this->shell_->addOutput(this->promptString_ + this->shell_->getInput() + '\n', Shell::Command);
+        this->shell_->addOutput(this->promptString_ + this->shell_->getInput(), Shell::Command);
     }
 

code/branches/output/src/libraries/core/command/Shell.cc

@@ -395 +395 @@
         else if (result != "")
         {
-            this->addOutput(result, Command);
+            this->addOutput(result, Result);
         }
 

code/branches/output/src/libraries/core/command/Shell.h

@@ -105 +105 @@
                 Input,
                 Command,
+                Result,
                 Hint
             };

code/branches/output/src/orxonox/overlays/InGameConsole.cc

@@ -59 +59 @@
 {
     const int LINES = 30;
-    const float CHAR_WIDTH = 7.45f; // fix this please - determine the char-width dynamically
+    const float CHAR_WIDTH = 8.0f; // fix this please - determine the char-width dynamically
 
     SetConsoleCommand("InGameConsole", "openConsole", &InGameConsole::openConsole);
@@ -339 +339 @@
     void InGameConsole::executed()
     {
-        this->shell_->addOutput(this->shell_->getInput() + '\n', Shell::Command);
+        this->shell_->addOutput(this->shell_->getInput(), Shell::Command);
     }
 
@@ -430 +430 @@
 
         // now adjust the text lines...
-        this->desiredTextWidth_ = static_cast<int>(this->windowW_ * this->relativeWidth) - 12;
+        this->desiredTextWidth_ = static_cast<int>(this->windowW_ * this->relativeWidth) - 24;
 
         if (LINES > 0)