diff options
Diffstat (limited to 'intern/ghost/intern/GHOST_ModifierKeys.cpp')
| -rw-r--r-- | intern/ghost/intern/GHOST_ModifierKeys.cpp | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/intern/ghost/intern/GHOST_ModifierKeys.cpp b/intern/ghost/intern/GHOST_ModifierKeys.cpp index d31dc8f0770..5ecbae77f46 100644 --- a/intern/ghost/intern/GHOST_ModifierKeys.cpp +++ b/intern/ghost/intern/GHOST_ModifierKeys.cpp @@ -10,6 +10,7 @@ */ #include "GHOST_ModifierKeys.h" +#include "GHOST_Debug.h" GHOST_ModifierKeys::GHOST_ModifierKeys() { @@ -42,11 +43,15 @@ GHOST_TKey GHOST_ModifierKeys::getModifierKeyCode(GHOST_TModifierKey mask) case GHOST_kModifierKeyRightControl: key = GHOST_kKeyRightControl; break; - case GHOST_kModifierKeyOS: - key = GHOST_kKeyOS; + case GHOST_kModifierKeyLeftOS: + key = GHOST_kKeyLeftOS; + break; + case GHOST_kModifierKeyRightOS: + key = GHOST_kKeyRightOS; break; default: - // Should not happen + /* Should not happen. */ + GHOST_ASSERT(0, "Invalid key!"); key = GHOST_kKeyUnknown; break; } @@ -68,9 +73,12 @@ bool GHOST_ModifierKeys::get(GHOST_TModifierKey mask) const return m_LeftControl; case GHOST_kModifierKeyRightControl: return m_RightControl; - case GHOST_kModifierKeyOS: - return m_OS; + case GHOST_kModifierKeyLeftOS: + return m_LeftOS; + case GHOST_kModifierKeyRightOS: + return m_RightOS; default: + GHOST_ASSERT(0, "Invalid key!"); return false; } } @@ -96,10 +104,14 @@ void GHOST_ModifierKeys::set(GHOST_TModifierKey mask, bool down) case GHOST_kModifierKeyRightControl: m_RightControl = down; break; - case GHOST_kModifierKeyOS: - m_OS = down; + case GHOST_kModifierKeyLeftOS: + m_LeftOS = down; + break; + case GHOST_kModifierKeyRightOS: + m_RightOS = down; break; default: + GHOST_ASSERT(0, "Invalid key!"); break; } } @@ -112,7 +124,8 @@ void GHOST_ModifierKeys::clear() m_RightAlt = false; m_LeftControl = false; m_RightControl = false; - m_OS = false; + m_LeftOS = false; + m_RightOS = false; } bool GHOST_ModifierKeys::equals(const GHOST_ModifierKeys &keys) const @@ -120,5 +133,5 @@ bool GHOST_ModifierKeys::equals(const GHOST_ModifierKeys &keys) const return (m_LeftShift == keys.m_LeftShift) && (m_RightShift == keys.m_RightShift) && (m_LeftAlt == keys.m_LeftAlt) && (m_RightAlt == keys.m_RightAlt) && (m_LeftControl == keys.m_LeftControl) && (m_RightControl == keys.m_RightControl) && - (m_OS == keys.m_OS); + (m_LeftOS == keys.m_LeftOS) && (m_RightOS == keys.m_RightOS); } |