Rolled back bomb to old behaviour, some bomb gfx tuning

[supertux.git] / src / console.hpp

diff --git a/src/console.hpp b/src/console.hpp
index 83ea2fe..3543cf6 100644 (file)
--- 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;
@@ -43,15 +44,18 @@ 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 init_graphics();
 
-  void backspace(); /**< delete last character sent to the input stream */
+  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);
@@ -103,7 +107,8 @@ private:
 
   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 */