dbus/qt connection.cpp,NONE,1.1 Makefile.am,1.2,1.3 connection.h,1.1,1.2 message.cpp,1.4,1.5 message.h,1.4,1.5

Zack Rusin zack@pdx.freedesktop.org
Sun, 23 Nov 2003 12:41:25 -0800
Previous message: dbus/qt connection.h,NONE,1.1 message.h,1.3,1.4 message.cpp,1.3,1.4
Next message: dbus ChangeLog,1.438,1.439
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Update of /cvs/dbus/dbus/qt
In directory pdx:/tmp/cvs-serv31204

Modified Files:
	Makefile.am connection.h message.cpp message.h 
Added Files:
	connection.cpp 
Log Message:
Coding on dbus is like christmas. Just without christmas tree, presents, santa
clause, shopping, food, cookies, carrols, eggs, bunnies, trick or treating,
smoking crack... I don't quite remember where I was going with this
but we're getting closer.


--- NEW FILE: connection.cpp ---
// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/* connection.cpp: Qt wrapper for DBusConnection
 *
 * Copyright (C) 2003  Zack Rusin <zack@kde.org>
 *
 * Licensed under the Academic Free License version 1.2
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * 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 General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 */
#include "connection.h"

#include <qsocketnotifier.h>
#include <qintdict.h>

using namespace DBusQt;

struct QtWatch {
  QtWatch(): readSocket( 0 ), writeSocket( 0 ) { }

  DBusWatch *watch;
  QSocketNotifier *readSocket;
  QSocketNotifier *writeSocket;
};

struct Connection::Private
{
  DBusConnection *connection;
  int connectionSlot;
  DBusError error;
  QIntDict<QtWatch> watches;
};

Connection::Connection( const QString& host )
{
  d = new Private;
  dbus_error_init( &d->error );

  if ( !host.isEmpty() )
    init( host );
}

void Connection::init( const QString& host )
{
  d->connection = dbus_connection_open( host.ascii(), &d->error );
  dbus_connection_allocate_data_slot( &d->connectionSlot );
  dbus_connection_set_data( d->connection, d->connectionSlot, 0, 0 );
}

bool Connection::isConnected() const
{
}

bool Connection::isAuthenticated() const
{
}

void Connection::open( const QString& host )
{
  if ( host.isEmpty() ) return;

  init( host );
}

void Connection::close()
{
  dbus_connection_disconnect( d->connection );
}

void Connection::flush()
{
  dbus_connection_flush( d->connection );
}

void Connection::slotRead( int fd )
{
  Q_UNUSED( fd );
  while ( dbus_connection_dispatch( d->connection ) == DBUS_DISPATCH_DATA_REMAINS )
    ;
}

void Connection::slotWrite( int fd )
{
  Q_UNUSED( fd );
}

void Connection::addWatch( DBusWatch *watch )
{
  if ( !dbus_watch_get_enabled( watch ) )
    return;

  QtWatch *qtwatch = new QtWatch;
  qtwatch->watch = watch;

  int flags = dbus_watch_get_flags( watch );
  int fd = dbus_watch_get_fd( watch );

  if ( flags & DBUS_WATCH_READABLE ) {
    qtwatch->readSocket = new QSocketNotifier( fd, QSocketNotifier::Read, this );
    QObject::connect( qtwatch->readSocket, SIGNAL(activated(int)), SLOT(slotRead(int)) );
  }

  if (flags & DBUS_WATCH_WRITABLE) {
    qtwatch->writeSocket = new QSocketNotifier( fd, QSocketNotifier::Write, this );
    QObject::connect( qtwatch->writeSocket, SIGNAL(activated(int)), SLOT(slotWrite(int)) );
  }

  d->watches.insert( fd, qtwatch );

}

void Connection::removeWatch( DBusWatch *watch )
{
  int key = dbus_watch_get_fd( watch );

  QtWatch *qtwatch = d->watches.take( key );

  if ( qtwatch ) {
    delete qtwatch->readSocket;  qtwatch->readSocket = 0;
    delete qtwatch->writeSocket; qtwatch->writeSocket = 0;
    delete qtwatch;
  }
}


/////////////////////////////////////////////////////////

Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/qt/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	7 Apr 2003 02:01:53 -0000	1.2
+++ Makefile.am	23 Nov 2003 20:41:23 -0000	1.3
@@ -5,10 +5,10 @@
 lib_LTLIBRARIES=libdbus-qt-1.la
 
 dbusinclude_HEADERS=				\
-	dbus-qt.h
+	dbus-qt.h message.h connection.h
 
 libdbus_qt_1_la_SOURCES = 			\
-	dbus-qthread.cpp
+	dbus-qthread.cpp message.cpp connection.cpp
 
 libdbus_qt_1_la_LIBADD= $(DBUS_QT_LIBS) $(top_builddir)/dbus/libdbus-1.la
 libdbus_qt_1_la_LDFLAGS= -version-info 1:0

Index: connection.h
===================================================================
RCS file: /cvs/dbus/dbus/qt/connection.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- connection.h	23 Nov 2003 08:35:48 -0000	1.1
+++ connection.h	23 Nov 2003 20:41:23 -0000	1.2
@@ -24,6 +24,7 @@
 #define DBUS_QT_CONNECTION_H
 
 #include <qobject.h>
+#include <qstring.h>
 
 #include "dbus/dbus.h"
 
@@ -33,24 +34,57 @@
   {
     Q_OBJECT
   public:
-    Connection();
+    Connection( const QString& host = QString::null );
 
-    bool isConnected();
-    bool isAuthenticated();
+    bool isConnected() const;
+    bool isAuthenticated() const;
 
   public slots:
-    bool connect( const QString& );
-    bool disconnect();
+    void open( const QString& );
+    void close();
     void flush();
 
+  protected slots:
+    void slotRead( int );
+    void slotWrite( int );
+
   protected:
-    virtual void* virtual_hook( int id, void* data );
+    void addWatch( DBusWatch* );
+    void removeWatch( DBusWatch* );
+
+  public:
+    friend dbus_bool_t dbusAddWatch( DBusWatch*, void* );
+    friend dbus_bool_t dbusRemoveWatch( DBusWatch*, void* );
+    friend dbus_bool_t dbusToggleWatch( DBusWatch*, void* );
 
+  protected:
+    void init( const QString& host );
+    virtual void* virtual_hook( int id, void* data );
   private:
     struct Private;
     Private *d;
   };
 
+  //////////////////////////////////////////////////////////////
+  //Friends
+  dbus_bool_t dbusAddWatch( DBusWatch *watch, void *data )
+  {
+    Connection *con = static_cast<Connection*>( data );
+    con->addWatch( watch );
+  }
+  dbus_bool_t dbusRemoveWatch( DBusWatch *watch, void *data )
+  {
+    Connection *con = static_cast<Connection*>( data );
+    con->removeWatch( watch );
+  }
+
+  dbus_bool_t dbusToggleWatch( DBusWatch*, void* )
+  {
+    //I don't know how to handle this one right now
+#warning "FIXME: implement"
+  }
+  //////////////////////////////////////////////////////////////
+
 }
 
 

Index: message.cpp
===================================================================
RCS file: /cvs/dbus/dbus/qt/message.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- message.cpp	23 Nov 2003 08:35:48 -0000	1.4
+++ message.cpp	23 Nov 2003 20:41:23 -0000	1.5
@@ -23,7 +23,7 @@
 #include "message.h"
 
 
-namespace DBus {
+namespace DBusQt {
 
 struct Message::iterator::IteratorData {
   DBusMessageIter *iter;

Index: message.h
===================================================================
RCS file: /cvs/dbus/dbus/qt/message.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- message.h	23 Nov 2003 08:35:48 -0000	1.4
+++ message.h	23 Nov 2003 20:41:23 -0000	1.5
@@ -20,13 +20,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+#ifndef DBUS_QT_MESSAGE_H
+#define DBUS_QT_MESSAGE_H
 
 #include <qvariant.h>
 #include <qstring.h>
 
 #include "dbus/dbus.h"
 
-namespace DBus {
+namespace DBusQt {
 
   class Message
   {
@@ -121,3 +123,5 @@
   };
 
 }
+
+#endif
Previous message: dbus/qt connection.h,NONE,1.1 message.h,1.3,1.4 message.cpp,1.3,1.4
Next message: dbus ChangeLog,1.438,1.439
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]