Changeset 428 for trunk/src

Timestamp:

Dec 16, 2009, 1:52:19 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented QSessionManager and removed the QT_NO_SESSIONMANAGER define (closes #100).

Location:

trunk/src

Files:

• corelib/kernel/qcoreapplication.h (modified) (1 diff)
• corelib/kernel/qcoreapplication_p.h (modified) (1 diff)
• corelib/kernel/qeventdispatcher_pm.cpp (modified) (1 diff)
• gui/kernel/qapplication.cpp (modified) (2 diffs)
• gui/kernel/qapplication_p.h (modified) (1 diff)
• gui/kernel/qapplication_pm.cpp (modified) (6 diffs)
• gui/kernel/qwidget_pm.cpp (modified) (1 diff)

trunk/src/corelib/kernel/qcoreapplication.h

@@ -207 +207 @@
 
     friend class QEventDispatcherUNIXPrivate;
+
     friend class QApplication;
     friend class QApplicationPrivate;

trunk/src/corelib/kernel/qcoreapplication_p.h

@@ -82 +82 @@
     static void removePostedTimerEvent(QObject *object, int timerId);
 #endif
+
+
+
 
 #ifdef Q_OS_MAC

trunk/src/corelib/kernel/qeventdispatcher_pm.cpp

@@ -1253 +1253 @@
             if (haveMessage) {
                 if (msg.msg == WM_QUIT) {
-                    if (QCoreApplication::instance())
-                        QCoreApplication::instance()->quit();
+                    if (QCoreApplication::instance()) {
+                        if (QCoreApplication::instance()->d_func()->canQuit()) {
+                            QCoreApplication::instance()->quit();
+                            return true;
+                        } else {
+                            WinCancelShutdown(d->hmq, FALSE);
+                            return true;
+                        }
+                    }
                     return false;
                 }

trunk/src/gui/kernel/qapplication.cpp

@@ -4369 +4369 @@
  *****************************************************************************/
 #ifndef QT_NO_SESSIONMANAGER
-#if defined(Q_WS_WIN) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
+#if defined(Q_WS_WIN) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
 
 #if defined(Q_OS_WINCE)
@@ -4451 +4451 @@
 #endif
 
-#if !defined(Q_WS_WIN)
+#if !defined(Q_WS_WIN)
 bool QSessionManager::allowsInteraction()
 {

trunk/src/gui/kernel/qapplication_p.h

@@ -425 +425 @@
     void sendSyntheticEnterLeave(QWidget *widget);
 #endif
+
+
+
 
 private:

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -54 +54 @@
 #include "qpixmapcache.h"
 #include "qdesktopwidget.h"
+
 
 #include "qset.h"
@@ -77 +78 @@
 #if !defined (QT_NO_SESSIONMANAGER)
 
+
+
 // Session management
-static bool     sm_blockUserInput    = FALSE;
-
-//#define DEBUG_SESSIONMANAGER
+static bool     sm_blockUserInput    = false;
+static bool     sm_smActive          = false;
+static bool     sm_cancel            = false;
+static bool     sm_gracefulShutdown  = false;
+static bool     sm_quitSkipped       = false;
+
+extern QSessionManager *qt_session_manager_self; // defined in qapplication.cpp
+extern bool qt_about_to_destroy_wnd; // defined in qwidget_pm.cpp
 
 #endif
@@ -765 +773 @@
         switch(msg) {
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         case WM_SYSVALUECHANGED: {
             // This message is sent to all top-level widgets, handle only once
@@ -785 +845 @@
             }
             #undef MY_IS_SV
+
+
+
+
+
+
+
+
+
+
+
+
+
             break;
         }
@@ -2222 +2295 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 /*!
@@ -2254 +2427 @@
     return QString(QLatin1String("<no-widget>"));
 }
-
-/*****************************************************************************
-  PM struct/message debug helpers
- *****************************************************************************/
 
 typedef QLatin1String QCStr;

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -71 +71 @@
 extern PFNWP QtOldFrameProc;
 extern MRESULT EXPENTRY QtFrameProc(HWND, ULONG, MPARAM, MPARAM);
+
+
+
+
 
 typedef QSet<QString> WinClassNameHash;