-rw-r--r-- | library/global.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/library/global.cpp b/library/global.cpp index 68a3a75..ce39751 100644 --- a/library/global.cpp +++ b/library/global.cpp | |||
@@ -97,33 +97,33 @@ private slots: | |||
97 | void handleNewChannel( const QString &); | 97 | void handleNewChannel( const QString &); |
98 | private: | 98 | private: |
99 | StartingAppList( QObject *parent=0, const char* name=0 ) ; | 99 | StartingAppList( QObject *parent=0, const char* name=0 ) ; |
100 | 100 | ||
101 | QDict<QTime> dict; | 101 | QDict<QTime> dict; |
102 | static StartingAppList *appl; | 102 | static StartingAppList *appl; |
103 | }; | 103 | }; |
104 | 104 | ||
105 | StartingAppList* StartingAppList::appl = 0; | 105 | StartingAppList* StartingAppList::appl = 0; |
106 | 106 | ||
107 | StartingAppList::StartingAppList( QObject *parent, const char* name ) | 107 | StartingAppList::StartingAppList( QObject *parent, const char* name ) |
108 | :QObject( parent, name ) | 108 | :QObject( parent, name ) |
109 | { | 109 | { |
110 | #if QT_VERSION >= 232 && defined(QWS) | 110 | #if QT_VERSION >= 232 && defined(QWS) |
111 | connect( qwsServer, SIGNAL( newChannel(const QString&)), | 111 | connect( qwsServer, SIGNAL( newChannel(const QString&)), |
112 | this, SLOT( handleNewChannel(const QString&)) ); | 112 | this, SLOT( handleNewChannel(const QString&)) ); |
113 | #endif | 113 | #endif |
114 | dict.setAutoDelete( TRUE ); | 114 | dict.setAutoDelete( TRUE ); |
115 | } | 115 | } |
116 | 116 | ||
117 | void StartingAppList::add( const QString& name ) | 117 | void StartingAppList::add( const QString& name ) |
118 | { | 118 | { |
119 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) | 119 | #if QT_VERSION >= 232 && !defined(QT_NO_COP) |
120 | if ( !appl ) | 120 | if ( !appl ) |
121 | appl = new StartingAppList; | 121 | appl = new StartingAppList; |
122 | QTime *t = new QTime; | 122 | QTime *t = new QTime; |
123 | t->start(); | 123 | t->start(); |
124 | appl->dict.insert( "QPE/Application/" + name, t ); | 124 | appl->dict.insert( "QPE/Application/" + name, t ); |
125 | #endif | 125 | #endif |
126 | } | 126 | } |
127 | 127 | ||
128 | bool StartingAppList::isStarting( const QString name ) | 128 | bool StartingAppList::isStarting( const QString name ) |
129 | { | 129 | { |
@@ -375,33 +375,33 @@ QString Global::applicationFileName(const QString& appname, const QString& filen | |||
375 | */ | 375 | */ |
376 | void Global::createDocDir() | 376 | void Global::createDocDir() |
377 | { | 377 | { |
378 | if ( !docDirCreated ) { | 378 | if ( !docDirCreated ) { |
379 | docDirCreated = TRUE; | 379 | docDirCreated = TRUE; |
380 | mkdir( QPEApplication::documentDir().latin1(), 0755 ); | 380 | mkdir( QPEApplication::documentDir().latin1(), 0755 ); |
381 | } | 381 | } |
382 | } | 382 | } |
383 | 383 | ||
384 | 384 | ||
385 | /*! | 385 | /*! |
386 | Displays a status \a message to the user. This usually appears | 386 | Displays a status \a message to the user. This usually appears |
387 | in the taskbar for a short amount of time, then disappears. | 387 | in the taskbar for a short amount of time, then disappears. |
388 | */ | 388 | */ |
389 | void Global::statusMessage(const QString& message) | 389 | void Global::statusMessage(const QString& message) |
390 | { | 390 | { |
391 | #if!defined(QT_NO_COP) | 391 | #if !defined(QT_NO_COP) |
392 | QCopEnvelope e( "QPE/TaskBar", "message(QString)" ); | 392 | QCopEnvelope e( "QPE/TaskBar", "message(QString)" ); |
393 | e << message; | 393 | e << message; |
394 | #endif | 394 | #endif |
395 | } | 395 | } |
396 | 396 | ||
397 | /*! | 397 | /*! |
398 | \internal | 398 | \internal |
399 | */ | 399 | */ |
400 | void Global::applyStyle() | 400 | void Global::applyStyle() |
401 | { | 401 | { |
402 | #if !defined(QT_NO_COP) | 402 | #if !defined(QT_NO_COP) |
403 | QCopChannel::send( "QPE/System", "applyStyle()" ); | 403 | QCopChannel::send( "QPE/System", "applyStyle()" ); |
404 | #else | 404 | #else |
405 | ((QPEApplication *)qApp)->applyStyle(); // apply without needing QCop for floppy version | 405 | ((QPEApplication *)qApp)->applyStyle(); // apply without needing QCop for floppy version |
406 | #endif | 406 | #endif |
407 | } | 407 | } |
@@ -548,33 +548,33 @@ void Global::terminate( const AppLnk* app ) | |||
548 | \warning Do not use this function. Use execute instead. | 548 | \warning Do not use this function. Use execute instead. |
549 | 549 | ||
550 | \sa execute() | 550 | \sa execute() |
551 | */ | 551 | */ |
552 | void Global::invoke(const QString &c) | 552 | void Global::invoke(const QString &c) |
553 | { | 553 | { |
554 | // Convert the command line in to a list of arguments | 554 | // Convert the command line in to a list of arguments |
555 | QStringList list = QStringList::split(QRegExp(" *"),c); | 555 | QStringList list = QStringList::split(QRegExp(" *"),c); |
556 | 556 | ||
557 | #if !defined(QT_NO_COP) | 557 | #if !defined(QT_NO_COP) |
558 | QString ap=list[0]; | 558 | QString ap=list[0]; |
559 | // see if the application is already running | 559 | // see if the application is already running |
560 | // XXX should lock file /tmp/qcop-msg-ap | 560 | // XXX should lock file /tmp/qcop-msg-ap |
561 | if ( QCopChannel::isRegistered( ("QPE/Application/" + ap).latin1() ) ) { | 561 | if ( QCopChannel::isRegistered( ("QPE/Application/" + ap).latin1() ) ) { |
562 | // If the channel is already register, the app is already running, so show it. | 562 | // If the channel is already register, the app is already running, so show it. |
563 | { QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "raise()" ); } | 563 | { QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "raise()" ); } |
564 | 564 | ||
565 | QCopEnvelope e("QPE/System", "notBusy(QString)" ); | 565 | QCopEnvelope e("QPE/System", "notBusy(QString)" ); |
566 | e << ap; | 566 | e << ap; |
567 | return; | 567 | return; |
568 | } | 568 | } |
569 | // XXX should unlock file /tmp/qcop-msg-ap | 569 | // XXX should unlock file /tmp/qcop-msg-ap |
570 | //see if it is being started | 570 | //see if it is being started |
571 | if ( StartingAppList::isStarting( ap ) ) { | 571 | if ( StartingAppList::isStarting( ap ) ) { |
572 | QCopEnvelope e("QPE/System", "notBusy(QString)" ); | 572 | QCopEnvelope e("QPE/System", "notBusy(QString)" ); |
573 | e << ap; | 573 | e << ap; |
574 | return; | 574 | return; |
575 | } | 575 | } |
576 | 576 | ||
577 | #endif | 577 | #endif |
578 | 578 | ||
579 | #ifdef QT_NO_QWS_MULTIPROCESS | 579 | #ifdef QT_NO_QWS_MULTIPROCESS |
580 | QMessageBox::warning( 0, "Error", "Could not find the application " + c, "Ok", 0, 0, 0, 1 ); | 580 | QMessageBox::warning( 0, "Error", "Could not find the application " + c, "Ok", 0, 0, 0, 1 ); |
@@ -591,82 +591,82 @@ void Global::invoke(const QString &c) | |||
591 | args[j] = NULL; | 591 | args[j] = NULL; |
592 | 592 | ||
593 | #if !defined(QT_NO_COP) | 593 | #if !defined(QT_NO_COP) |
594 | // an attempt to show a wait... | 594 | // an attempt to show a wait... |
595 | // more logic should be used, but this will be fine for the moment... | 595 | // more logic should be used, but this will be fine for the moment... |
596 | QCopEnvelope ( "QPE/System", "busy()" ); | 596 | QCopEnvelope ( "QPE/System", "busy()" ); |
597 | #endif | 597 | #endif |
598 | 598 | ||
599 | #ifdef HAVE_QUICKEXEC | 599 | #ifdef HAVE_QUICKEXEC |
600 | QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".so"; | 600 | QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".so"; |
601 | qDebug("libfile = %s", libexe.latin1() ); | 601 | qDebug("libfile = %s", libexe.latin1() ); |
602 | if ( QFile::exists( libexe ) ) { | 602 | if ( QFile::exists( libexe ) ) { |
603 | qDebug("calling quickexec %s", libexe.latin1() ); | 603 | qDebug("calling quickexec %s", libexe.latin1() ); |
604 | quickexecv( libexe.utf8().data(), (const char **)args ); | 604 | quickexecv( libexe.utf8().data(), (const char **)args ); |
605 | } else | 605 | } else |
606 | #endif | 606 | #endif |
607 | { | 607 | { |
608 | bool success = false; | 608 | bool success = false; |
609 | int pfd [2]; | 609 | int pfd [2]; |
610 | if ( ::pipe ( pfd ) < 0 ) | 610 | if ( ::pipe ( pfd ) < 0 ) |
611 | pfd [0] = pfd [1] = -1; | 611 | pfd [0] = pfd [1] = -1; |
612 | 612 | ||
613 | pid_t pid = ::fork ( ); | 613 | pid_t pid = ::fork ( ); |
614 | 614 | ||
615 | if ( pid == 0 ) { // child | 615 | if ( pid == 0 ) { // child |
616 | for ( int fd = 3; fd < 100; fd++ ) { | 616 | for ( int fd = 3; fd < 100; fd++ ) { |
617 | if ( fd != pfd [1] ) | 617 | if ( fd != pfd [1] ) |
618 | ::close ( fd ); | 618 | ::close ( fd ); |
619 | } | 619 | } |
620 | ::setpgid ( ::getpid ( ), ::getppid ( )); | 620 | ::setpgid ( ::getpid ( ), ::getppid ( )); |
621 | 621 | ||
622 | // Closing of fd[1] indicates that the execvp succeeded! | 622 | // Closing of fd[1] indicates that the execvp succeeded! |
623 | if ( pfd [1] >= 0 ) | 623 | if ( pfd [1] >= 0 ) |
624 | ::fcntl ( pfd [1], F_SETFD, FD_CLOEXEC ); | 624 | ::fcntl ( pfd [1], F_SETFD, FD_CLOEXEC ); |
625 | 625 | ||
626 | // Try bindir first, so that foo/bar works too | 626 | // Try bindir first, so that foo/bar works too |
627 | ::execv ( qpeDir ( ) + "/bin/" + args [0], (char * const *) args ); | 627 | ::execv ( qpeDir ( ) + "/bin/" + args [0], (char * const *) args ); |
628 | ::execvp ( args [0], (char * const *) args ); | 628 | ::execvp ( args [0], (char * const *) args ); |
629 | 629 | ||
630 | char resultByte = 1; | 630 | char resultByte = 1; |
631 | if ( pfd [1] >= 0 ) | 631 | if ( pfd [1] >= 0 ) |
632 | ::write ( pfd [1], &resultByte, 1 ); | 632 | ::write ( pfd [1], &resultByte, 1 ); |
633 | ::_exit ( -1 ); | 633 | ::_exit ( -1 ); |
634 | } | 634 | } |
635 | else if ( pid > 0 ) { | 635 | else if ( pid > 0 ) { |
636 | success = true; | 636 | success = true; |
637 | 637 | ||
638 | if ( pfd [1] >= 0 ) | 638 | if ( pfd [1] >= 0 ) |
639 | ::close ( pfd [1] ); | 639 | ::close ( pfd [1] ); |
640 | if ( pfd [0] >= 0 ) { | 640 | if ( pfd [0] >= 0 ) { |
641 | while ( true ) { | 641 | while ( true ) { |
642 | char resultByte; | 642 | char resultByte; |
643 | int n = ::read ( pfd [0], &resultByte, 1 ); | 643 | int n = ::read ( pfd [0], &resultByte, 1 ); |
644 | if ( n == 1 ) { | 644 | if ( n == 1 ) { |
645 | success = false; | 645 | success = false; |
646 | break; | 646 | break; |
647 | } | 647 | } |
648 | if (( n == -1 ) && (( errno == ECHILD ) || ( errno == EINTR ))) | 648 | if (( n == -1 ) && (( errno == ECHILD ) || ( errno == EINTR ))) |
649 | continue; | 649 | continue; |
650 | 650 | ||
651 | break; // success | 651 | break; // success |
652 | } | 652 | } |
653 | ::close ( pfd [0] ); | 653 | ::close ( pfd [0] ); |
654 | } | 654 | } |
655 | } | 655 | } |
656 | if ( success ) | 656 | if ( success ) |
657 | StartingAppList::add( list[0] ); | 657 | StartingAppList::add( list[0] ); |
658 | else | 658 | else |
659 | QMessageBox::warning( 0, "Error", "Could not start the application " + c, "Ok", 0, 0, 0, 1 ); | 659 | QMessageBox::warning( 0, "Error", "Could not start the application " + c, "Ok", 0, 0, 0, 1 ); |
660 | } | 660 | } |
661 | #endif //QT_NO_QWS_MULTIPROCESS | 661 | #endif //QT_NO_QWS_MULTIPROCESS |
662 | } | 662 | } |
663 | 663 | ||
664 | 664 | ||
665 | /*! | 665 | /*! |
666 | Executes the application identfied by \a c, passing \a | 666 | Executes the application identfied by \a c, passing \a |
667 | document if it isn't null. | 667 | document if it isn't null. |
668 | 668 | ||
669 | Note that a better approach might be to send a QCop message to the | 669 | Note that a better approach might be to send a QCop message to the |
670 | application's QPE/Application/\e{appname} channel. | 670 | application's QPE/Application/\e{appname} channel. |
671 | */ | 671 | */ |
672 | void Global::execute( const QString &c, const QString& document ) | 672 | void Global::execute( const QString &c, const QString& document ) |