summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/irdaapplet/irda.cpp44
-rw-r--r--core/applets/irdaapplet/irda.h2
2 files changed, 42 insertions, 4 deletions
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index 28a79d1..e21f191 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -21,48 +21,49 @@
#include <qpe/resource.h>
#include <qpe/qpeapplication.h>
#include <qpe/timestring.h>
#include <qpe/resource.h>
#include <qpe/config.h>
#include <qpe/applnk.h>
#include <qpe/config.h>
#include <qpe/ir.h>
#include <qpe/qcopenvelope_qws.h>
#include <qdir.h>
#include <qfileinfo.h>
#include <qpoint.h>
#include <qpushbutton.h>
#include <qpainter.h>
#include <qcombobox.h>
#include <qspinbox.h>
#include <qslider.h>
#include <qlayout.h>
#include <qframe.h>
#include <qpixmap.h>
#include <qstring.h>
#include <qfile.h>
#include <qtimer.h>
+#include <qtextstream.h>
#include <qpopupmenu.h>
#include <net/if.h>
#include <netinet/in.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
//===========================================================================
IrdaApplet::IrdaApplet( QWidget *parent, const char *name )
: QWidget( parent, name ) {
setFixedHeight( 18 );
setFixedWidth( 14 );
sockfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
irdaOnPixmap = Resource::loadPixmap( "irdaapplet/irdaon" );
irdaOffPixmap = Resource::loadPixmap( "irdaapplet/irdaoff" );
irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" );
receiveActivePixmap = Resource::loadPixmap("irdaapplet/receive");
receiveActive = false;
startTimer(5000);
timerEvent(NULL);
}
@@ -107,66 +108,101 @@ int IrdaApplet::checkIrdaDiscoveryStatus() {
discovery.open( IO_ReadOnly|IO_Raw );
discovery.readBlock (&status, 1);
discovery.close();
return atoi(&status);
}
int IrdaApplet::setIrdaDiscoveryStatus(int d) {
QFile discovery("/proc/sys/net/irda/discovery");
discovery.open( IO_WriteOnly|IO_Raw );
if (d)
discovery.putch('1');
else
discovery.putch('0');
discovery.close();
return 0;
}
+void IrdaApplet::showDiscovered() {
+ QFile discovery("/proc/net/irda/discovery");
+
+ if (discovery.open(IO_ReadOnly) ) {
+ QStringList list;
+ // since it is /proc we _must_ use QTextStream
+ QTextStream stream ( &discovery);
+ QString streamIn;
+ streamIn = stream.read();
+ list = QStringList::split("\n", streamIn);
+
+ for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) {
+ if( (*line).startsWith("nickname:") ){
+ discoveredDevice = (*line).mid(((*line).find(':'))+1,(*line).find(',')-(*line).find(':')-1);
+ qDebug(discoveredDevice);
+ }
+ }
+ }
+
+}
+
void IrdaApplet::mousePressEvent( QMouseEvent *) {
QPopupMenu *menu = new QPopupMenu();
QString cmd;
int ret=0;
+ showDiscovered();
/* Refresh active state */
timerEvent(NULL);
// menu->insertItem( tr("More..."), 4 );
- if (irdaactive)
+
+ menu->insertItem( tr("Discovered Device:"), 9);
+
+ if ( !discoveredDevice.isEmpty() ) {
+ menu->insertItem( discoveredDevice ,7 );
+ } else {
+ menu->insertItem( tr("None"), 8);
+ }
+
+ menu->insertSeparator();
+
+ if (irdaactive) {
menu->insertItem( tr("Disable IrDA"), 0 );
- else
+ } else {
menu->insertItem( tr("Enable IrDA"), 1 );
+ }
- if (irdaDiscoveryActive)
+ if (irdaDiscoveryActive) {
menu->insertItem( tr("Disable Discovery"), 2 );
- else
+ } else {
menu->insertItem( tr("Enable Discovery"), 3 );
+ }
if( receiveActive ){
menu->insertItem( tr("Disable Receive"), 5 );
} else {
menu->insertItem( tr("Enable Receive"), 4 );
}
QPoint p = mapToGlobal( QPoint(1, menu->sizeHint().height()-1) );
ret = menu->exec(p, 2);
qDebug("ret was %d\n", ret);
switch(ret) {
case 0:
setIrdaStatus(0);
timerEvent(NULL);
break;
case 1:
setIrdaStatus(1);
timerEvent(NULL);
break;
case 2:
setIrdaDiscoveryStatus(0);
timerEvent(NULL);
diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h
index 002d295..5822afe 100644
--- a/core/applets/irdaapplet/irda.h
+++ b/core/applets/irdaapplet/irda.h
@@ -21,43 +21,45 @@
#include <qframe.h>
#include <qpixmap.h>
#include <qguardedptr.h>
#include <qtimer.h>
#include <qfile.h>
class IrdaApplet : public QWidget
{
Q_OBJECT
public:
IrdaApplet( QWidget *parent = 0, const char *name=0 );
~IrdaApplet();
protected:
void timerEvent(QTimerEvent *te );
private:
void mousePressEvent( QMouseEvent * );
void paintEvent( QPaintEvent* );
int checkIrdaStatus();
int setIrdaStatus(int);
int checkIrdaDiscoveryStatus();
int setIrdaDiscoveryStatus(int);
+ void showDiscovered();
int sockfd;
private:
QPixmap irdaOnPixmap;
QPixmap irdaOffPixmap;
QPixmap irdaDiscoveryOnPixmap;
QPixmap receiveActivePixmap;
+ QString discoveredDevice;
int irdaactive; // bool and bitfields later bool irdaactive :1 ;
int irdaDiscoveryActive;
bool receiveActive : 1;
bool receiveStateChanged;
private slots:
};
#endif // __SCREENSHOT_APPLET_H__