Changeset 5998 for code/branches

Timestamp:

Oct 28, 2009, 11:03:30 AM (15 years ago)

Author:

rgrieder

Message:

Build fixes for IOConsole (can't test that on Windows…)

Location:

code/branches/console/src/libraries/core

Files:

• IOConsole.cc (modified) (8 diffs)
• IOConsole.h (modified) (1 diff)

code/branches/console/src/libraries/core/IOConsole.cc

@@ -112 +112 @@
         unsigned char c = 0;
         std::string escapeSequence;
-        EscapeMode escapeMode = EscapeMode::None;
+        EscapeMode::Value escapeMode = EscapeMode::None;
         while (read(STDIN_FILENO, &c, 1) == 1)
         {
@@ -118 +118 @@
                 escapeMode = EscapeMode::Second;
             // Get Alt+Tab combination when switching applications
-            else if (escapeMode == First && c == '\t')
+            else if (escapeMode == EscapeMode::First && c == '\t')
             {
                 this->buffer_->buttonPressed(KeyEvent(KeyCode::Tab, '\t', KeyboardModifier::Alt));
@@ -236 +236 @@
         //std::cout << std::fixed << std::setprecision(2) << std::setw(5) << Game::getInstance().getAvgFPS() << " fps, " << std::setprecision(2) << std::setw(5) << Game::getInstance().getAvgTickTime() << " ms avg ticktime # ";
         // Indicate a command prompt
-        std::cout << promptString;
+        std::cout << promptString_g;
         // Save cursor position
         std::cout << "\033[s";
@@ -258 +258 @@
             }
             // Check terminal size
+            /*
             int x, y;
             if (this->getTerminalSize(&x, &y) && (x < statusTextWidth_g || y < (2 + statusTextHeight_g)))
@@ -264 +265 @@
                 return;
             }
+            */
         }
     }
@@ -358 +360 @@
     {
         // Save cursor position and move it to the beginning of the first output line
-        std::cout << "\033[s\033[" << (1 + statusTextHeight_g) << "F";
+        std::cout << "\033[s\033[" << (1 + 0/*statusTextHeight_g*/) << "F";
         // Erase the line
         std::cout << "\033[K";
@@ -375 +377 @@
     {
         // Save cursor and move it to the beginning of the first status line
-        std::cout << "\033[s\033[" << statusTextHeight_g << "F";
+        std::cout << "\033[s\033[" << 0/*statusTextHeight_g*/ << "F";
         // Create a new line and move cursor to the beginning of it (one cell up)
         std::cout << std::endl << "\033[1F";
@@ -381 +383 @@
         this->printLogText(*(this->shell_.getNewestLineIterator()));
         // Restore cursor (for horizontal position) and move it down again (just in case the lines were shifted)
-        std::cout << "\033[u\033[" << (1 + statusTextHeight_g) << "B";
+        std::cout << "\033[u\033[" << (1 + 0/*statusTextHeight_g*/) << "B";
         std::cout.flush();
     }

code/branches/console/src/libraries/core/IOConsole.h

@@ -58 +58 @@
         int getTerminalSize(int* x, int* y);
 
-        void print(const std::string& line);
+        void printLogText(const std::string& line);
         void printInputLine();
         void printStatusLines();