Changeset 61 for trunk/src/kernel/qapplication_pm.cpp

Timestamp:

Feb 6, 2006, 10:43:39 PM (20 years ago)

Author:

dmik

Message:

Implemented QRegion(..., QRegion::Eclipse) and QRegion(QPointArray &,...) constructors.
Improved Qt<->GPI region coordinates translation (it's now implicit), QRegion::handle() takes a height of the target devise as an argument (defaults to 0).

File:

• trunk/src/kernel/qapplication_pm.cpp (modified) (11 diffs)

trunk/src/kernel/qapplication_pm.cpp

@@ -43 +43 @@
 
 #include "qapplication.h"
-//@@TODO (dmik): need?
-//#if defined(QT_NON_COMMERCIAL)
-//#include "qnc_win.h"
-//#endif
 #include "private/qapplication_p.h"
 #include "qwidget.h"
@@ -606 +602 @@
 }
 
-//@@TODO (dmik): later (guess remove)
-//Q_EXPORT HINSTANCE qWinAppInst()              // get Windows app handle
-//{
-//    return appInst;
-//}
-//
-//Q_EXPORT HINSTANCE qWinAppPrevInst()          // get Windows prev app handle
-//{
-//    return appPrevInst;
-//}
-//
-//Q_EXPORT int qWinAppCmdShow()                 // get main window show command
-//{
-//    return appCmdShow;
-//}
-
 Q_EXPORT HPS qt_display_ps()                    // get display PS
 {
@@ -1054 +1034 @@
 //    }
 //    */
-
-//@@TODO (dmik): need?
-//#if defined(QT_NON_COMMERCIAL)
-//    QT_NC_WNDPROC
-//#endif
 
     if ( qt_pmEventFilter( &qmsg, rc ) )        // send through app filter
@@ -1392 +1367 @@
             bool window_state_change = FALSE;
             PSWP pswp = (PSWP) mp1;
-//@@TODO (dmik): need?
-//#if defined(QT_NON_COMMERCIAL)
-//              QT_NC_SYSCOMMAND
-//#endif
             if ( pswp->fl & SWP_MAXIMIZE ) {
                 window_state_change = TRUE;
@@ -1432 +1403 @@
         }
 
-//@@TODO (dmik): remove, we processed these in the message above.
-//@@TODO (dmik): what to do with QWhatsThis?..
-//      case WM_SYSCOMMAND: {
-//#ifndef Q_OS_TEMP
-//          bool window_state_change = FALSE;
-//          switch( wParam ) {
-//          case SC_CONTEXTHELP:
-//#ifndef QT_NO_WHATSTHIS
-//              QWhatsThis::enterWhatsThisMode();
-//#endif
-//              QT_WA( {
-//                  DefWindowProc( hwnd, WM_NCPAINT, 1, 0 );
-//              } , {
-//                  DefWindowProcA( hwnd, WM_NCPAINT, 1, 0 );
-//              } );
-//              break;
-//#if defined(QT_NON_COMMERCIAL)
-//              QT_NC_SYSCOMMAND
-//#endif
-//          case SC_MAXIMIZE:
-//              window_state_change = TRUE;
-//              widget->clearWState(Qt::WState_Minimized);
-//              widget->setWState(Qt::WState_Maximized);
-//              result = FALSE;
-//              break;
-//          case SC_MINIMIZE:
-//              window_state_change = TRUE;
-//              widget->setWState(Qt::WState_Minimized);
-//              if ( widget->isVisible() ) {
-//                  QHideEvent e;
-//                  qt_sendSpontaneousEvent( widget, &e );
-//                  widget->hideChildren( TRUE );
-//              }
-//              result = FALSE;
-//              break;
-//          case SC_RESTORE:
-//              window_state_change = TRUE;
-//              if (widget->isMinimized()) {
-//                  widget->clearWState(Qt::WState_Minimized);
-//                  widget->showChildren( TRUE );
-//                  QShowEvent e;
-//                  qt_sendSpontaneousEvent( widget, &e );
-//              } else {
-//                  widget->clearWState(Qt::WState_Maximized);
-//              }
-//              result = FALSE;
-//              break;
-//          default:
-//              result = FALSE;
-//              break;
-//          }
-//
-//          if (window_state_change) {
-//              QEvent e(QEvent::WindowStateChange);
-//              qt_sendSpontaneousEvent(widget, &e);
-//          }
-//#endif
-//
-//          break;
-//      }
-
-//@@TODO (dmik): later
+/// @todo (dmik) later
 //      case WM_SETTINGCHANGE:
 //          if ( !msg.wParam ) {
@@ -1552 +1462 @@
 
         case WM_ACTIVATE:
-//@@TODO (dmik): remove
-//qDebug("WM_ACTIVATE: [%s] %d", widget->name(), SHORT1FROMMP(mp1) );
+#if 0
+            qDebug( "WM_ACTIVATE: [%s] %d", widget->name(), SHORT1FROMMP(mp1) );
+#endif            
             qApp->pmFocus( widget, SHORT1FROMMP(mp1) );
             break;
 
         case WM_SETFOCUS:
-//@@TODO (dmik): remove
-//qDebug("WM_SETFOCUS: [%s] %s [%s]", widget->name(),
-//        SHORT1FROMMP(mp2) ? "<=" : "=>",
-//        QWidget::find( (HWND)mp1 ) ? QWidget::find( (HWND)mp1 )->name() : "{foreign}"
-//);
+#if 0            
+            qDebug( "WM_SETFOCUS: [%s] %s [%s]", widget->name(),
+                    SHORT1FROMMP(mp2) ? "<=" : "=>",
+                    QWidget::find( (HWND)mp1 ) ? QWidget::find( (HWND)mp1 )->name()
+                                               : "{foreign}" );
+#endif            
             result = FALSE;
             if ( !SHORT1FROMMP(mp2) ) {
@@ -1589 +1501 @@
             break;
 
-//@@TODO (dmik): remove, handled in OS/2 version of WM_SETFOCUS above
-//      case WM_ACTIVATE:
-//          if ( QApplication::activePopupWidget() && LOWORD(wParam) == WA_INACTIVE &&
-//              QWidget::find((HWND)lParam) == 0 ) {
-//              // Another application was activated while our popups are open,
-//              // then close all popups.  In case some popup refuses to close,
-//              // we give up after 1024 attempts (to avoid an infinite loop).
-//              int maxiter = 1024;
-//              QWidget *popup;
-//              while ( (popup=QApplication::activePopupWidget()) && maxiter-- )
-//                  popup->close();
-//          }
-//          qApp->winFocus( widget, LOWORD(wParam) == WA_INACTIVE ? 0 : 1 );
-//          break;
-
-//@@TODO (dmik): later
+/// @todo (dmik) remove?
 //#ifndef Q_OS_TEMP
 //          case WM_MOUSEACTIVATE:
@@ -1623 +1520 @@
             result = FALSE;
             break;
-//@@TODO (dmik): remove later
+/// @todo (dmik) remove later
 //          case WM_SHOWWINDOW:
 //#ifndef Q_OS_TEMP
@@ -1656 +1553 @@
             RETURN(0);                          // always handled
 
-//@@TODO (dmik): it seems we don't need this
+/// @todo (dmik) it seems we don't need this
 //      case WM_DESTROY:                        // destroy window
 //          if ( hwnd == curWin ) {
@@ -3364 +3261 @@
 #endif
 
-    // convert region y coordinates from GPI to Qt (see qregion_pm.cpp)
-    POINTL ptl = { 0, -height() };
-    GpiOffsetRegion( hps, hrgn, &ptl );
-    // create a non-null region
-    QRegion rgn( FALSE );
-    // destructor will delete rgn
-    rgn.data->rgn = hrgn;
-
-    QPaintEvent e(
-        rgn,
-        QRect( rcl.xLeft, rcl.yBottom, rcl.xRight, rcl.yTop ),
-        erase
-    );
+    // create a region that will take ownership of hrgn
+    QRegion rgn( hrgn, height() );
+
+    QPaintEvent e( rgn, QRect( rcl.xLeft, rcl.yBottom, rcl.xRight, rcl.yTop ),
+                   erase );
     QApplication::sendSpontaneousEvent( this, (QEvent*) &e );
 
@@ -3455 +3344 @@
         }
         QPoint newCPos( swp.x, swp.y );
-//@@TODO (dmik): should it apply to OS/2?
-//      // Ignore silly Windows move event to wild pos after iconify.
-//      if ( !isMinimized() && newCPos != oldPos ) {
         if ( newCPos != oldPos ) {
             cr.moveTopLeft( newCPos );