move input related files into input dir.

1 files changed, 0 insertions, 368 deletions

diff --git a/src/joystick.cpp b/src/joystick.cpp
deleted file mode 100644
index a2809d8b9..000000000
--- a/src/joystick.cpp
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2004-2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2013  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/>.
- */
-
-#include "joystick.h"
-
-#include "client.h"
-#include "configuration.h"
-#include "inputmanager.h"
-#include "logger.h"
-#include "sdlshared.h"
-
-#include "debug.h"
-
-int Joystick::joystickCount = 0;
-bool Joystick::mEnabled = false;
-
-Joystick::Joystick(const int no):
-    mDirection(0),
-    mJoystick(nullptr),
-    mUpTolerance(0),
-    mDownTolerance(0),
-    mLeftTolerance(0),
-    mRightTolerance(0),
-    mCalibrating(false),
-    mNumber(no >= joystickCount ? joystickCount : no),
-    mCalibrated(false),
-    mButtonsNumber(MAX_BUTTONS),
-    mUseInactive(false),
-    mHaveHats(false),
-    mKeyToAction(),
-    mKeyToId(),
-    mKeyTimeMap()
-{
-    for (int i = 0; i < MAX_BUTTONS; i++)
-        mActiveButtons[i] = false;
-}
-
-Joystick::~Joystick()
-{
-    close();
-}
-
-void Joystick::init()
-{
-    SDL_InitSubSystem(SDL_INIT_JOYSTICK);
-    SDL_JoystickEventState(SDL_ENABLE);
-    joystickCount = SDL_NumJoysticks();
-    logger->log("%i joysticks/gamepads found", joystickCount);
-    for (int i = 0; i < joystickCount; i++)
-        logger->log("- %s", SDL_JoystickNameForIndex(i));
-
-    mEnabled = config.getBoolValue("joystickEnabled");
-
-    if (joystickCount > 0)
-    {
-        joystick = new Joystick(config.getIntValue("selectedJoystick"));
-        if (mEnabled)
-            joystick->open();
-    }
-}
-
-bool Joystick::open()
-{
-    if (mNumber >= joystickCount)
-        mNumber = joystickCount - 1;
-    if (mNumber < 0)
-    {
-        logger->log1("error: incorrect joystick selection");
-        return false;
-    }
-    logger->log("open joystick %d", mNumber);
-
-    mJoystick = SDL_JoystickOpen(mNumber);
-
-    if (!mJoystick)
-    {
-        logger->log("Couldn't open joystick: %s", SDL_GetError());
-        return false;
-    }
-
-    mButtonsNumber = SDL_JoystickNumButtons(mJoystick);
-    logger->log("Joystick: %i ", mNumber);
-    logger->log("Axes: %i ", SDL_JoystickNumAxes(mJoystick));
-    logger->log("Balls: %i", SDL_JoystickNumBalls(mJoystick));
-    logger->log("Hats: %i", SDL_JoystickNumHats(mJoystick));
-    logger->log("Buttons: %i", mButtonsNumber);
-
-    mHaveHats = (SDL_JoystickNumHats(mJoystick) > 0);
-
-    if (mButtonsNumber > MAX_BUTTONS)
-        mButtonsNumber = MAX_BUTTONS;
-
-    mCalibrated = config.getValueBool("joystick"
-        + toString(mNumber) + "calibrated", false);
-    mUpTolerance = config.getIntValue("upTolerance" + toString(mNumber));
-    mDownTolerance = config.getIntValue("downTolerance" + toString(mNumber));
-    mLeftTolerance = config.getIntValue("leftTolerance" + toString(mNumber));
-    mRightTolerance = config.getIntValue("rightTolerance" + toString(mNumber));
-    mUseInactive = config.getBoolValue("useInactiveJoystick");
-
-    return true;
-}
-
-void Joystick::close()
-{
-    logger->log("close joystick %d", mNumber);
-    if (mJoystick)
-    {
-        SDL_JoystickClose(mJoystick);
-        mJoystick = nullptr;
-    }
-}
-
-void Joystick::reload()
-{
-    joystickCount = SDL_NumJoysticks();
-    setNumber(mNumber);
-}
-
-void Joystick::setNumber(const int n)
-{
-    if (mJoystick)
-    {
-        SDL_JoystickClose(mJoystick);
-        mNumber = n;
-        open();
-    }
-    else
-    {
-        mNumber = n;
-    }
-}
-
-void Joystick::logic()
-{
-    // When calibrating, don't bother the outside with our state
-    if (mCalibrating)
-    {
-        doCalibration();
-        return;
-    };
-
-    if (!mEnabled || !mCalibrated)
-        return;
-
-    mDirection = 0;
-
-    if (mUseInactive || client->getInputFocused())
-    {
-        // X-Axis
-        int position = SDL_JoystickGetAxis(mJoystick, 0);
-        if (position >= mRightTolerance)
-            mDirection |= RIGHT;
-        else if (position <= mLeftTolerance)
-            mDirection |= LEFT;
-
-        // Y-Axis
-        position = SDL_JoystickGetAxis(mJoystick, 1);
-        if (position <= mUpTolerance)
-            mDirection |= UP;
-        else if (position >= mDownTolerance)
-            mDirection |= DOWN;
-
-#ifdef DEBUG_JOYSTICK
-        if (SDL_JoystickGetAxis(mJoystick, 2))
-            logger->log("axis 2 pos: %d", SDL_JoystickGetAxis(mJoystick, 2));
-        if (SDL_JoystickGetAxis(mJoystick, 3))
-            logger->log("axis 3 pos: %d", SDL_JoystickGetAxis(mJoystick, 3));
-        if (SDL_JoystickGetAxis(mJoystick, 4))
-            logger->log("axis 4 pos: %d", SDL_JoystickGetAxis(mJoystick, 4));
-#endif
-
-        if (!mDirection && mHaveHats)
-        {
-            // reading only hat 0
-            const uint8_t hat = SDL_JoystickGetHat(mJoystick, 0);
-            if (hat & SDL_HAT_RIGHT)
-                mDirection |= RIGHT;
-            else if (hat & SDL_HAT_LEFT)
-                mDirection |= LEFT;
-            if (hat & SDL_HAT_UP)
-                mDirection |= UP;
-            else if (hat & SDL_HAT_DOWN)
-                mDirection |= DOWN;
-        }
-
-        // Buttons
-        for (int i = 0; i < mButtonsNumber; i++)
-        {
-            const bool state = (SDL_JoystickGetButton(mJoystick, i) == 1);
-            mActiveButtons[i] = state;
-            if (!state)
-                resetRepeat(i);
-#ifdef DEBUG_JOYSTICK
-            if (mActiveButtons[i])
-                logger->log("button: %d", i);
-#endif
-        }
-    }
-    else
-    {
-        for (int i = 0; i < mButtonsNumber; i++)
-            mActiveButtons[i] = false;
-    }
-}
-
-void Joystick::startCalibration()
-{
-    mUpTolerance = 0;
-    mDownTolerance = 0;
-    mLeftTolerance = 0;
-    mRightTolerance = 0;
-    mCalibrating = true;
-}
-
-void Joystick::doCalibration()
-{
-    // X-Axis
-    int position = SDL_JoystickGetAxis(mJoystick, 0);
-    if (position > mRightTolerance)
-        mRightTolerance = position;
-    else if (position < mLeftTolerance)
-        mLeftTolerance = position;
-
-    // Y-Axis
-    position = SDL_JoystickGetAxis(mJoystick, 1);
-    if (position > mDownTolerance)
-        mDownTolerance = position;
-    else if (position < mUpTolerance)
-        mUpTolerance = position;
-}
-
-void Joystick::finishCalibration()
-{
-    mCalibrated = true;
-    mCalibrating = false;
-    config.setValue("joystick" + toString(mNumber) + "calibrated", true);
-    config.setValue("leftTolerance" + toString(mNumber), mLeftTolerance);
-    config.setValue("rightTolerance" + toString(mNumber), mRightTolerance);
-    config.setValue("upTolerance" + toString(mNumber), mUpTolerance);
-    config.setValue("downTolerance" + toString(mNumber), mDownTolerance);
-}
-
-bool Joystick::buttonPressed(const unsigned char no) const
-{
-    return (mEnabled && no < MAX_BUTTONS) ? mActiveButtons[no] : false;
-}
-
-void Joystick::getNames(std::vector <std::string> &names)
-{
-    names.clear();
-    for (int i = 0; i < joystickCount; i++)
-        names.push_back(SDL_JoystickNameForIndex(i));
-}
-
-void Joystick::update()
-{
-    inputManager.updateKeyActionMap(mKeyToAction, mKeyToId,
-        mKeyTimeMap, INPUT_JOYSTICK);
-}
-
-KeysVector *Joystick::getActionVector(const SDL_Event &event)
-{
-    const int i = getButtonFromEvent(event);
-
-    if (i < 0 || i >= mButtonsNumber)
-        return nullptr;
-//    logger->log("button triggerAction: %d", i);
-    if (mKeyToAction.find(i) != mKeyToAction.end())
-        return &mKeyToAction[i];
-    return nullptr;
-}
-
-KeysVector *Joystick::getActionVectorByKey(const int i)
-{
-    if (i < 0 || i >= mButtonsNumber)
-        return nullptr;
-//    logger->log("button triggerAction: %d", i);
-    if (mKeyToAction.find(i) != mKeyToAction.end())
-        return &mKeyToAction[i];
-    return nullptr;
-}
-
-int Joystick::getButtonFromEvent(const SDL_Event &event) const
-{
-    if (event.jbutton.which != mNumber)
-        return -1;
-    return event.jbutton.button;
-}
-
-bool Joystick::isActionActive(const int index) const
-{
-    if (!validate())
-        return false;
-
-    const KeyFunction &key = inputManager.getKey(index);
-    for (size_t i = 0; i < KeyFunctionSize; i ++)
-    {
-        const KeyItem &val = key.values[i];
-        if (val.type != INPUT_JOYSTICK)
-            continue;
-        const int value = val.value;
-        if (value >= 0 && value < mButtonsNumber)
-        {
-            if (mActiveButtons[value])
-                return true;
-        }
-    }
-    return false;
-}
-
-bool Joystick::validate() const
-{
-    if (mCalibrating || !mEnabled || !mCalibrated)
-        return false;
-
-    return (mUseInactive || client->getInputFocused());
-}
-
-void Joystick::handleRepeat(const int time)
-{
-    FOR_EACH (KeyTimeMapIter, it, mKeyTimeMap)
-    {
-        bool repeat(false);
-        const int key = (*it).first;
-        int &keyTime = (*it).second;
-        if (key >= 0 && key < mButtonsNumber)
-        {
-            if (mActiveButtons[key])
-                repeat = true;
-        }
-        if (repeat)
-        {
-            if (time > keyTime && abs(time - keyTime)
-                > SDL_DEFAULT_REPEAT_DELAY * 10)
-            {
-                keyTime = time;
-                inputManager.triggerAction(getActionVectorByKey(key));
-            }
-        }
-    }
-}
-
-void Joystick::resetRepeat(const int key)
-{
-    const KeyTimeMapIter it = mKeyTimeMap.find(key);
-    if (it != mKeyTimeMap.end())
-        (*it).second = tick_time;
-}