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

diff --git a/src/console.cpp b/src/console.cpp
index abb10d615..4cfa87412 100644
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -23,10 +23,9 @@
 #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"
@@ -35,22 +34,28 @@
 static const float FADE_SPEED = 1;
 
 Console::Console()
-  : vm(NULL), backgroundOffset(0), height(0), alpha(1.0), offset(0),
-    focused(false), stayOpen(0)
-{
-  font.reset(new Font("images/engine/fonts/white-small.png",
-                      "images/engine/fonts/shadow-small.png", 8, 9, 1));
-  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(ScriptManager::instance->get_vm(), &vm_object);
+    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 
 Console::flush(ConsoleStreamBuffer* buffer) 
 {
@@ -79,11 +84,10 @@ Console::execute_script(const std::string& command)
   using namespace Scripting;
 
   if(vm == NULL) {
-    vm = ScriptManager::instance->get_vm();
+    vm = Scripting::global_vm;
     HSQUIRRELVM new_vm = sq_newthread(vm, 16);
     if(new_vm == NULL)
-      throw Scripting::SquirrelError(ScriptManager::instance->get_vm(),
-          "Couldn't create new VM thread for console");
+      throw Scripting::SquirrelError(vm, "Couldn't create new VM thread for console");
 
     // store reference to thread
     sq_resetobject(&vm_object);
@@ -118,7 +122,7 @@ Console::execute_script(const std::string& command)
       throw SquirrelError(vm, "Couldn't compile command");
 
     sq_pushroottable(vm); 
-    if(SQ_FAILED(sq_call(vm, 1, SQTrue)))
+    if(SQ_FAILED(sq_call(vm, 1, SQTrue, SQTrue)))
       throw SquirrelError(vm, "Problem while executing command");
 
     if(sq_gettype(vm, -1) != OT_NULL)
@@ -153,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();
@@ -192,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
@@ -205,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;