summaryrefslogtreecommitdiff
path: root/indra/llwindow/llkeyboard.h
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2023-12-14 14:12:01 -0600
committerRunitaiLinden <davep@lindenlab.com>2023-12-14 14:12:01 -0600
commit3c858d7e2d6633df14df473a918d2fb848403972 (patch)
tree62b36692a0c1df2f34a85bc7fd4111afb2737d81 /indra/llwindow/llkeyboard.h
parent8b86e2ad1b1326cb3e98acd857dc93f4f1455b8c (diff)
parent32de0cb67d824498d0fc9d489ce19731ebfddfdf (diff)
Merge branch 'DRTVWR-601' of github.com:secondlife/viewer into DRTVWR-601
Diffstat (limited to 'indra/llwindow/llkeyboard.h')
-rw-r--r--indra/llwindow/llkeyboard.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llwindow/llkeyboard.h b/indra/llwindow/llkeyboard.h
index fb1ae10f50..dad150e3c1 100644
--- a/indra/llwindow/llkeyboard.h
+++ b/indra/llwindow/llkeyboard.h
@@ -96,8 +96,10 @@ public:
static BOOL maskFromString(const std::string& str, MASK *mask); // False on failure
static BOOL keyFromString(const std::string& str, KEY *key); // False on failure
static std::string stringFromKey(KEY key, bool translate = true);
+ static std::string stringFromMouse(EMouseClickType click, bool translate = true);
static std::string stringFromAccelerator( MASK accel_mask ); // separated for convinience, returns with "+": "Shift+" or "Shift+Alt+"...
static std::string stringFromAccelerator( MASK accel_mask, KEY key );
+ static std::string stringFromAccelerator(MASK accel_mask, EMouseClickType click);
void setCallbacks(LLWindowCallbacks *cbs) { mCallbacks = cbs; }
F32 getKeyElapsedTime( KEY key ); // Returns time in seconds since key was pressed.
@@ -130,6 +132,13 @@ protected:
static std::map<std::string,KEY> sNamesToKeys;
};
+// Interface to get key from assigned command
+class LLKeyBindingToStringHandler
+{
+public:
+ virtual std::string getKeyBindingAsString(const std::string& mode, const std::string& control) const = 0;
+};
+
extern LLKeyboard *gKeyboard;
#endif