Diffstat (limited to 'core/launcher/runningappbar.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/launcher/runningappbar.cpp | 238 |
1 files changed, 52 insertions, 186 deletions
diff --git a/core/launcher/runningappbar.cpp b/core/launcher/runningappbar.cpp index 356200b..1fda5a4 100644 --- a/core/launcher/runningappbar.cpp +++ b/core/launcher/runningappbar.cpp @@ -17,41 +17,28 @@ ** not clear to you. ** -********************************************************************** -*/ +***********************************************************************/ #define QTOPIA_INTERNAL_PRELOADACCESS -// For "kill" -#include <sys/types.h> -#include <signal.h> -#include <stdio.h> +#include <qtopia/global.h> + #include <stdlib.h> -#include <qdir.h> #include <qtimer.h> #include <qpopupmenu.h> -#include <qmessagebox.h> #include <qpainter.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 <qmessagebox.h> + +#include <qtopia/qpeapplication.h> +#include <qtopia/applnk.h> +#include <qtopia/qcopenvelope_qws.h> +#include <qtopia/mimetype.h> + #include "runningappbar.h" +#include "serverinterface.h" RunningAppBar::RunningAppBar(QWidget* parent) - : QFrame(parent), m_AppLnkSet(0L), m_SelectedAppIndex( -1) + : QFrame(parent), selectedAppIndex(-1) { - setBackgroundMode( PaletteBackground ); - - 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&))); -#endif - QCopChannel* channel = new QCopChannel( "QPE/System", this ); connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), @@ -62,34 +49,8 @@ RunningAppBar::RunningAppBar(QWidget* parent) 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::received(const QCString& msg, const QByteArray& data) -{ +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. @@ -98,31 +59,30 @@ void RunningAppBar::received(const QCString& msg, const QByteArray& data) QString appName; stream >> appName; - addTask(*m_AppLnkSet->findExec(appName)); - } - else if ( msg == "fastAppHiding(QString)") { + // qDebug("fastAppShowing %s", appName.data() ); + const AppLnk* f = ServerInterface::appLnks().findExec(appName); + if ( f ) addTask(*f); + } else if ( msg == "fastAppHiding(QString)") { QString appName; stream >> appName; - removeTask(*m_AppLnkSet->findExec(appName)); + const AppLnk* f = ServerInterface::appLnks().findExec(appName); + if ( f ) removeTask(*f); } } -void RunningAppBar::addTask(const AppLnk& appLnk) -{ - // qDebug("Added %s to app list.", appLnk.name().latin1()); +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); + appList.prepend(newApp); update(); } -void RunningAppBar::removeTask(const AppLnk& appLnk) -{ +void RunningAppBar::removeTask(const AppLnk& appLnk) { unsigned int i = 0; - for (; i < m_AppList.count() ; i++) { - AppLnk* target = m_AppList.at(i); + for (; i < appList.count() ; i++) { + AppLnk* target = appList.at(i); if (target->exec() == appLnk.exec()) { qDebug("Removing %s from app list.", appLnk.name().latin1()); - m_AppList.remove(); - + appList.remove(); delete target; } @@ -136,21 +96,20 @@ void RunningAppBar::mousePressEvent(QMouseEvent *e) // If so, snag the index so when we repaint we show it // as highlighed. - m_SelectedAppIndex = 0; + selectedAppIndex = 0; int x = 0; - QListIterator<AppLnk> it( m_AppList ); - for ( ; it.current(); ++it, ++m_SelectedAppIndex, x += spacing ) { + QListIterator<AppLnk> it( appList ); + for ( ; it.current(); ++it,++selectedAppIndex,x+=spacing ) { if ( x + spacing <= width() ) { if ( e->x() >= x && e->x() < x + spacing ) { - if ( m_SelectedAppIndex < (int)m_AppList.count() ) { + if ( selectedAppIndex < (int)appList.count() ) { repaint(FALSE); return ; } } - } - else { + } else { break; } } - m_SelectedAppIndex = -1; + selectedAppIndex = -1; repaint( FALSE ); } @@ -158,20 +117,11 @@ void RunningAppBar::mousePressEvent(QMouseEvent *e) void RunningAppBar::mouseReleaseEvent(QMouseEvent *e) { - if (e->button() == QMouseEvent::RightButton) { + 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; + if ( selectedAppIndex >= 0 ) { + QString app = appList.at(selectedAppIndex)->exec(); + QCopEnvelope e("QPE/System", "raise(QString)"); + e << app; + selectedAppIndex = -1; update(); } @@ -186,15 +136,16 @@ void RunningAppBar::paintEvent( QPaintEvent * ) int i = 0; - //p.fillRect( 0, 0, width(), height(), colorGroup().background() ); + p.fillRect( 0, 0, width(), height(), colorGroup().background() ); - QListIterator<AppLnk> it(m_AppList); + QListIterator<AppLnk> it(appList); for (; it.current(); i++, ++it ) { if ( x + spacing <= width() ) { curApp = it.current(); - if ( (int)i == m_SelectedAppIndex ) + qWarning("Drawing %s", curApp->name().latin1() ); + if ( (int)i == selectedAppIndex ) p.fillRect( x, y, spacing, curApp->pixmap().height() + 1, colorGroup().highlight() ); else - // p.eraseRect( x, y, spacing, curApp->pixmap().height()+1 ); + p.eraseRect( x, y, spacing, curApp->pixmap().height()+1 ); p.drawPixmap( x, y, curApp->pixmap() ); x += spacing; @@ -208,106 +159,21 @@ QSize RunningAppBar::sizeHint() const } -const int AppMonitor::RAISE_TIMEOUT_MS = 500; - -AppMonitor::AppMonitor(const AppLnk& app, RunningAppBar& owner) - : QObject(0L), m_Owner(owner), m_App(app), m_AppKillerBox(0L) +void RunningAppBar::applicationLaunched(const QString &appName) { - 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; + qDebug("desktop:: app: %s launched with pid ", appName.data() ); + const AppLnk* newGuy = ServerInterface::appLnks().findExec(appName); + if ( newGuy && !newGuy->isPreloaded() ) { + addTask( *newGuy ); } } -void AppMonitor::received(const QCString& msg, const QByteArray& data) +void RunningAppBar::applicationTerminated(const QString &app) { - 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; - } + const AppLnk* gone = ServerInterface::appLnks().findExec(app); + if ( gone ) { + removeTask(*gone); } } -} - -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; -} |