Diffstat (limited to 'noncore/applets/wirelessapplet/wireless.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/applets/wirelessapplet/wireless.cpp | 149 |
1 files changed, 136 insertions, 13 deletions
diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp index 183aab8..a5aabb0 100644 --- a/noncore/applets/wirelessapplet/wireless.cpp +++ b/noncore/applets/wirelessapplet/wireless.cpp @@ -12,49 +12,57 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** **********************************************************************/ #include "wireless.h" #include <qapplication.h> #include <qpe/qpeapplication.h> #include <qpe/config.h> #include <qpoint.h> #include <qradiobutton.h> -#include <qcheckbox.h> +#include <qpushbutton.h> #include <qpainter.h> #include <qlabel.h> #include <qslider.h> #include <qbuttongroup.h> #include <qlayout.h> #include <qframe.h> #include <qpixmap.h> #include <qstring.h> #include <qfile.h> +#include <qtextstream.h> + +#include <sys/types.h> +#include <signal.h> #include "networkinfo.h" #include "mgraph.h" +#include "advancedconfig.h" + #include "connect0.xpm" #include "connect1.xpm" #include "connect2.xpm" #include "connect3.xpm" #include "connect4.xpm" #include "connect5.xpm" #include "nowireless.xpm" #define STYLE_BARS 0 #define STYLE_ANTENNA 1 +#define MDEBUG 0 + WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name ) : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet ) { readConfig(); writeConfigEntry( "UpdateFrequency", updateFrequency ); writeConfigEntry( "DisplayStyle", displayStyle ); setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); QGridLayout *grid = new QGridLayout( this, 3, 2, 6, 2, "top layout" ); /* status label */ @@ -85,30 +93,31 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const group->setButton( displayStyle ); grid->addWidget( group, 0, 1 ); /* quality graph */ mgraph = new MGraph( this ); mgraph->setFrameStyle( QFrame::Panel | QFrame::Sunken ); mgraph->setMin( 0 ); mgraph->setMax( 92 ); grid->addWidget( mgraph, 1, 0 ); mgraph->setFocusPolicy( QWidget::NoFocus ); - /* dhcp renew CheckBox */ + /* advanced configuration Button */ - //FIXME: under construction - //QCheckBox* dhcpCheckBox = new QCheckBox( "DHCP renew", this ); - //dhcpCheckBox->setFocusPolicy( QWidget::NoFocus ); - //grid->addWidget( dhcpCheckBox, 2, 0, Qt::AlignCenter ); + QPushButton* advanced = new QPushButton( "Advanced...", this ); + advanced->setFocusPolicy( QWidget::NoFocus ); + grid->addWidget( advanced, 2, 0, Qt::AlignCenter ); + connect( advanced, SIGNAL( clicked() ), + this, SLOT( advancedConfigClicked() ) ); /* update Frequency Label */ updateLabel = new QLabel( this ); text.sprintf( "Update every %d s", updateFrequency ); updateLabel->setText( text ); grid->addWidget( updateLabel, 2, 1 ); /* update Frequency Slider */ QSlider* updateSlider = new QSlider( QSlider::Horizontal, this ); updateSlider->setRange( 0, 9 ); @@ -119,25 +128,40 @@ WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const updateSlider->setFocusPolicy( QWidget::NoFocus ); grid->addWidget( updateSlider, 1, 1 ); connect( updateSlider, SIGNAL( valueChanged( int ) ), this, SLOT( updateDelayChange( int ) ) ); setFixedSize( sizeHint() ); setFocusPolicy( QWidget::NoFocus ); applet->displayStyleChange( displayStyle ); applet->updateDelayChange( updateFrequency ); connect( group, SIGNAL( clicked( int ) ), - this, SLOT( displayStyleChange( int ) ) ); + this, SLOT( displayStyleChange( int ) ) ); + + applet->updateDHCPConfig( rocESSID, rocFREQ, rocAP, rocMODE ); +} + +void WirelessControl::advancedConfigClicked() +{ + AdvancedConfig* a = new AdvancedConfig( this, "dialog", TRUE ); + int result = a->exec(); + a->hide(); + delete a; + if ( result == QDialog::Accepted ) + { + readConfig(); + applet->updateDHCPConfig( rocESSID, rocFREQ, rocAP, rocMODE ); + } } void WirelessControl::updateDelayChange( int delay ) { QString text; text.sprintf( "Update every %d s", delay ); updateLabel->setText( text ); applet->updateDelayChange( delay ); writeConfigEntry( "UpdateFrequency", delay ); } void WirelessControl::displayStyleChange( int style ) @@ -157,60 +181,105 @@ void WirelessControl::show ( bool ) x = QPEApplication::desktop ( )-> width ( ) - w; move( x, curPos.y () - sizeHint().height () ); QFrame::show(); } void WirelessControl::readConfig() { Config cfg( "qpe" ); cfg.setGroup( "Wireless" ); updateFrequency = cfg.readNumEntry( "UpdateFrequency", 2 ); - displayStyle = cfg. readNumEntry( "DisplayStyle", STYLE_ANTENNA ); + displayStyle = cfg.readNumEntry( "DisplayStyle", STYLE_ANTENNA ); + rocESSID = cfg.readBoolEntry( "renew_dhcp_on_essid_change", false ); + rocFREQ = cfg.readBoolEntry( "renew_dhcp_on_freq_change", false ); + rocAP = cfg.readBoolEntry( "renew_dhcp_on_ap_change", false ); + rocMODE = cfg.readBoolEntry( "renew_dhcp_on_mode_change", false ); } void WirelessControl::writeConfigEntry( const char *entry, int val ) { Config cfg( "qpe" ); cfg.setGroup( "Wireless" ); cfg.writeEntry( entry, val ); } //=========================================================================== WirelessApplet::WirelessApplet( QWidget *parent, const char *name ) : QWidget( parent, name ), visualStyle( STYLE_ANTENNA ), - timer( 0 ), interface( 0 ) + timer( 0 ), interface( 0 ), + rocESSID( false ), rocFREQ( false ), rocAP( false ), rocMODE( false ) { setFixedHeight( 18 ); setFixedWidth( 14 ); network = new MWirelessNetwork(); status = new WirelessControl( this, 0, "wireless status" ); } void WirelessApplet::checkInterface() { interface = network->getFirstInterface(); if ( interface ) { +#ifdef MDEBUG qDebug( "WIFIAPPLET: using interface '%s'", (const char*) +#endif interface->getName() ); } else { +#ifdef MDEBUG qDebug( "WIFIAPPLET: D'oh! No Wireless interface present... :(" ); + hide(); +#endif } } +void WirelessApplet::renewDHCP() +{ +#ifdef MDEBUG + qDebug( "WIFIAPPLET: Going to request a DHCP configuration renew." ); +#endif + + QString pidfile; + if ( !interface ) + return; + QString ifacename( interface->getName() ); + pidfile.sprintf( "/var/run/dhcpcd-%s.pid", (const char* ) ifacename ); +#ifdef MDEBUG + qDebug( "WIFIAPPLET: pidfile is '%s'", (const char*) pidfile ); +#endif + int pid; + QFile pfile( pidfile ); + bool hasFile = pfile.open( IO_ReadOnly ); + QTextStream s( &pfile ); + if ( hasFile ) + s >> pid; +#ifdef MDEBUG + qDebug( "WIFIAPPLET: sent -14 to pid %d", pid ); +#endif + kill( pid, -14 ); + +} + +void WirelessApplet::updateDHCPConfig( bool ESSID, bool FREQ, bool AP, bool MODE ) +{ + rocESSID = ESSID; + rocFREQ = FREQ; + rocAP = AP; + rocMODE = MODE; +} + void WirelessApplet::updateDelayChange( int delay ) { if ( timer ) killTimer( timer ); delay *= 1000; if ( delay == 0 ) delay = 50; timer = startTimer( delay ); } void WirelessApplet::displayStyleChange( int style ) { @@ -219,25 +288,31 @@ void WirelessApplet::displayStyleChange( int style ) } WirelessApplet::~WirelessApplet() { } void WirelessApplet::timerEvent( QTimerEvent* ) { MWirelessNetworkInterface* iface = ( MWirelessNetworkInterface* ) interface; if ( iface ) { - iface->updateStatistics(); + bool statResult = iface->updateStatistics(); + if ( !statResult ) + { + interface = 0; + mustRepaint(); + return; + } else if ( mustRepaint() ) { //qDebug( "WIFIAPPLET: A value has changed -> repainting." ); repaint(); } if ( status->isVisible() ) updatePopupWindow(); } else checkInterface(); } void WirelessApplet::mousePressEvent( QMouseEvent *) @@ -249,49 +324,97 @@ void WirelessApplet::mousePressEvent( QMouseEvent *) } bool WirelessApplet::mustRepaint() { MWirelessNetworkInterface* iface = ( MWirelessNetworkInterface* ) interface; // check if there are enough changes to justify a (flickering) repaint // has the interface changed? if ( iface != oldiface ) { - oldiface = iface; - return true; + oldiface = iface; + if ( iface ) + { +#ifdef MDEBUG + qDebug( "WIFIAPPLET: We had no interface but now we have one! :-)" ); +#endif + show(); + } + else + { +#ifdef MDEBUG + qDebug( "WIFIAPPLET: We had a interface but now we don't have one! ;-(" ); +#endif + hide(); + return true; + } } const char** pixmap = getQualityPixmap(); if ( pixmap && ( pixmap != oldpixmap ) ) { oldpixmap = pixmap; return true; } int noiseH = iface->noisePercent() * ( height() - 3 ) / 100; int signalH = iface->signalPercent() * ( height() - 3 ) / 100; int qualityH = iface->qualityPercent() * ( height() - 3 ) / 100; if ( ( noiseH != oldnoiseH ) || ( signalH != oldsignalH ) || ( qualityH != oldqualityH ) ) { oldnoiseH = noiseH; oldsignalH = signalH; oldqualityH = qualityH; return true; } + + if ( rocESSID && ( oldESSID != iface->essid ) ) + { +#ifdef MDEBUG + qDebug( "WIFIAPPLET: ESSID has changed."); +#endif + renewDHCP(); + } + else if ( rocFREQ && ( oldFREQ != iface->freq ) ) + { +#ifdef MDEBUG + qDebug( "WIFIAPPLET: FREQ has changed."); +#endif + renewDHCP(); + } + else if ( rocAP && ( oldAP != iface->APAddr ) ) + { +#ifdef MDEBUG + qDebug( "WIFIAPPLET: AP has changed."); +#endif + renewDHCP(); + } + else if ( rocMODE && ( oldMODE != iface->mode ) ) + { +#ifdef MDEBUG + qDebug( "WIFIAPPLET: MODE has changed."); +#endif + renewDHCP(); + } + + oldESSID = iface->essid; + oldMODE = iface->mode; + oldFREQ = iface->freq; + oldAP = iface->APAddr; return false; } void WirelessApplet::updatePopupWindow() { MWirelessNetworkInterface* iface = ( MWirelessNetworkInterface* ) interface; int qualityH = iface->qualityPercent(); if ( status->mgraph ) status->mgraph->addValue( qualityH, false ); @@ -325,25 +448,25 @@ const char** WirelessApplet::getQualityPixmap() return 0; // please draw your bars } void WirelessApplet::paintEvent( QPaintEvent* ) { MWirelessNetworkInterface* iface = ( MWirelessNetworkInterface* ) interface; QPainter p(this); QColor color; const char** pixmap = getQualityPixmap(); - + if ( pixmap ) p.drawPixmap( 0, 1, pixmap ); else { int noiseH = iface->noisePercent() * ( height() - 3 ) / 100; int signalH = iface->signalPercent() * ( height() - 3 ) / 100; int qualityH = iface->qualityPercent() * ( height() - 3 ) / 100; double intensity; int pixelHeight; int pixelWidth = 2; |