X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fconsole.cpp;h=4cfa87412277e97e9bf95bbf090b82eb201ae59c;hb=e57c65e0862b48e91fd1b24916c662dd38ec4419;hp=3b1633b0cea4c1334e16da9e45f56f7401cd5334;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/console.cpp b/src/console.cpp
index 3b1633b0c..4cfa87412 100644
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -23,29 +23,39 @@
 #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 FADE_SPEED = 1;
 
 Console::Console()
-  : 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() 
+{
+  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"));
 }
 
-Console::~Console() 
-{
-}
-
 void 
 Console::flush(ConsoleStreamBuffer* buffer) 
 {
@@ -73,19 +83,46 @@ Console::execute_script(const std::string& command)
 {
   using namespace Scripting;
 
-  HSQUIRRELVM vm = ScriptManager::instance->get_vm();
-
-  if(command == "")
-    return;
-  
+  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)))
+    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)
@@ -120,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();
@@ -159,12 +215,12 @@ Console::addLine(std::string s)
   if (height < 64) {
     if(height < 4)
       height = 4;
-    height += font->get_height();
+    height += fontheight;
   }
 
   alpha = 1.0;
-  if(stayOpen < 5)
-    stayOpen += 1;
+  if(stayOpen < 6)
+    stayOpen += 1.5;
 }
 
 void
@@ -172,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<std::string> args;
   size_t start = 0;