combine mouseinput into one file.

2 files changed, 217 insertions, 1 deletions

diff --git a/src/input/mouseinput.h b/src/input/mouseinput.h
new file mode 100644
index 000000000..5ece1f77a
--- /dev/null
+++ b/src/input/mouseinput.h
@@ -0,0 +1,216 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012-2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program 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.
+ *
+ *  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*      _______   __   __   __   ______   __   __   _______   __   __
+ *     / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___  /\ /  |\/ /\
+ *    / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ *   / / /__   / / // / // / // / /    / ___  / // ___  / // /| ' / /
+ *  / /_// /\ / /_// / // / // /_/_   / / // / // /\_/ / // / |  / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
+ *
+ *
+ * Per Larsson a.k.a finalman
+ * Olof Naessén a.k.a jansem/yakslem
+ *
+ * Visit: http://guichan.sourceforge.net
+ *
+ * License: (BSD)
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name of Guichan nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef MOUSEINPUT_H
+#define MOUSEINPUT_H
+
+#include "input/mouseinput.h"
+
+#include "localconsts.h"
+
+class MouseInput final
+{
+    public:
+        MouseInput() :
+            mType(0),
+            mButton(0),
+            mTimeStamp(0),
+            mX(0),
+            mY(0),
+            mRealX(0),
+            mRealY(0)
+        { }
+
+        ~MouseInput()
+        { }
+
+        /**
+         * Mouse input event types. This enum partially corresponds
+         * to the enum with event types in MouseEvent for easy mapping.
+         */
+        enum
+        {
+            MOVED = 0,
+            PRESSED,
+            RELEASED,
+            WHEEL_MOVED_DOWN,
+            WHEEL_MOVED_UP
+        };
+
+        /**
+         * Mouse button types.
+         */
+        enum
+        {
+            EMPTY = 0,
+            LEFT,
+            RIGHT,
+            MIDDLE
+        };
+
+        void setType(unsigned int type)
+        {
+            mType = type;
+        }
+
+        unsigned int getType() const
+        {
+            return mType;
+        }
+
+        void setButton(unsigned int button)
+        {
+            mButton = button;
+        }
+
+        unsigned int getButton() const
+        {
+            return mButton;
+        }
+
+        int getTimeStamp() const
+        {
+            return mTimeStamp;
+        }
+
+        void setTimeStamp(int timeStamp)
+        {
+            mTimeStamp = timeStamp;
+        }
+
+        void setX(int x)
+        {
+            mX = x;
+        }
+
+        int getX() const
+        {
+            return mX;
+        }
+
+        void setY(int y)
+        {
+            mY = y;
+        }
+
+        int getY() const
+        {
+            return mY;
+        }
+
+        void setReal(const int x, const int y)
+        { mRealX = x; mRealY = y; }
+
+        int getRealX() const A_WARN_UNUSED
+        { return mRealX; }
+
+        int getRealY() const A_WARN_UNUSED
+        { return mRealY; }
+
+#ifdef ANDROID
+        int getTouchX() const A_WARN_UNUSED
+        { return mRealX; }
+
+        int getTouchY() const A_WARN_UNUSED
+        { return mRealY; }
+#else
+        int getTouchX() const A_WARN_UNUSED
+        { return mX; }
+
+        int getTouchY() const A_WARN_UNUSED
+        { return mY; }
+#endif
+
+    protected:
+        /**
+         * Holds the type of the mouse input.
+         */
+        unsigned int mType;
+
+        /**
+         * Holds the button of the mouse input.
+         */
+        unsigned int mButton;
+
+        /** 
+         * Holds the timestamp of the mouse input. Used to 
+         * check for double clicks.
+         */
+        int mTimeStamp;
+
+        /** 
+         * Holds the x coordinate of the mouse input.
+         */
+        int mX;
+
+        /** 
+         * Holds the y coordinate of the mouse input.
+         */
+        int mY;
+
+        int mRealX;
+
+        int mRealY;
+};
+
+#endif  // MOUSEINPUT_H
diff --git a/src/input/multitouchmanager.cpp b/src/input/multitouchmanager.cpp
index 7e6798807..446e40aa1 100644
--- a/src/input/multitouchmanager.cpp
+++ b/src/input/multitouchmanager.cpp
@@ -82,7 +82,7 @@ void MultiTouchManager::checkDevice(const int touchId,
             const int w = mainGraphics->mWidth;
             const int h = mainGraphics->mHeight;
             guiInput->simulateMouseClick(finger0.x * w, finger0.y * h,
-                gcn::MouseInput::RIGHT);
+                MouseInput::RIGHT);
         }
     }
 }