1 files changed, 2 insertions, 2 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 5d05ed5..3370264 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -869,257 +869,257 @@ public:
         bool needsOk()
         {
                 return ( getWState() & WState_Reserved1 );
         }
 };
 
 /*!
   \internal
 */
 
 #ifdef QWS
 bool QPEApplication::qwsEventFilter( QWSEvent * e )
 {
         if ( !d->notbusysent && e->type == QWSEvent::Focus ) {
                 if ( qApp->type() != QApplication::GuiServer ) {
                         QCopEnvelope e( "QPE/System", "notBusy(QString)" );
                         e << d->appName;
                 }
                 d->notbusysent = TRUE;
         }
         if ( type() == GuiServer ) {
                 switch ( e->type ) {
                         case QWSEvent::Mouse:
                                 if ( e->asMouse() ->simpleData.state && !QWidget::find( e->window() ) )
                                         emit clientMoused();
                                 break;
                         default:
                                 break;
                 }
         }
         if ( e->type == QWSEvent::Key ) {
                 QWSKeyEvent *ke = ( QWSKeyEvent * ) e;
                 if ( ke->simpleData.keycode == Qt::Key_F33 ) {
                         // Use special "OK" key to press "OK" on top level widgets
                         QWidget * active = activeWindow();
                         QWidget *popup = 0;
                         if ( active && active->isPopup() ) {
                                 popup = active;
                                 active = active->parentWidget();
                         }
                         if ( active && ( int ) active->winId() == ke->simpleData.window &&
                                 !active->testWFlags( WStyle_Customize | WType_Popup | WType_Desktop ) ) {
                                 if ( ke->simpleData.is_press ) {
                                         if ( popup )
                                                 popup->close();
                                         if ( active->inherits( "QDialog" ) ) {
                                                 HackDialog * d = ( HackDialog * ) active;
                                                 d->acceptIt();
                                                 return TRUE;
                                         }
                                         else if ( ( ( HackWidget * ) active ) ->needsOk() ) {
                                                 QSignal s;
                                                 s.connect( active, SLOT( accept() ) );
                                                 s.activate();
                                         }
                                         else {
                                                 // do the same as with the select key: Map to the default action of the widget:
                                                 mapToDefaultAction( ke, Qt::Key_Return );
                                         }
                                 }
                         }
                 }
                 else if ( ke->simpleData.keycode == Qt::Key_F30 ) {
                         // Use special "select" key to do whatever default action a widget has
                         mapToDefaultAction( ke, Qt::Key_Space );
                 }
                 else if ( ke->simpleData.keycode == Qt::Key_Escape &&
                           ke->simpleData.is_press ) {
                         // Escape key closes app if focus on toplevel
                         QWidget * active = activeWindow();
                         if ( active && active->testWFlags( WType_TopLevel ) &&
                                 ( int ) active->winId() == ke->simpleData.window &&
                                 !active->testWFlags( WStyle_Dialog | WStyle_Customize | WType_Popup | WType_Desktop ) ) {
                                 if ( active->inherits( "QDialog" ) ) {
                                         HackDialog * d = ( HackDialog * ) active;
                                         d->rejectIt();
                                         return TRUE;
                                 }
                                 else if ( strcmp( argv() [ 0 ], "embeddedkonsole" ) != 0 ) {
                                         active->close();
                                 }
                         }
                 }
                 else if ( ke->simpleData.keycode >= Qt::Key_F1 && ke->simpleData.keycode <= Qt::Key_F29 ) {
                         // this should be if ( ODevice::inst ( )-> buttonForKeycode ( ... ))
                         // but we cannot access libopie function within libqpe :(
 
                         QWidget * active = activeWindow ( );
                         if ( active && ((int) active-> winId ( ) == ke-> simpleData.window )) {
                                 if ( d-> kbgrabbed ) { // we grabbed the keyboard
                                         QChar ch ( ke-> simpleData.unicode );
                                         QKeyEvent qke ( ke-> simpleData. is_press ? QEvent::KeyPress : QEvent::KeyRelease,
                                                         ke-> simpleData.keycode,
                                                         ch. latin1 ( ),
                                                         ke-> simpleData.modifiers,
                                                         QString ( ch ),
                                                         ke-> simpleData.is_auto_repeat, 1 );
 
                                         QObject *which = QWidget::keyboardGrabber ( );
                                         if ( !which )
                                                 which = QApplication::focusWidget ( );
                                         if ( !which )
                                                 which = QApplication::activeWindow ( );
                                         if ( !which )
                                                 which = qApp;
 
                                         QApplication::sendEvent ( which, &qke );
                                 }
                                 else { // we didn't grab the keyboard, so send the event to the launcher
                                         QCopEnvelope e ( "QPE/Launcher", "deviceButton(int,int,int)" );
                                         e << int( ke-> simpleData.keycode ) << int( ke-> simpleData. is_press ) << int( ke-> simpleData.is_auto_repeat );
                                 }
                         }
                         return true;
                 }
         }
         if ( e->type == QWSEvent::Focus ) {
                 QWSFocusEvent * fe = ( QWSFocusEvent* ) e;
                 if ( !fe->simpleData.get_focus ) {
                         QWidget * active = activeWindow();
                         while ( active && active->isPopup() ) {
                                 active->close();
                                 active = activeWindow();
                         }
                 }
                 else {
                         // make sure our modal widget is ALWAYS on top
                         QWidget *topm = activeModalWidget();
-                        if ( topm ) {
+                        if ( topm && static_cast<int>( topm->winId() ) != fe->simpleData.window) {
                                 topm->raise();
                         }
                 }
                 if ( fe->simpleData.get_focus && inputMethodDict ) {
                         InputMethodHint m = inputMethodHint( QWidget::find( e->window() ) );
                         if ( m == AlwaysOff )
                                 Global::hideInputMethod();
                         if ( m == AlwaysOn )
                                 Global::showInputMethod();
                 }
         }
 
 
         return QApplication::qwsEventFilter( e );
 }
 #endif
 
 /*!
   Destroys the QPEApplication.
 */
 QPEApplication::~QPEApplication()
 {
         ungrabKeyboard();
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
         // Need to delete QCopChannels early, since the display will
         // be gone by the time we get to ~QObject().
         delete sysChannel;
         delete pidChannel;
 #endif
 
         delete d;
 }
 
 /*!
   Returns <tt>$OPIEDIR/</tt>.
 */
 QString QPEApplication::qpeDir()
 {
         const char * base = getenv( "OPIEDIR" );
         if ( base )
                 return QString( base ) + "/";
 
         return QString( "../" );
 }
 
 /*!
   Returns the user's current Document directory. There is a trailing "/".
   .. well, it does now,, and there's no trailing '/'
 */
 QString QPEApplication::documentDir()
 {
         const char* base = getenv( "HOME");
         if ( base )
                 return QString( base ) + "/Documents";
 
         return QString( "../Documents" );
 }
 
 static int deforient = -1;
 
 /*!
   \internal
 */
 int QPEApplication::defaultRotation()
 {
         if ( deforient < 0 ) {
                 QString d = getenv( "QWS_DISPLAY" );
                 if ( d.contains( "Rot90" ) ) {
                         deforient = 90;
                 }
                 else if ( d.contains( "Rot180" ) ) {
                         deforient = 180;
                 }
                 else if ( d.contains( "Rot270" ) ) {
                         deforient = 270;
                 }
                 else {
                         deforient = 0;
                 }
         }
         return deforient;
 }
 
 /*!
   \internal
 */
 void QPEApplication::setDefaultRotation( int r )
 {
         if ( qApp->type() == GuiServer ) {
                 deforient = r;
                 setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 );
                 Config config("qpe");
                 config.setGroup( "Rotation" );
                 config.writeEntry( "Rot", r );
         }
         else {
 #ifndef QT_NO_COP
                 { QCopEnvelope e( "QPE/System", "setDefaultRotation(int)" );
                         e << r;
                 }
 #endif
 
         }
 }
 
 #include <qgfx_qws.h>
 #include <qwindowsystem_qws.h>
 
 extern void qws_clearLoadedFonts();
 
 void QPEApplication::setCurrentMode( int x, int y, int depth )
 {
     // Reset the caches
     qws_clearLoadedFonts();
     QPixmapCache::clear();
 
     // Change the screen mode
     qt_screen->setMode(x, y, depth);
 
     if ( qApp->type() == GuiServer ) {
         // Reconfigure the GuiServer
         qwsServer->beginDisplayReconfigure();
         qwsServer->endDisplayReconfigure();
 
         // Get all the running apps to reset
         QCopEnvelope env( "QPE/System", "reset()" );
     }
 }
@@ -1340,257 +1340,257 @@ void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data
         else if ( msg == "setDateFormat(DateFormat)" ) {
                 DateFormat tmp;
                 stream >> tmp;
                 emit dateFormatChanged( tmp );
         }
         else if ( msg == "setVolume(int,int)" ) {
                 int t, v;
                 stream >> t >> v;
                 setVolume( t, v );
                 emit volumeChanged( muted );
         }
         else if ( msg == "volumeChange(bool)" ) {
                 stream >> muted;
                 setVolume();
                 emit volumeChanged( muted );
         }
         else if ( msg == "setMic(int,int)" ) { // Added: 2002-02-08 by Jeremy Cowgar <jc@cowgar.com>
                 int t, v;
                 stream >> t >> v;
                 setMic( t, v );
                 emit micChanged( micMuted );
         }
         else if ( msg == "micChange(bool)" ) { // Added: 2002-02-08 by Jeremy Cowgar <jc@cowgar.com>
                 stream >> micMuted;
                 setMic();
                 emit micChanged( micMuted );
         }
         else if ( msg == "setBass(int,int)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
                 int t, v;
                 stream >> t >> v;
                 setBass( t, v );
         }
         else if ( msg == "bassChange(bool)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
                 setBass();
         }
             else if ( msg == "setTreble(int,int)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
                 int t, v;
                 stream >> t >> v;
                 setTreble( t, v );
         }
         else if ( msg == "trebleChange(bool)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
                 setTreble();
         } else if ( msg == "getMarkedText()" ) {
         if ( type() == GuiServer ) {
             const ushort unicode = 'C'-'@';
             const int scan = Key_C;
             qwsServer->processKeyEvent( unicode, scan, ControlButton, TRUE, FALSE );
             qwsServer->processKeyEvent( unicode, scan, ControlButton, FALSE, FALSE );
         }
     } else if ( msg == "newChannel(QString)") {
         QString myChannel = "QPE/Application/" + d->appName;
         QString channel;
         stream >> channel;
         if (channel == myChannel) {
             processQCopFile();
             d->sendQCopQ();
         }
     }
 
 
 #endif
 }
 
 
 
 
 
 /*!
   \internal
 */
 bool QPEApplication::raiseAppropriateWindow()
 {
     bool r=FALSE;
 
     // 1. Raise the main widget
     QWidget *top = d->qpe_main_widget;
     if ( !top ) top = mainWidget();
 
     if ( top && d->keep_running ) {
         if ( top->isVisible() )
             r = TRUE;
         else if (d->preloaded) {
             // We are preloaded and not visible.. pretend we just started..
 #ifndef QT_NO_COP
             QCopEnvelope e("QPE/System", "fastAppShowing(QString)");
             e << d->appName;
 #endif
         }
 
         d->show_mx(top,d->nomaximize, d->appName);
         top->raise();
     }
 
     QWidget *topm = activeModalWidget();
 
     // 2. Raise any parentless widgets (except top and topm, as they
     //     are raised before and after this loop).  Order from most
     //     recently raised as deepest to least recently as top, so
     //     that repeated calls cycle through widgets.
     QWidgetList *list = topLevelWidgets();
     if ( list ) {
         bool foundlast = FALSE;
         QWidget* topsub = 0;
         if ( d->lastraised ) {
             for (QWidget* w = list->first(); w; w = list->next()) {
                 if ( !w->parentWidget() && w != topm && w->isVisible() && !w->isDesktop() ) {
                     if ( w == d->lastraised )
                         foundlast = TRUE;
                     if ( foundlast ) {
                         w->raise();
                         topsub = w;
                     }
                 }
             }
         }
         for (QWidget* w = list->first(); w; w = list->next()) {
             if ( !w->parentWidget() && w != topm && w->isVisible() && !w->isDesktop() ) {
                 if ( w == d->lastraised )
                     break;
                 w->raise();
                 topsub = w;
             }
         }
         d->lastraised = topsub;
         delete list;
     }
 
     // 3. Raise the active modal widget.
-    if ( topm && topm != top ) {
+    if ( topm ) {
         topm->show();
         topm->raise();
         // If we haven't already handled the fastAppShowing message
         if (!top && d->preloaded) {
 #ifndef QT_NO_COP
             QCopEnvelope e("QPE/System", "fastAppShowing(QString)");
             e << d->appName;
 #endif
         }
         r = FALSE;
     }
 
     return r;
 }
 
 
 void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data)
 {
 #ifdef Q_WS_QWS
 
         if ( msg == "quit()" ) {
                 tryQuit();
         }
         else if ( msg == "quitIfInvisible()" ) {
                 if ( d->qpe_main_widget && !d->qpe_main_widget->isVisible() )
                         quit();
         }
         else if ( msg == "close()" ) {
                 hideOrQuit();
         }
         else if ( msg == "disablePreload()" ) {
                 d->preloaded = FALSE;
                 d->keep_running = TRUE;
                 /* so that quit will quit */
         }
         else if ( msg == "enablePreload()" ) {
                 if (d->qpe_main_widget)
                         d->preloaded = TRUE;
                 d->keep_running = TRUE;
                 /* so next quit won't quit */
         }
         else if ( msg == "raise()" ) {
                 d->keep_running = TRUE;
                 d->notbusysent = FALSE;
                 raiseAppropriateWindow();
                 // Tell the system we're still chugging along...
                 QCopEnvelope e("QPE/System", "appRaised(QString)");
                 e << d->appName;
         }
         else if ( msg == "flush()" ) {
                 emit flush();
                 // we need to tell the desktop
                 QCopEnvelope e( "QPE/Desktop", "flushDone(QString)" );
                 e << d->appName;
         }
         else if ( msg == "reload()" ) {
                 emit reload();
         }
         else if ( msg == "setDocument(QString)" ) {
                 d->keep_running = TRUE;
                 QDataStream stream( data, IO_ReadOnly );
                 QString doc;
                 stream >> doc;
                 QWidget *mw = mainWidget();
                 if ( !mw )
                         mw = d->qpe_main_widget;
                 if ( mw )
                         Global::setDocument( mw, doc );
 
         } else if ( msg == "QPEProcessQCop()" ) {
             processQCopFile();
             d->sendQCopQ();
         }else
         {
             bool p = d->keep_running;
             d->keep_running = FALSE;
             emit appMessage( msg, data);
             if ( d->keep_running ) {
                 d->notbusysent = FALSE;
                 raiseAppropriateWindow();
                 if ( !p ) {
                     // Tell the system we're still chugging along...
 #ifndef QT_NO_COP
                     QCopEnvelope e("QPE/System", "appRaised(QString)");
                     e << d->appName;
 #endif
                 }
             }
             if ( p )
                 d->keep_running = p;
         }
 #endif
 }
 
 
 /*!
   Sets widget \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
 
   \sa showMainDocumentWidget()
 */
 void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
 {
         //    setMainWidget(mw); this breaks FastLoading because lastWindowClose() would quit
             d->show(mw, nomaximize );
 }
 
 /*!
   Sets widget \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
 
   This calls designates the application as
   a \link docwidget.html document-oriented\endlink application.
 
   The \a mw widget \e must have this slot: setDocument(const QString&).
 
   \sa showMainWidget()
 */
 void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize )
 {
         if ( mw && argc() == 2 )
                 Global::setDocument( mw, QString::fromUtf8(argv()[1]) );
 
 
         //setMainWidget(mw); see above
         d->show(mw, nomaximize );
 }