| -rw-r--r-- | libopie2/opiecore/okeyconfigmanager.cpp | 16 | ||||
| -rw-r--r-- | libopie2/opiecore/okeyconfigmanager.h | 74 |
2 files changed, 87 insertions, 3 deletions
diff --git a/libopie2/opiecore/okeyconfigmanager.cpp b/libopie2/opiecore/okeyconfigmanager.cpp index e6055e0..18740ef 100644 --- a/libopie2/opiecore/okeyconfigmanager.cpp +++ b/libopie2/opiecore/okeyconfigmanager.cpp @@ -404,22 +404,32 @@ bool OKeyConfigItem::operator==( const OKeyConfigItem& conf )const { return true; } bool OKeyConfigItem::operator!=( const OKeyConfigItem& conf )const { return !( *this == conf ); } +/*! \enum OKeyConfigManager::EventMask + <a name="Eventmask flags"></a> + This enum is used to tell OKeyConfigManager which type of key events should inspected. + + <ul> + <li>\c MaskPressed When a key is pressed an action performs + <li>\c MaskReleased When a key is released an action performs + </ul> +*/ + /** * \brief c'tor * The Constructor for a OKeyConfigManager * * You can use this manager in multiple ways. Either make it handle - * QKeyEvents + * QKeyEvents. The EventMask is set to OKeyConfigManager::MaskReleased by default. * * \code * Opie::Core::Config conf = oApp->config(); * Opie::Core::OKeyPairList blackList; * blackList.append(Opie::Core::OKeyPair::leftArrowKey()); * blackList.append(Opie::Core::OKeyPair::rightArrowKey()); * Opie::Core::OKeyConfigManager *manager = new Opie::Core::OKeyConfigManager(conf,"key_actions",blackList, * false); @@ -468,16 +478,17 @@ OKeyConfigManager::OKeyConfigManager( Opie::Core::OConfig* conf, const QString& group, const OKeyPair::List& black, bool grabkeyboard, QObject* par, const char* name) : QObject( par, name ), m_conf( conf ), m_group( group ), m_blackKeys( black ), m_grab( grabkeyboard ), m_map( 0 ){ if ( m_grab ) QPEApplication::grabKeyboard(); + m_event_mask = OKeyConfigManager::MaskReleased; } /** * Destructor */ OKeyConfigManager::~OKeyConfigManager() { if ( m_grab ) @@ -669,17 +680,18 @@ void OKeyConfigManager::handleWidget( QWidget* wid ) { /** * @internal */ bool OKeyConfigManager::eventFilter( QObject* obj, QEvent* ev) { if ( !obj->isWidgetType() ) return false; - if ( ev->type() != QEvent::KeyPress && ev->type() != QEvent::KeyRelease ) + if ( (ev->type() != QEvent::KeyPress||!testEventMask(MaskPressed)) && + (ev->type() != QEvent::KeyRelease||!testEventMask(MaskReleased)) ) return false; QKeyEvent *key = static_cast<QKeyEvent*>( ev ); OKeyConfigItem item = handleKeyEvent( key ); if ( item.isEmpty() ) return false; diff --git a/libopie2/opiecore/okeyconfigmanager.h b/libopie2/opiecore/okeyconfigmanager.h index d610375..b861675 100644 --- a/libopie2/opiecore/okeyconfigmanager.h +++ b/libopie2/opiecore/okeyconfigmanager.h @@ -129,17 +129,17 @@ private: * keyboard to handle hardware keys, you can supply a blacklist of * keys which should not be used by allowed to be used. * You can even pass this manager to a Widget to do the configuration for you. * You need to add OKeyConfigItem for your keys and then issue a load() to * read the Key information. * You can either handle the QKeyEvent yourself and ask this class if it is * handled by your action and let give you the action. Or you can install * the event filter and get a signal. - * You need to load ans save yourself! + * You need to load and save yourself! * * @since 1.1.2 */ class OKeyConfigManager : public QObject { Q_OBJECT typedef QMap<int, OKeyConfigItem::List> OKeyMapConfigPrivate; public: OKeyConfigManager(Opie::Core::OConfig *conf = 0, @@ -163,17 +163,63 @@ public: void removeFromBlackList( const OKeyPair& ); void clearBlackList(); OKeyPair::List blackList()const; void handleWidget( QWidget* ); bool eventFilter( QObject*, QEvent* ); + /** + * Sets the event mask flags aMask. + * + * aMask is a combination of OKeyConfigManager::EventMask + * + * @see eventMask(), testEventMask(), addEventMask(), clearEventMask() + */ + void setEventMask(uint aMask); + /** + * Returns the event mask flags set. + * + * aMask is a combination of OKeyConfigManager::EventMask + * + * @see setEventMask(), testEventMask(), addEventMask(), clearEventMask() + */ + uint eventMask()const; + /** + * Test if the event mask flag aMask is set. + * + * @param aMask one of OKeyConfigManager::EventMask + * + * @see eventMask(), setEventMask(), addEventMask(), clearEventMask() + */ + bool testEventMask(uint aMask); + /** + * Add the event mask flag aMask. + * + * @param aMask one of OKeyConfigManager::EventMask + * + * @see eventMask(), setEventMask(), addEventMask(), clearEventMask() + */ + void addEventMask(uint aMask); + /** + * Clears the event mask flag aMask. + * + * @param aMask is one of OKeyConfigManager::EventMask + * + * @see eventMask(), testEventMask(), addEventMask(), setEventMask() + */ + void clearEventMask(uint aMask); + OKeyConfigItem::List keyConfigList()const; + + enum EventMask { + MaskPressed = 0x1, + MaskReleased = 0x2, + }; signals: /** * The Signals are triggered on KeyPress and KeyRelease! * You can check the isDown of the QKeyEvent * @see QKeyEvent */ void actionActivated( QWidget*, QKeyEvent*, const Opie::Core::OKeyConfigItem& ); @@ -192,14 +238,40 @@ private: QValueList<QWidget*> m_widgets; Opie::Core::OConfig *m_conf; QString m_group; OKeyPair::List m_blackKeys; bool m_grab : 1; OKeyMapConfigPrivate *m_map; class Private; Private *d; + uint m_event_mask; }; +inline bool OKeyConfigManager::testEventMask(uint aMask) +{ + return (m_event_mask&aMask)!=0; +} + +inline void OKeyConfigManager::addEventMask(uint aMask) +{ + m_event_mask |= aMask; +} + +inline void OKeyConfigManager::clearEventMask(uint aMask) +{ + m_event_mask &= ~aMask; +} + +inline void OKeyConfigManager::setEventMask(uint aMask) +{ + m_event_mask = aMask; +} + +inline uint OKeyConfigManager::eventMask()const +{ + return m_event_mask; +} + } } #endif |