livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-6109 Mouse localization support

meow-7.2.2
andreykproductengine 2019-11-12 14:08:01 +02:00
parent f680e5913a
commit 0c8f561910
4 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
indra/newview/llkeyconflict.cpp
View File

@ -36,6 +36,7 @@
#include "llinitparam.h"
#include "llkeyboard.h"
#include "lltrans.h"
#include "llviewercontrol.h"
#include "llviewerinput.h"
#include "llviewermenu.h"
@ -73,7 +74,7 @@ std::string string_from_mask(MASK mask)
return res;
}
std::string string_from_mouse(EMouseClickType click)
std::string string_from_mouse(EMouseClickType click, bool translate)
{
std::string res;
switch (click)
@ -99,36 +100,12 @@ std::string string_from_mouse(EMouseClickType click)
default:
break;
}
return res;
}
EMouseClickType mouse_from_string(const std::string& input)
{
if (input == "LMB")
if (translate && !res.empty())
{
return CLICK_LEFT;
res = LLTrans::getString(res);
}
if (input == "MMB")
{
return CLICK_MIDDLE;
}
if (input == "RMB")
{
return CLICK_RIGHT;
}
if (input == "MB4")
{
return CLICK_BUTTON4;
}
if (input == "MB5")
{
return CLICK_BUTTON5;
}
if (input == "Double LMB")
{
return CLICK_DOUBLELEFT;
}
return CLICK_NONE;
return res;
}
// LLKeyConflictHandler
@ -266,7 +243,7 @@ std::string LLKeyConflictHandler::getStringFromKeyData(const LLKeyData& keydata)
result = LLKeyboard::stringFromAccelerator(keydata.mMask);
}
result += string_from_mouse(keydata.mMouse);
result += string_from_mouse(keydata.mMouse, true);
return result;
}
@ -300,7 +277,11 @@ void LLKeyConflictHandler::loadFromSettings(const LLViewerInput::KeyMode& keymod
{
KEY key;
MASK mask;
EMouseClickType mouse = it->mouse.isProvided() ? mouse_from_string(it->mouse) : CLICK_NONE;
EMouseClickType mouse = CLICK_NONE;
if (it->mouse.isProvided())
{
LLViewerInput::mouseFromString(it->mouse.getValue(), &mouse);
}
if (it->key.getValue().empty())
{
key = KEY_NONE;
@ -528,7 +509,7 @@ void LLKeyConflictHandler::saveToSettings(bool temporary)
{
// set() because 'optional', for compatibility purposes
// just copy old keys.xml and rename to key_bindings.xml, it should work
binding.mouse.set(string_from_mouse(data.mMouse), true);
binding.mouse.set(string_from_mouse(data.mMouse, false), true);
}
binding.command = iter->first;
mode.bindings.add(binding);

6
indra/newview/llviewerinput.cpp
View File

@ -922,7 +922,8 @@ LLViewerInput::LLViewerInput()
}
}
BOOL LLViewerInput::modeFromString(const std::string& string, S32 *mode) const
// static
BOOL LLViewerInput::modeFromString(const std::string& string, S32 *mode)
{
if (string == "FIRST_PERSON")
{
@ -951,7 +952,8 @@ BOOL LLViewerInput::modeFromString(const std::string& string, S32 *mode) const
}
}
BOOL LLViewerInput::mouseFromString(const std::string& string, EMouseClickType *mode) const
// static
BOOL LLViewerInput::mouseFromString(const std::string& string, EMouseClickType *mode)
{
if (string == "LMB")
{

4
indra/newview/llviewerinput.h
View File

@ -112,8 +112,8 @@ public:
S32 loadBindingsXML(const std::string& filename); // returns number bound, 0 on error
EKeyboardMode getMode() const;
BOOL modeFromString(const std::string& string, S32 *mode) const; // False on failure
BOOL mouseFromString(const std::string& string, EMouseClickType *mode) const;// False on failure
static BOOL modeFromString(const std::string& string, S32 *mode); // False on failure
static BOOL mouseFromString(const std::string& string, EMouseClickType *mode);// False on failure
bool scanKey(KEY key,
BOOL key_down,

9
indra/newview/skins/default/xui/en/strings.xml
View File

@ -4069,6 +4069,15 @@ Try enclosing path to the editor with double quotes.
<string name="Z">Z</string>
<!-- Key names end -->
<!-- Mouse button names (short) begin -->
<string name="LMB">LMB</string>
<string name="MMB">MMB</string>
<string name="RMB">RMB</string>
<string name="MB4">MB4</string>
<string name="MB5">MB5</string>
<string name="Double LMB">Double LMB</string>
<!-- Mouse button names end -->
<!-- llviewerwindow -->
<string name="BeaconParticle">Viewing particle beacons (blue)</string>
<string name="BeaconPhysical">Viewing physical object beacons (green)</string>