Allow to completely turn off/on Right on Hold Visual Feedback

mickey thanks for spotting the linking failures :}

1 files changed, 12 insertions, 5 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index acad81d..35f433c 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -85,102 +85,107 @@
 
 #include "alarmserver.h"
 #include "applnk.h"
 #include "qpemenubar.h"
 #include "textcodecinterface.h"
 #include "imagecodecinterface.h"
 
 #include <unistd.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #ifndef QT_NO_SOUND
 #include <sys/soundcard.h>
 #endif
 #include "qt_override_p.h"
 
 #include <qpe/rohfeedback.h>
 
 
 static bool useBigPixmaps = 0;
 
 
 class HackWidget : public QWidget
 {
 public:
     bool needsOk()
     { return (getWState() & WState_Reserved1 ); }
 
     QRect normalGeometry()
     { return topData()->normalGeometry; };
 };
 
 class QPEApplicationData
 {
 public:
     QPEApplicationData ( )
         : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ),
           notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ),
           keep_running( true ), qcopQok( false ),
           fontFamily( "Vera" ), fontSize( 10 ), smallIconSize( 14 ),
           bigIconSize( 32 ), qpe_main_widget( 0 )
     {
         Config cfg( "qpe" );
         cfg.setGroup( "Appearance" );
         useBigPixmaps = cfg.readBoolEntry( "useBigPixmaps", false );
         fontFamily = cfg.readEntry( "FontFamily", "Vera" );
         fontSize = cfg.readNumEntry( "FontSize", 10 );
         smallIconSize = cfg.readNumEntry( "SmallIconSize", 14 );
         bigIconSize = cfg.readNumEntry( "BigIconSize", 32 );
+#ifdef OPIE_ROHFEEDBACK
         RoH = 0;
+#endif
     }
 
     int presstimer;
     QWidget* presswidget;
     QPoint presspos;
+#ifdef OPIE_ROHFEEDBACK
+    Opie::Internal::RoHFeedback *RoH;
+#endif
 
     bool rightpressed : 1;
     bool kbgrabbed    : 1;
     bool notbusysent  : 1;
     bool preloaded    : 1;
     bool forceshow    : 1;
     bool nomaximize   : 1;
     bool keep_running : 1;
     bool qcopQok      : 1;
 
     QCString fontFamily;
     int fontSize;
     int smallIconSize;
     int bigIconSize;
 
   QStringList langs;
     QString appName;
     struct QCopRec
     {
         QCopRec( const QCString &ch, const QCString &msg,
                  const QByteArray &d ) :
                 channel( ch ), message( msg ), data( d )
         { }
 
         QCString channel;
         QCString message;
         QByteArray data;
     };
     QWidget* qpe_main_widget;
         QGuardedPtr<QWidget> lastraised;
     QQueue<QCopRec> qcopq;
         QString styleName;
     QString decorationName;
 
     void enqueueQCop( const QCString &ch, const QCString &msg,
                       const QByteArray &data )
     {
         qcopq.enqueue( new QCopRec( ch, msg, data ) );
     }
     void sendQCopQ()
     {
             if (!qcopQok )
                 return;
 
         QCopRec * r;
 
            while((r=qcopq.dequeue())) {
                // remove from queue before sending...
@@ -452,98 +457,96 @@ static void qpe_show_dialog( QDialog* d, bool nomax )
         if ( dir. exists ( ))
             list = dir.entryList();
         QStringList::Iterator it;
         for ( it = list.begin(); it != list.end(); ++it ) {
             TextCodecInterface *iface = 0;
             QLibrary *lib = new QLibrary( path + "/" + *it );
             if ( lib->queryInterface( IID_QtopiaTextCodec, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
                 QValueList<int> mibs = iface->mibEnums();
                 for (QValueList<int>::ConstIterator i = mibs.begin(); i != mibs.end(); ++i) {
                     (void)iface->createForMib(*i);
                     // ### it exists now; need to remember if we can delete it
                 }
             }
             else {
                 lib->unload();
                 delete lib;
             }
         }
     }
 
     void loadImageCodecs()
     {
         QString path = QPEApplication::qpeDir() + "/plugins/imagecodecs";
 #ifdef Q_OS_MACX
         QDir dir( path, "lib*.dylib" );
 #else
         QDir dir( path, "lib*.so" );
 #endif
         QStringList list;
         if ( dir. exists ( ))
             list = dir.entryList();
         QStringList::Iterator it;
         for ( it = list.begin(); it != list.end(); ++it ) {
             ImageCodecInterface *iface = 0;
             QLibrary *lib = new QLibrary( path + "/" + *it );
             if ( lib->queryInterface( IID_QtopiaImageCodec, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
                 QStringList formats = iface->keys();
                 for (QStringList::ConstIterator i = formats.begin(); i != formats.end(); ++i) {
                     (void)iface->installIOHandler(*i);
                     // ### it exists now; need to remember if we can delete it
                 }
             }
             else {
                 lib->unload();
                 delete lib;
             }
         }
     }
-
-    Opie::Internal::RoHFeedback * RoH;
 };
 
 class ResourceMimeFactory : public QMimeSourceFactory
 {
 public:
         ResourceMimeFactory() : resImage( 0 )
     {
         setFilePath( Global::helpPath() );
         setExtensionType( "html", "text/html;charset=UTF-8" );
     }
         ~ResourceMimeFactory() {
             delete resImage;
         }
 
     const QMimeSource* data( const QString& abs_name ) const
     {
         const QMimeSource * r = QMimeSourceFactory::data( abs_name );
         if ( !r ) {
             int sl = abs_name.length();
             do {
                 sl = abs_name.findRev( '/', sl - 1 );
                 QString name = sl >= 0 ? abs_name.mid( sl + 1 ) : abs_name;
                 int dot = name.findRev( '.' );
                 if ( dot >= 0 )
                     name = name.left( dot );
                 QImage img = Resource::loadImage( name );
                 if ( !img.isNull() ) {
                                     delete resImage;
                                     resImage = new QImageDrag( img );
                                     r = resImage;
                                 }
             }
             while ( !r && sl > 0 );
         }
         return r;
     }
 private:
     mutable QImageDrag *resImage;
 };
 
 static int& hack(int& i)
 {
 #if QT_VERSION <= 230 && defined(QT_NO_CODECS)
     // These should be created, but aren't in Qt 2.3.0
     (void)new QUtf8Codec;
     (void)new QUtf16Codec;
 #endif
     return i;
@@ -1167,97 +1170,99 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e )
                     e << int( ke-> simpleData.keycode ) << int( ke-> simpleData. is_press ) << int( ke-> simpleData.is_auto_repeat );
                 }
             }
             return true;
         }
     }
     if ( e->type == QWSEvent::Focus ) {
         QWSFocusEvent * fe = ( QWSFocusEvent* ) e;
         if ( !fe->simpleData.get_focus ) {
             QWidget * active = activeWindow();
             while ( active && active->isPopup() ) {
                 active->close();
                 active = activeWindow();
             }
         }
         else {
             // make sure our modal widget is ALWAYS on top
             QWidget *topm = activeModalWidget();
             if ( topm && static_cast<int>( topm->winId() ) != fe->simpleData.window) {
                 topm->raise();
             }
         }
         if ( fe->simpleData.get_focus && inputMethodDict ) {
             InputMethodHint m = inputMethodHint( QWidget::find( e->window() ) );
             if ( m == AlwaysOff )
                 Global::hideInputMethod();
             if ( m == AlwaysOn )
                 Global::showInputMethod();
         }
     }
 
 
     return QApplication::qwsEventFilter( e );
 }
 #endif
 
 /*!
   Destroys the QPEApplication.
 */
 QPEApplication::~QPEApplication()
 {
     ungrabKeyboard();
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     // Need to delete QCopChannels early, since the display will
     // be gone by the time we get to ~QObject().
     delete sysChannel;
     delete pidChannel;
 #endif
+#ifdef OPIE_ROHFEEDBACK
     delete d->RoH;
+#endif
     delete d;
 }
 
 /*!
   Returns <tt>$OPIEDIR/</tt>.
 */
 QString QPEApplication::qpeDir()
 {
     const char * base = getenv( "OPIEDIR" );
     if ( base )
         return QString( base ) + "/";
 
     return QString( "../" );
 }
 
 /*!
   Returns the user's current Document directory. There is a trailing "/".
   .. well, it does now,, and there's no trailing '/'
 */
 QString QPEApplication::documentDir()
 {
     const char* base = getenv( "HOME");
     if ( base )
         return QString( base ) + "/Documents";
 
     return QString( "../Documents" );
 }
 
 static int deforient = -1;
 
 /*!
   \internal
 */
 int QPEApplication::defaultRotation()
 {
     if ( deforient < 0 ) {
         QString d = getenv( "QWS_DISPLAY" );
         if ( d.contains( "Rot90" ) ) {
             deforient = 90;
         }
         else if ( d.contains( "Rot180" ) ) {
             deforient = 180;
         }
         else if ( d.contains( "Rot270" ) ) {
             deforient = 270;
         }
         else {
             deforient = 0;
@@ -1990,180 +1995,182 @@ QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* w )
                        if the user uses the press-and-hold gesture.
 
     \sa setStylusOperation() stylusOperation()
 */
 
 /*!
   Causes widget \a w to receive mouse events according to the stylus
   \a mode.
 
   \sa stylusOperation() StylusMode
 */
 void QPEApplication::setStylusOperation( QWidget * w, StylusMode mode )
 {
     createDict();
     if ( mode == LeftOnly ) {
         stylusDict->remove
         ( w );
         w->removeEventFilter( qApp );
     }
     else {
         stylusDict->insert( w, ( void* ) mode );
         connect( w, SIGNAL( destroyed() ), qApp, SLOT( removeSenderFromStylusDict() ) );
         w->installEventFilter( qApp );
     }
 }
 
 
 /*!
   \reimp
 */
 bool QPEApplication::eventFilter( QObject *o, QEvent *e )
 {
         if ( !o->isWidgetType() )
             return FALSE;
 
     if ( stylusDict && e->type() >= QEvent::MouseButtonPress && e->type() <= QEvent::MouseMove ) {
         QMouseEvent * me = ( QMouseEvent* ) e;
         StylusMode mode = (StylusMode)(int)stylusDict->find(o);
         switch (mode) {
             case RightOnHold:
                 switch ( me->type() ) {
                     case QEvent::MouseButtonPress:
                         if ( me->button() == LeftButton ) {
                             d->presswidget = (QWidget*)o;
                             d->presspos = me->pos();
                             d->rightpressed = FALSE;
                             // just for the time being
                             static int pref = 500;
-#ifdef WITHROHFEEDBACK
+#ifdef OPIE_ROHFEEDBACK
                             if( ! d->RoH )
                               d->RoH = new Opie::Internal::RoHFeedback;
 
                             d->RoH->init( me->globalPos(), d->presswidget );
                             pref = d->RoH->delay();
 #endif
                             if (!d->presstimer )
                                 d->presstimer = startTimer( pref ); // #### pref.
 
                         }
                         break;
                     case QEvent::MouseMove:
                         if (d->presstimer && (me->pos() - d->presspos).manhattanLength() > 8) {
                             killTimer(d->presstimer);
-#ifdef WITHROHFEEDBACK
+#ifdef OPIE_ROHFEEDBACK
                             if( d->RoH )
                               d->RoH->stop( );
 #endif
                             d->presstimer = 0;
                         }
                         break;
                     case QEvent::MouseButtonRelease:
                         if ( me->button() == LeftButton ) {
                             if ( d->presstimer ) {
                                 killTimer(d->presstimer);
-#ifdef WITHROHFEEDBACK
+#ifdef OPIE_ROHFEEDBACK
                                 if( d->RoH )
                                   d->RoH->stop( );
 #endif
                                 d->presstimer = 0;
                             }
                             if ( d->rightpressed && d->presswidget ) {
                                 // Right released
                                 postEvent( d->presswidget,
                                            new QMouseEvent( QEvent::MouseButtonRelease, me->pos(),
                                                             RightButton, LeftButton + RightButton ) );
                                 // Left released, off-widget
                                 postEvent( d->presswidget,
                                            new QMouseEvent( QEvent::MouseMove, QPoint( -1, -1),
                                                             LeftButton, LeftButton ) );
                                 postEvent( d->presswidget,
                                            new QMouseEvent( QEvent::MouseButtonRelease, QPoint( -1, -1),
                                                             LeftButton, LeftButton ) );
                                 d->rightpressed = FALSE;
                                 return TRUE; // don't send the real Left release
                             }
                         }
                         break;
                     default:
                         break;
                 }
                 break;
             default:
                 ;
         }
     }
     else if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) {
         QKeyEvent *ke = (QKeyEvent *)e;
         if ( ke->key() == Key_Enter ) {
             if ( o->isA( "QRadioButton" ) || o->isA( "QCheckBox" ) ) {
                 postEvent( o, new QKeyEvent( e->type(), Key_Space, ' ',
                                              ke->state(), " ", ke->isAutoRepeat(), ke->count() ) );
                 return TRUE;
             }
         }
     }
     return FALSE;
 }
 
 /*!
   \reimp
 */
 void QPEApplication::timerEvent( QTimerEvent *e )
 {
     if ( e->timerId() == d->presstimer && d->presswidget ) {
         // Right pressed
         postEvent( d->presswidget,
                    new QMouseEvent( QEvent::MouseButtonPress, d->presspos,
                                     RightButton, LeftButton ) );
         killTimer( d->presstimer );
         d->presstimer = 0;
         d->rightpressed = TRUE;
+#ifdef OPIE_ROHFEEDBACK
         d->RoH->stop();
+#endif
     }
 }
 
 void QPEApplication::removeSenderFromStylusDict()
 {
     stylusDict->remove
     ( ( void* ) sender() );
     if ( d->presswidget == sender() )
         d->presswidget = 0;
 }
 
 /*!
   \internal
 */
 bool QPEApplication::keyboardGrabbed() const
 {
     return d->kbgrabbed;
 }
 
 
 /*!
   Reverses the effect of grabKeyboard(). This is called automatically
   on program exit.
 */
 void QPEApplication::ungrabKeyboard()
 {
     ((QPEApplication *) qApp )-> d-> kbgrabbed = false;
 }
 
 /*!
   Grabs the physical keyboard keys, e.g. the application's launching
   keys. Instead of launching applications when these keys are pressed
   the signals emitted are sent to this application instead. Some games
   programs take over the launch keys in this way to make interaction
   easier.
 
   \sa ungrabKeyboard()
 */
 void QPEApplication::grabKeyboard()
 {
     ((QPEApplication *) qApp )-> d-> kbgrabbed = true;
 }
 
 /*!
   \reimp
 */
 int QPEApplication::exec()
 {