6 files changed, 176 insertions, 2 deletions

diff --git a/examples/opiecore/onotifytest/.cvsignore b/examples/opiecore/onotifytest/.cvsignore
new file mode 100644
index 0000000..8f7300c
--- a/dev/null
+++ b/examples/opiecore/onotifytest/.cvsignore
@@ -0,0 +1,6 @@
+Makefile*
+moc*
+*moc
+*.o
+~*
+
diff --git a/examples/opiecore/onotifytest/main.cpp b/examples/opiecore/onotifytest/main.cpp
new file mode 100644
index 0000000..467ebc9
--- a/dev/null
+++ b/examples/opiecore/onotifytest/main.cpp
@@ -0,0 +1,59 @@
+// (C) Michael 'Mickey' Lauer <mickey@Vanille.de>
+// LICENSE = "GPLv2"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <opie2/oapplication.h>
+#include <opie2/ofilenotify.h>
+using namespace Opie::Core;
+
+/* QT */
+#include <qpushbutton.h>
+#include <qtextstream.h>
+
+class App : public OApplication
+{
+
+public:
+OFile* tmpfoo;
+
+App( int argc, char** argv ) : OApplication( argc, argv, "libopie2 notify test" )
+{
+    odebug << "App()" << oendl;
+
+    tmpfoo = new OFile( "/tmp/foo" );
+    if ( tmpfoo->open( IO_ReadWrite ) )
+    {
+        QTextStream stream( tmpfoo );
+        stream << "This is my content";
+    }
+
+    QObject::connect( tmpfoo, SIGNAL(accessed(const QString&)), this, SLOT(quit()) );
+    QObject::connect( tmpfoo, SIGNAL(closed(const QString&,bool)), this, SLOT(quit()) );
+}
+
+~App()
+{
+    odebug << "~App()" << oendl;
+
+    delete tmpfoo;
+}
+
+};
+
+int main( int argc, char** argv )
+{
+    App* app = new App( argc, argv );
+    QPushButton* b = new QPushButton( "Click me to close", 0 );
+    QObject::connect( b, SIGNAL(clicked()), app, SLOT(quit()) );
+    b->resize( 200, 200 );
+    b->move( 150, 150 );
+    b->show();
+    app->setMainWidget( b );
+    app->exec();
+    delete app;
+
+    return 0;
+
+}
+
diff --git a/examples/opiecore/onotifytest/onotifytest.pro b/examples/opiecore/onotifytest/onotifytest.pro
new file mode 100644
index 0000000..4e0faec
--- a/dev/null
+++ b/examples/opiecore/onotifytest/onotifytest.pro
@@ -0,0 +1,16 @@
+TEMPLATE        = app
+CONFIG          = qt warn_on
+SOURCES         = main.cpp
+INCLUDEPATH     += $(OPIEDIR)/include
+DEPENDPATH      += $(OPIEDIR)/include
+LIBS            += -lopiecore2
+TARGET          = onotifytest
+
+!contains( platform, x11 ) {
+  include( $(OPIEDIR)/include.pro )
+}
+
+contains( platform, x11 ) {
+  LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
+}
+
diff --git a/examples/opiecore/opiecore.pro b/examples/opiecore/opiecore.pro
index 1f86a40..3550055 100644
--- a/examples/opiecore/opiecore.pro
+++ b/examples/opiecore/opiecore.pro
@@ -1,2 +1,2 @@
 TEMPLATE        = subdirs
-unix:SUBDIRS    = odebugdemo oconfigdemo oglobalsettingsdemo onotifydemo oprocessdemo oplugins oinputsystemdemo
+unix:SUBDIRS    = odebugdemo oconfigdemo oglobalsettingsdemo onotifydemo onotifytest oprocessdemo oplugins oinputsystemdemo
diff --git a/libopie2/opiecore/ofilenotify.cpp b/libopie2/opiecore/ofilenotify.cpp
index 4264327..36ec6bf 100644
--- a/libopie2/opiecore/ofilenotify.cpp
+++ b/libopie2/opiecore/ofilenotify.cpp
@@ -30,64 +30,120 @@ _;:,     .>    :=|.         This program is free software; you can
 using namespace Opie::Core;
 
 /* OPIE */
 
 /* QT */
 #include <qobject.h>
 #include <qsocketnotifier.h>
 #include <qsignal.h>
 #include <qintdict.h>
 #include <qdir.h>
 
 /* STD */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <assert.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
 
 static QIntDict<OFileNotification> notification_list;
 
 QSocketNotifier* OFileNotification::_sn;
 int OFileNotification::_fd = -1;
 
 #define INOTIFY_DEVICE "/dev/inotify"
 
 namespace Opie {
 namespace Core {
 
 //=================================================================================================
+// OFile
+//=================================================================================================
+
+OFile::OFile() : QObject( 0, 0 ), QFile()
+{
+    qDebug( "OFile()" );
+}
+
+OFile::OFile( const QString& name ) : QObject( 0, 0 ), QFile( name )
+{
+    qDebug( "OFile()" );
+}
+
+OFile::~OFile()
+{
+    qDebug( "~OFile()" );
+}
+
+void OFile::connectNotify( const char *signal )
+{
+    QString s = normalizeSignalSlot( signal+1 );
+    qDebug( "OFile::connectNotify() signal = '%s'", (const char*) s );
+
+    if ( s.startsWith( "accessed" ) )
+
+
+
+
+
+
+
+    QObject::connectNotify( signal );
+
+/*
+    void accessed( const QString& );
+    void modified( const QString& );
+    void attributed( const QString& );
+    void closed( const QString&, bool );
+    void opened( const QString& );
+    void deleted( const QString& );
+    void unmounted( const QString& );
+*/
+
+}
+
+void OFile::disconnectNotify( const char* signal )
+{
+    qDebug( "OFile::disconnectNotify() signal = '%s'", signal );
+    QObject::disconnectNotify( signal );
+}
+
+int OFile::startWatch( int mode )
+{
+}
+
+//=================================================================================================
 // OFileNotificationEvent
 //=================================================================================================
 OFileNotificationEvent::OFileNotificationEvent( OFileNotification* parent, int wd, unsigned int mask, unsigned int cookie, const QString& name )
                        :_parent( parent ), _wd( wd ), _mask( mask ), _cookie( cookie ), _name( name )
 {
     qDebug( "OFileNotificationEvent()" );
 }
 
 
 OFileNotificationEvent::~OFileNotificationEvent()
 {
     qDebug( "~OFileNotificationEvent()" );
 }
 
 //=================================================================================================
 // OFileNotification
 //=================================================================================================
 OFileNotification::OFileNotification( QObject* parent, const char* name )
                   :QObject( parent, name ), _active( false ), _multi( true )
 {
     qDebug( "OFileNotification::OFileNotification()" );
 }
 
 
 OFileNotification::~OFileNotification()
 {
     stop();
     qDebug( "OFileNotification::~OFileNotification()" );
 }
 
 
 bool OFileNotification::isActive() const
@@ -190,65 +246,65 @@ bool OFileNotification::activate( const OFileNotificationEvent* e )
         case CloseNoWrite:  emit closed( _path, false );            break;
         case Open:          emit opened( _path );                   break;
         case MovedFrom:     emit movedFrom( _path, e->name() );     break;
         case MovedTo:       emit movedTo( _path, e->name() );       break;
         case DeleteSubdir:  emit deletedSubdir( _path, e->name() ); break;
         case DeleteFile:    emit deletedFile( _path, e->name() );   break;
         case CreateSubdir:  emit createdSubdir( _path, e->name() ); break;
         case CreateFile:    emit createdFile( _path, e->name() );   break;
         case DeleteSelf:    emit deleted( _path );                  break;
         case Unmount:       emit unmounted( _path );                break;
         default: assert( 0 );
     }
 
     if ( !_multi ) stop();
 
     return true;
 }
 
 
 bool OFileNotification::singleShot( const QString& path, QObject* receiver, const char* member, OFileNotificationType type )
 {
     OFileNotification* ofn = new OFileNotification();
     ofn->_signal.connect( receiver, member );
     return ofn->watch( path, true, type ) != -1;
 }
 
 
 void OFileNotification::inotifyEventHandler()
 {
     qDebug( "OFileNotification::inotifyEventHandler(): reached." );
 
     char buffer[16384];
-    size_t buffer_i;
+    ssize_t buffer_i;
     struct inotify_event *pevent, *event;
     ssize_t r;
     size_t event_size;
     int count = 0;
 
     r = ::read(_fd, buffer, 16384);
 
     if ( r <= 0 )
         return;
 
     buffer_i = 0;
     while ( buffer_i < r )
     {
         pevent = (struct inotify_event *)&buffer[buffer_i];
         event_size = sizeof(struct inotify_event) + pevent->len;
         OFileNotificationEvent* e = new OFileNotificationEvent( notification_list[ pevent->wd ], pevent->wd, pevent->mask,
                                                                 pevent->cookie, pevent->len ? pevent->name : 0 );
         e->activate();
         buffer_i += event_size;
         count++;
     }
 
     qDebug( "OFileNotification::inotifyEventHandler(): processed %d events", count );
 }
 
 
 bool OFileNotification::registerEventHandler()
 {
     OFileNotification::_fd = ::open( INOTIFY_DEVICE, O_RDONLY );
     if ( OFileNotification::_fd < 0 )
     {
         qWarning( "OFileNotification::registerEventHandler(): couldn't register event handler: %s", strerror( errno ) );
diff --git a/libopie2/opiecore/ofilenotify.h b/libopie2/opiecore/ofilenotify.h
index 5bbf421..05343b9 100644
--- a/libopie2/opiecore/ofilenotify.h
+++ b/libopie2/opiecore/ofilenotify.h
@@ -9,68 +9,105 @@ _;:,     .>    :=|.         This program is free software; you can
 .="- .-=="i,     .._        License as published by the Free Software
 - .   .-<_>     .<>         Foundation; version 2 of the License.
     ._= =}       :
    .%`+i>       _;_.
    .i_,=:_.      -<s.       This program is distributed in the hope that
     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
    : ..    .:,     . . .    without even the implied warranty of
    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;     Library General Public License for more
 ++=   -.     .`     .:      details.
 :     =  ...= . :.=-
 -.   .:....=;==+<;          You should have received a copy of the GNU
  -_. . .   )=.  =           Library General Public License along with
    --        :-=`           this library; see the file COPYING.LIB.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 
 #ifndef OFILENOTIFY_H
 #define OFILENOTIFY_H
 #if defined (__GNUC__) && (__GNUC__ < 3)
 #define _GNU_SOURCE
 #endif
 
 #include "linux_inotify.h"
 
 /* QT */
 #include <qsocketnotifier.h>
 #include <qsignal.h>
 #include <qstring.h>
+#include <qobject.h>
+#include <qfile.h>
 
 namespace Opie {
 namespace Core {
 
+class OFile : public QObject, public QFile
+{
+  Q_OBJECT
+
+  public:
+    OFile();
+    OFile( const QString & name );
+    virtual ~OFile();
+
+  protected:
+    virtual void connectNotify( const char* signal );
+    virtual void disconnectNotify( const char* signal );
+
+  private:
+    int startWatch( int mode );
+
+  signals:
+    void accessed( const QString& );
+    void modified( const QString& );
+    void attributed( const QString& );
+    void closed( const QString&, bool );
+    void opened( const QString& );
+    void deleted( const QString& );
+    void unmounted( const QString& );
+};
+
+/*
+    void movedTo( const QString&, const QString& );
+    void movedFrom( const QString&, const QString& );
+    void deletedSubdir( const QString&, const QString& );
+    void deletedFile( const QString&, const QString& );
+    void createdSubdir( const QString&, const QString& );
+    void createdFile( const QString&, const QString& );
+*/
+
 class OFileNotificationEvent;
 
 /*======================================================================================
  * OFileNotificationType
  *======================================================================================*/
 
 /**
  * @brief An enumerate for the different types of file notifications
  *
  * This enumerate provides a means to specify the type of events that you are interest in.
  * Valid values are:
  * <ul>
  *    <li>Access: The file was accessed (read)
  *    <li>Modify The file was modified (write,truncate)
  *    <li>Attrib = The file had its attributes changed (chmod,chown,chgrp)
  *    <li>CloseWrite = Writable file was closed
  *    <li>CloseNoWrite = Unwritable file was closed
  *    <li>Open = File was opened
  *    <li>MovedFrom = File was moved from X
  *    <li>MovedTo = File was moved to Y
  *    <li>DeleteSubdir = Subdir was deleted
  *    <li>DeleteFile = Subfile was deleted
  *    <li>CreateSubdir = Subdir was created
  *    <li>CreateFile = Subfile was created
  *    <li>DeleteSelf = Self was deleted
  *    <li>Unmount = The backing filesystem was unmounted
  * </ul>
  *
  **/
 
 enum OFileNotificationType
 {