Diffstat (limited to 'libopie2/opiecore/okeyfilter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/okeyfilter.cpp | 53 |
1 files changed, 39 insertions, 14 deletions
diff --git a/libopie2/opiecore/okeyfilter.cpp b/libopie2/opiecore/okeyfilter.cpp index d806dbd..b064272 100644 --- a/libopie2/opiecore/okeyfilter.cpp +++ b/libopie2/opiecore/okeyfilter.cpp @@ -24,96 +24,121 @@ _;:, .> :=|. This program is free software; you can If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "okeyfilter.h" #include "device/odevice.h" #include "odebug.h" namespace Opie { namespace Core { -QValueList<QWSServer::KeyboardFilter*> OKeyFilter::filterList; -QValueList<QWSServer::KeyboardFilter*> OKeyFilter::preFilterList; +class OKeyFilterPrivate:public OKeyFilter, QWSServer::KeyboardFilter +{ + static QValueList<QWSServer::KeyboardFilter*> filterList; + static QValueList<QWSServer::KeyboardFilter*> preFilterList; +protected: + OKeyFilterPrivate(const OKeyFilterPrivate&):OKeyFilter(),QWSServer::KeyboardFilter(){}; + virtual void addPreHandler(QWSServer::KeyboardFilter*); + virtual void remPreHandler(QWSServer::KeyboardFilter*); + +public: + OKeyFilterPrivate(); + virtual ~OKeyFilterPrivate(); + virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat ); + virtual void addHandler(QWSServer::KeyboardFilter*); + virtual void remHandler(QWSServer::KeyboardFilter*); +}; + +QValueList<QWSServer::KeyboardFilter*> OKeyFilterPrivate::filterList; +QValueList<QWSServer::KeyboardFilter*> OKeyFilterPrivate::preFilterList; OKeyFilter::OKeyFilter() - :QWSServer::KeyboardFilter() { - filterList.clear(); - preFilterList.clear(); - if ( isQWS( ) ) { - QWSServer::setKeyboardFilter ( this ); - } } OKeyFilter::~OKeyFilter() { } OKeyFilter* OKeyFilter::inst() { static OKeyFilter*ofilter = 0; if (!ofilter) { - ofilter = new OKeyFilter; + ofilter = new OKeyFilterPrivate; } return ofilter; } -bool OKeyFilter::filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat ) +bool OKeyFilterPrivate::filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat ) { QValueList<QWSServer::KeyboardFilter*>::Iterator iter; for (iter=preFilterList.begin();iter!=preFilterList.end();++iter) { if ((*iter)->filter(unicode,keycode,modifiers,isPress,autoRepeat)) { return true; } } for (iter=filterList.begin();iter!=filterList.end();++iter) { if ((*iter)->filter(unicode,keycode,modifiers,isPress,autoRepeat)) { return true; } } return false; } -void OKeyFilter::addHandler(QWSServer::KeyboardFilter*aF) +void OKeyFilterPrivate::addHandler(QWSServer::KeyboardFilter*aF) { if (filterList.find(aF)!=filterList.end()) { return; } odebug << "adding a keyboard filter handler"<<oendl; filterList.append(aF); } -void OKeyFilter::remHandler(QWSServer::KeyboardFilter*aF) +void OKeyFilterPrivate::remHandler(QWSServer::KeyboardFilter*aF) { QValueList<QWSServer::KeyboardFilter*>::Iterator iter; if ( (iter=filterList.find(aF))==filterList.end() ) { return; } odebug << "removing a keyboard filter handler"<<oendl; filterList.remove(iter); } -void OKeyFilter::addPreHandler(QWSServer::KeyboardFilter*aF) +void OKeyFilterPrivate::addPreHandler(QWSServer::KeyboardFilter*aF) { if (preFilterList.find(aF)!=preFilterList.end()) { return; } odebug << "adding a preferred keyboard filter handler"<<oendl; preFilterList.append(aF); } -void OKeyFilter::remPreHandler(QWSServer::KeyboardFilter*aF) +void OKeyFilterPrivate::remPreHandler(QWSServer::KeyboardFilter*aF) { QValueList<QWSServer::KeyboardFilter*>::Iterator iter; if ( (iter=preFilterList.find(aF))==preFilterList.end() ) { return; } odebug << "removing a preferred keyboard filter handler"<<oendl; preFilterList.remove(iter); } +OKeyFilterPrivate::OKeyFilterPrivate() + :OKeyFilter(),QWSServer::KeyboardFilter() +{ + filterList.clear(); + preFilterList.clear(); + if ( isQWS( ) ) { + QWSServer::setKeyboardFilter ( this ); + } +} + +OKeyFilterPrivate::~OKeyFilterPrivate() +{ +} + /* namespace Core */ } /* namespace Opie */ } |