summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2002-11-25 20:43:21 (UTC)
committer mickeyl <mickeyl>2002-11-25 20:43:21 (UTC)
commit9307404cf3ef2edfea615a073bbc9db2d1eac8a5 (patch) (unidiff)
tree16839e56c19aea7d2a80a398fcc081fce02aaa3f
parent1e1de522890ad2ea46c95543cace9a2a5ae14716 (diff)
downloadopie-9307404cf3ef2edfea615a073bbc9db2d1eac8a5.zip
opie-9307404cf3ef2edfea615a073bbc9db2d1eac8a5.tar.gz
opie-9307404cf3ef2edfea615a073bbc9db2d1eac8a5.tar.bz2
gui opens socket and checks messages from daemon.
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 @@
13** 13**
14***********************************************************************/ 14***********************************************************************/
15 15
16// Qt
17
18#include <qpushbutton.h>
19
20// Standard
21
22#include <unistd.h>
23#include <sys/types.h>
24
25// Local
26
16#include "wellenreiter.h" 27#include "wellenreiter.h"
17#include "scanlistitem.h" 28#include "scanlistitem.h"
18 29
19#include <qpushbutton.h> 30#include "../libwellenreiter/source/sock.hh" // <--- ugly path, FIX THIS!
31#include "../daemon/source/config.hh" // <--- ugly path, FIX THIS!
20 32
21Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) 33Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
22 : WellenreiterBase( parent, name, fl ) 34 : WellenreiterBase( parent, name, fl )
@@ -24,6 +36,16 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
24 36
25 connect( button, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) ); 37 connect( button, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) );
26 38
39 //
40 // setup socket for daemon communication and start poller
41 //
42
43 daemon_fd = commsock( DAEMONADDR, DAEMONPORT );
44 if ( daemon_fd == -1 )
45 qDebug( "D'oh! Could not get file descriptor for daemon socket." );
46 else
47 startTimer( 700 );
48
27} 49}
28 50
29Wellenreiter::~Wellenreiter() 51Wellenreiter::~Wellenreiter()
@@ -31,6 +53,39 @@ Wellenreiter::~Wellenreiter()
31 // no need to delete child widgets, Qt does it all for us 53 // no need to delete child widgets, Qt does it all for us
32} 54}
33 55
56void Wellenreiter::handleMessage()
57{
58 // FIXME: receive message and handle it
59
60 qDebug( "received message from daemon." );
61}
62
63
64bool Wellenreiter::hasMessage()
65{
66 fd_set rfds;
67 FD_ZERO( &rfds );
68 FD_SET( daemon_fd, &rfds );
69 struct timeval tv;
70 tv.tv_sec = 0;
71 tv.tv_usec = 0;
72 return select( 1, &rfds, NULL, NULL, &tv );
73}
74
75void Wellenreiter::timerEvent( QTimerEvent* e )
76{
77 // qDebug( "checking for message..." );
78
79 if ( hasMessage() )
80 {
81 handleMessage();
82 }
83 else
84 {
85 // qDebug( "no message :(" );
86 }
87}
88
34void Wellenreiter::buttonClicked() 89void Wellenreiter::buttonClicked()
35{ 90{
36 91
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 @@
18 18
19#include "wellenreiterbase.h" 19#include "wellenreiterbase.h"
20 20
21class QTimerEvent;
22
21class Wellenreiter : public WellenreiterBase { 23class Wellenreiter : public WellenreiterBase {
22 Q_OBJECT 24 Q_OBJECT
23 25
@@ -27,12 +29,17 @@ public:
27 ~Wellenreiter(); 29 ~Wellenreiter();
28 30
29protected: 31protected:
30 32 virtual void timerEvent( QTimerEvent* );
31 33
32public slots: 34public slots:
33 void buttonClicked(); 35 void buttonClicked();
34 36
35private: 37private:
38 int daemon_fd; // socket filedescriptor for udp communication socket
39
40 bool hasMessage();
41 void handleMessage();
42
36 //void readConfig(); 43 //void readConfig();
37 //void writeConfig(); 44 //void writeConfig();
38}; 45};
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 @@
2 2
3INCLUDES = 3INCLUDES =
4LIBRARIES = 4LIBRARIES =
5LIBOBJ = proto.o sock.o log.o 5LIBOBJ = sock.o log.o
6CXX = g++ -Wall -pedantic -g $(INCLUDES) -DDEBUG 6CXX = g++ -Wall -pedantic -g $(INCLUDES) -DDEBUG
7 7
8 static:libwellenreiter.a 8 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
6SOURCES = gui/main.cpp gui/wellenreiter.cpp gui/scanlistitem.cpp 6SOURCES = gui/main.cpp gui/wellenreiter.cpp gui/scanlistitem.cpp
7INCLUDEPATH += $(OPIEDIR)/include gui daemon 7INCLUDEPATH += $(OPIEDIR)/include gui daemon
8DEPENDPATH += $(OPIEDIR)/include gui daemon 8DEPENDPATH += $(OPIEDIR)/include gui daemon
9LIBS += -lqpe 9LIBS += -lqpe -Llibwellenreiter/source -lwellenreiter
10INTERFACES = gui/wellenreiterbase.ui 10INTERFACES = gui/wellenreiterbase.ui
11TARGET = wellenreiter 11TARGET = wellenreiter