-rw-r--r-- | core/applets/irdaapplet/irda.cpp | 28 | ||||
-rw-r--r-- | core/applets/irdaapplet/irda.h | 3 |
2 files changed, 21 insertions, 10 deletions
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp index a5b4bfc..51c2ebf 100644 --- a/core/applets/irdaapplet/irda.cpp +++ b/core/applets/irdaapplet/irda.cpp | |||
@@ -12,97 +12,98 @@ | |||
12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
14 | ** | 14 | ** |
15 | **********************************************************************/ | 15 | **********************************************************************/ |
16 | 16 | ||
17 | #include <qcopchannel_qws.h> | 17 | #include <qcopchannel_qws.h> |
18 | 18 | ||
19 | #include <qpe/qpeapplication.h> | 19 | #include <qpe/qpeapplication.h> |
20 | #include <qpe/resource.h> | 20 | #include <qpe/resource.h> |
21 | #include <qpe/ir.h> | 21 | #include <qpe/ir.h> |
22 | #include <qpe/qcopenvelope_qws.h> | 22 | #include <qpe/qcopenvelope_qws.h> |
23 | #include <qpe/sound.h> | 23 | #include <qpe/sound.h> |
24 | 24 | ||
25 | #include <qpainter.h> | 25 | #include <qpainter.h> |
26 | #include <qfile.h> | 26 | #include <qfile.h> |
27 | #include <qtimer.h> | 27 | #include <qtimer.h> |
28 | #include <qtextstream.h> | 28 | #include <qtextstream.h> |
29 | #include <qpopupmenu.h> | 29 | #include <qpopupmenu.h> |
30 | 30 | ||
31 | #include <unistd.h> | 31 | #include <unistd.h> |
32 | #include <net/if.h> | 32 | #include <net/if.h> |
33 | #include <netinet/in.h> | 33 | #include <netinet/in.h> |
34 | #include <sys/types.h> | 34 | #include <sys/types.h> |
35 | #include <sys/socket.h> | 35 | #include <sys/socket.h> |
36 | #include <sys/ioctl.h> | 36 | #include <sys/ioctl.h> |
37 | 37 | ||
38 | #include "irda.h" | 38 | #include "irda.h" |
39 | 39 | ||
40 | //=========================================================================== | 40 | //=========================================================================== |
41 | 41 | ||
42 | IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) | 42 | IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) |
43 | : QWidget ( parent, name ) | 43 | : QWidget ( parent, name ) |
44 | { | 44 | { |
45 | setFixedHeight ( 18 ); | 45 | setFixedHeight ( 18 ); |
46 | setFixedWidth ( 14 ); | 46 | setFixedWidth ( 14 ); |
47 | 47 | ||
48 | m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ); | 48 | m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ); |
49 | 49 | ||
50 | m_irdaOnPixmap = Resource::loadPixmap( "irdaapplet/irdaon" ); | 50 | m_irdaOnPixmap = Resource::loadPixmap( "irdaapplet/irdaon" ); |
51 | m_irdaOffPixmap = Resource::loadPixmap( "irdaapplet/irdaoff" ); | 51 | m_irdaOffPixmap = Resource::loadPixmap( "irdaapplet/irdaoff" ); |
52 | m_irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" ); | 52 | m_irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" ); |
53 | m_receiveActivePixmap = Resource::loadPixmap( "irdaapplet/receive" ); | 53 | m_receiveActivePixmap = Resource::loadPixmap( "irdaapplet/receive" ); |
54 | 54 | ||
55 | m_irda_active = false; | 55 | m_irda_active = false; |
56 | m_irda_discovery_active = false; | 56 | m_irda_discovery_active = false; |
57 | m_receive_active = false; | 57 | m_receive_active = false; |
58 | m_receive_state_changed = false; | 58 | m_receive_state_changed = false; |
59 | m_popup = 0; | 59 | m_popup = 0; |
60 | m_wasOn = false; | 60 | m_wasOn = false; |
61 | m_wasDiscover = false; | ||
61 | 62 | ||
62 | QCopChannel* chan = new QCopChannel("QPE/IrDaApplet", this ); | 63 | QCopChannel* chan = new QCopChannel("QPE/IrDaApplet", this ); |
63 | connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ), | 64 | connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ), |
64 | this, SLOT(slotMessage(const QCString&, const QByteArray& ) ) ); | 65 | this, SLOT(slotMessage(const QCString&, const QByteArray& ) ) ); |
65 | } | 66 | } |
66 | 67 | ||
67 | void IrdaApplet::show() | 68 | void IrdaApplet::show() |
68 | { | 69 | { |
69 | QWidget::show ( ); | 70 | QWidget::show ( ); |
70 | startTimer ( 2000 ); | 71 | startTimer ( 2000 ); |
71 | } | 72 | } |
72 | 73 | ||
73 | IrdaApplet::~IrdaApplet() | 74 | IrdaApplet::~IrdaApplet() |
74 | { | 75 | { |
75 | if ( m_sockfd >= 0 ) | 76 | if ( m_sockfd >= 0 ) |
76 | ::close ( m_sockfd ); | 77 | ::close ( m_sockfd ); |
77 | } | 78 | } |
78 | 79 | ||
79 | void IrdaApplet::popup ( QString message, QString icon ) | 80 | void IrdaApplet::popup ( QString message, QString icon ) |
80 | { | 81 | { |
81 | if ( !m_popup ) | 82 | if ( !m_popup ) |
82 | m_popup = new QPopupMenu ( this ); | 83 | m_popup = new QPopupMenu ( this ); |
83 | 84 | ||
84 | m_popup-> clear ( ); | 85 | m_popup-> clear ( ); |
85 | 86 | ||
86 | if ( icon. isEmpty ( )) | 87 | if ( icon. isEmpty ( )) |
87 | m_popup-> insertItem ( message, 0 ); | 88 | m_popup-> insertItem ( message, 0 ); |
88 | else | 89 | else |
89 | m_popup-> insertItem ( QIconSet ( Resource::loadPixmap ( icon )), message, 0 ); | 90 | m_popup-> insertItem ( QIconSet ( Resource::loadPixmap ( icon )), message, 0 ); |
90 | 91 | ||
91 | QPoint p = mapToGlobal ( QPoint ( 0, 0 )); | 92 | QPoint p = mapToGlobal ( QPoint ( 0, 0 )); |
92 | QSize s = m_popup-> sizeHint ( ); | 93 | QSize s = m_popup-> sizeHint ( ); |
93 | m_popup-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), | 94 | m_popup-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), |
94 | p. y ( ) - s. height ( ))); | 95 | p. y ( ) - s. height ( ))); |
95 | 96 | ||
96 | QTimer::singleShot ( 2000, this, SLOT( popupTimeout ( ))); | 97 | QTimer::singleShot ( 2000, this, SLOT( popupTimeout ( ))); |
97 | } | 98 | } |
98 | 99 | ||
99 | void IrdaApplet::popupTimeout ( ) | 100 | void IrdaApplet::popupTimeout ( ) |
100 | { | 101 | { |
101 | m_popup-> hide ( ); | 102 | m_popup-> hide ( ); |
102 | } | 103 | } |
103 | 104 | ||
104 | bool IrdaApplet::checkIrdaStatus ( ) | 105 | bool IrdaApplet::checkIrdaStatus ( ) |
105 | { | 106 | { |
106 | struct ifreq ifr; | 107 | struct ifreq ifr; |
107 | strcpy ( ifr. ifr_name, "irda0" ); | 108 | strcpy ( ifr. ifr_name, "irda0" ); |
108 | 109 | ||
@@ -243,105 +244,114 @@ void IrdaApplet::mousePressEvent ( QMouseEvent * ) | |||
243 | QString cmd; | 244 | QString cmd; |
244 | 245 | ||
245 | /* Refresh active state */ | 246 | /* Refresh active state */ |
246 | timerEvent ( 0 ); | 247 | timerEvent ( 0 ); |
247 | 248 | ||
248 | //menu->insertItem( tr("More..."), 4 ); | 249 | //menu->insertItem( tr("More..."), 4 ); |
249 | 250 | ||
250 | if ( m_irda_active && !m_devices. isEmpty ( )) { | 251 | if ( m_irda_active && !m_devices. isEmpty ( )) { |
251 | menu-> insertItem ( tr( "Discovered Device:" ), 9 ); | 252 | menu-> insertItem ( tr( "Discovered Device:" ), 9 ); |
252 | 253 | ||
253 | for ( QMap<QString, QString>::Iterator it = m_devices. begin ( ); it != m_devices. end ( ); ++it ) | 254 | for ( QMap<QString, QString>::Iterator it = m_devices. begin ( ); it != m_devices. end ( ); ++it ) |
254 | menu-> insertItem ( *it ); | 255 | menu-> insertItem ( *it ); |
255 | 256 | ||
256 | menu-> insertSeparator ( ); | 257 | menu-> insertSeparator ( ); |
257 | } | 258 | } |
258 | 259 | ||
259 | menu-> insertItem ( m_irda_active ? tr( "Disable IrDA" ) : tr( "Enable IrDA" ), 0 ); | 260 | menu-> insertItem ( m_irda_active ? tr( "Disable IrDA" ) : tr( "Enable IrDA" ), 0 ); |
260 | 261 | ||
261 | if ( m_irda_active ) { | 262 | if ( m_irda_active ) { |
262 | menu-> insertItem ( m_irda_discovery_active ? tr( "Disable Discovery" ) : tr( "Enable Discovery" ), 1 ); | 263 | menu-> insertItem ( m_irda_discovery_active ? tr( "Disable Discovery" ) : tr( "Enable Discovery" ), 1 ); |
263 | menu-> insertItem ( m_receive_active ? tr( "Disable Receive" ) : tr( "Enable Receive" ), 2 ); | 264 | menu-> insertItem ( m_receive_active ? tr( "Disable Receive" ) : tr( "Enable Receive" ), 2 ); |
264 | } | 265 | } |
265 | 266 | ||
266 | QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); | 267 | QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); |
267 | QSize s = menu-> sizeHint ( ); | 268 | QSize s = menu-> sizeHint ( ); |
268 | 269 | ||
269 | p = QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( )); | 270 | p = QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( )); |
270 | 271 | ||
271 | switch ( menu-> exec ( p )) { | 272 | switch ( menu-> exec ( p )) { |
272 | case 0: | 273 | case 0: |
273 | setIrdaStatus ( !m_irda_active ); | 274 | setIrdaStatus ( !m_irda_active ); |
274 | timerEvent ( 0 ); | 275 | timerEvent ( 0 ); |
275 | break; | 276 | break; |
276 | case 1: | 277 | case 1: |
277 | setIrdaDiscoveryStatus ( !m_irda_discovery_active ); | 278 | setIrdaDiscoveryStatus ( !m_irda_discovery_active ); |
278 | timerEvent ( 0 ); | 279 | timerEvent ( 0 ); |
279 | break; | 280 | break; |
280 | case 2: | 281 | case 2: |
281 | setIrdaReceiveStatus ( !m_receive_active ); | 282 | setIrdaReceiveStatus ( !m_receive_active ); |
282 | timerEvent( 0 ); | 283 | timerEvent( 0 ); |
283 | break; | 284 | break; |
284 | } | 285 | } |
285 | 286 | ||
286 | delete menu; | 287 | delete menu; |
287 | } | 288 | } |
288 | 289 | ||
289 | void IrdaApplet::timerEvent ( QTimerEvent * ) | 290 | void IrdaApplet::timerEvent ( QTimerEvent * ) |
290 | { | 291 | { |
291 | bool oldactive = m_irda_active; | 292 | bool oldactive = m_irda_active; |
292 | bool olddiscovery = m_irda_discovery_active; | 293 | bool olddiscovery = m_irda_discovery_active; |
293 | bool receiveUpdate = false; | 294 | bool receiveUpdate = false; |
294 | 295 | ||
295 | if ( m_receive_state_changed ) { | 296 | if ( m_receive_state_changed ) { |
296 | receiveUpdate = true; | 297 | receiveUpdate = true; |
297 | m_receive_state_changed = false; | 298 | m_receive_state_changed = false; |
298 | } | 299 | } |
299 | 300 | ||
300 | m_irda_active = checkIrdaStatus ( ); | 301 | m_irda_active = checkIrdaStatus ( ); |
301 | m_irda_discovery_active = checkIrdaDiscoveryStatus ( ); | 302 | m_irda_discovery_active = checkIrdaDiscoveryStatus ( ); |
302 | 303 | ||
303 | if ( m_irda_discovery_active ) | 304 | if ( m_irda_discovery_active ) |
304 | showDiscovered ( ); | 305 | showDiscovered ( ); |
305 | 306 | ||
306 | if (( m_irda_active != oldactive ) || ( m_irda_discovery_active != olddiscovery ) || receiveUpdate ) | 307 | if (( m_irda_active != oldactive ) || ( m_irda_discovery_active != olddiscovery ) || receiveUpdate ) |
307 | update ( ); | 308 | update ( ); |
308 | } | 309 | } |
309 | 310 | ||
310 | void IrdaApplet::paintEvent ( QPaintEvent * ) | 311 | void IrdaApplet::paintEvent ( QPaintEvent * ) |
311 | { | 312 | { |
312 | QPainter p ( this ); | 313 | QPainter p ( this ); |
313 | 314 | ||
314 | p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap ); | 315 | p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap ); |
315 | 316 | ||
316 | if ( m_irda_discovery_active ) | 317 | if ( m_irda_discovery_active ) |
317 | p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap ); | 318 | p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap ); |
318 | 319 | ||
319 | if ( m_receive_active ) | 320 | if ( m_receive_active ) |
320 | p. drawPixmap( 0, 1, m_receiveActivePixmap ); | 321 | p. drawPixmap( 0, 1, m_receiveActivePixmap ); |
321 | } | 322 | } |
322 | /* | 323 | /* |
323 | * We know 3 calls | 324 | * We know 3 calls |
324 | * a) enable | 325 | * a) enable |
325 | * b) disable | 326 | * b) disable |
326 | * a and b will temp enable the IrDa device and disable will disable it again if it wasn't on | 327 | * a and b will temp enable the IrDa device and disable will disable it again if it wasn't on |
327 | * c) listDevices: We will return a list of known devices | 328 | * c) listDevices: We will return a list of known devices |
328 | */ | 329 | */ |
329 | void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) { | 330 | void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) { |
330 | if ( str == "enableIrda()") { | 331 | if ( str == "enableIrda()") { |
331 | m_wasOn = checkIrdaStatus(); | 332 | m_wasOn = checkIrdaStatus(); |
332 | if (!m_wasOn) | 333 | m_wasDiscover = checkIrdaDiscoveryStatus(); |
334 | if (!m_wasOn) { | ||
333 | setIrdaStatus( true ); | 335 | setIrdaStatus( true ); |
334 | }else if ( str == "disableIrda()") { | 336 | } |
335 | if (!m_wasOn) | 337 | if ( !m_wasDiscover ) { |
338 | setIrdaDiscoveryStatus ( true ); | ||
339 | } | ||
340 | } else if ( str == "disableIrda()") { | ||
341 | if (!m_wasOn) { | ||
336 | setIrdaStatus( false ); | 342 | setIrdaStatus( false ); |
337 | }else if ( str == "listDevices()") { | 343 | } |
344 | if ( !m_wasDiscover ) { | ||
345 | setIrdaDiscoveryStatus ( false ); | ||
346 | } | ||
347 | } else if ( str == "listDevices()") { | ||
338 | QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)"); | 348 | QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)"); |
339 | 349 | ||
340 | QStringList list; | 350 | QStringList list; |
341 | QMap<QString, QString>::Iterator it; | 351 | QMap<QString, QString>::Iterator it; |
342 | for (it = m_devices.begin(); it != m_devices.end(); ++it ) | 352 | for (it = m_devices.begin(); it != m_devices.end(); ++it ) |
343 | list << (*it); | 353 | list << (*it); |
344 | 354 | ||
345 | e << list; | 355 | e << list; |
346 | } | 356 | } |
347 | } | 357 | } |
diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h index 675f874..ec1d32c 100644 --- a/core/applets/irdaapplet/irda.h +++ b/core/applets/irdaapplet/irda.h | |||
@@ -23,53 +23,54 @@ | |||
23 | 23 | ||
24 | class IrdaApplet : public QWidget | 24 | class IrdaApplet : public QWidget |
25 | { | 25 | { |
26 | Q_OBJECT | 26 | Q_OBJECT |
27 | 27 | ||
28 | public: | 28 | public: |
29 | IrdaApplet( QWidget *parent = 0, const char *name = 0 ); | 29 | IrdaApplet( QWidget *parent = 0, const char *name = 0 ); |
30 | ~IrdaApplet(); | 30 | ~IrdaApplet(); |
31 | 31 | ||
32 | virtual void show ( ); | 32 | virtual void show ( ); |
33 | 33 | ||
34 | protected: | 34 | protected: |
35 | virtual void timerEvent ( QTimerEvent * ); | 35 | virtual void timerEvent ( QTimerEvent * ); |
36 | virtual void mousePressEvent ( QMouseEvent * ); | 36 | virtual void mousePressEvent ( QMouseEvent * ); |
37 | virtual void paintEvent ( QPaintEvent* ); | 37 | virtual void paintEvent ( QPaintEvent* ); |
38 | 38 | ||
39 | private slots: | 39 | private slots: |
40 | void popupTimeout ( ); | 40 | void popupTimeout ( ); |
41 | void slotMessage( const QCString& , const QByteArray& ); | 41 | void slotMessage( const QCString& , const QByteArray& ); |
42 | 42 | ||
43 | private: | 43 | private: |
44 | void popup( QString message, QString icon = QString::null ); | 44 | void popup( QString message, QString icon = QString::null ); |
45 | 45 | ||
46 | bool checkIrdaStatus ( ); | 46 | bool checkIrdaStatus ( ); |
47 | bool setIrdaStatus ( bool ); | 47 | bool setIrdaStatus ( bool ); |
48 | bool checkIrdaDiscoveryStatus (); | 48 | bool checkIrdaDiscoveryStatus (); |
49 | bool setIrdaDiscoveryStatus ( bool ); | 49 | bool setIrdaDiscoveryStatus ( bool ); |
50 | bool setIrdaReceiveStatus ( bool ); | 50 | bool setIrdaReceiveStatus ( bool ); |
51 | 51 | ||
52 | void showDiscovered(); | 52 | void showDiscovered(); |
53 | 53 | ||
54 | private: | 54 | private: |
55 | QPixmap m_irdaOnPixmap; | 55 | QPixmap m_irdaOnPixmap; |
56 | QPixmap m_irdaOffPixmap; | 56 | QPixmap m_irdaOffPixmap; |
57 | QPixmap m_irdaDiscoveryOnPixmap; | 57 | QPixmap m_irdaDiscoveryOnPixmap; |
58 | QPixmap m_receiveActivePixmap; | 58 | QPixmap m_receiveActivePixmap; |
59 | 59 | ||
60 | bool m_irda_active; | 60 | bool m_irda_active; |
61 | bool m_irda_discovery_active; | 61 | bool m_irda_discovery_active; |
62 | bool m_receive_active; | 62 | bool m_receive_active; |
63 | bool m_receive_state_changed; | 63 | bool m_receive_state_changed; |
64 | 64 | ||
65 | QPopupMenu *m_popup; | 65 | QPopupMenu *m_popup; |
66 | 66 | ||
67 | int m_sockfd; | 67 | int m_sockfd; |
68 | 68 | ||
69 | QMap <QString, QString> m_devices; | 69 | QMap <QString, QString> m_devices; |
70 | 70 | ||
71 | bool m_wasOn; // if IrDa was enabled | 71 | bool m_wasOn; // if IrDa was enabled |
72 | bool m_wasDiscover; | ||
72 | }; | 73 | }; |
73 | 74 | ||
74 | 75 | ||
75 | #endif // __OPIE_IRDA_APPLET_H__ | 76 | #endif // __OPIE_IRDA_APPLET_H__ |