X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fconsole.hpp;h=15d9791cbd144ec532c12d947fc96a7993c5c325;hb=ca86583fae991aa3280c5d70bf20dbf0504a93cb;hp=72dedd3338140731fd71ef0cef084d6b481c0176;hpb=e6a940db5904743e8220491ce10b5107e119a44c;p=supertux.git

diff --git a/src/console.hpp b/src/console.hpp
index 72dedd333..15d9791cb 100644
--- a/src/console.hpp
+++ b/src/console.hpp
@@ -1,5 +1,5 @@
-//  $Id: worldmap.hpp 3209 2006-04-02 22:19:22Z sommer $
-// 
+//  $Id$
+//
 //  SuperTux - Console
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  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.
@@ -26,6 +26,7 @@
 #include <string>
 #include <sstream>
 #include <iostream>
+#include <squirrel.h>
 
 class Console;
 class ConsoleStreamBuffer;
@@ -34,7 +35,7 @@ class DrawingContext;
 class Surface;
 class Font;
 
-class Console 
+class Console
 {
 public:
   Console();
@@ -45,13 +46,16 @@ public:
   static std::ostream input; /**< stream of keyboard input to send to the console. Do not forget to send std::endl or to flush the stream. */
   static std::ostream output; /**< stream of characters to output to the console. Do not forget to send std::endl or to flush the stream. */
 
+  void init_graphics();
+
   void backspace(); /**< delete last character sent to the input stream */
   void scroll(int offset); /**< scroll console text up or down by @c offset lines */
   void autocomplete(); /**< autocomplete current command */
+  void show_history(int offset); /**< move @c offset lines forward through history; Negative offset moves backward */
 
   void draw(DrawingContext& context); /**< draw the console in a DrawingContext */
   void update(float elapsed_time);
-  
+
   void show(); /**< display the console */
   void hide(); /**< hide the console */
   void toggle(); /**< display the console if hidden, hide otherwise */
@@ -82,40 +86,50 @@ public:
   }
 
 private:
-  std::list<std::string> lines; /**< backbuffer of lines sent to the console */
+  std::list<std::string> history; /**< command history. New lines get added to back. */
+  std::list<std::string>::iterator history_position; /**< item of command history that is currently displayed */
+  std::list<std::string> lines; /**< backbuffer of lines sent to the console. New lines get added to front. */
   std::map<std::string, std::list<ConsoleCommandReceiver*> > commands; /**< map of console commands and a list of associated ConsoleCommandReceivers */
-  
+
   std::auto_ptr<Surface> background; /**< console background image */
   std::auto_ptr<Surface> background2; /**< second, moving console background image */
-  
+
+  HSQUIRRELVM vm; /**< squirrel thread for the console (with custom roottable) */
+  HSQOBJECT vm_object;
+
   int backgroundOffset; /**< current offset of scrolling background image */
   float height; /**< height of the console in px */
   float alpha;
   int offset; /**< decrease to scroll text up */
   bool focused; /**< true if console has input focus */
   std::auto_ptr<Font> font;
+  float fontheight; /**< height of the font (this is a separate var, because the font could not be initialized yet but is needed in the addLine message */
 
   float stayOpen;
 
   static ConsoleStreamBuffer inputBuffer; /**< stream buffer used by input stream */
   static ConsoleStreamBuffer outputBuffer; /**< stream buffer used by output stream */
 
+  void addLines(std::string s); /**< display a string of (potentially) multiple lines in the console */
   void addLine(std::string s); /**< display a line in the console */
   void parse(std::string s); /**< react to a given command */
-    
+
+  /** ready a virtual machine instance, creating a new thread and loading default .nut files if needed */
+  void ready_vm();
+
   /** execute squirrel script and output result */
   void execute_script(const std::string& s);
-    
+
   bool consoleCommand(std::string command, std::vector<std::string> arguments); /**< process internal command; return false if command was unknown, true otherwise */
 
   friend class ConsoleStreamBuffer;
   void flush(ConsoleStreamBuffer* buffer); /**< act upon changes in a ConsoleStreamBuffer */
 };
 
-class ConsoleStreamBuffer : public std::stringbuf 
+class ConsoleStreamBuffer : public std::stringbuf
 {
   public:
-    int sync() 
+    int sync()
     {
       int result = std::stringbuf::sync();
       if(Console::instance != NULL)
@@ -131,7 +145,7 @@ public:
   {
     Console::instance->unregisterCommands(this);
   }
-   
+
   /**
    * callback from Console; return false if command was unknown,
    * true otherwise