diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-09-09 14:27:48 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-09-09 14:27:48 -0700 |
| commit | 094a226fd8027405dd220dbc25951a3b70c9fa67 (patch) | |
| tree | fe782e520a8a40c531080281b509b28cf8feec68 /indra/llwindow/llkeyboardmacosx.h | |
| parent | eaf287cc20efbad97fba17a65efd57eeba0f7278 (diff) | |
| parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) | |
Pull from lindenlab/viewer-release
Diffstat (limited to 'indra/llwindow/llkeyboardmacosx.h')
| -rwxr-xr-x | indra/llwindow/llkeyboardmacosx.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llwindow/llkeyboardmacosx.h b/indra/llwindow/llkeyboardmacosx.h index f09ff720ce..f9d014ab70 100755 --- a/indra/llwindow/llkeyboardmacosx.h +++ b/indra/llwindow/llkeyboardmacosx.h @@ -29,6 +29,15 @@ #include "llkeyboard.h" +// These more or less mirror their equivalents in NSEvent.h. +enum EMacEventKeys { + MAC_SHIFT_KEY = 1 << 17, + MAC_CTRL_KEY = 1 << 18, + MAC_ALT_KEY = 1 << 19, + MAC_CMD_KEY = 1 << 20, + MAC_FN_KEY = 1 << 23 +}; + class LLKeyboardMacOSX : public LLKeyboard { public: @@ -40,6 +49,7 @@ public: /*virtual*/ void resetMaskKeys(); /*virtual*/ MASK currentMask(BOOL for_mouse_event); /*virtual*/ void scanKeyboard(); + /*virtual*/ void handleModifier(MASK mask); protected: MASK updateModifiers(const U32 mask); |