summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/CMakeLists.txt2
-rw-r--r--indra/llcommon/indra_constants.h11
-rw-r--r--indra/llcommon/llkeybind.cpp395
-rw-r--r--indra/llcommon/llkeybind.h106
4 files changed, 0 insertions, 514 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 7e52a620db..af41b9e460 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -73,7 +73,6 @@ set(llcommon_SOURCE_FILES
llinitparam.cpp
llinitdestroyclass.cpp
llinstancetracker.cpp
- llkeybind.cpp
llleap.cpp
llleaplistener.cpp
llliveappconfig.cpp
@@ -184,7 +183,6 @@ set(llcommon_HEADER_FILES
llinitdestroyclass.h
llinitparam.h
llinstancetracker.h
- llkeybind.h
llkeythrottle.h
llleap.h
llleaplistener.h
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h
index 10b98f49aa..e7b0e0ef8e 100644
--- a/indra/llcommon/indra_constants.h
+++ b/indra/llcommon/indra_constants.h
@@ -54,17 +54,6 @@ enum ETerrainBrushType
E_LANDBRUSH_INVALID = 6
};
-enum EMouseClickType{
- CLICK_NONE = -1,
- CLICK_LEFT = 0,
- CLICK_MIDDLE,
- CLICK_RIGHT,
- CLICK_BUTTON4,
- CLICK_BUTTON5,
- CLICK_DOUBLELEFT,
- CLICK_COUNT // 'size', CLICK_NONE does not counts
-};
-
// keys
// Bit masks for various keyboard modifier keys.
const MASK MASK_NONE = 0x0000;
diff --git a/indra/llcommon/llkeybind.cpp b/indra/llcommon/llkeybind.cpp
deleted file mode 100644
index ecfc289cb3..0000000000
--- a/indra/llcommon/llkeybind.cpp
+++ /dev/null
@@ -1,395 +0,0 @@
-/**
- * @file llkeybind.cpp
- * @brief Information about key combinations.
- *
- * $LicenseInfo:firstyear=2019&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2019, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#include "llkeybind.h"
-
-#include "llsd.h"
-#include "llsdutil.h"
-
-LLKeyData::LLKeyData()
- :
- mMouse(CLICK_NONE),
- mKey(KEY_NONE),
- mMask(MASK_NONE),
- mIgnoreMasks(false)
-{
-}
-
-LLKeyData::LLKeyData(EMouseClickType mouse, KEY key, MASK mask)
- :
- mMouse(mouse),
- mKey(key),
- mMask(mask),
- mIgnoreMasks(false)
-{
-}
-
-LLKeyData::LLKeyData(EMouseClickType mouse, KEY key, bool ignore_mask)
- :
- mMouse(mouse),
- mKey(key),
- mMask(MASK_NONE),
- mIgnoreMasks(ignore_mask)
-{
-}
-
-LLKeyData::LLKeyData(EMouseClickType mouse, KEY key, MASK mask, bool ignore_mask)
- :
- mMouse(mouse),
- mKey(key),
- mMask(mask),
- mIgnoreMasks(ignore_mask)
-{
-}
-
-LLKeyData::LLKeyData(const LLSD &key_data)
-{
- if (key_data.has("mouse"))
- {
- mMouse = (EMouseClickType)key_data["mouse"].asInteger();
- }
- if (key_data.has("key"))
- {
- mKey = key_data["key"].asInteger();
- }
- if (key_data.has("ignore_accelerators"))
- {
- mIgnoreMasks = key_data["ignore_accelerators"];
- }
- if (key_data.has("mask"))
- {
- mMask = key_data["mask"].asInteger();
- }
-}
-
-LLSD LLKeyData::asLLSD() const
-{
- LLSD data;
- data["mouse"] = (LLSD::Integer)mMouse;
- data["key"] = (LLSD::Integer)mKey;
- data["mask"] = (LLSD::Integer)mMask;
- if (mIgnoreMasks)
- {
- data["ignore_accelerators"] = (LLSD::Boolean)mIgnoreMasks;
- }
- return data;
-}
-
-bool LLKeyData::isEmpty() const
-{
- return mMouse == CLICK_NONE && mKey == KEY_NONE;
-}
-
-void LLKeyData::reset()
-{
- mMouse = CLICK_NONE;
- mKey = KEY_NONE;
- mMask = MASK_NONE;
- mIgnoreMasks = false;
-}
-
-LLKeyData& LLKeyData::operator=(const LLKeyData& rhs)
-{
- mMouse = rhs.mMouse;
- mKey = rhs.mKey;
- mMask = rhs.mMask;
- mIgnoreMasks = rhs.mIgnoreMasks;
- return *this;
-}
-
-bool LLKeyData::operator==(const LLKeyData& rhs)
-{
- if (mMouse != rhs.mMouse) return false;
- if (mKey != rhs.mKey) return false;
- if (mMask != rhs.mMask) return false;
- if (mIgnoreMasks != rhs.mIgnoreMasks) return false;
- return true;
-}
-
-bool LLKeyData::operator!=(const LLKeyData& rhs)
-{
- if (mMouse != rhs.mMouse) return true;
- if (mKey != rhs.mKey) return true;
- if (mMask != rhs.mMask) return true;
- if (mIgnoreMasks != rhs.mIgnoreMasks) return true;
- return false;
-}
-
-bool LLKeyData::canHandle(const LLKeyData& data) const
-{
- if (data.mKey == mKey
- && data.mMouse == mMouse
- && ((mIgnoreMasks && (data.mMask & mMask) == data.mMask) || data.mMask == mMask))
- {
- return true;
- }
- return false;
-}
-
-bool LLKeyData::canHandle(EMouseClickType mouse, KEY key, MASK mask) const
-{
- if (mouse == mMouse
- && key == mKey
- && ((mIgnoreMasks && (mask & mMask) == mask) || mask == mMask))
- {
- return true;
- }
- return false;
-}
-
-// LLKeyBind
-
-LLKeyBind::LLKeyBind(const LLSD &key_bind)
-{
- if (key_bind.isArray())
- {
- for (LLSD::array_const_iterator data = key_bind.beginArray(), endLists = key_bind.endArray();
- data != endLists;
- data++
- )
- {
- mData.push_back(LLKeyData(*data));
- }
- }
-}
-
-bool LLKeyBind::operator==(const LLKeyBind& rhs)
-{
- U32 size = mData.size();
- if (size != rhs.mData.size()) return false;
-
- for (U32 i = 0; i < size; i++)
- {
- if (mData[i] != rhs.mData[i]) return false;
- }
-
- return true;
-}
-
-bool LLKeyBind::operator!=(const LLKeyBind& rhs)
-{
- U32 size = mData.size();
- if (size != rhs.mData.size()) return true;
-
- for (U32 i = 0; i < size; i++)
- {
- if (mData[i] != rhs.mData[i]) return true;
- }
-
- return false;
-}
-
-bool LLKeyBind::isEmpty() const
-{
- for (data_vector_t::const_iterator iter = mData.begin(); iter != mData.end(); iter++)
- {
- if (!iter->isEmpty()) return false;
- }
- return true;
-}
-
-LLSD LLKeyBind::asLLSD() const
-{
- S32 last = mData.size() - 1;
- while (mData[last].empty())
- {
- last--;
- }
-
- LLSD data;
- for (S32 i = 0; i <= last; ++i)
- {
- // append even if empty to not affect visual representation
- data.append(mData[i].asLLSD());
- }
- return data;
-}
-
-bool LLKeyBind::canHandle(EMouseClickType mouse, KEY key, MASK mask) const
-{
- if (mouse == CLICK_NONE && key == KEY_NONE)
- {
- // assume placeholder
- return false;
- }
-
- for (data_vector_t::const_iterator iter = mData.begin(); iter != mData.end(); iter++)
- {
- if (iter->canHandle(mouse, key, mask))
- {
- return true;
- }
- }
- return false;
-}
-
-bool LLKeyBind::canHandleKey(KEY key, MASK mask) const
-{
- return canHandle(CLICK_NONE, key, mask);
-}
-
-bool LLKeyBind::canHandleMouse(EMouseClickType mouse, MASK mask) const
-{
- return canHandle(mouse, KEY_NONE, mask);
-}
-
-bool LLKeyBind::hasKeyData(EMouseClickType mouse, KEY key, MASK mask, bool ignore) const
-{
- if (mouse != CLICK_NONE || key != KEY_NONE)
- {
- for (data_vector_t::const_iterator iter = mData.begin(); iter != mData.end(); iter++)
- {
- if (iter->mKey == key
- && iter->mMask == mask
- && iter->mMouse == mouse
- && iter->mIgnoreMasks == ignore)
- {
- return true;
- }
- }
- }
- return false;
-}
-
-bool LLKeyBind::hasKeyData(const LLKeyData& data) const
-{
- return hasKeyData(data.mMouse, data.mKey, data.mMask, data.mIgnoreMasks);
-}
-
-bool LLKeyBind::hasKeyData(U32 index) const
-{
- return mData.size() > index;
-}
-
-S32 LLKeyBind::findKeyData(EMouseClickType mouse, KEY key, MASK mask, bool ignore) const
-{
- if (mouse != CLICK_NONE || key != KEY_NONE)
- {
- for (S32 i = 0; i < mData.size(); ++i)
- {
- if (mData[i].mKey == key
- && mData[i].mMask == mask
- && mData[i].mMouse == mouse
- && mData[i].mIgnoreMasks == ignore)
- {
- return i;
- }
- }
- }
- return -1;
-}
-
-S32 LLKeyBind::findKeyData(const LLKeyData& data) const
-{
- return findKeyData(data.mMouse, data.mKey, data.mMask, data.mIgnoreMasks);
-}
-
-LLKeyData LLKeyBind::getKeyData(U32 index) const
-{
- if (mData.size() > index)
- {
- return mData[index];
- }
- return LLKeyData();
-}
-
-bool LLKeyBind::addKeyData(EMouseClickType mouse, KEY key, MASK mask, bool ignore)
-{
- if (!hasKeyData(mouse, key, mask, ignore))
- {
- mData.push_back(LLKeyData(mouse, key, mask, ignore));
- return true;
- }
- return false;
-}
-
-bool LLKeyBind::addKeyData(const LLKeyData& data)
-{
- if (!hasKeyData(data))
- {
- mData.push_back(data);
- return true;
- }
- return false;
-}
-
-void LLKeyBind::replaceKeyData(EMouseClickType mouse, KEY key, MASK mask, bool ignore, U32 index)
-{
- replaceKeyData(LLKeyData(mouse, key, mask, ignore), index);
-}
-
-void LLKeyBind::replaceKeyData(const LLKeyData& data, U32 index)
-{
- if (!data.isEmpty())
- {
- // if both click and key are none (isEmpty()), we are inserting a placeholder, we don't want to reset anything
- // otherwise reset identical key
- for (data_vector_t::iterator iter = mData.begin(); iter != mData.end(); iter++)
- {
- if (iter->mKey == data.mKey
- && iter->mMouse == data.mMouse
- && iter->mIgnoreMasks == data.mIgnoreMasks
- && iter->mMask == data.mMask)
- {
- // Replacing only fully equal combinations even in case 'ignore' is set
- // Reason: Simplicity and user might decide to do a 'move' command as W and Shift+Ctrl+W, and 'run' as Shift+W
- iter->reset();
- break;
- }
- }
- }
- if (mData.size() <= index)
- {
- mData.resize(index + 1);
- }
- mData[index] = data;
-}
-
-void LLKeyBind::resetKeyData(S32 index)
-{
- if (mData.size() > index)
- {
- mData[index].reset();
- }
-}
-
-void LLKeyBind::trimEmpty()
-{
- S32 last = mData.size() - 1;
- while (last >= 0 && mData[last].empty())
- {
- mData.erase(mData.begin() + last);
- last--;
- }
-}
-
-U32 LLKeyBind::getDataCount()
-{
- return mData.size();
-}
-
diff --git a/indra/llcommon/llkeybind.h b/indra/llcommon/llkeybind.h
deleted file mode 100644
index c6b4bd970f..0000000000
--- a/indra/llcommon/llkeybind.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * @file llkeybind.h
- * @brief Information about key combinations.
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_KEYBIND_H
-#define LL_KEYBIND_H
-
-#include "indra_constants.h"
-
-// KeyData - single key combination (mouse/mask/keyboard)
-class LL_COMMON_API LLKeyData
-{
-public:
- LLKeyData();
- LLKeyData(EMouseClickType mouse, KEY key, MASK mask);
- LLKeyData(EMouseClickType mouse, KEY key, bool ignore_mask);
- LLKeyData(EMouseClickType mouse, KEY key, MASK mask, bool ignore_mask);
- LLKeyData(const LLSD &key_data);
-
- LLSD asLLSD() const;
- bool isEmpty() const;
- bool empty() const { return isEmpty(); };
- void reset();
- LLKeyData& operator=(const LLKeyData& rhs);
- bool operator==(const LLKeyData& rhs);
- bool operator!=(const LLKeyData& rhs);
-
- bool canHandle(const LLKeyData& data) const;
- bool canHandle(EMouseClickType mouse, KEY key, MASK mask) const;
-
- EMouseClickType mMouse;
- KEY mKey;
- MASK mMask;
- // Either to expect exact match or ignore not expected masks as long as expected mask-bit is present
- bool mIgnoreMasks;
-};
-
-// One function can bind to multiple Key options
-class LLKeyBind
-{
-public:
- LLKeyBind() {}
- LLKeyBind(const LLSD &key_bind);
-
- bool operator==(const LLKeyBind& rhs);
- bool operator!=(const LLKeyBind& rhs);
- bool isEmpty() const;
- bool empty() const { return isEmpty(); };
-
- LLSD asLLSD() const;
-
- bool canHandle(EMouseClickType mouse, KEY key, MASK mask) const;
- bool canHandleKey(KEY key, MASK mask) const;
- bool canHandleMouse(EMouseClickType mouse, MASK mask) const;
-
- // contains specified combination
- bool hasKeyData(EMouseClickType mouse, KEY key, MASK mask, bool ignore) const;
- bool hasKeyData(const LLKeyData& data) const;
- bool hasKeyData(U32 index) const;
-
- // index of contained LLKeyData
- S32 findKeyData(EMouseClickType mouse, KEY key, MASK mask, bool ignore) const;
- S32 findKeyData(const LLKeyData& data) const;
-
- LLKeyData getKeyData(U32 index) const;
-
- // these methods enshure there will be no repeats
- bool addKeyData(EMouseClickType mouse, KEY key, MASK mask, bool ignore);
- bool addKeyData(const LLKeyData& data);
- void replaceKeyData(EMouseClickType mouse, KEY key, MASK mask, bool ignore, U32 index);
- void replaceKeyData(const LLKeyData& data, U32 index);
- void resetKeyData(S32 index);
- void clear() { mData.clear(); }
- // if there any empty LLKeyData in the end of the array, remove them
- void trimEmpty();
- U32 getDataCount();
-
-private:
- typedef std::vector<LLKeyData> data_vector_t;
- data_vector_t mData;
-};
-
-
-#endif // LL_KEYBIND_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-16 00:16:05 +0000