2 files changed, 4 insertions, 4 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 3f07b41..48146ab 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -264,117 +264,117 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
        cardInPcmcia1 = FALSE;
    }
    repaint( FALSE );
    return ( ( cardWas0 == cardInPcmcia0
               && cardWas1 == cardInPcmcia1 ) ? FALSE : TRUE );
 }
 bool CardMonitor::getStatusSd( int showPopUp ) {
    bool cardWas = cardInSd;    // remember last state
    cardInSd = FALSE;
    #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
    struct mntent *me;
    FILE *mntfp = setmntent( "/etc/mtab", "r" );
    if ( mntfp ) {
        while ( ( me = getmntent( mntfp ) ) != 0 ) {
            QString fs = me->mnt_fsname;
            //odebug << fs << oendl;
            if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd"
                    || fs.left( 9 ) == "/dev/mmcd" ) {
                cardInSd = TRUE;
                show();
            }
            //            else {
            //                 cardInSd = FALSE;
            //             }
        }
        endmntent( mntfp );
    }
    if ( !showPopUp && cardWas != cardInSd ) {
        QString text = QString::null;
        QString what = QString::null;
        if ( cardInSd ) {
            text += "New card: SD/MMC";
            what = "on";
        } else {
            text += "Ejected: SD/MMC";
            what = "off";
        }
        //odebug << "TEXT: " + text << oendl;
        #ifndef QT_NO_SOUND
        QSound::play( Resource::findSound( "cardmon/card" + what ) );
        #endif
        popUp( text, "cardmon/ide" );    // XX add SD pic
    }
    #else
    #error "Not on Linux"
    #endif
    repaint( FALSE );
    return ( ( cardWas == cardInSd ) ? FALSE : TRUE );
 }
 void CardMonitor::paintEvent( QPaintEvent * ) {
    QPainter p( this );
    if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
        p.drawPixmap( 0, 0, pm );
        show();
    } else {
        //p.eraseRect(rect());
        hide();
    }
 }
 int CardMonitor::position() {
    return 7;
 }
 void CardMonitor::execCommand( const QString &command ) {
    if ( m_process == 0 ) {
        m_process = new OProcess();
        QStringList strList = QStringList::split( " ", command );
           for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) {
                *m_process << *it;
            }
        connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ),
                this, SLOT( slotExited(Opie::Core::OProcess* ) ) );
        if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ) {
            delete m_process;
            m_process = 0;
        }
    }
 }
-void CardMonitor::slotExited( OProcess* proc ) {
+void CardMonitor::slotExited( OProcess*  ) {
   if( m_process->normalExit() ) {
        int ret = m_process->exitStatus();
        if( ret != 0 ) {
            if ( m_commandOrig == 1 ) {
                popUp( tr( "CF/PCMCIA card eject failed!" ) );
            } else if ( m_commandOrig == 2 ) {
                popUp( tr( "SD/MMC card eject failed!" ) );
            } else if ( m_commandOrig == 3 ) {
                popUp( tr( "CF/PCMCIA card eject failed!" ) );
            }
        }
    }
    delete m_process;
    m_process = 0;
 }
 EXPORT_OPIE_APPLET_v1( CardMonitor )
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index 7122b40..267714e 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -114,250 +114,250 @@ bool IrdaApplet::checkIrdaStatus ( )
        if ( ::ioctl ( m_sockfd, SIOCGIFFLAGS, &ifr ) < 0 )
                return false;
        return ( ifr. ifr_flags & IFF_UP );
 }
 bool IrdaApplet::setIrdaStatus ( bool b )
 {
        struct ifreq ifr;
        strcpy ( ifr. ifr_name, "irda0" );
        if ( ::ioctl ( m_sockfd, SIOCGIFFLAGS, &ifr ) < 0 )
                return false;
        if ( b ) {
                ifr. ifr_flags |= IFF_UP;
        }
        else {
                setIrdaDiscoveryStatus ( 0 );
                setIrdaReceiveStatus ( 0 );
                ifr. ifr_flags &= ~IFF_UP;
        }
        if ( ::ioctl ( m_sockfd, SIOCSIFFLAGS, &ifr ) < 0 )
                return false;
        return true;
 }
 bool IrdaApplet::checkIrdaDiscoveryStatus ( )
 {
        QFile discovery ( "/proc/sys/net/irda/discovery" );
        QString streamIn = "0";
        if ( discovery. open ( IO_ReadOnly )) {
                QTextStream stream ( &discovery );
                streamIn = stream. read ( );
        }
        return streamIn. toInt ( ) > 0;
 }
 bool IrdaApplet::setIrdaDiscoveryStatus ( bool d )
 {
        QFile discovery ( "/proc/sys/net/irda/discovery" );
        if ( discovery. open ( IO_WriteOnly | IO_Raw )) {
                discovery.putch ( d ? '1' : '0' );
                return true;
        }
        return false;
 }
 bool IrdaApplet::setIrdaReceiveStatus ( bool d )
 {
        QCopEnvelope e ( "QPE/Obex", "receive(int)" );
        e << ( d ? 1 : 0 );
        m_receive_active = d;
        m_receive_state_changed = true;
        return true;
 }
 void IrdaApplet::showDiscovered ( )
 {
        //static Sound snd_found ( "irdaapplet/irdaon" );
        //static Sound snd_lost ( "irdaapplet/irdaoff" );
        QFile discovery ( "/proc/net/irda/discovery" );
        if ( discovery. open ( IO_ReadOnly )) {
                bool qcopsend = false;
                QString discoveredDevice;
                QString deviceAddr;
                // since it is /proc we _must_ use QTextStream
                QStringList list =  QStringList::split ( "\n", QTextStream ( &discovery ). read ( ));
                QMap <QString, QString>::Iterator it;
                for ( it = m_devices. begin ( ); it != m_devices. end ( ); ++it )
                        it. data ( ). prepend ( "+++" );
                for ( QStringList::Iterator lit = list. begin ( ); lit != list. end ( ); ++lit ) {
                        const QString &line = *lit;
                        if ( line. startsWith ( "nickname:" )) {
                                discoveredDevice = line. mid ( line. find ( ':' ) + 2, line. find ( ',' ) - line. find ( ':' ) - 2 );
                                deviceAddr       = line. mid ( line. find ( "daddr:" ) + 9, 8 );
-                                // odebug << discoveredDevice + "(" + deviceAddr + ")" << oendl; 
+                                // odebug << discoveredDevice + "(" + deviceAddr + ")" << oendl;
                                if ( !m_devices. contains ( deviceAddr )) {
                                        popup ( tr( "Found:" ) + " " + discoveredDevice );
                                        //snd_found. play ( );
                                        qcopsend = true;
                                }
                                m_devices. replace ( deviceAddr, discoveredDevice );
                        }
                }
                for ( it = m_devices. begin ( ); it != m_devices. end ( ); ) {
-                        // odebug << "IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?" << oendl; 
+                        // odebug << "IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?" << oendl;
                        if ( it. data ( ). left ( 3 ) == "+++" ) {
                                popup ( tr( "Lost:" ) + " " + it. data ( ). mid ( 3 ));
                                //snd_lost. play ( );
                                QMap <QString, QString>::Iterator tmp = it;
                                tmp++;
                                m_devices. remove ( it ); // in contrast to QValueListIterator this remove doesn't return the next Iterator
                                it = tmp;
                                qcopsend = true;
                        }
                        else
                                it++;
                }
                // XXX if( qcopsend ) {
                    QCopEnvelope e ( "QPE/Network", "irdaSend(bool)" );
                    e << ( m_devices. count ( ) > 0 );
                // }
        }
 }
 void IrdaApplet::mousePressEvent ( QMouseEvent * )
 {
        QPopupMenu *menu = new QPopupMenu ( this );
        QString cmd;
        /* Refresh active state */
        timerEvent ( 0 );
                //menu->insertItem( tr("More..."), 4 );
        if ( m_irda_active && !m_devices. isEmpty ( )) {
                menu-> insertItem ( tr( "Discovered Device:" ), 9 );
                for ( QMap<QString, QString>::Iterator it = m_devices. begin ( ); it != m_devices. end ( ); ++it )
                        menu-> insertItem ( *it );
                menu-> insertSeparator ( );
        }
        menu-> insertItem ( m_irda_active ? tr( "Disable IrDA" ) : tr( "Enable IrDA" ), 0 );
        if ( m_irda_active ) {
                menu-> insertItem ( m_irda_discovery_active ? tr( "Disable Discovery" ) : tr( "Enable Discovery" ), 1 );
                menu-> insertItem ( m_receive_active ? tr( "Disable Receive" ) : tr( "Enable Receive" ), 2 );
        }
        QPoint p = mapToGlobal ( QPoint ( 0, 0 ) );
        QSize s = menu-> sizeHint ( );
        p = QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ));
        switch (  menu-> exec ( p )) {
                case 0:
                        setIrdaStatus ( !m_irda_active );
                        timerEvent ( 0 );
                        break;
                case 1:
                        setIrdaDiscoveryStatus ( !m_irda_discovery_active );
                        timerEvent ( 0 );
                        break;
                case 2:
                        setIrdaReceiveStatus ( !m_receive_active );
                        timerEvent( 0 );
                        break;
        }
        delete menu;
 }
 void IrdaApplet::timerEvent ( QTimerEvent * )
 {
        bool oldactive = m_irda_active;
        bool olddiscovery = m_irda_discovery_active;
        bool receiveUpdate = false;
        if ( m_receive_state_changed ) {
                receiveUpdate = true;
                m_receive_state_changed = false;
        }
        m_irda_active = checkIrdaStatus ( );
        m_irda_discovery_active = checkIrdaDiscoveryStatus ( );
        if ( m_irda_discovery_active )
                showDiscovered ( );
        if (( m_irda_active != oldactive ) || ( m_irda_discovery_active != olddiscovery ) || receiveUpdate )
                update ( );
 }
 void IrdaApplet::paintEvent ( QPaintEvent * )
 {
        QPainter p ( this );
        p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap );
        if ( m_irda_discovery_active )
                    p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap );
        if ( m_receive_active )
                p. drawPixmap( 0, 1, m_receiveActivePixmap );
 }
 /*
 * We know 3 calls
 * a) enable
 * b) disable
 * a and b will temp enable the IrDa device and disable will disable it again if it wasn't on
 * c) listDevices: We will return a list of known devices
 */
-void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) {
+void IrdaApplet::slotMessage( const QCString& str, const QByteArray&  ) {
    if ( str == "enableIrda()") {
        m_wasOn = checkIrdaStatus();
        m_wasDiscover = checkIrdaDiscoveryStatus();
        if (!m_wasOn)  {
            setIrdaStatus( true );
        }
        if ( !m_wasDiscover ) {
            setIrdaDiscoveryStatus ( true );
        }
    } else if ( str == "disableIrda()") {
        if (!m_wasOn)  {
            setIrdaStatus( false );
        }
        if ( !m_wasDiscover ) {
            setIrdaDiscoveryStatus ( false );
        }
    } else if ( str == "listDevices()") {
        QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)");
        QStringList list;
        QMap<QString, QString>::Iterator it;
        for (it = m_devices.begin(); it != m_devices.end(); ++it )
            list << (*it);
        e << list;
    }
 }
 EXPORT_OPIE_APPLET_v1( IrdaApplet )

diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 3f07b41..48146ab 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp
@@ -264,117 +264,117 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
264	cardInPcmcia1 = FALSE;	264	cardInPcmcia1 = FALSE;
265	}	265	}
266	repaint( FALSE );	266	repaint( FALSE );
267	return ( ( cardWas0 == cardInPcmcia0	267	return ( ( cardWas0 == cardInPcmcia0
268	&& cardWas1 == cardInPcmcia1 ) ? FALSE : TRUE );	268	&& cardWas1 == cardInPcmcia1 ) ? FALSE : TRUE );
269		269
270	}	270	}
271		271
272		272
273	bool CardMonitor::getStatusSd( int showPopUp ) {	273	bool CardMonitor::getStatusSd( int showPopUp ) {
274		274
275	bool cardWas = cardInSd; // remember last state	275	bool cardWas = cardInSd; // remember last state
276	cardInSd = FALSE;	276	cardInSd = FALSE;
277		277
278	#if defined(_OS_LINUX_) \|\| defined(Q_OS_LINUX)	278	#if defined(_OS_LINUX_) \|\| defined(Q_OS_LINUX)
279		279
280	struct mntent *me;	280	struct mntent *me;
281	FILE *mntfp = setmntent( "/etc/mtab", "r" );	281	FILE *mntfp = setmntent( "/etc/mtab", "r" );
282		282
283	if ( mntfp ) {	283	if ( mntfp ) {
284	while ( ( me = getmntent( mntfp ) ) != 0 ) {	284	while ( ( me = getmntent( mntfp ) ) != 0 ) {
285	QString fs = me->mnt_fsname;	285	QString fs = me->mnt_fsname;
286	//odebug << fs << oendl;	286	//odebug << fs << oendl;
287	if ( fs.left( 14 ) == "/dev/mmc/part1" \|\| fs.left( 7 ) == "/dev/sd"	287	if ( fs.left( 14 ) == "/dev/mmc/part1" \|\| fs.left( 7 ) == "/dev/sd"
288	\|\| fs.left( 9 ) == "/dev/mmcd" ) {	288	\|\| fs.left( 9 ) == "/dev/mmcd" ) {
289	cardInSd = TRUE;	289	cardInSd = TRUE;
290	show();	290	show();
291	}	291	}
292	// else {	292	// else {
293	// cardInSd = FALSE;	293	// cardInSd = FALSE;
294	// }	294	// }
295	}	295	}
296	endmntent( mntfp );	296	endmntent( mntfp );
297	}	297	}
298		298
299	if ( !showPopUp && cardWas != cardInSd ) {	299	if ( !showPopUp && cardWas != cardInSd ) {
300	QString text = QString::null;	300	QString text = QString::null;
301	QString what = QString::null;	301	QString what = QString::null;
302	if ( cardInSd ) {	302	if ( cardInSd ) {
303	text += "New card: SD/MMC";	303	text += "New card: SD/MMC";
304	what = "on";	304	what = "on";
305	} else {	305	} else {
306	text += "Ejected: SD/MMC";	306	text += "Ejected: SD/MMC";
307	what = "off";	307	what = "off";
308	}	308	}
309	//odebug << "TEXT: " + text << oendl;	309	//odebug << "TEXT: " + text << oendl;
310	#ifndef QT_NO_SOUND	310	#ifndef QT_NO_SOUND
311	QSound::play( Resource::findSound( "cardmon/card" + what ) );	311	QSound::play( Resource::findSound( "cardmon/card" + what ) );
312	#endif	312	#endif
313		313
314	popUp( text, "cardmon/ide" ); // XX add SD pic	314	popUp( text, "cardmon/ide" ); // XX add SD pic
315	}	315	}
316	#else	316	#else
317	#error "Not on Linux"	317	#error "Not on Linux"
318	#endif	318	#endif
319	repaint( FALSE );	319	repaint( FALSE );
320	return ( ( cardWas == cardInSd ) ? FALSE : TRUE );	320	return ( ( cardWas == cardInSd ) ? FALSE : TRUE );
321	}	321	}
322		322
323	void CardMonitor::paintEvent( QPaintEvent * ) {	323	void CardMonitor::paintEvent( QPaintEvent * ) {
324		324
325	QPainter p( this );	325	QPainter p( this );
326		326
327	if ( cardInPcmcia0 \|\| cardInPcmcia1 \|\| cardInSd ) {	327	if ( cardInPcmcia0 \|\| cardInPcmcia1 \|\| cardInSd ) {
328	p.drawPixmap( 0, 0, pm );	328	p.drawPixmap( 0, 0, pm );
329	show();	329	show();
330	} else {	330	} else {
331	//p.eraseRect(rect());	331	//p.eraseRect(rect());
332	hide();	332	hide();
333	}	333	}
334	}	334	}
335		335
336	int CardMonitor::position() {	336	int CardMonitor::position() {
337	return 7;	337	return 7;
338	}	338	}
339		339
340	void CardMonitor::execCommand( const QString &command ) {	340	void CardMonitor::execCommand( const QString &command ) {
341		341
342	if ( m_process == 0 ) {	342	if ( m_process == 0 ) {
343	m_process = new OProcess();	343	m_process = new OProcess();
344	QStringList strList = QStringList::split( " ", command );	344	QStringList strList = QStringList::split( " ", command );
345		345
346	for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) {	346	for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) {
347	m_process << it;	347	m_process << it;
348	}	348	}
349		349
350	connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ),	350	connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ),
351	this, SLOT( slotExited(Opie::Core::OProcess* ) ) );	351	this, SLOT( slotExited(Opie::Core::OProcess* ) ) );
352		352
353	if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ) {	353	if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ) {
354	delete m_process;	354	delete m_process;
355	m_process = 0;	355	m_process = 0;
356	}	356	}
357	}	357	}
358	}	358	}
359		359
360	void CardMonitor::slotExited( OProcess* proc ) {	360	void CardMonitor::slotExited( OProcess* ) {
361		361
362	if( m_process->normalExit() ) {	362	if( m_process->normalExit() ) {
363	int ret = m_process->exitStatus();	363	int ret = m_process->exitStatus();
364	if( ret != 0 ) {	364	if( ret != 0 ) {
365	if ( m_commandOrig == 1 ) {	365	if ( m_commandOrig == 1 ) {
366	popUp( tr( "CF/PCMCIA card eject failed!" ) );	366	popUp( tr( "CF/PCMCIA card eject failed!" ) );
367	} else if ( m_commandOrig == 2 ) {	367	} else if ( m_commandOrig == 2 ) {
368	popUp( tr( "SD/MMC card eject failed!" ) );	368	popUp( tr( "SD/MMC card eject failed!" ) );
369	} else if ( m_commandOrig == 3 ) {	369	} else if ( m_commandOrig == 3 ) {
370	popUp( tr( "CF/PCMCIA card eject failed!" ) );	370	popUp( tr( "CF/PCMCIA card eject failed!" ) );
371	}	371	}
372	}	372	}
373	}	373	}
374		374
375	delete m_process;	375	delete m_process;
376	m_process = 0;	376	m_process = 0;
377	}	377	}
378		378
379	EXPORT_OPIE_APPLET_v1( CardMonitor )	379	EXPORT_OPIE_APPLET_v1( CardMonitor )
380		380


diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp index 7122b40..267714e 100644 --- a/core/applets/irdaapplet/irda.cpp +++ b/core/applets/irdaapplet/irda.cpp
@@ -114,250 +114,250 @@ bool IrdaApplet::checkIrdaStatus ( )
114	if ( ::ioctl ( m_sockfd, SIOCGIFFLAGS, &ifr ) < 0 )	114	if ( ::ioctl ( m_sockfd, SIOCGIFFLAGS, &ifr ) < 0 )
115	return false;	115	return false;
116		116
117	return ( ifr. ifr_flags & IFF_UP );	117	return ( ifr. ifr_flags & IFF_UP );
118	}	118	}
119		119
120	bool IrdaApplet::setIrdaStatus ( bool b )	120	bool IrdaApplet::setIrdaStatus ( bool b )
121	{	121	{
122	struct ifreq ifr;	122	struct ifreq ifr;
123	strcpy ( ifr. ifr_name, "irda0" );	123	strcpy ( ifr. ifr_name, "irda0" );
124		124
125	if ( ::ioctl ( m_sockfd, SIOCGIFFLAGS, &ifr ) < 0 )	125	if ( ::ioctl ( m_sockfd, SIOCGIFFLAGS, &ifr ) < 0 )
126	return false;	126	return false;
127		127
128	if ( b ) {	128	if ( b ) {
129	ifr. ifr_flags \|= IFF_UP;	129	ifr. ifr_flags \|= IFF_UP;
130	}	130	}
131	else {	131	else {
132	setIrdaDiscoveryStatus ( 0 );	132	setIrdaDiscoveryStatus ( 0 );
133	setIrdaReceiveStatus ( 0 );	133	setIrdaReceiveStatus ( 0 );
134	ifr. ifr_flags &= ~IFF_UP;	134	ifr. ifr_flags &= ~IFF_UP;
135	}	135	}
136		136
137	if ( ::ioctl ( m_sockfd, SIOCSIFFLAGS, &ifr ) < 0 )	137	if ( ::ioctl ( m_sockfd, SIOCSIFFLAGS, &ifr ) < 0 )
138	return false;	138	return false;
139		139
140	return true;	140	return true;
141	}	141	}
142		142
143	bool IrdaApplet::checkIrdaDiscoveryStatus ( )	143	bool IrdaApplet::checkIrdaDiscoveryStatus ( )
144	{	144	{
145	QFile discovery ( "/proc/sys/net/irda/discovery" );	145	QFile discovery ( "/proc/sys/net/irda/discovery" );
146		146
147	QString streamIn = "0";	147	QString streamIn = "0";
148		148
149	if ( discovery. open ( IO_ReadOnly )) {	149	if ( discovery. open ( IO_ReadOnly )) {
150	QTextStream stream ( &discovery );	150	QTextStream stream ( &discovery );
151	streamIn = stream. read ( );	151	streamIn = stream. read ( );
152	}	152	}
153		153
154	return streamIn. toInt ( ) > 0;	154	return streamIn. toInt ( ) > 0;
155	}	155	}
156		156
157		157
158	bool IrdaApplet::setIrdaDiscoveryStatus ( bool d )	158	bool IrdaApplet::setIrdaDiscoveryStatus ( bool d )
159	{	159	{
160	QFile discovery ( "/proc/sys/net/irda/discovery" );	160	QFile discovery ( "/proc/sys/net/irda/discovery" );
161		161
162	if ( discovery. open ( IO_WriteOnly \| IO_Raw )) {	162	if ( discovery. open ( IO_WriteOnly \| IO_Raw )) {
163	discovery.putch ( d ? '1' : '0' );	163	discovery.putch ( d ? '1' : '0' );
164	return true;	164	return true;
165	}	165	}
166	return false;	166	return false;
167	}	167	}
168		168
169		169
170	bool IrdaApplet::setIrdaReceiveStatus ( bool d )	170	bool IrdaApplet::setIrdaReceiveStatus ( bool d )
171	{	171	{
172	QCopEnvelope e ( "QPE/Obex", "receive(int)" );	172	QCopEnvelope e ( "QPE/Obex", "receive(int)" );
173	e << ( d ? 1 : 0 );	173	e << ( d ? 1 : 0 );
174		174
175	m_receive_active = d;	175	m_receive_active = d;
176	m_receive_state_changed = true;	176	m_receive_state_changed = true;
177		177
178	return true;	178	return true;
179	}	179	}
180		180
181		181
182	void IrdaApplet::showDiscovered ( )	182	void IrdaApplet::showDiscovered ( )
183	{	183	{
184	//static Sound snd_found ( "irdaapplet/irdaon" );	184	//static Sound snd_found ( "irdaapplet/irdaon" );
185	//static Sound snd_lost ( "irdaapplet/irdaoff" );	185	//static Sound snd_lost ( "irdaapplet/irdaoff" );
186		186
187	QFile discovery ( "/proc/net/irda/discovery" );	187	QFile discovery ( "/proc/net/irda/discovery" );
188		188
189	if ( discovery. open ( IO_ReadOnly )) {	189	if ( discovery. open ( IO_ReadOnly )) {
190	bool qcopsend = false;	190	bool qcopsend = false;
191		191
192	QString discoveredDevice;	192	QString discoveredDevice;
193	QString deviceAddr;	193	QString deviceAddr;
194		194
195	// since it is /proc we _must_ use QTextStream	195	// since it is /proc we _must_ use QTextStream
196	QStringList list = QStringList::split ( "\n", QTextStream ( &discovery ). read ( ));	196	QStringList list = QStringList::split ( "\n", QTextStream ( &discovery ). read ( ));
197		197
198	QMap <QString, QString>::Iterator it;	198	QMap <QString, QString>::Iterator it;
199		199
200	for ( it = m_devices. begin ( ); it != m_devices. end ( ); ++it )	200	for ( it = m_devices. begin ( ); it != m_devices. end ( ); ++it )
201	it. data ( ). prepend ( "+++" );	201	it. data ( ). prepend ( "+++" );
202		202
203	for ( QStringList::Iterator lit = list. begin ( ); lit != list. end ( ); ++lit ) {	203	for ( QStringList::Iterator lit = list. begin ( ); lit != list. end ( ); ++lit ) {
204	const QString &line = *lit;	204	const QString &line = *lit;
205		205
206	if ( line. startsWith ( "nickname:" )) {	206	if ( line. startsWith ( "nickname:" )) {
207	discoveredDevice = line. mid ( line. find ( ':' ) + 2, line. find ( ',' ) - line. find ( ':' ) - 2 );	207	discoveredDevice = line. mid ( line. find ( ':' ) + 2, line. find ( ',' ) - line. find ( ':' ) - 2 );
208	deviceAddr = line. mid ( line. find ( "daddr:" ) + 9, 8 );	208	deviceAddr = line. mid ( line. find ( "daddr:" ) + 9, 8 );
209		209
210	// odebug << discoveredDevice + "(" + deviceAddr + ")" << oendl;	210	// odebug << discoveredDevice + "(" + deviceAddr + ")" << oendl;
211		211
212	if ( !m_devices. contains ( deviceAddr )) {	212	if ( !m_devices. contains ( deviceAddr )) {
213	popup ( tr( "Found:" ) + " " + discoveredDevice );	213	popup ( tr( "Found:" ) + " " + discoveredDevice );
214	//snd_found. play ( );	214	//snd_found. play ( );
215	qcopsend = true;	215	qcopsend = true;
216	}	216	}
217	m_devices. replace ( deviceAddr, discoveredDevice );	217	m_devices. replace ( deviceAddr, discoveredDevice );
218	}	218	}
219	}	219	}
220		220
221	for ( it = m_devices. begin ( ); it != m_devices. end ( ); ) {	221	for ( it = m_devices. begin ( ); it != m_devices. end ( ); ) {
222	// odebug << "IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?" << oendl;	222	// odebug << "IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?" << oendl;
223		223
224	if ( it. data ( ). left ( 3 ) == "+++" ) {	224	if ( it. data ( ). left ( 3 ) == "+++" ) {
225	popup ( tr( "Lost:" ) + " " + it. data ( ). mid ( 3 ));	225	popup ( tr( "Lost:" ) + " " + it. data ( ). mid ( 3 ));
226	//snd_lost. play ( );	226	//snd_lost. play ( );
227		227
228	QMap <QString, QString>::Iterator tmp = it;	228	QMap <QString, QString>::Iterator tmp = it;
229	tmp++;	229	tmp++;
230	m_devices. remove ( it ); // in contrast to QValueListIterator this remove doesn't return the next Iterator	230	m_devices. remove ( it ); // in contrast to QValueListIterator this remove doesn't return the next Iterator
231	it = tmp;	231	it = tmp;
232		232
233	qcopsend = true;	233	qcopsend = true;
234	}	234	}
235	else	235	else
236	it++;	236	it++;
237	}	237	}
238	// XXX if( qcopsend ) {	238	// XXX if( qcopsend ) {
239	QCopEnvelope e ( "QPE/Network", "irdaSend(bool)" );	239	QCopEnvelope e ( "QPE/Network", "irdaSend(bool)" );
240	e << ( m_devices. count ( ) > 0 );	240	e << ( m_devices. count ( ) > 0 );
241	// }	241	// }
242	}	242	}
243	}	243	}
244		244
245	void IrdaApplet::mousePressEvent ( QMouseEvent * )	245	void IrdaApplet::mousePressEvent ( QMouseEvent * )
246	{	246	{
247	QPopupMenu *menu = new QPopupMenu ( this );	247	QPopupMenu *menu = new QPopupMenu ( this );
248	QString cmd;	248	QString cmd;
249		249
250	/* Refresh active state */	250	/* Refresh active state */
251	timerEvent ( 0 );	251	timerEvent ( 0 );
252		252
253	//menu->insertItem( tr("More..."), 4 );	253	//menu->insertItem( tr("More..."), 4 );
254		254
255	if ( m_irda_active && !m_devices. isEmpty ( )) {	255	if ( m_irda_active && !m_devices. isEmpty ( )) {
256	menu-> insertItem ( tr( "Discovered Device:" ), 9 );	256	menu-> insertItem ( tr( "Discovered Device:" ), 9 );
257		257
258	for ( QMap<QString, QString>::Iterator it = m_devices. begin ( ); it != m_devices. end ( ); ++it )	258	for ( QMap<QString, QString>::Iterator it = m_devices. begin ( ); it != m_devices. end ( ); ++it )
259	menu-> insertItem ( *it );	259	menu-> insertItem ( *it );
260		260
261	menu-> insertSeparator ( );	261	menu-> insertSeparator ( );
262	}	262	}
263		263
264	menu-> insertItem ( m_irda_active ? tr( "Disable IrDA" ) : tr( "Enable IrDA" ), 0 );	264	menu-> insertItem ( m_irda_active ? tr( "Disable IrDA" ) : tr( "Enable IrDA" ), 0 );
265		265
266	if ( m_irda_active ) {	266	if ( m_irda_active ) {
267	menu-> insertItem ( m_irda_discovery_active ? tr( "Disable Discovery" ) : tr( "Enable Discovery" ), 1 );	267	menu-> insertItem ( m_irda_discovery_active ? tr( "Disable Discovery" ) : tr( "Enable Discovery" ), 1 );
268	menu-> insertItem ( m_receive_active ? tr( "Disable Receive" ) : tr( "Enable Receive" ), 2 );	268	menu-> insertItem ( m_receive_active ? tr( "Disable Receive" ) : tr( "Enable Receive" ), 2 );
269	}	269	}
270		270
271	QPoint p = mapToGlobal ( QPoint ( 0, 0 ) );	271	QPoint p = mapToGlobal ( QPoint ( 0, 0 ) );
272	QSize s = menu-> sizeHint ( );	272	QSize s = menu-> sizeHint ( );
273		273
274	p = QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ));	274	p = QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ));
275		275
276	switch ( menu-> exec ( p )) {	276	switch ( menu-> exec ( p )) {
277	case 0:	277	case 0:
278	setIrdaStatus ( !m_irda_active );	278	setIrdaStatus ( !m_irda_active );
279	timerEvent ( 0 );	279	timerEvent ( 0 );
280	break;	280	break;
281	case 1:	281	case 1:
282	setIrdaDiscoveryStatus ( !m_irda_discovery_active );	282	setIrdaDiscoveryStatus ( !m_irda_discovery_active );
283	timerEvent ( 0 );	283	timerEvent ( 0 );
284	break;	284	break;
285	case 2:	285	case 2:
286	setIrdaReceiveStatus ( !m_receive_active );	286	setIrdaReceiveStatus ( !m_receive_active );
287	timerEvent( 0 );	287	timerEvent( 0 );
288	break;	288	break;
289	}	289	}
290		290
291	delete menu;	291	delete menu;
292	}	292	}
293		293
294	void IrdaApplet::timerEvent ( QTimerEvent * )	294	void IrdaApplet::timerEvent ( QTimerEvent * )
295	{	295	{
296	bool oldactive = m_irda_active;	296	bool oldactive = m_irda_active;
297	bool olddiscovery = m_irda_discovery_active;	297	bool olddiscovery = m_irda_discovery_active;
298	bool receiveUpdate = false;	298	bool receiveUpdate = false;
299		299
300	if ( m_receive_state_changed ) {	300	if ( m_receive_state_changed ) {
301	receiveUpdate = true;	301	receiveUpdate = true;
302	m_receive_state_changed = false;	302	m_receive_state_changed = false;
303	}	303	}
304		304
305	m_irda_active = checkIrdaStatus ( );	305	m_irda_active = checkIrdaStatus ( );
306	m_irda_discovery_active = checkIrdaDiscoveryStatus ( );	306	m_irda_discovery_active = checkIrdaDiscoveryStatus ( );
307		307
308	if ( m_irda_discovery_active )	308	if ( m_irda_discovery_active )
309	showDiscovered ( );	309	showDiscovered ( );
310		310
311	if (( m_irda_active != oldactive ) \|\| ( m_irda_discovery_active != olddiscovery ) \|\| receiveUpdate )	311	if (( m_irda_active != oldactive ) \|\| ( m_irda_discovery_active != olddiscovery ) \|\| receiveUpdate )
312	update ( );	312	update ( );
313	}	313	}
314		314
315	void IrdaApplet::paintEvent ( QPaintEvent * )	315	void IrdaApplet::paintEvent ( QPaintEvent * )
316	{	316	{
317	QPainter p ( this );	317	QPainter p ( this );
318		318
319	p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap );	319	p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap );
320		320
321	if ( m_irda_discovery_active )	321	if ( m_irda_discovery_active )
322	p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap );	322	p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap );
323		323
324	if ( m_receive_active )	324	if ( m_receive_active )
325	p. drawPixmap( 0, 1, m_receiveActivePixmap );	325	p. drawPixmap( 0, 1, m_receiveActivePixmap );
326	}	326	}
327	/*	327	/*
328	* We know 3 calls	328	* We know 3 calls
329	* a) enable	329	* a) enable
330	* b) disable	330	* b) disable
331	* a and b will temp enable the IrDa device and disable will disable it again if it wasn't on	331	* a and b will temp enable the IrDa device and disable will disable it again if it wasn't on
332	* c) listDevices: We will return a list of known devices	332	* c) listDevices: We will return a list of known devices
333	*/	333	*/
334	void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) {	334	void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ) {
335	if ( str == "enableIrda()") {	335	if ( str == "enableIrda()") {
336	m_wasOn = checkIrdaStatus();	336	m_wasOn = checkIrdaStatus();
337	m_wasDiscover = checkIrdaDiscoveryStatus();	337	m_wasDiscover = checkIrdaDiscoveryStatus();
338	if (!m_wasOn) {	338	if (!m_wasOn) {
339	setIrdaStatus( true );	339	setIrdaStatus( true );
340	}	340	}
341	if ( !m_wasDiscover ) {	341	if ( !m_wasDiscover ) {
342	setIrdaDiscoveryStatus ( true );	342	setIrdaDiscoveryStatus ( true );
343	}	343	}
344	} else if ( str == "disableIrda()") {	344	} else if ( str == "disableIrda()") {
345	if (!m_wasOn) {	345	if (!m_wasOn) {
346	setIrdaStatus( false );	346	setIrdaStatus( false );
347	}	347	}
348	if ( !m_wasDiscover ) {	348	if ( !m_wasDiscover ) {
349	setIrdaDiscoveryStatus ( false );	349	setIrdaDiscoveryStatus ( false );
350	}	350	}
351	} else if ( str == "listDevices()") {	351	} else if ( str == "listDevices()") {
352	QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)");	352	QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)");
353		353
354	QStringList list;	354	QStringList list;
355	QMap<QString, QString>::Iterator it;	355	QMap<QString, QString>::Iterator it;
356	for (it = m_devices.begin(); it != m_devices.end(); ++it )	356	for (it = m_devices.begin(); it != m_devices.end(); ++it )
357	list << (*it);	357	list << (*it);
358		358
359	e << list;	359	e << list;
360	}	360	}
361	}	361	}
362		362
363	EXPORT_OPIE_APPLET_v1( IrdaApplet )	363	EXPORT_OPIE_APPLET_v1( IrdaApplet )