Changeset 110

Timestamp:

Jul 30, 2006, 7:11:51 PM (19 years ago)

Author:

dmik

Message:

Widgets: Implemented QDesktopWidget::availableGeometry().

Location:

trunk/src/kernel

Files:

• qapplication_pm.cpp (modified) (4 diffs)
• qdesktopwidget_pm.cpp (modified) (5 diffs)

trunk/src/kernel/qapplication_pm.cpp

@@ -951 +951 @@
 //
 
-// some undocumented messages (they have the WM_U_ prefix for clarity)
-//@@TODO (dmik): are they all available in Warp3?
 enum {
+    // some undocumented messages (they have the WM_U_ prefix for clarity)
+    
     // sent to hwnd that has been entered to by a mouse pointer.
     // FID_CLIENT also receives enter messages of its WC_FRAME.
@@ -962 +962 @@
     // mp1 = hwnd that is left, mp2 = hwnd that is entered
     WM_U_MOUSELEAVE = 0x41F,
+
+    // some undocumented system values
+    
+    SV_WORKAREA_YTOP = 51,            
+    SV_WORKAREA_YBOTTOM = 52,            
+    SV_WORKAREA_XRIGHT = 53,            
+    SV_WORKAREA_XLEFT = 54,
 };
 
@@ -1080 +1087 @@
 #endif
 
-/// @todo (dmik) later
-//    case WM_SETTINGCHANGE:
-//#ifdef Q_OS_TEMP
-//      // CE SIP hide/show
-//      if ( wParam == SPI_SETSIPINFO ) {
-//          QResizeEvent re( QSize(0, 0), QSize(0, 0) ); // Calculated by QDesktopWidget
-//          QApplication::sendEvent( qt_desktopWidget, &re );
-//          break;
-//      }
-//#endif
-//      // ignore spurious XP message when user logs in again after locking
-//      if ( qApp->type() == QApplication::Tty )
-//          break;
-//      if ( QApplication::desktopSettingsAware() && wParam != SPI_SETWORKAREA ) {
-//          widget = (QETWidget*)QWidget::find( hwnd );
-//          if ( widget ) {
-//              widget->markFrameStrutDirty();
-//              if ( !widget->parentWidget() )
-//                  qt_set_windows_resources();
-//          }
-//      }
-//      break;
-//    case WM_SYSCOLORCHANGE:
-//      if ( qApp->type() == QApplication::Tty )
-//          break;
-//      if ( QApplication::desktopSettingsAware() ) {
-//          widget = (QETWidget*)QWidget::find( hwnd );
-//          if ( widget && !widget->parentWidget() )
-//              qt_set_windows_resources();
-//      }
-//      break;
+        case WM_SYSVALUECHANGED: {
+            // This message is sent to all top-level widgets, handle only once
+            QWidgetList *list = QApplication::topLevelWidgets();
+            bool firstWidget = list->first()->winId() == hwnd;
+            delete list;
+            if ( !firstWidget )
+                break;
+            LONG from = (LONG) mp1;
+            LONG to = (LONG) mp2;
+            #define _IS_SV(sv) (from >= (sv) && to <= (sv))
+            if ( _IS_SV( SV_WORKAREA_XLEFT ) || _IS_SV( SV_WORKAREA_XRIGHT ) ||
+                 _IS_SV( SV_WORKAREA_YBOTTOM ) || _IS_SV( SV_WORKAREA_YTOP ) ) {
+                 // send a special invalid resize event to QDesktopWidget
+                 QResizeEvent re( QSize( -1, -1 ), QSize( -1, -1 ) );
+                 QApplication::sendEvent( qt_desktopWidget, &re );
+                 /// @todo (dmik) enumerate all top-level widgets and
+                 //  remaximize those that are maximized
+            } else {
+                 /// @todo (dmik) call qt_set_pm_resources() in the way it is
+                 //  done in WM_SYSCOLORCHANGE for relevant SV_ values.
+            }
+            #undef _IS_SV
+            break;
+        }
+
+        case WM_SYSCOLORCHANGE: {
+            // This message is sent to all top-level widgets, handle only once
+            QWidgetList *list = QApplication::topLevelWidgets();
+            bool firstWidget = list->first()->winId() == hwnd;
+            delete list;
+            if ( !firstWidget )
+                break;
+            if ( qApp->type() == QApplication::Tty )
+                break;
+            if ( QApplication::desktopSettingsAware() ) {
+                widget = (QETWidget*)QWidget::find( hwnd );
+                if ( widget && !widget->parentWidget() )
+                    qt_set_pm_resources();
+            }
+            break;
+        }
 
         case WM_BUTTON1DOWN:
@@ -2012 +2029 @@
         }
     }
+    delete list;
 
     if ( mgl ) {

trunk/src/kernel/qdesktopwidget_pm.cpp

@@ -52 +52 @@
   \endomit
 */
+
+// just stolen from xWorkplace sources 
+static
+APIRET qt_DosQueryProcAddr( PCSZ pcszModuleName, ULONG ulOrdinal, PFN *ppfn )
+{
+    HMODULE hmod = NULL;
+    APIRET rc = 0;
+    if ( !(rc = DosQueryModuleHandle( (PSZ)pcszModuleName, &hmod )) ) {
+        if ( (rc = DosQueryProcAddr( hmod, ulOrdinal, NULL, ppfn )) ) {
+            // the CP programming guide and reference says use
+            // DosLoadModule if DosQueryProcAddr fails with this error
+            if ( rc == ERROR_INVALID_HANDLE ) {
+                if ( !(rc = DosLoadModule( NULL, 0, (PSZ) pcszModuleName,
+                                            &hmod )) ) {
+                    rc = DosQueryProcAddr( hmod, ulOrdinal, NULL, ppfn );
+                }
+            }
+        }
+    }
+    return rc;
+}
+
+class QDesktopWidgetPrivate
+{
+public:
+
+    QRect workArea;
+};
 
 /*!
@@ -105 +133 @@
 : QWidget( 0, "desktop", WType_Desktop )
 {
+    d = new QDesktopWidgetPrivate();
 }
 
@@ -112 +141 @@
 QDesktopWidget::~QDesktopWidget()
 {
+    delete d;
 }
 
@@ -181 +211 @@
 const QRect& QDesktopWidget::availableGeometry( int /*screen*/ ) const
 {
-    //@@TODO (dmik): use WinGetMaxPosition () to take into account such
-    //  things as XCenter?
+    typedef    
+    BOOL (APIENTRY *WinQueryDesktopWorkArea_T) (HWND hwndDesktop,
+                                                PRECTL pwrcWorkArea);
+    static WinQueryDesktopWorkArea_T WinQueryDesktopWorkArea =
+        (WinQueryDesktopWorkArea_T) ~0;
+    
+    if ( (ULONG) WinQueryDesktopWorkArea == (ULONG) ~0 ) {
+        if ( qt_DosQueryProcAddr( "PMMERGE", 5469,
+                                  (PFN *) &WinQueryDesktopWorkArea ) )
+            WinQueryDesktopWorkArea = NULL;
+    }
+
+    if ( WinQueryDesktopWorkArea ) {
+        RECTL rcl;
+        if ( WinQueryDesktopWorkArea( HWND_DESKTOP, &rcl ) ) {
+            // flip y coordinates
+            d->workArea.setCoords( rcl.xLeft, height() - rcl.yTop,
+                                   rcl.xRight - 1,
+                                   height() - (rcl.yBottom + 1) );
+            return d->workArea;
+        }
+    }
+    
     return geometry();
 }
@@ -252 +303 @@
     \reimp
 */
-void QDesktopWidget::resizeEvent( QResizeEvent * )
-{
-    // do nothing, since the desktop cannot be dynamically resized in OS/2
-    //@@TODO (dmik): emit workAreaResized() when XCenter changes its size
-    //  while reducing the desktop area?
+void QDesktopWidget::resizeEvent( QResizeEvent *e )
+{
+    if ( e && !e->size().isValid() && !e->oldSize().isValid() ) {
+        // This is a Work Area Changed notification, see WM_SYSVALUECHANGED
+        // in qapplication_pm.cpp
+        emit workAreaResized( 0 );
+        return;
+    }
+    
+    // nothing to do, the desktop cannot be dynamically resized in OS/2
 }