3 files changed, 121 insertions, 1 deletions

diff --git a/src/gui/allegroinput.cpp b/src/gui/allegroinput.cpp
new file mode 100644
index 00000000..8ca077c1
--- /dev/null
+++ b/src/gui/allegroinput.cpp
@@ -0,0 +1,70 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  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 The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#include "allegroinput.h"
+#include "../game.h"
+#include <allegro.h>
+
+AllegroInput::AllegroInput() :
+    gcn::AllegroInput()
+{
+}
+
+void AllegroInput::pollKeyInput()
+{
+    int unicode, scancode;
+
+    if (keyboard_needs_poll())
+    {
+        poll_keyboard();
+    }
+
+    while (keypressed())
+    {
+        unicode = ureadkey(&scancode);
+
+        if (!handle_key(unicode, scancode))
+        {
+            gcn::Key keyObj = convertToKey(scancode, unicode);
+            mKeyQueue.push(gcn::KeyInput(keyObj, gcn::KeyInput::PRESS));
+            mPressedKeys[scancode] = keyObj;
+        }
+    }
+
+    // Check for released keys
+    std::map<int, gcn::Key>::iterator iter, tempIter;
+    for (iter = mPressedKeys.begin(); iter != mPressedKeys.end(); )
+    {
+        if (!key[iter->first])
+        {
+            mKeyQueue.push(gcn::KeyInput(iter->second, gcn::KeyInput::RELEASE));
+            tempIter = iter;
+            iter++;
+            mPressedKeys.erase(tempIter);
+        }
+        else
+        {
+            iter++;
+        }
+    }
+}
diff --git a/src/gui/allegroinput.h b/src/gui/allegroinput.h
new file mode 100644
index 00000000..ab1a1301
--- /dev/null
+++ b/src/gui/allegroinput.h
@@ -0,0 +1,49 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  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 The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
+ */
+
+#ifndef _TMW_ALLEGRO_INPUT_H__
+#define _TMW_ALLEGRO_INPUT_H__
+
+#include <guichan.hpp>
+#include <guichan/allegro.hpp>
+
+/**
+ * Allegro input handler that gives us a chance to handle some shortkeys.
+ *
+ * \ingroup GUI
+ */
+class AllegroInput : public gcn::AllegroInput
+{
+    public:
+        /**
+         * Constructor.
+         */
+        AllegroInput();
+
+        /**
+         * Polls key input.
+         */
+        void pollKeyInput();
+};
+
+#endif
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index e8217cf8..a64ff457 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -27,6 +27,7 @@
 #include <math.h>
 #include "../log.h"
 #include "../sound/sound.h"
+#include "allegroinput.h"
 
 #ifndef WIN32
 #define __cdecl __attribute__((cdecl))
@@ -77,7 +78,7 @@ void init_gui(BITMAP *bitmap, const char *skin) {
     guiGraphics = new gcn::AllegroGraphics();
     guiGraphics->setTarget(bitmap);
 
-    guiInput = new gcn::AllegroInput();
+    guiInput = new AllegroInput();
 
     guiTop = new gcn::Container();
     guiTop->setDimension(gcn::Rectangle(0, 0, SCREEN_W, SCREEN_H));