flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-21 04:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #139 , allows to store the native scan code and the virtual key code. Adjusted list to use changed constructor.

Browse Source
This commit is contained in:
Klaus Basan
2014-02-18 14:18:34 +01:00
parent b52ef641c2
commit f4d1eadbe5
3 changed files with 78 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/blackmisc/hwkeyboardkey.h
View File

@@ -37,7 +37,8 @@ namespace BlackMisc
IndexModifier2AsString,
IndexFunction,
IndexFunctionAsString,
IndexIsPressed
IndexIsPressed,
IndexKeyObject, // just for updates
};
//! \brief Function
@@ -71,8 +72,11 @@ namespace BlackMisc
//! \brief Default constructor
CKeyboardKey();
//! \brief Constructor by function
CKeyboardKey(HotkeyFunction function);
//! \brief Constructor
CKeyboardKey(int keyCode, Modifier modifier1 = ModifierNone, Modifier modifier2 = ModifierNone, const HotkeyFunction &function = HotkeyNone, bool isPressed = false);
CKeyboardKey(int keyCode, quint32 nativeScanCode, quint32 nativeVirtualKey, Modifier modifier1 = ModifierNone, Modifier modifier2 = ModifierNone, const HotkeyFunction &function = HotkeyNone, bool isPressed = false);
//! \brief Destructor
~CKeyboardKey() {}
@@ -102,16 +106,16 @@ namespace BlackMisc
void setPressed(bool isPressed) { this->m_pressed = isPressed; }
//! \brief Get key code
QChar getKey() const { return QChar(this->m_key); }
QChar getKey() const { return QChar(this->m_qtKey); }
//! \brief Get key code
QString getKeyAsString() const { return QString(this->getKey()); }
//! \brief Get key code
QString getKeyAsStringRepresentation() const { return CKeyboardKey::toStringRepresentation(this->m_key); }
QString getKeyAsStringRepresentation() const { return CKeyboardKey::toStringRepresentation(this->m_qtKey); }
//! \brief As Qt::Key
Qt::Key getKeyAsQtKey() const { return static_cast<Qt::Key>(this->m_key);}
Qt::Key getKeyAsQtKey() const { return static_cast<Qt::Key>(this->m_qtKey);}
//! \brief Set key code
void setKey(const QString &key);
@@ -119,6 +123,24 @@ namespace BlackMisc
//! \brief Set key code
void setKey(const QChar key);
//! \brief Set key code
void setKey(const Qt::Key key) { this->m_qtKey = static_cast<int>(key); }
//! \brief Set key code
void setKey(int key) { this->m_qtKey = key; }
//! \brief Native scan code
void setNativeScanCode(quint32 scanCode) { this->m_nativeScanCode = scanCode; }
//! \brief Native virtual key
void setNativeVirtualKey(quint32 virtualKey) { this->m_nativeVirtualKey = virtualKey; }
//! \brief Native scan code
quint32 getNativeScanCode() const { return this->m_nativeScanCode; }
//! \brief Native virtual key
quint32 getNativeVirtualKey() const { return this->m_nativeVirtualKey; }
//! \brief number of modifiers
int numberOfModifiers() const;
@@ -152,7 +174,7 @@ namespace BlackMisc
//! \brief with key?
bool hasKey() const
{
return !this->m_key == 0;
return !this->m_qtKey == 0;
}
//! \brief Key + modifier?
@@ -167,6 +189,9 @@ namespace BlackMisc
//! \brief Function (optional)
QString getFunctionAsString() const;
//! \brief Set key object
void setKeyObject(const BlackMisc::Hardware::CKeyboardKey &key);
//! \brief Set function
void setFunction(const HotkeyFunction &function) { this->m_function = function; }
@@ -215,7 +240,9 @@ namespace BlackMisc
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
private:
int m_key;
int m_qtKey; //!< code similar to Qt::Key
quint32 m_nativeScanCode; //!< native scan code, QKeyEvent::nativeScanCode
quint32 m_nativeVirtualKey; //!< virtual key code
Modifier m_modifier1;
Modifier m_modifier2;
HotkeyFunction m_function;