Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5998 for code/branches


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/console/src/libraries/core/IOConsole.cc

    r5995 r5998  
    112112        unsigned char c = 0;
    113113        std::string escapeSequence;
    114         EscapeMode escapeMode = EscapeMode::None;
     114        EscapeMode::Value escapeMode = EscapeMode::None;
    115115        while (read(STDIN_FILENO, &c, 1) == 1)
    116116        {
     
    118118                escapeMode = EscapeMode::Second;
    119119            // Get Alt+Tab combination when switching applications
    120             else if (escapeMode == First && c == '\t')
     120            else if (escapeMode == EscapeMode::First && c == '\t')
    121121            {
    122122                this->buffer_->buttonPressed(KeyEvent(KeyCode::Tab, '\t', KeyboardModifier::Alt));
     
    236236        //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 # ";
    237237        // Indicate a command prompt
    238         std::cout << promptString;
     238        std::cout << promptString_g;
    239239        // Save cursor position
    240240        std::cout << "\033[s";
     
    258258            }
    259259            // Check terminal size
     260            /*
    260261            int x, y;
    261262            if (this->getTerminalSize(&x, &y) && (x < statusTextWidth_g || y < (2 + statusTextHeight_g)))
     
    264265                return;
    265266            }
     267            */
    266268        }
    267269    }
     
    358360    {
    359361        // Save cursor position and move it to the beginning of the first output line
    360         std::cout << "\033[s\033[" << (1 + statusTextHeight_g) << "F";
     362        std::cout << "\033[s\033[" << (1 + 0/*statusTextHeight_g*/) << "F";
    361363        // Erase the line
    362364        std::cout << "\033[K";
     
    375377    {
    376378        // Save cursor and move it to the beginning of the first status line
    377         std::cout << "\033[s\033[" << statusTextHeight_g << "F";
     379        std::cout << "\033[s\033[" << 0/*statusTextHeight_g*/ << "F";
    378380        // Create a new line and move cursor to the beginning of it (one cell up)
    379381        std::cout << std::endl << "\033[1F";
     
    381383        this->printLogText(*(this->shell_.getNewestLineIterator()));
    382384        // Restore cursor (for horizontal position) and move it down again (just in case the lines were shifted)
    383         std::cout << "\033[u\033[" << (1 + statusTextHeight_g) << "B";
     385        std::cout << "\033[u\033[" << (1 + 0/*statusTextHeight_g*/) << "B";
    384386        std::cout.flush();
    385387    }
  • code/branches/console/src/libraries/core/IOConsole.h

    r5995 r5998  
    5858        int getTerminalSize(int* x, int* y);
    5959
    60         void print(const std::string& line);
     60        void printLogText(const std::string& line);
    6161        void printInputLine();
    6262        void printStatusLines();
Note: See TracChangeset for help on using the changeset viewer.