-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 57 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 9 |
2 files changed, 64 insertions, 2 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 | |||
@@ -4,42 +4,97 @@ | |||
4 | ** This file is part of Opie Environment. | 4 | ** This file is part of Opie Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
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 | ||
21 | Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) | 33 | Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) |
22 | : WellenreiterBase( parent, name, fl ) | 34 | : WellenreiterBase( parent, name, fl ) |
23 | { | 35 | { |
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 | ||
29 | Wellenreiter::~Wellenreiter() | 51 | Wellenreiter::~Wellenreiter() |
30 | { | 52 | { |
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 | ||
56 | void Wellenreiter::handleMessage() | ||
57 | { | ||
58 | // FIXME: receive message and handle it | ||
59 | |||
60 | qDebug( "received message from daemon." ); | ||
61 | } | ||
62 | |||
63 | |||
64 | bool 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 | |||
75 | void 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 | |||
34 | void Wellenreiter::buttonClicked() | 89 | void Wellenreiter::buttonClicked() |
35 | { | 90 | { |
36 | 91 | ||
37 | // FIXME: communicate with daemon and set button text according to state | 92 | // FIXME: communicate with daemon and set button text according to state |
38 | 93 | ||
39 | button->setText( "Stop Scanning" ); | 94 | button->setText( "Stop Scanning" ); |
40 | 95 | ||
41 | // add some icons, so that we can see if this works | 96 | // add some icons, so that we can see if this works |
42 | 97 | ||
43 | new MScanListItem( netview, "managed", "MyNet", "04:00:20:EF:A6:43", true, 6, 80 ); | 98 | new MScanListItem( netview, "managed", "MyNet", "04:00:20:EF:A6:43", true, 6, 80 ); |
44 | new MScanListItem( netview, "adhoc", "YourNet", "40:03:A3:E7:56:22", false, 11, 30 ); | 99 | new MScanListItem( netview, "adhoc", "YourNet", "40:03:A3:E7:56:22", false, 11, 30 ); |
45 | 100 | ||
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 | |||
@@ -9,32 +9,39 @@ | |||
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #ifndef WELLENREITER_H | 16 | #ifndef WELLENREITER_H |
17 | #define WELLENREITER_H | 17 | #define WELLENREITER_H |
18 | 18 | ||
19 | #include "wellenreiterbase.h" | 19 | #include "wellenreiterbase.h" |
20 | 20 | ||
21 | class QTimerEvent; | ||
22 | |||
21 | class Wellenreiter : public WellenreiterBase { | 23 | class Wellenreiter : public WellenreiterBase { |
22 | Q_OBJECT | 24 | Q_OBJECT |
23 | 25 | ||
24 | public: | 26 | public: |
25 | 27 | ||
26 | Wellenreiter( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 28 | Wellenreiter( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
27 | ~Wellenreiter(); | 29 | ~Wellenreiter(); |
28 | 30 | ||
29 | protected: | 31 | protected: |
30 | 32 | virtual void timerEvent( QTimerEvent* ); | |
31 | 33 | ||
32 | public slots: | 34 | public slots: |
33 | void buttonClicked(); | 35 | void buttonClicked(); |
34 | 36 | ||
35 | private: | 37 | private: |
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 | }; |
39 | 46 | ||
40 | #endif | 47 | #endif |