Changeset 77

Timestamp:

Apr 2, 2006, 12:41:47 AM (19 years ago)

Author:

dmik

Message:

Implemented the OS/2 version of the QSessionManager class (see ticket:15 for more details); QT_NO_SESSIONMANAGER is no more defined by default.

Location:

trunk

Files:

• .qtos2defines (modified) (1 diff)
• src/kernel/qapplication.cpp (modified) (2 diffs)
• src/kernel/qapplication_pm.cpp (modified) (21 diffs)
• src/kernel/qeventloop_pm.cpp (modified) (3 diffs)
• src/kernel/qt_kernel.pri (modified) (1 diff)
• src/kernel/qwidget_pm.cpp (modified) (8 diffs)

trunk/.qtos2defines

@@ -5 +5 @@
 DEFINES *= \
         QT_NO_DRAGANDDROP \
-        QT_NO_SESSIONMANAGER \
         QT_NO_PRINTER
 

trunk/src/kernel/qapplication.cpp

@@ -4395 +4395 @@
  *****************************************************************************/
 #ifndef QT_NO_SESSIONMANAGER
-#if defined( QT_NO_SM_SUPPORT ) || defined( Q_WS_WIN ) || defined( Q_WS_MAC ) || defined( Q_WS_QWS )
+#if defined( QT_NO_SM_SUPPORT ) || defined( Q_WS_WIN ) || defined( Q_WS_MAC ) || defined( Q_WS_QWS ) || defined( Q_WS_PM )
 
 class QSessionManagerData
@@ -4452 +4452 @@
 #endif
 
-#if !defined(Q_WS_WIN)
+#if !defined(Q_WS_WIN) && !defined(Q_WS_PM)
 bool QSessionManager::allowsInteraction()
 {

trunk/src/kernel/qapplication_pm.cpp

@@ -51 +51 @@
 #include "qpixmapcache.h"
 #include "qdatetime.h"
-//@@TODO (dmik): later
-//#include "qsessionmanager.h"
+#include "qsessionmanager.h"
 #include "qmime.h"
 #include "qguardedptr.h"
@@ -64 +63 @@
 #include "private/qinternal_p.h"
 #include "private/qcriticalsection_p.h"
-//@@TODO (dmik): remove?
+/// @todo (dmik) remove?
 //#include "private/qinputcontext_p.h"
 #include "qstyle.h"
@@ -76 +75 @@
 extern void qt_ensure_pm();
 
-//@@TODO (dmik): how we can use buttons 4 and 5 on OS/2?
+/// @todo (dmik) how we can use buttons 4 and 5 on OS/2?
 //// support for xbuttons
 //#ifndef WM_XBUTTONDOWN
@@ -90 +89 @@
 //#endif
 
-//@@TODO (dmik): hmm, extended keys under OS/2?
+/// @todo (dmik) hmm, extended keys under OS/2?
 //// support for multi-media-keys on ME/2000/XP
 //#ifndef WM_APPCOMMAND
@@ -179 +178 @@
                 buf[realLen+1] = 0;
                 strupr( dot2 );
-//@@TODO (dmik): currently, simulated bold and italic font styles are not
+/// @todo (dmik) currently, simulated bold and italic font styles are not
 //  supported by Qt/OS2 because Qt doesn't support style simulation
 //  explicitly. the code below is commented out to prevent selecting
@@ -231 +230 @@
  *****************************************************************************/
 
-//@@TODO (dmik): later (guess remove)
-//static HMODULE appInst          = 0;
-//
-//static HINSTANCE appInst      = 0;            // handle to app instance
-//static HINSTANCE appPrevInst  = 0;            // handle to prev app instance
-//static int     appCmdShow     = 0;            // main window show command
 static HWND      curWin         = 0;            // current window
 static HPS       displayPS      = 0;            // display presentation space
-//@@TODO (dmik): later (guess remove)
-//#ifdef Q_OS_TEMP
-//static UINT    appUniqueID    = 0;            // application id
-//#endif
-
-//@@TODO (dmik): later
-//// Session management
-//static bool   sm_blockUserInput    = FALSE;
-//static bool   sm_smActive          = FALSE;
-//extern QSessionManager* qt_session_manager_self;
-//static bool   sm_cancel;
+
+#if !defined (QT_NO_SESSIONMANAGER)
+
+// Session management
+static bool     sm_blockUserInput    = FALSE;
+static bool     sm_smActive          = FALSE;
+extern QSessionManager* qt_session_manager_self;
+static bool     sm_cancel            = FALSE;
+static bool     sm_gracefulShutdown  = FALSE;
+bool            qt_about_to_destroy_wnd = FALSE;
+
+//#define DEBUG_SESSIONMANAGER
+
+#endif
 
 static bool replayPopupMouseEvent = FALSE; // replay handling when popups close
@@ -298 +294 @@
 }
 
-// ### Remove 4.0 [end] --------------------
 bool qt_pmEventFilter( QMSG* msg, MRESULT &result )
 {
@@ -969 +964 @@
 
 static bool inLoop = FALSE;
-//@@TODO (dmik): remove
-//static int inputcharset = CP_ACP;
 
 #define RETURN(x) { inLoop = FALSE; return (MRESULT) (x); }
@@ -1021 +1014 @@
     qmsg.ptl.y = QApplication::desktop()->height() - (qmsg.ptl.y + 1);
 
-//@@TODO (dmik): do we need this?
+/// @todo (dmik) do we need this?
 //    /*
 //    // sometimes the autograb is not released, so the clickevent is sent
@@ -1039 +1032 @@
 
     switch ( msg ) {
-//@@TODO (dmik): later
-//#ifndef Q_OS_TEMP
-//    case WM_QUERYENDSESSION: {
-//      if ( sm_smActive ) // bogus message from windows
-//          RETURN(TRUE);
-//
-//      sm_smActive = TRUE;
-//      sm_blockUserInput = TRUE; // prevent user-interaction outside interaction windows
-//      sm_cancel = FALSE;
-//      if ( qt_session_manager_self )
-//          qApp->commitData( *qt_session_manager_self );
-//      if ( lParam == (LPARAM)ENDSESSION_LOGOFF ) {
-//          _flushall();
-//      }
-//      RETURN(!sm_cancel);
-//    }
-//    case WM_ENDSESSION: {
-//      sm_smActive = FALSE;
-//      sm_blockUserInput = FALSE;
-//      bool endsession = (bool) wParam;
-//
-//      if ( endsession ) {
-//          // since the process will be killed immediately quit() has no real effect
-//          int index = qApp->metaObject()->findSignal( "aboutToQuit()", TRUE );
-//          qApp->qt_emit(index,0);
-//          qApp->quit();
-//      }
-//
-//      RETURN(0);
-//    }
-//    case WM_DISPLAYCHANGE:
-//      if ( qApp->type() == QApplication::Tty )
-//          break;
-//      if ( qt_desktopWidget ) {
-//          int x = GetSystemMetrics( 76 );
-//          int y = GetSystemMetrics( 77 );
-//          QMoveEvent mv( QPoint(x, y), qt_desktopWidget->pos() );
-//          QApplication::sendEvent( qt_desktopWidget, &mv );
-//          x = GetSystemMetrics( 78 );
-//          y = GetSystemMetrics( 79 );
-//          QResizeEvent re( QSize(x, y), qt_desktopWidget->size() );
-//          QApplication::sendEvent( qt_desktopWidget, &re );
-//      }
-//      break;
-//#endif
-//
+#if !defined (QT_NO_SESSIONMANAGER)
+        case WM_SAVEAPPLICATION: {
+#if defined (DEBUG_SESSIONMANAGER)                
+            qDebug( "WM_SAVEAPPLICATION: sm_gracefulShutdown=%d "
+                    "qt_about_to_destroy_wnd=%d",
+                    sm_gracefulShutdown, qt_about_to_destroy_wnd );
+#endif            
+            // PM seems to post this message to all top-level windows on system
+            // shutdown, so react only to the first one. Also, this message is
+            // always sent by WinDestroyWindow(), where it must be also ignored.
+            if ( !sm_gracefulShutdown && !qt_about_to_destroy_wnd ) {
+                sm_gracefulShutdown = TRUE;
+            }
+            // PMREF recommends to pass it to WinDefWindowProc()
+            rc = WinDefWindowProc( hwnd, msg, mp1, mp2 );
+            RETURN( rc );
+        }
+#endif
+        
+/// @todo (dmik) later
 //    case WM_SETTINGCHANGE:
 //#ifdef Q_OS_TEMP
@@ -1119 +1086 @@
         case WM_BUTTON2DOWN:
         case WM_BUTTON3DOWN:
-//@@TODO (dmik): later (extra buttons)
+/// @todo (dmik) later (extra buttons)
 //        case WM_XBUTTONDOWN:
             if ( ignoreNextMouseReleaseEvent )
@@ -1127 +1094 @@
         case WM_BUTTON2UP:
         case WM_BUTTON3UP:
-//@@TODO (dmik): later (extra buttons)
+/// @todo (dmik) later (extra buttons)
 //        case WM_XBUTTONUP:
             if ( ignoreNextMouseReleaseEvent ) {
@@ -1155 +1122 @@
 
     if ( widget->pmEvent( &qmsg ) )             // send through widget filter
-//@@TODO (dmik): should we always return TRUE as MRESULT here?
         RETURN( TRUE );
 
@@ -1619 +1585 @@
 #endif
 
-/// @todo (dmik) later
-//#if defined(QT_ACCESSIBILITY_SUPPORT)
-//      case WM_GETOBJECT:
-//          {
-//              // Ignoring all requests while starting up
-//              if ( qApp->startingUp() || !qApp->loopLevel() || lParam != OBJID_CLIENT ) {
-//                  result = FALSE;
-//                  break;
-//              }
-//
-//              typedef LRESULT (WINAPI *PtrLresultFromObject)(REFIID, WPARAM, LPUNKNOWN );
-//              static PtrLresultFromObject ptrLresultFromObject = 0;
-//              static bool oleaccChecked = FALSE;
-//
-//              if ( !oleaccChecked ) {
-//                  oleaccChecked = TRUE;
-//                  ptrLresultFromObject = (PtrLresultFromObject)QLibrary::resolve( "oleacc.dll", "LresultFromObject" );
-//              }
-//              if ( ptrLresultFromObject ) {
-//                  QAccessibleInterface *acc = 0;
-//                  QAccessible::queryAccessibleInterface( widget, &acc );
-//                  if ( !acc ) {
-//                      result = FALSE;
-//                      break;
-//                  }
-//
-//                  QCustomEvent e( QEvent::Accessibility, acc );
-//                  QApplication::sendEvent( widget, &e );
-//
-//                  // and get an instance of the IAccessibile implementation
-//                  IAccessible *iface = qt_createWindowsAccessible( acc );
-//                  acc->release();
-//                  LRESULT res = ptrLresultFromObject( IID_IAccessible, wParam, iface );  // ref == 2
-//                  iface->Release(); // the client will release the object again, and then it will destroy itself
-//
-//                  if ( res > 0 )
-//                      RETURN(res);
-//              }
-//          }
-//          result = FALSE;
-//          break;
-//#endif
-
-//@@TODO (dmik): remove. functionality is implemented in WM_SETFOCUS above.
+/// @todo (dmik) remove? functionality is implemented in WM_SETFOCUS above.
 //      case WM_KILLFOCUS:
 //          if ( !QWidget::find( (HWND)wParam ) ) { // we don't get focus, so unset it now
@@ -1695 +1618 @@
 //          break;
 //
-//#ifndef Q_OS_TEMP
-//      case WM_INPUTLANGCHANGE: {
-//          char info[7];
-//          if ( !GetLocaleInfoA( MAKELCID(lParam, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, info, 6 ) ) {
-//              inputcharset = CP_ACP;
-//          } else {
-//              inputcharset = QString( info ).toInt();
-//          }
-//            break;
-//        }
-//#else
 //      case WM_COMMAND:
 //          result = (wParam == 0x1);
@@ -1741 +1653 @@
             break;
 
-//@@TODO (dmik): remove. functionality is implemented in WM_SETFOCUS above.
+/// @todo (dmik) remove? functionality is implemented in WM_SETFOCUS above.
 //      case WM_CANCELMODE:
 //          if ( qApp->focusWidget() ) {
@@ -1766 +1678 @@
 do_default:
     RETURN( WinDefWindowProc( hwnd, msg, mp1, mp2 ) );
-//@@TODO (dmik): remove
+/// @todo (dmik) remove?
 //    RETURN( QInputContext::DefWindowProc(hwnd,message,wParam,lParam) )
 }
@@ -2377 +2289 @@
     static HWND dblClickCandidateWin = 0;
     
-//@@TODO (dmik): later
-//    if ( sm_blockUserInput ) //block user interaction during session management
-//      return TRUE;
+    if ( sm_blockUserInput ) //block user interaction during session management
+        return TRUE;
 
     // Compress mouse move events
@@ -2986 +2897 @@
     QString text;
 
-//@@TODO (dmik): later
-//    if ( sm_blockUserInput ) // block user interaction during session management
-//      return TRUE;
+    if ( sm_blockUserInput ) // block user interaction during session management
+        return TRUE;
 
     translateKeyCode( chm, code, ascii, state, text );
-//@@TODO (dmik): currently WM_CHARs chars with zero virtual code or zero
+/// @todo (dmik) currently WM_CHARs chars with zero virtual code or zero
 //  scancode are totally ignored. -- are they?
 //    if ( !code || !chm.scancode ) return FALSE;
@@ -3075 +2985 @@
     enum { WHEEL_DELTA = 120 };
 
-//@@TODO (dmik): later
-//    if ( sm_blockUserInput ) // block user interaction during session management
-//      return TRUE;
+    if ( sm_blockUserInput ) // block user interaction during session management
+        return TRUE;
 
     // consume duplicate wheel events sent by the AMouse driver to emulate
@@ -3517 +3426 @@
 }
 
-//@@TODO (dmik): later
-//bool QSessionManager::allowsInteraction()
-//{
-//    sm_blockUserInput = FALSE;
-//    return TRUE;
-//}
-//
-//bool QSessionManager::allowsErrorInteraction()
-//{
-//    sm_blockUserInput = FALSE;
-//    return TRUE;
-//}
-//
-//void QSessionManager::release()
-//{
-//    if ( sm_smActive )
-//      sm_blockUserInput = TRUE;
-//}
-//
-//void QSessionManager::cancel()
-//{
-//    sm_cancel = TRUE;
-//}
-
+#if !defined (QT_NO_SESSIONMANAGER)
+
+bool qt_app_canQuit()
+{
+#if defined (DEBUG_SESSIONMANAGER)                
+    qDebug( "qt_app_canQuit(): sm_smActive=%d qt_about_to_destroy_wnd=%d "
+            "sm_gracefulShutdown=%d sm_cancel=%d",
+            sm_smActive, qt_about_to_destroy_wnd,
+            sm_gracefulShutdown, sm_cancel );                
+#endif
+
+    BOOL answer = FALSE;
+
+    // We can get multiple WM_QUIT messages while the "session termination
+    // procedure" (i.e. the QApplication::commitData() call) is still in
+    // progress. Ignore them.
+    if ( !sm_smActive ) {
+        sm_smActive = TRUE;
+        sm_blockUserInput = TRUE; // prevent user-interaction outside interaction windows
+        sm_cancel = FALSE;
+        if ( qt_session_manager_self )
+            qApp->commitData( *qt_session_manager_self );
+        sm_smActive = FALSE;
+        sm_gracefulShutdown = FALSE;
+        answer = !sm_cancel;
+    }
+    
+#if defined (DEBUG_SESSIONMANAGER)                
+    qDebug( "qt_app_canQuit(): answer=%ld", answer );
+#endif
+
+    return answer;
+}
+
+bool QSessionManager::allowsInteraction()
+{
+    // Allow interation only when the system is being normally shutdown
+    // and informs us using WM_SAVEAPPLICATION. When we receive WM_QUIT directly
+    // (so sm_gracefulShutdown is FALSE), interaction is disallowed.
+    if ( sm_smActive && sm_gracefulShutdown ) {
+        sm_blockUserInput = FALSE;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+bool QSessionManager::allowsErrorInteraction()
+{
+    // Allow interation only when the system is being normally shutdown
+    // and informs us using WM_SAVEAPPLICATION. When we receive WM_QUIT directly
+    // (so sm_gracefulShutdown is FALSE), interaction is disallowed.
+    if ( sm_smActive && sm_gracefulShutdown ) {
+        sm_blockUserInput = FALSE;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+void QSessionManager::release()
+{
+    if ( sm_smActive && sm_gracefulShutdown )
+        sm_blockUserInput = TRUE;
+}
+
+void QSessionManager::cancel()
+{
+    if ( sm_smActive && sm_gracefulShutdown )
+        sm_cancel = TRUE;
+}
+
+#endif

trunk/src/kernel/qeventloop_pm.cpp

@@ -51 +51 @@
 extern bool qt_pmEventFilter( QMSG* msg, MRESULT &result );
 
+#if !defined (QT_NO_SESSIONMANAGER)
+extern bool qt_app_canQuit(); // defined in qapplication_pm.cpp
+#endif
+
 static HAB qt_gui_hab = 0;
 static HMQ qt_gui_queue = 0;
-//@@TODO (dmik): later
-//// Simpler timers are needed when Qt does not have the event loop,
-//// such as for plugins.
+
+/// @todo (dmik) later
+//  Simpler timers are needed when Qt does not have the event loop,
+//  such as for plugins.
 //#ifndef Q_OS_TEMP
 //Q_EXPORT bool qt_win_use_simple_timers = TRUE;
@@ -433 +438 @@
 // recursive mutex to serialize access to socket notifier data
 static QMutex ss_mutex( TRUE );
-// flag to indicate a presence of sockets to do select() (we use QSemaphore
+// flag to indicate the presence of sockets to do select() (we use QSemaphore
 // instead of QWaitCondition because we need the "level-triggered" semantics,
-// the "edge-triggered" one can produce deadlocks)
+// the "edge-triggered" semantics can produce deadlocks)
 static QSemaphore ss_flag( 1 );
 
@@ -786 +791 @@
             locker.mutex()->unlock();
 #endif // QT_THREAD_SUPPORT
-            if ( !WinGetMsg( 0, &msg, 0, 0, 0 ) ) {
+            if ( !WinGetMsg( 0, &msg, 0, 0, 0 ) ) {     // WM_QUIT received
+#if !defined (QT_NO_SESSIONMANAGER)
+                if ( qt_app_canQuit() ) {
+#endif                    
 #ifdef QT_THREAD_SUPPORT
-                locker.mutex()->lock();
-#endif // QT_THREAD_SUPPORT
-                exit( 0 );                              // WM_QUIT received
-                return FALSE;
+                    locker.mutex()->lock();
+#endif // QT_THREAD_SUPPORT
+                    exit( 0 );
+                    return FALSE;
+#if !defined (QT_NO_SESSIONMANAGER)
+                } else {
+                    WinCancelShutdown( d->hmq, FALSE );
+                }
+#endif                    
             }
 #ifdef QT_THREAD_SUPPORT

trunk/src/kernel/qt_kernel.pri

@@ -284 +284 @@
         HEADERS -= \
                 $$KERNEL_P/qinputcontext_p.h \
-                $$KERNEL_H/qprinter.h \
-                $$KERNEL_H/qsessionmanager.h
+                $$KERNEL_H/qprinter.h
 
         SOURCES -= \

trunk/src/kernel/qwidget_pm.cpp

@@ -64 +64 @@
 // defined in qapplication_pm.cpp
 extern void qt_sendBlocked( QObject *obj, QWidget *modal, QEvent *e, bool override );
+#if !defined (QT_NO_SESSIONMANAGER)
+extern bool qt_about_to_destroy_wnd;
+#endif
 
 static QWidget *mouseGrb    = 0;
@@ -598 +601 @@
 #endif
 
+/*!
+ * \internal
+ * For some unknown reason, PM sends WM_SAVEAPPLICATION to every window
+ * being destroyed, which makes it indistinguishable from WM_SAVEAPPLICATION
+ * sent to top level windows during system shutdown. We use our own version of
+ * WinDestroyWindow() and a special flag (qt_about_to_destroy_wnd) to
+ * distinguish it in qapplication_pm.cpp. 
+ */
+static BOOL qt_WinDestroyWindow( HWND hwnd )
+{
+#if !defined (QT_NO_SESSIONMANAGER)
+    qt_about_to_destroy_wnd = TRUE;
+#endif
+    BOOL rc = WinDestroyWindow( hwnd );
+#if !defined (QT_NO_SESSIONMANAGER)
+    qt_about_to_destroy_wnd = FALSE;
+#endif
+    return rc;
+}
+
 static void removeSysMenuAccels( HWND frame )
 {
@@ -808 +831 @@
             fcData.idResources = 0;
 #if !defined(QT_NO_DEBUG) && defined(QT_DEBUGWINCREATEDESTROY)
-            qDebug(
-                "|Creating top level window [%s] (frame):\n"
-                "|  owner = %08lX\n"
-                "|  title = '%s'\n"
-                "|  style = %08lX\n"
-                "|  fcFlags = %08lX",
-                name(), ownerw, title, fStyle, fcFlags
-            );
+            qDebug ( "|Creating top level window [%s/%s] (frame):\n"
+                     "|  owner = %08lX\n"
+                     "|  title = '%s'\n"
+                     "|  style = %08lX\n"
+                     "|  fcFlags = %08lX",
+                     name(), this->className(), ownerw, title, fStyle, fcFlags );
 #endif
             fId = WinCreateWindow(
@@ -838 +859 @@
             // create client
 #if !defined(QT_NO_DEBUG) && defined(QT_DEBUGWINCREATEDESTROY)
-            qDebug(
-                "|Creating top level window [%s] (client):\n"
-                "|  owner & parent = %08lX\n"
-                "|  class = '%s'\n"
-                "|  title = '%s'\n"
-                "|  style = %08lX",
-                name(), fId, pszClassName, title, style
-            );
+            qDebug( "|Creating top level window [%s/%s] (client):\n"
+                    "|  owner & parent = %08lX\n"
+                    "|  class = '%s'\n"
+                    "|  title = '%s'\n"
+                    "|  style = %08lX",
+                    name(), this->className(), fId, pszClassName, title, style );
 #endif
             // note that we place the client on top (HWND_TOP) to exclude other
@@ -855 +874 @@
         } else {
 #if !defined(QT_NO_DEBUG) && defined(QT_DEBUGWINCREATEDESTROY)
-            qDebug(
-                "|Creating top level window [%s]:\n"
-                "|  owner = %08lX\n"
-                "|  class = '%s'\n"
-                "|  title = '%s'\n"
-                "|  style = %08lX",
-                name(), ownerw, pszClassName, title, style
-            );
+            qDebug( "|Creating top level window [%s/%s]:\n"
+                    "|  owner = %08lX\n"
+                    "|  class = '%s'\n"
+                    "|  title = '%s'\n"
+                    "|  style = %08lX",
+                    name(), this->className(), ownerw, pszClassName, title, style );
 #endif
             id = WinCreateWindow(
@@ -894 +911 @@
         HWND parentw = parentWidget()->winId();
 #if !defined(QT_NO_DEBUG) && defined(QT_DEBUGWINCREATEDESTROY)
-        qDebug(
-            "|Creating child window [%s]:\n"
-            "|  owner & parent = %08lX\n"
-            "|  class = '%s'\n"
-            "|  title = '%s'\n"
-            "|  style = %08lX",
-            name(), parentw, pszClassName, title, style
-        );
+        qDebug( "|Creating child window [%s/%s]:\n"
+                "|  owner & parent = %08lX\n"
+                "|  class = '%s'\n"
+                "|  title = '%s'\n"
+                "|  style = %08lX",
+                name(), this->className(), parentw, pszClassName, title, style );
 #endif
         id = WinCreateWindow(
@@ -998 +1013 @@
             }
 #if !defined(QT_NO_DEBUG) && defined(QT_DEBUGWINCREATEDESTROY)
-            qDebug(
-                "|Destroying window:\n"
-                "|  hwnd = %08lX",
-                id
-            );
-#endif
-            WinDestroyWindow( id );
+            qDebug( "|Destroying window [%s/%s]:\n"
+                    "|  hwnd = %08lX",
+                    name(), className(), id );
+#endif
+            qt_WinDestroyWindow( id );
         }
         setWinId( 0 );
@@ -1128 +1141 @@
         show();
     if ( old_winfid )
-        WinDestroyWindow( old_winfid );
+        qt_WinDestroyWindow( old_winfid );
 
     reparentFocusWidgets( oldtlw );             // fix focus chains