summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/irdaapplet/irda.cpp265
-rw-r--r--core/applets/irdaapplet/irda.h6
2 files changed, 147 insertions, 124 deletions
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index 67e7f22..03912aa 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -54,165 +54,186 @@
//===========================================================================
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" );
- startTimer(5000);
- timerEvent(NULL);
+ : 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);
}
-IrdaApplet::~IrdaApplet()
-{
- close(sockfd);
+IrdaApplet::~IrdaApplet() {
+ close(sockfd);
}
-int IrdaApplet::checkIrdaStatus()
-{
- struct ifreq ifr;
+int IrdaApplet::checkIrdaStatus() {
+ struct ifreq ifr;
- strcpy(ifr.ifr_name, "irda0");
+ strcpy(ifr.ifr_name, "irda0");
- if (ioctl(sockfd, SIOCGIFFLAGS, &ifr))
- return -1;
+ if (ioctl(sockfd, SIOCGIFFLAGS, &ifr))
+ return -1;
- return (ifr.ifr_flags & IFF_UP)?1:0;
+ return (ifr.ifr_flags & IFF_UP)?1:0;
}
-int IrdaApplet::setIrdaStatus(int c)
-{
- struct ifreq ifr;
+int IrdaApplet::setIrdaStatus(int c) {
+ struct ifreq ifr;
- strcpy(ifr.ifr_name, "irda0");
+ strcpy(ifr.ifr_name, "irda0");
- if (ioctl(sockfd, SIOCGIFFLAGS, &ifr))
- return -1;
+ if (ioctl(sockfd, SIOCGIFFLAGS, &ifr))
+ return -1;
- if (c)
- ifr.ifr_flags |= IFF_UP;
- else
- ifr.ifr_flags &= ~IFF_UP;
+ if (c)
+ ifr.ifr_flags |= IFF_UP;
+ else
+ ifr.ifr_flags &= ~IFF_UP;
- if (ioctl(sockfd, SIOCSIFFLAGS, &ifr))
- return -1;
+ if (ioctl(sockfd, SIOCSIFFLAGS, &ifr))
+ return -1;
- return 0;
+ return 0;
}
-int IrdaApplet::checkIrdaDiscoveryStatus()
-{
- QFile discovery("/proc/sys/net/irda/discovery");
- char status;
+int IrdaApplet::checkIrdaDiscoveryStatus() {
+ QFile discovery("/proc/sys/net/irda/discovery");
+ char status;
- discovery.open( IO_ReadOnly|IO_Raw );
- discovery.readBlock (&status, 1);
- discovery.close();
+ discovery.open( IO_ReadOnly|IO_Raw );
+ discovery.readBlock (&status, 1);
+ discovery.close();
- return atoi(&status);
+ return atoi(&status);
}
-int IrdaApplet::setIrdaDiscoveryStatus(int d)
-{
- QFile discovery("/proc/sys/net/irda/discovery");
+int IrdaApplet::setIrdaDiscoveryStatus(int d) {
+ QFile discovery("/proc/sys/net/irda/discovery");
- discovery.open( IO_WriteOnly|IO_Raw );
+ discovery.open( IO_WriteOnly|IO_Raw );
- if (d)
- discovery.putch('1');
- else
- discovery.putch('0');
+ if (d)
+ discovery.putch('1');
+ else
+ discovery.putch('0');
- discovery.close();
+ discovery.close();
- return 0;
+ return 0;
}
-void IrdaApplet::mousePressEvent( QMouseEvent *)
-{
- QPopupMenu *menu = new QPopupMenu();
- QString cmd;
- int ret=0;
- /* Refresh active state */
- timerEvent(NULL);
+void IrdaApplet::mousePressEvent( QMouseEvent *) {
+ QPopupMenu *menu = new QPopupMenu();
+ QString cmd;
+ int ret=0;
+
+ /* Refresh active state */
+ timerEvent(NULL);
// menu->insertItem( tr("More..."), 4 );
- if (irdaactive)
- menu->insertItem( tr("Disable IrDA"), 0 );
- else
- menu->insertItem( tr("Enable IrDA"), 1 );
-
- if (irdaDiscoveryActive)
- menu->insertItem( tr("Disable Discovery"), 2 );
- else
- menu->insertItem( tr("Enable Discovery"), 3 );
-
- if( Ir::supported() ){
- 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);
- break;
- case 3:
- setIrdaDiscoveryStatus(1);
- timerEvent(NULL); // NULL is undefined in c++ use 0 or 0l
- break;
- case 4: { // enable receive{
- qWarning("Enable receive" );
- QCopEnvelope e("QPE/Obex", "receive(bool)" );
- e << true;
- break;
- }
- case 6:
- qDebug("FIXME: Bring up pretty menu...\n");
- // With table of currently-detected devices.
- }
- delete menu; // Can somebody explain why use a QPopupMenu* and not QPopupMenu nor QAction. with out delete we will leak cause QPopupMenu doesn't have a parent in this case
+ if (irdaactive)
+ menu->insertItem( tr("Disable IrDA"), 0 );
+ else
+ menu->insertItem( tr("Enable IrDA"), 1 );
+
+ if (irdaDiscoveryActive)
+ menu->insertItem( tr("Disable Discovery"), 2 );
+ 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);
+ break;
+ case 3:
+ setIrdaDiscoveryStatus(1);
+ timerEvent(NULL); // NULL is undefined in c++ use 0 or 0l
+ break;
+ case 4: { // enable receive
+ qWarning("Enable receive" );
+ QCopEnvelope e("QPE/Obex", "receive(bool)" );
+ e << true;
+ receiveActive = true;
+ receiveStateChanged = true;
+ timerEvent(NULL);
+ break;
+ }
+ case 5: { // disable receive
+ qWarning("Disable receive" );
+ QCopEnvelope e("QPE/Obex", "receive(bool)" );
+ e << false;
+ receiveActive = false;
+ receiveStateChanged = true;
+ timerEvent(NULL);
+ break;
+ }
+ case 6:
+ qDebug("FIXME: Bring up pretty menu...\n");
+ // With table of currently-detected devices.
+ }
+ delete menu; // Can somebody explain why use a QPopupMenu* and not QPopupMenu nor QAction. with out delete we will leak cause QPopupMenu doesn't have a parent in this case
}
-void IrdaApplet::timerEvent( QTimerEvent * )
-{
+void IrdaApplet::timerEvent( QTimerEvent * ) {
int oldactive = irdaactive;
int olddiscovery = irdaDiscoveryActive;
+ bool receiveUpdate = false;
+
+ if (receiveStateChanged) {
+ receiveUpdate = true;
+ receiveStateChanged = false;
+ }
irdaactive = checkIrdaStatus();
irdaDiscoveryActive = checkIrdaDiscoveryStatus();
- if ((irdaactive != oldactive) || (irdaDiscoveryActive != olddiscovery))
- paintEvent(NULL);
-
-}
+ if ((irdaactive != oldactive) || (irdaDiscoveryActive != olddiscovery) || receiveUpdate ) {
+ paintEvent(NULL);
+ }
-void IrdaApplet::paintEvent( QPaintEvent* )
-{
- QPainter p(this);
- qDebug("paint irda pixmap");
-
- p.eraseRect ( 0, 0, this->width(), this->height() );
- if (irdaactive > 0)
- p.drawPixmap( 0, 1, irdaOnPixmap );
- else
- p.drawPixmap( 0, 1, irdaOffPixmap );
+}
- if (irdaDiscoveryActive > 0)
- p.drawPixmap( 0, 1, irdaDiscoveryOnPixmap );
+void IrdaApplet::paintEvent( QPaintEvent* ) {
+ QPainter p(this);
+ qDebug("paint irda pixmap");
+
+ p.eraseRect ( 0, 0, this->width(), this->height() );
+ if (irdaactive > 0) {
+ p.drawPixmap( 0, 1, irdaOnPixmap );
+ } else {
+ p.drawPixmap( 0, 1, irdaOffPixmap );
+ }
+
+ if (irdaDiscoveryActive > 0) {
+ p.drawPixmap( 0, 1, irdaDiscoveryOnPixmap );
+ }
+ if (receiveActive) {
+ p.drawPixmap( 0, 1, receiveActivePixmap);
+ }
}
diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h
index bb174e8..97ca3c3 100644
--- a/core/applets/irdaapplet/irda.h
+++ b/core/applets/irdaapplet/irda.h
@@ -48,12 +48,14 @@ private:
QPixmap irdaOnPixmap;
QPixmap irdaOffPixmap;
QPixmap irdaDiscoveryOnPixmap;
+ QPixmap receiveActivePixmap;
int irdaactive; // bool and bitfields later bool irdaactive :1 ;
int irdaDiscoveryActive;
-
+ bool receiveActive;
+ bool receiveStateChanged;
private slots:
-
+
};