Merge branch 'master' into lpc2012lpc2012

1 files changed, 21 insertions, 1 deletions

diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 90f70df3..09bb788e 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -61,13 +61,15 @@
 
 #include <queue>
 
-#include <SDL/SDL.h>
+#include <SDL.h>
 
 #include <guichan/input.hpp>
 #include <guichan/keyinput.hpp>
 #include <guichan/mouseinput.hpp>
 #include <guichan/platform.hpp>
 
+#include <string>
+
 namespace Key
 {
     enum
@@ -122,6 +124,19 @@ namespace Key
     };
 }
 
+class TextInput
+{
+public:
+    TextInput(const char *text)
+        : mText(text)
+    {}
+
+    const std::string &getText() const { return mText; }
+
+private:
+    std::string mText;
+};
+
 /**
  * SDL implementation of Input.
  */
@@ -160,6 +175,10 @@ public:
 
     virtual gcn::MouseInput dequeueMouseInput();
 
+    bool isTextQueueEmpty() const;
+
+    TextInput dequeueTextInput();
+
 protected:
     /**
      * Converts a mouse button from SDL to a Guichan mouse button
@@ -181,6 +200,7 @@ protected:
 
     std::queue<gcn::KeyInput> mKeyInputQueue;
     std::queue<gcn::MouseInput> mMouseInputQueue;
+    std::queue<TextInput> mTextInputQueue;
 
     bool mMouseDown;
     bool mMouseInWindow;