Changeset 100 for trunk/src/gui

Timestamp:

Aug 6, 2009, 2:24:58 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented widget show/hide functions. Added widget mask (clip region) helpers.

Location:

trunk/src/gui

Files:

• kernel/qapplication_pm.cpp (modified) (3 diffs)
• kernel/qwidget_p.h (modified) (1 diff)
• kernel/qwidget_pm.cpp (modified) (6 diffs)
• kernel/qwindowdefs_pm.h (modified) (1 diff)
• painting/qregion_pm.cpp (modified) (4 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -205 +205 @@
  *****************************************************************************/
 
-Q_GUI_EXPORT HPS qt_display_dc()
+Q_GUI_EXPORT HPS qt_display_()
 {
     Q_ASSERT(qApp && qApp->thread() == QThread::currentThread());
@@ -424 +424 @@
 MRESULT EXPENTRY QtWndProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-    // @todo implement
-    return FALSE;
+    // message handling indicators: if handled is true at the end of message
+    // processing, no default window proc is called but rc is returned.
+    bool handled = false;
+    MRESULT rc = (MRESULT) FALSE;
+    QETWidget *widget = 0;
+    HWND hwndC = NULLHANDLE;
+
+    do {
+        switch(msg) {
+        default:
+            break;
+        }
+        if (handled)
+            return rc;
+    } while(0);
+
+    return WinDefWindowProc(hwnd, msg, mp1, mp2);
 }
 
@@ -432 +447 @@
 MRESULT EXPENTRY QtFrameProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-    // @todo implement
-    return FALSE;
+    // message handling indicators: if handled is true at the end of message
+    // processing, no default window proc is called but rc is returned.
+    bool handled = false;
+    MRESULT rc = (MRESULT) FALSE;
+    QETWidget *widget = 0;
+    HWND hwndC = NULLHANDLE;
+
+    do {
+        switch(msg) {
+        default:
+            break;
+        }
+        if (handled)
+            return rc;
+    } while(0);
+
+    return QtOldFrameProc(hwnd, msg, mp1, mp2);
 }
 

trunk/src/gui/kernel/qwidget_p.h

@@ -156 +156 @@
 #if defined(Q_WS_PM)
     HWND fId;
+
 #endif
     QRect normalGeometry; // used by showMin/maximized/FullScreen

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -51 +51 @@
 
 #include "private/qapplication_p.h"
+
 
 #include <qdebug.h>
 
 #define QT_DEBUGWINCREATEDESTROY
+
 
 QT_BEGIN_NAMESPACE
@@ -105 +107 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*!
  * \internal
@@ -115 +668 @@
 static BOOL qt_WinDestroyWindow(HWND hwnd)
 {
-#if !defined (QT_NO_SESSIONMANAGER)
+#if !defined(QT_NO_SESSIONMANAGER)
     qt_about_to_destroy_wnd = true;
 #endif
     BOOL rc = WinDestroyWindow(hwnd);
-#if !defined (QT_NO_SESSIONMANAGER)
+#if !defined(QT_NO_SESSIONMANAGER)
     qt_about_to_destroy_wnd = false;
 #endif
@@ -321 +874 @@
             QWidget *parent = q->parentWidget();
 
-QWidgetPrivate *ppp;
-ppp->frameWinId();
             if (parent && !(parent->windowType() == Qt::Desktop))
                 ownerw = parent->window()->d_func()->frameWinId();
@@ -682 +1233 @@
 void QWidgetPrivate::hide_sys()
 {
-    // @todo implement
+    Q_Q(QWidget);
+    deactivateWidgetCleanup();
+    Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
+    if (q->windowFlags() != Qt::Desktop) {
+        ULONG fl = SWP_HIDE;
+        if (q->isWindow() && frameWinId() != NULLHANDLE) {
+            if (!(q->windowFlags() & Qt::Popup))
+                fl |= SWP_DEACTIVATE;
+        }
+        qt_WinSetWindowPos(frameWinId(), 0, 0, 0, 0, 0, fl);
+        HSWITCH swEntry = maybeTopData() ? maybeTopData()->swEntry : NULLHANDLE;
+        if (swEntry != NULLHANDLE) {
+            SWCNTRL swc;
+            WinQuerySwitchEntry(swEntry, &swc);
+            swc.uchVisibility = SWL_INVISIBLE;
+            WinChangeSwitchEntry(swEntry, &swc);
+        }
+    }
+    if (q->isWindow()) {
+        if (QWidgetBackingStore *bs = maybeBackingStore())
+            bs->releaseBuffer();
+    } else {
+        invalidateBuffer(q->rect());
+    }
+    q->setAttribute(Qt::WA_Mapped, false);
 }
 
 void QWidgetPrivate::show_sys()
 {
-    // @todo implement
+    Q_Q(QWidget);
+#if defined(QT_NON_COMMERCIAL)
+    QT_NC_SHOW_WINDOW
+#endif
+    if (q->testAttribute(Qt::WA_OutsideWSRange))
+        return;
+    q->setAttribute(Qt::WA_Mapped);
+    Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
+
+    if (q->testAttribute(Qt::WA_DontShowOnScreen)) {
+        invalidateBuffer(q->rect());
+        return;
+    }
+
+    if (frameWinId() != NULLHANDLE) {
+        ULONG fl = SWP_SHOW;
+        if (q->isWindow()) {
+            if (q->isMinimized()) {
+                fl = SWP_MINIMIZE;
+            } else if (q->isMaximized()) {
+                fl |= SWP_MAXIMIZE;
+            } else {
+                fl |= SWP_RESTORE;
+            }
+
+            if (!(q->testAttribute(Qt::WA_ShowWithoutActivating)
+                  || (q->windowType() == Qt::Popup)
+                  || (q->windowType() == Qt::ToolTip)
+                  || (q->windowType() == Qt::Tool))) {
+                fl |= SWP_ACTIVATE;
+            }
+        }
+
+        qt_WinSetWindowPos(frameWinId(), 0, 0, 0, 0, 0, fl);
+
+        if (q->isWindow()) {
+            if (q->windowType() != Qt::Popup &&
+                q->windowType() != Qt::Tool &&
+                (q->windowType() != Qt::Dialog || !q->parentWidget())
+            ) {
+                HSWITCH &swEntry = topData()->swEntry;
+                if (!swEntry) {
+                    // lazily create a new window list entry
+                    HWND id = frameWinId();
+                    PID pid;
+                    WinQueryWindowProcess(id, &pid, NULL);
+                    SWCNTRL swc;
+                    memset(&swc, 0, sizeof(SWCNTRL));
+                    swc.hwnd = id;
+                    swc.idProcess = pid;
+                    swc.uchVisibility = SWL_VISIBLE;
+                    swc.fbJump = SWL_JUMPABLE;
+                    WinQueryWindowText(id, sizeof(swc.szSwtitle), swc.szSwtitle);
+                    swEntry = WinAddSwitchEntry(&swc);
+                } else {
+                    SWCNTRL swc;
+                    WinQuerySwitchEntry(swEntry, &swc);
+                    swc.uchVisibility = SWL_VISIBLE;
+                    WinChangeSwitchEntry(swEntry, &swc);
+                }
+            }
+
+            ULONG wstyle = WinQueryWindowULong(frameWinId(), QWL_STYLE);
+            if (wstyle & WS_MINIMIZED)
+                data.window_state |= Qt::WindowMinimized;
+            if (wstyle & WS_MAXIMIZED)
+                data.window_state |= Qt::WindowMaximized;
+        }
+    }
+
+    invalidateBuffer(q->rect());
 }
 
@@ -764 +1409 @@
 {
     extra->topextra->fId = NULLHANDLE;
+
 }
 
 void QWidgetPrivate::deleteTLSysExtra()
 {
+
+
     // Note: extra->topextra->fId is cleaned up in QWidget::destroy()
 }

trunk/src/gui/kernel/qwindowdefs_pm.h

@@ -58 +58 @@
 typedef unsigned long LHANDLE;
 typedef LHANDLE HWND;
+
 typedef struct _QMSG QMSG;
 typedef void *MRESULT;
 
 typedef HWND WId;
+
+
 
 // constants to address extra window data

trunk/src/gui/painting/qregion_pm.cpp

@@ -60 +60 @@
 QRegion::QRegion(const QRect &r, RegionType t)
 {
+
+
     // @todo implement
 }
@@ -65 +67 @@
 QRegion::QRegion(const QPolygon &a, Qt::FillRule fillRule)
 {
+
+
     // @todo implement
 }
@@ -76 +80 @@
 QRegion::QRegion(const QBitmap &bm)
 {
+
+
     // @todo implement
 }
@@ -81 +87 @@
 void QRegion::cleanUp(QRegion::QRegionData *x)
 {
+
     // @todo implement
 }