summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp57
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.h9
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/Makefile2
-rw-r--r--noncore/net/wellenreiter/wellenreiter.pro2
4 files changed, 66 insertions, 4 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 9364a75..96ab7bd 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -13,10 +13,22 @@
**
***********************************************************************/
+// Qt
+
+#include <qpushbutton.h>
+
+// Standard
+
+#include <unistd.h>
+#include <sys/types.h>
+
+// Local
+
#include "wellenreiter.h"
#include "scanlistitem.h"
-#include <qpushbutton.h>
+#include "../libwellenreiter/source/sock.hh" // <--- ugly path, FIX THIS!
+#include "../daemon/source/config.hh" // <--- ugly path, FIX THIS!
Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
: WellenreiterBase( parent, name, fl )
@@ -24,6 +36,16 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
connect( button, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) );
+ //
+ // setup socket for daemon communication and start poller
+ //
+
+ daemon_fd = commsock( DAEMONADDR, DAEMONPORT );
+ if ( daemon_fd == -1 )
+ qDebug( "D'oh! Could not get file descriptor for daemon socket." );
+ else
+ startTimer( 700 );
+
}
Wellenreiter::~Wellenreiter()
@@ -31,6 +53,39 @@ Wellenreiter::~Wellenreiter()
// no need to delete child widgets, Qt does it all for us
}
+void Wellenreiter::handleMessage()
+{
+ // FIXME: receive message and handle it
+
+ qDebug( "received message from daemon." );
+}
+
+
+bool Wellenreiter::hasMessage()
+{
+ fd_set rfds;
+ FD_ZERO( &rfds );
+ FD_SET( daemon_fd, &rfds );
+ struct timeval tv;
+ tv.tv_sec = 0;
+ tv.tv_usec = 0;
+ return select( 1, &rfds, NULL, NULL, &tv );
+}
+
+void Wellenreiter::timerEvent( QTimerEvent* e )
+{
+ // qDebug( "checking for message..." );
+
+ if ( hasMessage() )
+ {
+ handleMessage();
+ }
+ else
+ {
+ // qDebug( "no message :(" );
+ }
+}
+
void Wellenreiter::buttonClicked()
{
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index 7ba8b01..206f364 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -18,6 +18,8 @@
#include "wellenreiterbase.h"
+class QTimerEvent;
+
class Wellenreiter : public WellenreiterBase {
Q_OBJECT
@@ -27,12 +29,17 @@ public:
~Wellenreiter();
protected:
-
+ virtual void timerEvent( QTimerEvent* );
public slots:
void buttonClicked();
private:
+ int daemon_fd; // socket filedescriptor for udp communication socket
+
+ bool hasMessage();
+ void handleMessage();
+
//void readConfig();
//void writeConfig();
};
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/Makefile b/noncore/net/wellenreiter/libwellenreiter/source/Makefile
index ecae73c..05a5bd3 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/Makefile
+++ b/noncore/net/wellenreiter/libwellenreiter/source/Makefile
@@ -2,7 +2,7 @@
INCLUDES =
LIBRARIES =
-LIBOBJ = proto.o sock.o log.o
+LIBOBJ = sock.o log.o
CXX = g++ -Wall -pedantic -g $(INCLUDES) -DDEBUG
static: libwellenreiter.a
diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro
index 6b6276b..6f07ac4 100644
--- a/noncore/net/wellenreiter/wellenreiter.pro
+++ b/noncore/net/wellenreiter/wellenreiter.pro
@@ -6,6 +6,6 @@ HEADERS = gui/mainwindowbase.h gui/wellenreiter.h gui/scanlistitem.h
SOURCES = gui/main.cpp gui/wellenreiter.cpp gui/scanlistitem.cpp
INCLUDEPATH += $(OPIEDIR)/include gui daemon
DEPENDPATH += $(OPIEDIR)/include gui daemon
-LIBS += -lqpe
+LIBS += -lqpe -Llibwellenreiter/source -lwellenreiter
INTERFACES = gui/wellenreiterbase.ui
TARGET = wellenreiter