| -rw-r--r-- | core/launcher/runningappbar.cpp | 441 | ||||
| -rw-r--r-- | core/launcher/runningappbar.h | 78 |
2 files changed, 275 insertions, 244 deletions
diff --git a/core/launcher/runningappbar.cpp b/core/launcher/runningappbar.cpp index c8f45d5..3ac66f2 100644 --- a/core/launcher/runningappbar.cpp +++ b/core/launcher/runningappbar.cpp @@ -1,291 +1,322 @@ /********************************************************************** ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** ********************************************************************** */ #define QTOPIA_INTERNAL_PRELOADACCESS // For "kill" #include <sys/types.h> #include <signal.h> +#include <stdio.h> +#include <stdlib.h> +#include <qdir.h> #include <qtimer.h> #include <qpopupmenu.h> #include <qmessagebox.h> #include <qpainter.h> -#include "qprocess.h" +#include <opie/oprocess.h> #include <qpe/qpeapplication.h> #include <qpe/applnk.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/global.h> #include <qwindowsystem_qws.h> #include "runningappbar.h" RunningAppBar::RunningAppBar(QWidget* parent) - : QFrame(parent), m_AppLnkSet(0L), m_SelectedAppIndex(-1) + : QFrame(parent), m_AppLnkSet(0L), m_SelectedAppIndex( -1) { - setBackgroundMode( PaletteBackground ); + setBackgroundMode( PaletteBackground ); - m_AppLnkSet = new AppLnkSet( QPEApplication::qpeDir() + "apps" ); + m_AppLnkSet = new AppLnkSet( QPEApplication::qpeDir() + "apps" ); #ifdef QWS - connect(qwsServer, SIGNAL(newChannel(const QString&)), this, SLOT(newQcopChannel(const QString&))); - connect(qwsServer, SIGNAL(removedChannel(const QString&)), this, SLOT(removedQcopChannel(const QString&))); + + connect(qwsServer, SIGNAL(newChannel(const QString&)), this, SLOT(newQcopChannel(const QString&))); + connect(qwsServer, SIGNAL(removedChannel(const QString&)), this, SLOT(removedQcopChannel(const QString&))); #endif - QCopChannel* channel = new QCopChannel( "QPE/System", this ); - connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), - this, SLOT(received(const QCString&, const QByteArray&)) ); - spacing = AppLnk::smallIconSize()+3; -} + QCopChannel* channel = new QCopChannel( "QPE/System", this ); + connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), + this, SLOT(received(const QCString&, const QByteArray&)) ); -RunningAppBar::~RunningAppBar() { + spacing = AppLnk::smallIconSize() + 3; } -void RunningAppBar::newQcopChannel(const QString& channelName) { - QString prefix("QPE/Application/"); - if (channelName.startsWith(prefix)) { - QString appName = channelName.mid(prefix.length()); -// qDebug("App %s just connected!", appName.latin1()); - const AppLnk* newGuy = m_AppLnkSet->findExec(appName); - if (newGuy && !newGuy->isPreloaded()) { - addTask(*newGuy); - } - } +RunningAppBar::~RunningAppBar() +{} + +void RunningAppBar::newQcopChannel(const QString& channelName) +{ + QString prefix("QPE/Application/"); + if (channelName.startsWith(prefix)) { + QString appName = channelName.mid(prefix.length()); + // qDebug("App %s just connected!", appName.latin1()); + const AppLnk* newGuy = m_AppLnkSet->findExec(appName); + if (newGuy && !newGuy->isPreloaded()) { + addTask(*newGuy); + } + } } -void RunningAppBar::removedQcopChannel(const QString& channelName) { - QString prefix("QPE/Application/"); - if (channelName.startsWith(prefix)) { - QString appName = channelName.mid(prefix.length()); - qDebug("App %s just disconnected!", appName.latin1()); - const AppLnk* newGuy = m_AppLnkSet->findExec(appName); - if (newGuy) { - removeTask(*newGuy); - } - } +void RunningAppBar::removedQcopChannel(const QString& channelName) +{ + QString prefix("QPE/Application/"); + if (channelName.startsWith(prefix)) { + QString appName = channelName.mid(prefix.length()); + qDebug("App %s just disconnected!", appName.latin1()); + const AppLnk* newGuy = m_AppLnkSet->findExec(appName); + if (newGuy) { + removeTask(*newGuy); + } + } } -void RunningAppBar::received(const QCString& msg, const QByteArray& data) { - // Since fast apps appear and disappear without disconnecting from their - // channel we need to watch for the showing/hiding events and update according. - QDataStream stream( data, IO_ReadOnly ); - if ( msg == "fastAppShowing(QString)") { - QString appName; - stream >> appName; - addTask(*m_AppLnkSet->findExec(appName)); - } else if ( msg == "fastAppHiding(QString)") { - QString appName; - stream >> appName; - removeTask(*m_AppLnkSet->findExec(appName)); - } +void RunningAppBar::received(const QCString& msg, const QByteArray& data) +{ + // Since fast apps appear and disappear without disconnecting from their + // channel we need to watch for the showing/hiding events and update according. + QDataStream stream( data, IO_ReadOnly ); + if ( msg == "fastAppShowing(QString)") { + QString appName; + stream >> appName; + addTask(*m_AppLnkSet->findExec(appName)); + } + else if ( msg == "fastAppHiding(QString)") { + QString appName; + stream >> appName; + removeTask(*m_AppLnkSet->findExec(appName)); + } } -void RunningAppBar::addTask(const AppLnk& appLnk) { -// qDebug("Added %s to app list.", appLnk.name().latin1()); - AppLnk* newApp = new AppLnk(appLnk); - newApp->setExec(appLnk.exec()); - m_AppList.prepend(newApp); - update(); +void RunningAppBar::addTask(const AppLnk& appLnk) +{ + // qDebug("Added %s to app list.", appLnk.name().latin1()); + AppLnk* newApp = new AppLnk(appLnk); + newApp->setExec(appLnk.exec()); + m_AppList.prepend(newApp); + update(); } -void RunningAppBar::removeTask(const AppLnk& appLnk) { - unsigned int i = 0; - for (; i < m_AppList.count() ; i++) { - AppLnk* target = m_AppList.at(i); - if (target->exec() == appLnk.exec()) { - qDebug("Removing %s from app list.", appLnk.name().latin1()); - m_AppList.remove(); - delete target; - } - } - update(); +void RunningAppBar::removeTask(const AppLnk& appLnk) +{ + unsigned int i = 0; + for (; i < m_AppList.count() ; i++) { + AppLnk* target = m_AppList.at(i); + if (target->exec() == appLnk.exec()) { + qDebug("Removing %s from app list.", appLnk.name().latin1()); + m_AppList.remove(); + + // grab the keyboard back, in case the app crashed/forgot + + QPEApplication *qpeapp = (QPEApplication *) qApp; + + if ( appLnk.exec() == qpeapp-> keyboardGrabbedBy ( )) { + qDebug ( "grabbing keyboard back from %s", appLnk.name().latin1()); + qpeapp-> grabKeyboard ( ); + } + + delete target; + } + } + update(); } void RunningAppBar::mousePressEvent(QMouseEvent *e) { - // Find out if the user is clicking on an app icon... - // If so, snag the index so when we repaint we show it - // as highlighed. - m_SelectedAppIndex = 0; - int x=0; - QListIterator<AppLnk> it( m_AppList ); - for ( ; it.current(); ++it,++m_SelectedAppIndex,x+=spacing ) { - if ( x + spacing <= width() ) { - if ( e->x() >= x && e->x() < x+spacing ) { - if ( m_SelectedAppIndex < (int)m_AppList.count() ) { - repaint(FALSE); - return; + // Find out if the user is clicking on an app icon... + // If so, snag the index so when we repaint we show it + // as highlighed. + m_SelectedAppIndex = 0; + int x = 0; + QListIterator<AppLnk> it( m_AppList ); + for ( ; it.current(); ++it, ++m_SelectedAppIndex, x += spacing ) { + if ( x + spacing <= width() ) { + if ( e->x() >= x && e->x() < x + spacing ) { + if ( m_SelectedAppIndex < (int)m_AppList.count() ) { + repaint(FALSE); + return ; + } + } + } + else { + break; + } } - } - } else { - break; - } - } - m_SelectedAppIndex = -1; - repaint( FALSE ); + m_SelectedAppIndex = -1; + repaint( FALSE ); } void RunningAppBar::mouseReleaseEvent(QMouseEvent *e) { - if (e->button() == QMouseEvent::RightButton) { - return; - } - if ( m_SelectedAppIndex >= 0 ) { - QString channel = QString("QPE/Application/") + m_AppList.at(m_SelectedAppIndex)->exec(); - if (QCopChannel::isRegistered(channel.latin1())) { -// qDebug("%s is running!", m_AppList.at(m_SelectedAppIndex)->exec().latin1()); - QCopEnvelope e(channel.latin1(), "raise()"); - // This class will delete itself after hearing from the app or the timer expiring - (void)new AppMonitor(*m_AppList.at(m_SelectedAppIndex), *this); - } - else { - removeTask(*m_AppList.at(m_SelectedAppIndex)); - } - - m_SelectedAppIndex = -1; - update(); - } + if (e->button() == QMouseEvent::RightButton) { + return ; + } + if ( m_SelectedAppIndex >= 0 ) { + QString channel = QString("QPE/Application/") + m_AppList.at(m_SelectedAppIndex)->exec(); + if (QCopChannel::isRegistered(channel.latin1())) { + // qDebug("%s is running!", m_AppList.at(m_SelectedAppIndex)->exec().latin1()); + QCopEnvelope e(channel.latin1(), "raise()"); + // This class will delete itself after hearing from the app or the timer expiring + (void)new AppMonitor(*m_AppList.at(m_SelectedAppIndex), *this); + } + else { + removeTask(*m_AppList.at(m_SelectedAppIndex)); + } + + m_SelectedAppIndex = -1; + update(); + } } void RunningAppBar::paintEvent( QPaintEvent * ) { - QPainter p( this ); - AppLnk *curApp; - int x = 0; - int y = (height() - AppLnk::smallIconSize()) / 2; - int i = 0; - - //p.fillRect( 0, 0, width(), height(), colorGroup().background() ); - - QListIterator<AppLnk> it(m_AppList); - - for (; it.current(); i++, ++it ) { - if ( x + spacing <= width() ) { - curApp = it.current(); - if ( (int)i == m_SelectedAppIndex ) - p.fillRect( x, y, spacing, curApp->pixmap().height()+1, colorGroup().highlight() ); - else - // p.eraseRect( x, y, spacing, curApp->pixmap().height()+1 ); - p.drawPixmap( x, y, curApp->pixmap() ); - x += spacing; - } - } + QPainter p( this ); + AppLnk *curApp; + int x = 0; + int y = (height() - AppLnk::smallIconSize()) / 2; + int i = 0; + + //p.fillRect( 0, 0, width(), height(), colorGroup().background() ); + + QListIterator<AppLnk> it(m_AppList); + + for (; it.current(); i++, ++it ) { + if ( x + spacing <= width() ) { + curApp = it.current(); + if ( (int)i == m_SelectedAppIndex ) + p.fillRect( x, y, spacing, curApp->pixmap().height() + 1, colorGroup().highlight() ); + else + // p.eraseRect( x, y, spacing, curApp->pixmap().height()+1 ); + p.drawPixmap( x, y, curApp->pixmap() ); + x += spacing; + } + } } QSize RunningAppBar::sizeHint() const { - return QSize( frameWidth(), AppLnk::smallIconSize()+frameWidth()*2+3 ); + return QSize( frameWidth(), AppLnk::smallIconSize() + frameWidth()*2 + 3 ); } const int AppMonitor::RAISE_TIMEOUT_MS = 500; AppMonitor::AppMonitor(const AppLnk& app, RunningAppBar& owner) - : QObject(0L), m_Owner(owner), m_App(app), m_PsProc(0L), m_AppKillerBox(0L) { - QCopChannel* channel = new QCopChannel( "QPE/System", this ); - connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), - this, SLOT(received(const QCString&, const QByteArray&)) ); - connect(&m_Timer, SIGNAL(timeout()), this, SLOT(timerExpired())); - m_Timer.start(RAISE_TIMEOUT_MS, TRUE); + : QObject(0L), m_Owner(owner), m_App(app), m_AppKillerBox(0L) +{ + QCopChannel* channel = new QCopChannel( "QPE/System", this ); + connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), + this, SLOT(received(const QCString&, const QByteArray&)) ); + connect(&m_Timer, SIGNAL(timeout()), this, SLOT(timerExpired())); + m_Timer.start(RAISE_TIMEOUT_MS, TRUE); } -AppMonitor::~AppMonitor() { - if (m_AppKillerBox) { - delete m_AppKillerBox; - m_AppKillerBox = 0L; - } +AppMonitor::~AppMonitor() +{ + if (m_AppKillerBox) { + delete m_AppKillerBox; + m_AppKillerBox = 0L; + } } -void AppMonitor::received(const QCString& msg, const QByteArray& data) { - QDataStream stream( data, IO_ReadOnly ); - - if (msg == "appRaised(QString)") { - QString appName; - stream >> appName; - if (appName == m_App.exec()) { - // qDebug("Got a heartbeat from %s", appName.latin1()); - m_Timer.stop(); - // Check to make sure we're not waiting on user input... - if (m_AppKillerBox) { - // If we are, we kill the dialog box, and the code waiting on the result - // will clean us up (basically the user said "no"). - delete m_AppKillerBox; - m_AppKillerBox = 0L; - } - else { - // Ok, we're not waiting on user input, so clean us up now. - // WE DELETE OURSELVES HERE! Don't do anything else!! - delete this; - } - } - } -} +void AppMonitor::received(const QCString& msg, const QByteArray& data) +{ + QDataStream stream( data, IO_ReadOnly ); -void AppMonitor::timerExpired() { - // qDebug("Checking in on %s", m_App.name().latin1()); - // We store this incase the application responds while we're - // waiting for user input so we know not to delete ourselves. This - // will be cleaned up in the destructor. - m_AppKillerBox = new QMessageBox(tr("Application Problem"), - tr("<p>%1 is not responding.</p>").arg(m_App.name()) + - tr("<p>Would you like to force the application to exit?</p>"), - QMessageBox::Warning, QMessageBox::Yes, - QMessageBox::No | QMessageBox::Default, - QMessageBox::NoButton); - if (m_AppKillerBox->exec() == QMessageBox::Yes) { - // qDebug("Killing the app!!! Bwuhahahaha!"); - m_PsProc = new QProcess(QString("ps")); - m_PsProc->addArgument("h"); - m_PsProc->addArgument("-C"); - m_PsProc->addArgument(m_App.exec()); - m_PsProc->addArgument("-o"); - m_PsProc->addArgument("pid"); - connect(m_PsProc, SIGNAL(processExited()), this, SLOT(psProcFinished())); - m_PsProc->start(); - } - else { - // qDebug("Wuss.."); - // WE DELETE OURSELVES HERE! Don't do anything else!! - delete this; - } + if (msg == "appRaised(QString)") { + QString appName; + stream >> appName; + if (appName == m_App.exec()) { + // qDebug("Got a heartbeat from %s", appName.latin1()); + m_Timer.stop(); + // Check to make sure we're not waiting on user input... + if (m_AppKillerBox) { + // If we are, we kill the dialog box, and the code waiting on the result + // will clean us up (basically the user said "no"). + delete m_AppKillerBox; + m_AppKillerBox = 0L; + } + else { + // Ok, we're not waiting on user input, so clean us up now. + // WE DELETE OURSELVES HERE! Don't do anything else!! + delete this; + } + } + } } -void AppMonitor::psProcFinished() { - QString pid = m_PsProc->readLineStdout(); - delete m_PsProc; - m_PsProc = 0L; - - // qDebug("Killing app %s", pid.latin1()); - if (pid.isEmpty()) { - // Hmm.. did the application bail before we got there? - qDebug("AppMonitor: Tried to kill application %s but ps couldn't find it.", m_App.exec().latin1()); - } - else { - int success = kill(pid.toUInt(), SIGKILL); - if (success == 0) { - m_Owner.removeTask(m_App); - } - else { - qWarning("Could not kill task %s", m_App.exec().latin1()); - } - } - - // WE DELETE OURSELVES HERE! Don't do anything else!! - delete this; +void AppMonitor::timerExpired() +{ + // We store this incase the application responds while we're + // waiting for user input so we know not to delete ourselves. This + // will be cleaned up in the destructor. + m_AppKillerBox = new QMessageBox(tr("Application Problem"), + tr("<p>%1 is not responding.</p>").arg(m_App.name()) + + tr("<p>Would you like to force the application to exit?</p>"), + QMessageBox::Warning, QMessageBox::Yes, + QMessageBox::No | QMessageBox::Default, + QMessageBox::NoButton); + if ( m_AppKillerBox-> exec ( ) == QMessageBox::Yes ) { + QDir proc ( "/proc/", "[0-9]*", QDir::Name | QDir::Reversed, QDir::Dirs ); + QStringList allprocs = proc. entryList ( ); + + pid_t mypid = ::getpid ( ); + + for ( QStringList::Iterator it = allprocs. begin ( ); it != allprocs. end ( ); ++it ) { + if (( *it ). toInt ( ) <= mypid ) // only interested in children + continue; + + QCString s = QString ( "/proc/" + *it + "/stat" ). local8Bit ( ); + + FILE *fp = ::fopen ( s. data ( ), "r" ); + if ( fp ) { + pid_t pid, ppid; + char *execptr, *exec = 0; + + if ( ::fscanf ( fp, "%d %as %*c %d ", &pid, &execptr, &ppid ) == 3 ) { + exec = execptr [0] ? execptr + 1 : execptr; + if ( exec [0] ) + exec [::strlen ( exec ) - 1] = 0; + + if (( ppid == ::getpid ( )) && ( m_App. exec ( ). local8Bit ( ) == exec )) { + bool success = false; + + qDebug ( "trying to kill pid=%d, exec=%s, ppid=%d", pid, exec, ppid ); + + + success |= ( ::kill ( pid, SIGTERM ) == 0 ); + ::usleep ( 1000 * 500 ); + success |= ( ::kill ( pid, SIGKILL ) == 0 ); + + if ( success ) + m_Owner. removeTask ( m_App ); + + ::free ( execptr ); + break; + } + ::free ( execptr ); + } + ::fclose ( fp ); + } + } + } + delete this; } + diff --git a/core/launcher/runningappbar.h b/core/launcher/runningappbar.h index 880bb69..eb5880e 100644 --- a/core/launcher/runningappbar.h +++ b/core/launcher/runningappbar.h @@ -1,88 +1,88 @@ /********************************************************************** ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #ifndef RUNNING_APP_BAR_H #define RUNNING_APP_BAR_H #include <qframe.h> #include <qlist.h> #include <qtimer.h> class AppLnk; class AppLnkSet; class QCString; class QProcess; class QMessageBox; -class RunningAppBar : public QFrame { - Q_OBJECT +class RunningAppBar : public QFrame +{ + Q_OBJECT - public: - RunningAppBar(QWidget* parent); - ~RunningAppBar(); - - void addTask(const AppLnk& appLnk); - void removeTask(const AppLnk& appLnk); - void paintEvent(QPaintEvent* event); - void mousePressEvent(QMouseEvent*); - void mouseReleaseEvent(QMouseEvent*); - QSize sizeHint() const; +public: + RunningAppBar(QWidget* parent); + ~RunningAppBar(); - private slots: - void newQcopChannel(const QString& channel); - void removedQcopChannel(const QString& channel); - void received(const QCString& msg, const QByteArray& data); + void addTask(const AppLnk& appLnk); + void removeTask(const AppLnk& appLnk); + void paintEvent(QPaintEvent* event); + void mousePressEvent(QMouseEvent*); + void mouseReleaseEvent(QMouseEvent*); + QSize sizeHint() const; - private: - AppLnkSet* m_AppLnkSet; - QList<AppLnk> m_AppList; - int m_SelectedAppIndex; - int spacing; +private slots: + void newQcopChannel(const QString& channel); + void removedQcopChannel(const QString& channel); + void received(const QCString& msg, const QByteArray& data); + +private: + AppLnkSet* m_AppLnkSet; + QList<AppLnk> m_AppList; + int m_SelectedAppIndex; + int spacing; }; /** * Internal class that checks back in on the process when timerExpired is called * to make sure the process is on top. If it's not it displays a dialog * box asking permission to kill it. */ -class AppMonitor : public QObject { - Q_OBJECT - - public: - static const int RAISE_TIMEOUT_MS; +class AppMonitor : public QObject +{ + Q_OBJECT + +public: + static const int RAISE_TIMEOUT_MS; + + AppMonitor(const AppLnk& app, RunningAppBar& owner); + ~AppMonitor(); - AppMonitor(const AppLnk& app, RunningAppBar& owner); - ~AppMonitor(); - - private slots: - void timerExpired(); - void received(const QCString& msg, const QByteArray& data); - void psProcFinished(); +private slots: + void timerExpired(); + void received(const QCString& msg, const QByteArray& data); - private: - RunningAppBar& m_Owner; - const AppLnk& m_App; - QTimer m_Timer; - QProcess* m_PsProc; - QMessageBox* m_AppKillerBox; +private: + RunningAppBar& m_Owner; + const AppLnk& m_App; + QTimer m_Timer; + QMessageBox* m_AppKillerBox; }; #endif |