X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fconsole.hpp;h=3543cf62ab496e6e0a50a9bbf3cb775a259ea59d;hb=7ffae068ecdecf51aa3ad6942151e2a2c3cf8fa1;hp=ff9357126c803d9f506cdd1cdac0cb52a72e4c23;hpb=59a0c6591fed50fac5521f17cc8c78450691ad6d;p=supertux.git

diff --git a/src/console.hpp b/src/console.hpp
index ff9357126..3543cf62a 100644
--- a/src/console.hpp
+++ b/src/console.hpp
@@ -26,6 +26,7 @@
 #include <string>
 #include <sstream>
 #include <iostream>
+#include <memory>
 #include <squirrel.h>
 
 class Console;
@@ -35,7 +36,7 @@ class DrawingContext;
 class Surface;
 class Font;
 
-class Console 
+class Console
 {
 public:
   Console();
@@ -43,24 +44,27 @@ public:
 
   static Console* instance;
 
-  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 backspace(); /**< delete last character sent to the input stream */
+  void init_graphics();
+
+  void input(char c); /**< add character to inputBuffer */
+  void backspace(); /**< delete character left of inputBufferPosition */
+  void eraseChar(); /**< delete character at inputBufferPosition */
+  void enter(); /**< process and clear 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 move_cursor(int offset); /**< move the cursor @c offset chars to the right; Negative offset moves backward; 0xFFFF moves to the end */
 
   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 */
 
   bool hasFocus(); /**< true if characters should be sent to the console instead of their normal target */
-  void registerCommand(std::string command, ConsoleCommandReceiver* ccr); /**< associate command with the given CCR */
-  void unregisterCommand(std::string command, ConsoleCommandReceiver* ccr); /**< dissociate command and CCR */
-  void unregisterCommands(ConsoleCommandReceiver* ccr); /**< dissociate all commands of given CCR */
 
   template<typename T> static bool string_is(std::string s) {
     std::istringstream iss(s);
@@ -83,43 +87,50 @@ public:
   }
 
 private:
-  std::list<std::string> lines; /**< backbuffer of lines sent to the console */
-  std::map<std::string, std::list<ConsoleCommandReceiver*> > commands; /**< map of console commands and a list of associated ConsoleCommandReceivers */
-  
+  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::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 */
+  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 int inputBufferPosition; /**< position in inputBuffer before which to append new characters */
+  static std::string inputBuffer; /**< string used for keyboard input */
   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)
@@ -128,19 +139,4 @@ class ConsoleStreamBuffer : public std::stringbuf
     }
 };
 
-class ConsoleCommandReceiver
-{
-public:
-  virtual ~ConsoleCommandReceiver()
-  {
-    Console::instance->unregisterCommands(this);
-  }
-   
-  /**
-   * callback from Console; return false if command was unknown,
-   * true otherwise
-   */
-  virtual bool consoleCommand(std::string command, std::vector<std::string> arguments) = 0;
-};
-
 #endif