X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fconsole.cpp;h=ee6f843ab18bf25f56e2559e9dda80ffd0d305b4;hb=f135ee3fa4a3e61f09da32c1b8e2145b655b247a;hp=66b7a6c68eea4d1dfdb748e28435fb948014ecf9;hpb=0b60c77a1a01e753919be95aafc22ee38a0fcb62;p=supertux.git diff --git a/src/console.cpp b/src/console.cpp index 66b7a6c68..ee6f843ab 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 @@ -23,24 +23,37 @@ #include "video/drawing_context.hpp" #include "video/surface.hpp" #include "scripting/squirrel_error.hpp" -#include "scripting/wrapper_util.hpp" +#include "scripting/squirrel_util.hpp" +#include "physfs/physfs_stream.hpp" #include "player_status.hpp" -#include "script_manager.hpp" #include "main.hpp" +#include "log.hpp" #include "resources.hpp" /// speed (pixels/s) the console closes -static const float CLOSE_SPEED = 50; +static const float FADE_SPEED = 1; Console::Console() - : backgroundOffset(0), height(0), offset(0), focused(false), stayOpen(0) -{ - background.reset(new Surface("images/engine/console.png")); - background2.reset(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() { + 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 @@ -70,19 +83,46 @@ Console::execute_script(const std::string& command) { using namespace Scripting; - HSQUIRRELVM vm = ScriptManager::instance->get_vm(); - - if(command == "") - return; - - int oldtop = sq_gettop(vm); + 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; + } + } + + 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); - if(SQ_FAILED(sq_call(vm, 1, SQTrue))) + 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) @@ -90,9 +130,9 @@ Console::execute_script(const std::string& command) } catch(std::exception& e) { addLine(e.what()); } - int newtop = sq_gettop(vm); + SQInteger newtop = sq_gettop(vm); if(newtop < oldtop) { - msg_fatal << "Script destroyed squirrel stack..." << std::endl; + log_fatal << "Script destroyed squirrel stack..." << std::endl; } else { sq_settop(vm, oldtop); } @@ -117,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(); @@ -149,14 +208,19 @@ 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; } - if(stayOpen < 5) - stayOpen += 0.7; + alpha = 1.0; + if(stayOpen < 6) + stayOpen += 1.5; } void @@ -164,7 +228,11 @@ 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; @@ -197,7 +265,7 @@ Console::parse(std::string s) // 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 @@ -205,12 +273,12 @@ Console::consoleCommand(std::string command, std::vector arguments) { if (command == "ccrs") { if (arguments.size() != 1) { - msg_info << "Usage: ccrs " << std::endl; + log_info << "Usage: ccrs " << std::endl; return true; } std::map >::iterator i = commands.find(arguments[0]); if ((i == commands.end()) || (i->second.size() == 0)) { - msg_info << "unknown command: \"" << arguments[0] << "\"" << std::endl; + log_info << "unknown command: \"" << arguments[0] << "\"" << std::endl; return true; } @@ -222,7 +290,7 @@ Console::consoleCommand(std::string command, std::vector arguments) ccr_list << "[" << *j << "]"; } - msg_info << "registered ccrs for \"" << arguments[0] << "\": " << ccr_list.str() << std::endl; + log_info << "registered ccrs for \"" << arguments[0] << "\": " << ccr_list.str() << std::endl; return true; } @@ -240,6 +308,7 @@ Console::show() { focused = true; height = 256; + alpha = 1.0; } void @@ -272,9 +341,11 @@ Console::update(float elapsed_time) if(stayOpen < 0) stayOpen = 0; } else if(!focused && height > 0) { - height -= elapsed_time * CLOSE_SPEED; - if(height < 0) + alpha -= elapsed_time * FADE_SPEED; + if(alpha < 0) { + alpha = 0; height = 0; + } } } @@ -284,9 +355,13 @@ Console::draw(DrawingContext& context) if (height == 0) return; - context.draw_surface(background2.get(), Vector(SCREEN_WIDTH/2 - background->get_width()/2 - background->get_width() + backgroundOffset, height - background->get_height()), LAYER_FOREGROUND1+1); - context.draw_surface(background2.get(), Vector(SCREEN_WIDTH/2 - background->get_width()/2 + backgroundOffset, height - background->get_height()), LAYER_FOREGROUND1+1); - context.draw_surface(background.get(), Vector(SCREEN_WIDTH/2 - background->get_width()/2, height - background->get_height()), LAYER_FOREGROUND1+1); + int layer = LAYER_GUI + 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(); @@ -295,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; @@ -304,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 @@ -319,12 +396,12 @@ 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);