X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fconsole.cpp;h=4cfa87412277e97e9bf95bbf090b82eb201ae59c;hb=e57c65e0862b48e91fd1b24916c662dd38ec4419;hp=f3e0220728bc09b2f501fe95ba07d44f0eb75d27;hpb=70291cc1f49340fc07bf1e3fec8f604c52e781ac;p=supertux.git diff --git a/src/console.cpp b/src/console.cpp index f3e022072..4cfa87412 100644 --- a/src/console.cpp +++ b/src/console.cpp @@ -1,4 +1,4 @@ -// $Id: worldmap.cpp 3209 2006-04-02 22:19:22Z sommer $ +// $Id$ // // SuperTux - Console // Copyright (C) 2006 Christoph Sommer @@ -16,30 +16,44 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #include + #include #include "console.hpp" #include "video/drawing_context.hpp" #include "video/surface.hpp" +#include "scripting/squirrel_error.hpp" +#include "scripting/squirrel_util.hpp" +#include "physfs/physfs_stream.hpp" #include "player_status.hpp" #include "main.hpp" +#include "log.hpp" #include "resources.hpp" -namespace { - int ticks; // TODO: use a clock? -} +/// speed (pixels/s) the console closes +static const float FADE_SPEED = 1; Console::Console() -{ - background = new Surface("images/engine/console.png"); - background2 = new Surface("images/engine/console2.png"); + : history_position(history.end()), vm(NULL), backgroundOffset(0), + height(0), alpha(1.0), offset(0), focused(false), stayOpen(0) { + fontheight = 8; } Console::~Console() { - delete background; - delete background2; + if(vm != NULL) { + sq_release(Scripting::global_vm, &vm_object); + } +} + +void +Console::init_graphics() +{ + font.reset(new Font("images/engine/fonts/white-small.png", + "images/engine/fonts/shadow-small.png", 8, 9, 1)); + fontheight = font->get_height(); + background.reset(new Surface("images/engine/console.png")); + background2.reset(new Surface("images/engine/console2.png")); } void @@ -65,6 +79,66 @@ Console::flush(ConsoleStreamBuffer* buffer) } void +Console::execute_script(const std::string& command) +{ + using namespace Scripting; + + if(vm == NULL) { + vm = Scripting::global_vm; + HSQUIRRELVM new_vm = sq_newthread(vm, 16); + if(new_vm == NULL) + throw Scripting::SquirrelError(vm, "Couldn't create new VM thread for console"); + + // store reference to thread + sq_resetobject(&vm_object); + if(SQ_FAILED(sq_getstackobj(vm, -1, &vm_object))) + 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); + if(SQ_FAILED(sq_setdelegate(new_vm, -2))) + throw Scripting::SquirrelError(new_vm, "Couldn't set console_table delegate"); + + sq_setroottable(new_vm); + + vm = new_vm; + + try { + std::string filename = "scripts/console.nut"; + IFileStream stream(filename); + Scripting::compile_and_run(vm, stream, filename); + } catch(std::exception& e) { + log_warning << "Couldn't load console.nut: " << e.what() << std::endl; + } + } + + int 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); + 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)); + } catch(std::exception& e) { + addLine(e.what()); + } + int newtop = sq_gettop(vm); + if(newtop < oldtop) { + log_fatal << "Script destroyed squirrel stack..." << std::endl; + } else { + sq_settop(vm, oldtop); + } +} + +void Console::backspace() { std::string s = inputBuffer.str(); @@ -83,6 +157,25 @@ 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); + } +} + +void Console::autocomplete() { std::string cmdPart = inputBuffer.str(); @@ -115,17 +208,31 @@ Console::addLine(std::string s) s = "..."+s.substr(99-3); } lines.push_front(s); - while (lines.size() >= 65535) lines.pop_back(); + + while (lines.size() >= 1000) + lines.pop_back(); + if (height < 64) { - if (height < 4+9) height=4+9; - height+=9; + if(height < 4) + height = 4; + height += fontheight; } - ticks=60; + + alpha = 1.0; + if(stayOpen < 6) + stayOpen += 1.5; } void 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; @@ -138,19 +245,56 @@ Console::parse(std::string s) } // command is args[0] + if (args.size() == 0) return; std::string command = args.front(); args.erase(args.begin()); + // ignore if it's an internal command + if (consoleCommand(command,args)) return; + // look up registered ccr std::map >::iterator i = commands.find(command); if ((i == commands.end()) || (i->second.size() == 0)) { - addLine("unknown command: \"" + command + "\""); + try { + execute_script(s); + } catch(std::exception& e) { + addLine(e.what()); + } return; } // send command to the most recently registered ccr ConsoleCommandReceiver* ccr = i->second.front(); - if (ccr->consoleCommand(command, args) != true) msg_warning << "Sent command to registered ccr, but command was unhandled" << std::endl; + if (ccr->consoleCommand(command, args) != true) log_warning << "Sent command to registered ccr, but command was unhandled" << std::endl; +} + +bool +Console::consoleCommand(std::string command, std::vector arguments) +{ + if (command == "ccrs") { + if (arguments.size() != 1) { + log_info << "Usage: ccrs " << std::endl; + return true; + } + std::map >::iterator i = commands.find(arguments[0]); + if ((i == commands.end()) || (i->second.size() == 0)) { + log_info << "unknown command: \"" << arguments[0] << "\"" << std::endl; + return true; + } + + std::ostringstream ccr_list; + std::list &ccrs = i->second; + std::list::iterator j; + for (j = ccrs.begin(); j != ccrs.end(); j++) { + if (j != ccrs.begin()) ccr_list << ", "; + ccr_list << "[" << *j << "]"; + } + + log_info << "registered ccrs for \"" << arguments[0] << "\": " << ccr_list.str() << std::endl; + return true; + } + + return false; } bool @@ -164,6 +308,7 @@ Console::show() { focused = true; height = 256; + alpha = 1.0; } void @@ -171,6 +316,7 @@ Console::hide() { focused = false; height = 0; + stayOpen = 0; // clear input buffer inputBuffer.str(std::string()); @@ -187,22 +333,35 @@ Console::toggle() } } -void -Console::draw(DrawingContext& context) +void +Console::update(float elapsed_time) { - if (height == 0) return; - if (!focused) { - if (ticks-- < 0) { - height-=10; - ticks=0; - if (height < 0) height=0; + if(stayOpen > 0) { + stayOpen -= elapsed_time; + if(stayOpen < 0) + stayOpen = 0; + } else if(!focused && height > 0) { + alpha -= elapsed_time * FADE_SPEED; + if(alpha < 0) { + alpha = 0; + height = 0; } - if (height == 0) return; } +} + +void +Console::draw(DrawingContext& context) +{ + if (height == 0) + return; + + int layer = LAYER_GUI + 1; - context.draw_surface(background2, Vector(SCREEN_WIDTH/2 - background->get_width()/2 - background->get_width() + backgroundOffset, height - background->get_height()), LAYER_FOREGROUND1+1); - context.draw_surface(background2, Vector(SCREEN_WIDTH/2 - background->get_width()/2 + backgroundOffset, height - background->get_height()), LAYER_FOREGROUND1+1); - context.draw_surface(background, Vector(SCREEN_WIDTH/2 - background->get_width()/2, height - background->get_height()), LAYER_FOREGROUND1+1); + context.push_transform(); + context.set_alpha(alpha); + context.draw_surface(background2.get(), Vector(SCREEN_WIDTH/2 - background->get_width()/2 - background->get_width() + backgroundOffset, height - background->get_height()), layer); + context.draw_surface(background2.get(), Vector(SCREEN_WIDTH/2 - background->get_width()/2 + backgroundOffset, height - background->get_height()), layer); + context.draw_surface(background.get(), Vector(SCREEN_WIDTH/2 - background->get_width()/2, height - background->get_height()), layer); backgroundOffset+=10; if (backgroundOffset > (int)background->get_width()) backgroundOffset -= (int)background->get_width(); @@ -211,7 +370,7 @@ Console::draw(DrawingContext& context) if (focused) { lineNo++; float py = height-4-1*9; - context.draw_text(white_small_text, "> "+inputBuffer.str()+"_", Vector(4, py), LEFT_ALLIGN, LAYER_FOREGROUND1+1); + context.draw_text(font.get(), "> "+inputBuffer.str()+"_", Vector(4, py), LEFT_ALLIGN, layer); } int skipLines = -offset; @@ -220,8 +379,10 @@ Console::draw(DrawingContext& context) lineNo++; float py = height-4-lineNo*9; if (py < -9) break; - context.draw_text(white_small_text, *i, Vector(4, py), LEFT_ALLIGN, LAYER_FOREGROUND1+1); + context.draw_text(font.get(), *i, Vector(4, py), LEFT_ALLIGN, layer); } + + context.pop_transform(); } void @@ -235,25 +396,32 @@ Console::unregisterCommand(std::string command, ConsoleCommandReceiver* ccr) { std::map >::iterator i = commands.find(command); if ((i == commands.end()) || (i->second.size() == 0)) { - msg_warning << "Command \"" << command << "\" not associated with a command receiver. Not dissociated." << std::endl; + log_warning << "Command \"" << command << "\" not associated with a command receiver. Not dissociated." << std::endl; return; } std::list::iterator j = find(i->second.begin(), i->second.end(), ccr); if (j == i->second.end()) { - msg_warning << "Command \"" << command << "\" not associated with given command receiver. Not dissociated." << std::endl; + log_warning << "Command \"" << command << "\" not associated with given command receiver. Not dissociated." << std::endl; return; } i->second.erase(j); } -int Console::height = 0; -bool Console::focused = false; -std::list Console::lines; -std::map > Console::commands; +void +Console::unregisterCommands(ConsoleCommandReceiver* ccr) +{ + for (std::map >::iterator i = commands.begin(); i != commands.end(); i++) { + std::list &ccrs = i->second; + std::list::iterator j; + while ((j = find(ccrs.begin(), ccrs.end(), ccr)) != ccrs.end()) { + ccrs.erase(j); + } + } +} + +Console* Console::instance = NULL; ConsoleStreamBuffer Console::inputBuffer; ConsoleStreamBuffer Console::outputBuffer; std::ostream Console::input(&Console::inputBuffer); std::ostream Console::output(&Console::outputBuffer); -int Console::offset = 0; -int Console::backgroundOffset = 0;