X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fconsole.cpp;h=2b4df37b2995958b83b4d2e30bedf760d5b723fa;hb=77d00a6f464cc87c6b50cf1f3b38064a7ae9aead;hp=1b5f01ea98cef706a7061a5b8d9079aac36e1d7a;hpb=c62711567861587107d124642db29e2674ee6533;p=supertux.git diff --git a/src/console.cpp b/src/console.cpp index 1b5f01ea9..2b4df37b2 100644 --- a/src/console.cpp +++ b/src/console.cpp @@ -34,13 +34,12 @@ static const float FADE_SPEED = 1; Console::Console() - : vm(NULL), backgroundOffset(0), height(0), alpha(1.0), offset(0), - focused(false), stayOpen(0) -{ + : history_position(history.end()), vm(NULL), backgroundOffset(0), + height(0), alpha(1.0), offset(0), focused(false), stayOpen(0) { fontheight = 8; } -Console::~Console() +Console::~Console() { if(vm != NULL) { sq_release(Scripting::global_vm, &vm_object); @@ -57,14 +56,14 @@ Console::init_graphics() background2.reset(new Surface("images/engine/console2.png")); } -void -Console::flush(ConsoleStreamBuffer* buffer) +void +Console::flush(ConsoleStreamBuffer* buffer) { if (buffer == &outputBuffer) { std::string s = outputBuffer.str(); if ((s.length() > 0) && ((s[s.length()-1] == '\n') || (s[s.length()-1] == '\r'))) { while ((s[s.length()-1] == '\n') || (s[s.length()-1] == '\r')) s.erase(s.length()-1); - addLine(s); + addLines(s); outputBuffer.str(std::string()); } } @@ -72,7 +71,7 @@ Console::flush(ConsoleStreamBuffer* buffer) std::string s = inputBuffer.str(); if ((s.length() > 0) && ((s[s.length()-1] == '\n') || (s[s.length()-1] == '\r'))) { while ((s[s.length()-1] == '\n') || (s[s.length()-1] == '\r')) s.erase(s.length()-1); - addLine("> "+s); + addLines("> "+s); parse(s); inputBuffer.str(std::string()); } @@ -80,10 +79,8 @@ Console::flush(ConsoleStreamBuffer* buffer) } void -Console::execute_script(const std::string& command) +Console::ready_vm() { - using namespace Scripting; - if(vm == NULL) { vm = Scripting::global_vm; HSQUIRRELVM new_vm = sq_newthread(vm, 16); @@ -96,7 +93,7 @@ Console::execute_script(const std::string& command) throw Scripting::SquirrelError(vm, "Couldn't get vm object for console"); sq_addref(vm, &vm_object); sq_pop(vm, 1); - + // create new roottable for thread sq_newtable(new_vm); sq_pushroottable(new_vm); @@ -106,7 +103,7 @@ Console::execute_script(const std::string& command) sq_setroottable(new_vm); vm = new_vm; - + try { std::string filename = "scripts/console.nut"; IFileStream stream(filename); @@ -115,23 +112,31 @@ Console::execute_script(const std::string& command) log_warning << "Couldn't load console.nut: " << e.what() << std::endl; } } - - int oldtop = sq_gettop(vm); +} + +void +Console::execute_script(const std::string& command) +{ + using namespace Scripting; + + ready_vm(); + + SQInteger oldtop = sq_gettop(vm); try { if(SQ_FAILED(sq_compilebuffer(vm, command.c_str(), command.length(), "", SQTrue))) throw SquirrelError(vm, "Couldn't compile command"); - sq_pushroottable(vm); + sq_pushroottable(vm); if(SQ_FAILED(sq_call(vm, 1, SQTrue, SQTrue))) throw SquirrelError(vm, "Problem while executing command"); if(sq_gettype(vm, -1) != OT_NULL) - addLine(squirrel2string(vm, -1)); + addLines(squirrel2string(vm, -1)); } catch(std::exception& e) { - addLine(e.what()); + addLines(e.what()); } - int newtop = sq_gettop(vm); + SQInteger newtop = sq_gettop(vm); if(newtop < oldtop) { log_fatal << "Script destroyed squirrel stack..." << std::endl; } else { @@ -158,59 +163,187 @@ Console::scroll(int numLines) } void +Console::show_history(int offset) +{ + while ((offset > 0) && (history_position != history.end())) { + history_position++; + offset--; + } + while ((offset < 0) && (history_position != history.begin())) { + history_position--; + offset++; + } + if (history_position == history.end()) { + inputBuffer.str(std::string()); + } else { + inputBuffer.str(*history_position); + inputBuffer.pubseekoff(0, std::ios_base::end, std::ios_base::out); + } +} + +// Helper functions for Console::autocomplete +// TODO: Fix rough documentation +namespace { + +void sq_insert_commands(std::list& cmds, HSQUIRRELVM vm, std::string table_prefix, std::string search_prefix); + +/** + * Acts upon key,value on top of stack: + * Appends key (plus type-dependent suffix) to cmds if table_prefix+key starts with search_prefix; + * Calls sq_insert_commands if search_prefix starts with table_prefix+key (and value is a table/class/instance); + */ +void +sq_insert_command(std::list& cmds, HSQUIRRELVM vm, std::string table_prefix, std::string search_prefix) +{ + const SQChar* key_chars; + if (SQ_FAILED(sq_getstring(vm, -2, &key_chars))) return; + std::string key_string = table_prefix + key_chars; + + switch (sq_gettype(vm, -1)) { + case OT_INSTANCE: + key_string+="."; + if (search_prefix.substr(0, key_string.length()) == key_string) { + sq_getclass(vm, -1); + sq_insert_commands(cmds, vm, key_string, search_prefix); + sq_pop(vm, 1); + } + break; + case OT_TABLE: + case OT_CLASS: + key_string+="."; + if (search_prefix.substr(0, key_string.length()) == key_string) { + sq_insert_commands(cmds, vm, key_string, search_prefix); + } + break; + case OT_CLOSURE: + case OT_NATIVECLOSURE: + key_string+="()"; + break; + default: + break; + } + + if (key_string.substr(0, search_prefix.length()) == search_prefix) { + cmds.push_back(key_string); + } + +} + +/** + * calls sq_insert_command for all entries of table/class on top of stack + */ +void +sq_insert_commands(std::list& cmds, HSQUIRRELVM vm, std::string table_prefix, std::string search_prefix) +{ + sq_pushnull(vm); // push iterator + while (SQ_SUCCEEDED(sq_next(vm,-2))) { + sq_insert_command(cmds, vm, table_prefix, search_prefix); + sq_pop(vm, 2); // pop key, val + } + sq_pop(vm, 1); // pop iterator +} + + +} +// End of Console::autocomplete helper functions + +void Console::autocomplete() { - std::string cmdPart = inputBuffer.str(); - addLine("> "+cmdPart); + std::string prefix = inputBuffer.str(); + addLines("> "+prefix); + + std::list cmds; - std::string cmdList = ""; - int cmdListLen = 0; + // append all known CCRs to list for (std::map >::iterator i = commands.begin(); i != commands.end(); i++) { std::string cmdKnown = i->first; - if (cmdKnown.substr(0, cmdPart.length()) == cmdPart) { - if (cmdListLen > 0) cmdList = cmdList + ", "; - cmdList = cmdList + cmdKnown; - cmdListLen++; + if (cmdKnown.substr(0, prefix.length()) == prefix) { + cmds.push_back(cmdKnown); + } + } + + ready_vm(); + + // append all keys of the current root table to list + sq_pushroottable(vm); // push root table + while(true) { + // check all keys (and their children) for matches + sq_insert_commands(cmds, vm, "", prefix); + + // cycle through parent(delegate) table + SQInteger oldtop = sq_gettop(vm); + if(SQ_FAILED(sq_getdelegate(vm, -1)) || oldtop == sq_gettop(vm)) { + break; } + sq_remove(vm, -2); // remove old table } - if (cmdListLen == 0) addLine("No known command starts with \""+cmdPart+"\""); - if (cmdListLen == 1) { - inputBuffer.str(cmdList); + sq_pop(vm, 1); // remove table + + // depending on number of hits, show matches or autocomplete + if (cmds.size() == 0) addLines("No known command starts with \""+prefix+"\""); + if (cmds.size() == 1) { + inputBuffer.str(cmds.front()); inputBuffer.pubseekoff(0, std::ios_base::end, std::ios_base::out); } - if (cmdListLen > 1) addLine(cmdList); + if (cmds.size() > 1) { + while (cmds.begin() != cmds.end()) { + addLines(cmds.front()); + cmds.pop_front(); + } + } +} + +void +Console::addLines(std::string s) +{ + std::istringstream iss(s); + std::string line; + while (std::getline(iss, line, '\n')) addLine(line); } -void -Console::addLine(std::string s) +void +Console::addLine(std::string s) { + // output line to stderr std::cerr << s << std::endl; - while (s.length() > 99) { - lines.push_front(s.substr(0, 99-3)+"..."); - s = "..."+s.substr(99-3); - } - lines.push_front(s); - + + // wrap long lines + std::string overflow; + do { + lines.push_front(Font::wrap_to_chars(s, 99, &overflow)); + s = overflow; + } while (s.length() > 0); + + // trim scrollback buffer while (lines.size() >= 1000) lines.pop_back(); - + + // increase console height if necessary if (height < 64) { if(height < 4) height = 4; height += fontheight; } + // reset console to full opacity alpha = 1.0; + + // increase time that console stays open if(stayOpen < 6) stayOpen += 1.5; } void -Console::parse(std::string s) +Console::parse(std::string s) { // make sure we actually have something to parse if (s.length() == 0) return; - + + // add line to history + history.push_back(s); + history_position = history.end(); + // split line into list of args std::vector args; size_t start = 0; @@ -236,7 +369,7 @@ Console::parse(std::string s) try { execute_script(s); } catch(std::exception& e) { - addLine(e.what()); + addLines(e.what()); } return; } @@ -247,7 +380,7 @@ Console::parse(std::string s) } bool -Console::consoleCommand(std::string command, std::vector arguments) +Console::consoleCommand(std::string command, std::vector arguments) { if (command == "ccrs") { if (arguments.size() != 1) { @@ -276,7 +409,7 @@ Console::consoleCommand(std::string command, std::vector arguments) } bool -Console::hasFocus() +Console::hasFocus() { return focused; } @@ -287,9 +420,10 @@ Console::show() focused = true; height = 256; alpha = 1.0; + SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); } -void +void Console::hide() { focused = false; @@ -298,15 +432,16 @@ Console::hide() // clear input buffer inputBuffer.str(std::string()); + SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL); } -void +void Console::toggle() { if (Console::hasFocus()) { - Console::hide(); - } - else { + Console::hide(); + } + else { Console::show(); } } @@ -327,7 +462,7 @@ Console::update(float elapsed_time) } } -void +void Console::draw(DrawingContext& context) { if (height == 0) @@ -359,17 +494,16 @@ Console::draw(DrawingContext& context) if (py < -9) break; context.draw_text(font.get(), *i, Vector(4, py), LEFT_ALLIGN, layer); } - context.pop_transform(); } -void +void Console::registerCommand(std::string command, ConsoleCommandReceiver* ccr) { commands[command].push_front(ccr); } -void +void Console::unregisterCommand(std::string command, ConsoleCommandReceiver* ccr) { std::map >::iterator i = commands.find(command); @@ -385,7 +519,7 @@ Console::unregisterCommand(std::string command, ConsoleCommandReceiver* ccr) i->second.erase(j); } -void +void Console::unregisterCommands(ConsoleCommandReceiver* ccr) { for (std::map >::iterator i = commands.begin(); i != commands.end(); i++) { @@ -402,4 +536,3 @@ ConsoleStreamBuffer Console::inputBuffer; ConsoleStreamBuffer Console::outputBuffer; std::ostream Console::input(&Console::inputBuffer); std::ostream Console::output(&Console::outputBuffer); -